summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-01-01 11:04:16 +0000
committerFrans Pop <elendil@planet.nl>2007-01-01 11:04:16 +0000
commitc9213e5a05a5abac7e73df55fcf7cbb06313dd70 (patch)
tree19c312722097697a63033739c158ecac5a86014b /po/zh_CN
parent7eeb7822ed453b00fbf3c534f3034940c2ed5465 (diff)
downloadinstallation-guide-c9213e5a05a5abac7e73df55fcf7cbb06313dd70.zip
[SILENT_COMMIT] Update of POT and PO files for the manual
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po249
-rw-r--r--po/zh_CN/hardware.po250
-rw-r--r--po/zh_CN/install-methods.po235
-rw-r--r--po/zh_CN/installation-howto.po23
-rw-r--r--po/zh_CN/preparing.po835
-rw-r--r--po/zh_CN/random-bits.po377
-rw-r--r--po/zh_CN/using-d-i.po224
7 files changed, 1151 insertions, 1042 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 4fd553af0..2ab9abee0 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-12-31 19:17+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-11-27 09:30+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1143,10 +1143,10 @@ msgstr ""
msgid ""
"If you intend to use the hard drive only for booting and then download "
"everything over the network, you should download the <filename>netboot/"
-"debian-installer/i386/initrd.gz</filename> file and its corresponding kernel "
-"<filename>netboot/debian-installer/i386/linux</filename>. This will allow "
-"you to repartition the hard disk from which you boot the installer, although "
-"you should do so with care."
+"debian-installer/&architecture;/initrd.gz</filename> file and its "
+"corresponding kernel <filename>netboot/debian-installer/&architecture;/"
+"linux</filename>. This will allow you to repartition the hard disk from "
+"which you boot the installer, although you should do so with care."
msgstr ""
"如果您愿意只使用硬盘引导,然后从网络下载其他文件,需要下载 <filename>netboot/"
"debian-installer/i386/initrd.gz</filename> 及其对应的内核。这将允许您重新分区"
@@ -1188,13 +1188,11 @@ msgstr ""
#. Tag: screen
#: boot-installer.xml:896
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"image=/boot/newinstall/vmlinuz\n"
" label=newinstall\n"
-" initrd=/boot/newinstall/initrd.gz\n"
-" root=/dev/ram0\n"
-" append=\"ramdisk_size=12000\""
+" initrd=/boot/newinstall/initrd.gz"
msgstr ""
"image=/boot/newinstall/vmlinuz\n"
" label=newinstall\n"
@@ -1219,14 +1217,14 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:905
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"The procedure for <command>GRUB</command> is quite similar. Locate your "
"<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
"directory (sometimes in the <filename>/boot/boot/grub/</filename>), add the "
"following lines: <informalexample><screen>\n"
"title New Install\n"
-"kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000\n"
+"kernel (hd0,0)/boot/newinstall/vmlinuz\n"
"initrd (hd0,0)/boot/newinstall/initrd.gz\n"
"</screen></informalexample> and reboot."
msgstr ""
@@ -1303,14 +1301,14 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:955
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"For installing from an LS-120 drive (ATAPI version) with a set of floppies, "
"you need to specify the virtual location for the floppy device. This is done "
"with the <emphasis>root=</emphasis> boot argument, giving the device that "
"the ide-floppy driver maps the device to. For example, if your LS-120 drive "
"is connected as the first IDE device (master) on the second cable, you enter "
-"<userinput>linux root=/dev/hdc</userinput> at the boot prompt."
+"<userinput>install root=/dev/hdc</userinput> at the boot prompt."
msgstr ""
"要想在 LS-120 驱动器(ATAPI 版本)使用这些软盘,您需指定这些软盘设备的虚拟地"
"址。这可以通过 <emphasis>root=</emphasis> 引导参数来指定映射的 ide-floppy 驱"
@@ -1461,13 +1459,13 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:1078
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Information on available boot methods and on boot parameters which might be "
"useful can be found by pressing <keycap>F2</keycap> through <keycap>F8</"
"keycap>. If you add any parameters to the boot command line, be sure to type "
-"the boot method (the default is <userinput>linux</userinput>) and a space "
-"before the first parameter (e.g., <userinput>linux fb=false</userinput>)."
+"the boot method (the default is <userinput>install</userinput>) and a space "
+"before the first parameter (e.g., <userinput>install fb=false</userinput>)."
msgstr ""
"使用 <keycap>F2</keycap> 至 <keycap>F8</keycap> 键,可以查看可用的引导方法和"
"引导参数的信息。如果您在引导命令行上添加任何参数,确保引导方法(默认是 "
@@ -3726,7 +3724,7 @@ msgstr ""
"起的问题。"
#. Tag: term
-#: boot-installer.xml:3007 boot-installer.xml:3171
+#: boot-installer.xml:3007 boot-installer.xml:3173
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
@@ -3863,17 +3861,20 @@ msgstr "ramdisk_size"
#. Tag: para
#: boot-installer.xml:3091
#, no-c-format
-msgid "If you are using a 2.2.x kernel, you may need to set &ramdisksize;."
-msgstr "如果您在使用 2.2.x 内核,也许需要设置 &ramdisksize;。"
+msgid ""
+"This parameter should already be set to a correct value where needed; set it "
+"only it you see errors during the boot that indicate the ramdisk could not "
+"be loaded completely. The value is in kB."
+msgstr ""
#. Tag: term
-#: boot-installer.xml:3099
+#: boot-installer.xml:3101
#, no-c-format
msgid "mouse/left"
msgstr "mouse/left"
#. Tag: para
-#: boot-installer.xml:3100
+#: boot-installer.xml:3102
#, no-c-format
msgid ""
"For the gtk frontend (graphical installer), users can switch the mouse to "
@@ -3884,13 +3885,13 @@ msgstr ""
"userinput> 切换成左手使用鼠标。"
#. Tag: term
-#: boot-installer.xml:3109
+#: boot-installer.xml:3111
#, no-c-format
msgid "directfb/hw-accel"
msgstr "directfb/hw-accel"
#. Tag: para
-#: boot-installer.xml:3110
+#: boot-installer.xml:3112
#, no-c-format
msgid ""
"For the gtk frontend (graphical installer), hardware acceleration in "
@@ -3901,13 +3902,13 @@ msgstr ""
"以在启动安装程序的时候设置参数为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:3120
+#: boot-installer.xml:3122
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:3121
+#: boot-installer.xml:3123
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3917,13 +3918,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:3132
+#: boot-installer.xml:3134
#, fuzzy, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:3133
+#: boot-installer.xml:3135
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3933,13 +3934,13 @@ msgid ""
msgstr ""
#. Tag: term
-#: boot-installer.xml:3145
+#: boot-installer.xml:3147
#, fuzzy, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/theme"
#. Tag: para
-#: boot-installer.xml:3146
+#: boot-installer.xml:3148
#, no-c-format
msgid ""
"Can be used to set both the language and country for the installation. This "
@@ -3949,13 +3950,13 @@ msgid ""
msgstr ""
#. Tag: term
-#: boot-installer.xml:3157
+#: boot-installer.xml:3159
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr ""
#. Tag: para
-#: boot-installer.xml:3158
+#: boot-installer.xml:3160
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3966,7 +3967,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:3172
+#: boot-installer.xml:3174
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3974,13 +3975,13 @@ msgid ""
msgstr ""
#. Tag: term
-#: boot-installer.xml:3181
+#: boot-installer.xml:3183
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr ""
#. Tag: para
-#: boot-installer.xml:3182
+#: boot-installer.xml:3184
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3992,13 +3993,13 @@ msgid ""
msgstr ""
#. Tag: term
-#: boot-installer.xml:3195
+#: boot-installer.xml:3197
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr ""
#. Tag: para
-#: boot-installer.xml:3196
+#: boot-installer.xml:3198
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -4007,13 +4008,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:3209
+#: boot-installer.xml:3211
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:3210
+#: boot-installer.xml:3212
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -4033,7 +4034,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:3223
+#: boot-installer.xml:3225
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -4045,7 +4046,7 @@ msgstr ""
"很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:3230
+#: boot-installer.xml:3232
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -4065,25 +4066,25 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:3240
+#: boot-installer.xml:3242
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:3252
+#: boot-installer.xml:3254
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:3257
+#: boot-installer.xml:3259
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:3258
+#: boot-installer.xml:3260
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -4095,7 +4096,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:3265
+#: boot-installer.xml:3267
#, no-c-format
msgid ""
"There are a many different possible causes for these problems. We can only "
@@ -4106,13 +4107,13 @@ msgstr ""
"下由您来处理。"
#. Tag: para
-#: boot-installer.xml:3271
+#: boot-installer.xml:3273
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:3276
+#: boot-installer.xml:3278
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -4120,7 +4121,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:3282
+#: boot-installer.xml:3284
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -4133,7 +4134,7 @@ msgstr ""
"的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:3292
+#: boot-installer.xml:3294
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -4144,7 +4145,7 @@ msgstr ""
"CD-ROM 和 DVD,为了简单,只说了 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:3298
+#: boot-installer.xml:3300
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -4152,13 +4153,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:3306
+#: boot-installer.xml:3308
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:3309
+#: boot-installer.xml:3311
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -4166,7 +4167,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:3315
+#: boot-installer.xml:3317
#, no-c-format
msgid ""
"If your system boots correctly from the CD-ROM, it does not necessarily mean "
@@ -4177,7 +4178,7 @@ msgstr ""
"准确一点,CD-ROM 驱动器所连接的控制器)。"
#. Tag: para
-#: boot-installer.xml:3322
+#: boot-installer.xml:3324
#, no-c-format
msgid ""
"Some older CD-ROM drives do not work correctly if <quote>direct memory "
@@ -4187,19 +4188,19 @@ msgstr ""
"常工作。"
#. Tag: title
-#: boot-installer.xml:3333
+#: boot-installer.xml:3335
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:3334
+#: boot-installer.xml:3336
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:3339
+#: boot-installer.xml:3341
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (older systems "
@@ -4209,7 +4210,7 @@ msgstr ""
"持您所使用的介质。"
#. Tag: para
-#: boot-installer.xml:3345
+#: boot-installer.xml:3347
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -4233,7 +4234,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:3358
+#: boot-installer.xml:3360
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -4255,7 +4256,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:3363
+#: boot-installer.xml:3365
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -4272,7 +4273,7 @@ msgstr ""
"Linux 知识。要执行命令,您应该首先切换到第二虚拟控制台(VT2),并激活 shell。"
#. Tag: para
-#: boot-installer.xml:3375
+#: boot-installer.xml:3377
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -4284,7 +4285,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:3382
+#: boot-installer.xml:3384
#, fuzzy, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -4312,7 +4313,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:3396
+#: boot-installer.xml:3398
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -4324,7 +4325,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:3404
+#: boot-installer.xml:3406
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -4339,7 +4340,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:3414
+#: boot-installer.xml:3416
#, fuzzy, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -4363,7 +4364,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:3429
+#: boot-installer.xml:3431
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -4375,13 +4376,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:3444
+#: boot-installer.xml:3446
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:3446
+#: boot-installer.xml:3448
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install Debian seems to "
@@ -4390,7 +4391,7 @@ msgstr ""
"对于用软盘安装 Debian 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:3451
+#: boot-installer.xml:3453
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -4406,7 +4407,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:3460
+#: boot-installer.xml:3462
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -4421,7 +4422,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:3469
+#: boot-installer.xml:3471
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -4432,7 +4433,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:3475
+#: boot-installer.xml:3477
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -4443,7 +4444,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:3481
+#: boot-installer.xml:3483
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -4454,13 +4455,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:3490
+#: boot-installer.xml:3492
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:3492
+#: boot-installer.xml:3494
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -4473,19 +4474,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:3499
-#, no-c-format
-msgid ""
-"If you are booting with your own kernel instead of the one supplied with the "
-"installer, be sure that <userinput>CONFIG_DEVFS</userinput> is set in your "
-"kernel. The installer requires <userinput>CONFIG_DEVFS</userinput>."
-msgstr ""
-"如果引导的是您自己的内核,而不是安装程序提供的内核,请确定 "
-"<userinput>CONFIG_DEVFS</userinput> 已被设置到内核。安装程序需要 "
-"<userinput>CONFIG_DEVFS</userinput>。"
-
-#. Tag: para
-#: boot-installer.xml:3506
+#: boot-installer.xml:3501
#, no-c-format
msgid ""
"Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -4496,7 +4485,7 @@ msgstr ""
"arch=\"x86\">内置调制解调器、声卡以及即插即用设备特别容易引起问题。</phrase>"
#. Tag: para
-#: boot-installer.xml:3512
+#: boot-installer.xml:3507
#, no-c-format
msgid ""
"If you have a large amount of memory installed in your machine, more than "
@@ -4509,13 +4498,13 @@ msgstr ""
"<userinput>mem=512m</userinput>。"
#. Tag: title
-#: boot-installer.xml:3523 boot-installer.xml:3608
+#: boot-installer.xml:3518 boot-installer.xml:3603
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:3524
+#: boot-installer.xml:3519
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -4523,7 +4512,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:3529
+#: boot-installer.xml:3524
#, no-c-format
msgid ""
"Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -4534,7 +4523,7 @@ msgstr ""
"息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:3535
+#: boot-installer.xml:3530
#, no-c-format
msgid ""
"On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -4552,7 +4541,7 @@ msgstr ""
"replaceable>,<replaceable>sectors</replaceable></userinput>。"
#. Tag: para
-#: boot-installer.xml:3544
+#: boot-installer.xml:3539
#, no-c-format
msgid ""
"If you have a very old machine, and the kernel hangs after saying "
@@ -4565,7 +4554,7 @@ msgstr ""
"userinput> 参数来取消这个测试。"
#. Tag: para
-#: boot-installer.xml:3551
+#: boot-installer.xml:3546
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4583,13 +4572,13 @@ msgstr ""
"能用英语,请参见 <xref linkend=\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:3565
+#: boot-installer.xml:3560
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:3566
+#: boot-installer.xml:3561
#, no-c-format
msgid ""
"Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -4607,7 +4596,7 @@ msgstr ""
"段。"
#. Tag: para
-#: boot-installer.xml:3576
+#: boot-installer.xml:3571
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4627,13 +4616,13 @@ msgstr ""
"装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: title
-#: boot-installer.xml:3593
+#: boot-installer.xml:3588
#, fuzzy, no-c-format
msgid "System Freeze while Loading USB Modules"
msgstr "在装入 USB 模块时系统停止"
#. Tag: para
-#: boot-installer.xml:3594
+#: boot-installer.xml:3589
#, no-c-format
msgid ""
"The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -4650,19 +4639,19 @@ msgstr ""
"installer/probe/usb=false</userinput> 参数,这将阻止装入此模块。"
#. Tag: para
-#: boot-installer.xml:3609
+#: boot-installer.xml:3604
#, fuzzy, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: title
-#: boot-installer.xml:3615
+#: boot-installer.xml:3610
#, no-c-format
msgid "Misdirected video output"
msgstr ""
#. Tag: para
-#: boot-installer.xml:3616
+#: boot-installer.xml:3611
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4678,7 +4667,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:3630
+#: boot-installer.xml:3625
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4688,13 +4677,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:3641
+#: boot-installer.xml:3636
#, fuzzy, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD 光盘上引导"
#. Tag: para
-#: boot-installer.xml:3642
+#: boot-installer.xml:3637
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4703,28 +4692,28 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:3648
+#: boot-installer.xml:3643
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr ""
#. Tag: title
-#: boot-installer.xml:3657
+#: boot-installer.xml:3652
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3659
-#, no-c-format
+#: boot-installer.xml:3654
+#, fuzzy, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
-"<computeroutput>can't find <replaceable>something</replaceable> </"
-"computeroutput>, or <computeroutput> <replaceable>something</replaceable> "
-"not present</computeroutput>, <computeroutput>can't initialize "
-"<replaceable>something</replaceable> </computeroutput>, or even "
+"<computeroutput>can't find <replaceable>something</replaceable></"
+"computeroutput>, or <computeroutput><replaceable>something</replaceable> not "
+"present</computeroutput>, <computeroutput>can't initialize "
+"<replaceable>something</replaceable></computeroutput>, or even "
"<computeroutput>this driver release depends on <replaceable>something</"
-"replaceable> </computeroutput>. Most of these messages are harmless. You see "
+"replaceable></computeroutput>. Most of these messages are harmless. You see "
"them because the kernel for the installation system is built to run on "
"computers with many different peripheral devices. Obviously, no one computer "
"will have every possible peripheral device, so the operating system may emit "
@@ -4748,13 +4737,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)。"
#. Tag: title
-#: boot-installer.xml:3684
+#: boot-installer.xml:3679
#, fuzzy, no-c-format
msgid "Reporting Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:3685
+#: boot-installer.xml:3680
#, fuzzy, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4771,7 +4760,7 @@ msgstr ""
"可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3696
+#: boot-installer.xml:3691
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4782,13 +4771,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3707
+#: boot-installer.xml:3702
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3708
+#: boot-installer.xml:3703
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4800,16 +4789,16 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3715
+#: boot-installer.xml:3710
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
"Tracking System (BTS) and forwarded to a public mailing list. Make sure that "
-"you use an E-Mail address that you do not mind being made public."
+"you use an e-mail address that you do not mind being made public."
msgstr ""
#. Tag: para
-#: boot-installer.xml:3721
+#: boot-installer.xml:3716
#, fuzzy, no-c-format
msgid ""
"If you have a working Debian system, the easiest way to send an installation "
@@ -4825,7 +4814,7 @@ msgstr ""
"installation-report</command> 命令。"
#. Tag: para
-#: boot-installer.xml:3731
+#: boot-installer.xml:3726
#, fuzzy, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
@@ -4911,6 +4900,18 @@ msgstr ""
"</screen></informalexample> 在 bug 报告内,请说明问题所在,包括内核挂起后最后"
"见到的内核消息。描述进入问题状态所进行的步骤。"
+#~ msgid "If you are using a 2.2.x kernel, you may need to set &ramdisksize;."
+#~ msgstr "如果您在使用 2.2.x 内核,也许需要设置 &ramdisksize;。"
+
+#~ msgid ""
+#~ "If you are booting with your own kernel instead of the one supplied with "
+#~ "the installer, be sure that <userinput>CONFIG_DEVFS</userinput> is set in "
+#~ "your kernel. The installer requires <userinput>CONFIG_DEVFS</userinput>."
+#~ msgstr ""
+#~ "如果引导的是您自己的内核,而不是安装程序提供的内核,请确定 "
+#~ "<userinput>CONFIG_DEVFS</userinput> 已被设置到内核。安装程序需要 "
+#~ "<userinput>CONFIG_DEVFS</userinput>。"
+
#~ msgid "Bug Reporter"
#~ msgstr "Bug Reporter"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 89138e45f..89db1aef2 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-12-31 03:15+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-10-31 21:18+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1927,12 +1927,12 @@ msgstr ""
#. Tag: para
#: hardware.xml:853
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
"are supported, including all varieties of Intel's \"Pentium\" series. This "
-"also includes 32-bit AMD and VIA (former Cyrix) processors, and new "
-"processors like the Athlon XP and Intel P4 Xeon."
+"also includes 32-bit AMD and VIA (former Cyrix) processors, and processors "
+"like the Athlon XP and Intel P4 Xeon."
msgstr ""
"几乎所有个人计算机中基于 x86 (IA-32) 的处理器都支持,包括所有的 Intel "
"\"Pentium\" 系列变种。还包括 32 位 AMD 和 VIA (前身是 Cyrix) 处理器,以及像 "
@@ -1942,8 +1942,8 @@ msgstr ""
#: hardware.xml:861
#, fuzzy, no-c-format
msgid ""
-"If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo "
-"processor, you will probably want to use the installer for the amd64 "
+"If your system has a 64-bit processor from the AMD64 or Intel EM64T "
+"families, you will probably want to use the installer for the amd64 "
"architecture instead of the installer for the (32-bit) i386 architecture."
msgstr ""
"假如您的系统中有 64 位 AMD64、Intel EM64t 或者 Intel Core 2 Duo 处理器,要用 "
@@ -1951,25 +1951,24 @@ msgstr ""
#. Tag: para
#: hardware.xml:868
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run on "
-"386 or earlier processors. Despite the architecture name \"i386\", Debian "
-"Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors "
-"(and their clones), which were supported by earlier releases<footnote> "
-"<para> We have long tried to avoid this, but in the end it was necessary due "
-"a unfortunate series of issues with the compiler and the kernel, starting "
-"with an bug in the C++ ABI provided by GCC. You should still be able to run "
-"Debian GNU/Linux on actual 80386 processors if you compile your own kernel "
-"and compile all packages from source, but that is beyond the scope of this "
-"manual. </para> </footnote>. (No version of Linux has ever supported the 286 "
-"or earlier chips in the series.) All i486 and later processors are still "
-"supported<footnote> <para> Many Debian packages will actually run slightly "
-"faster on modern computers as a positive side effect of dropping support for "
-"these old chips. The i486, introduced in 1989, has three opcodes (bswap, "
-"cmpxchg, and xadd) which the i386, introduced in 1986, did not have. "
-"Previously, these could not be easily used by most Debian packages; now they "
-"can. </para> </footnote>."
+"386 or earlier processors. Despite the architecture name \"i386\", support "
+"for actual 80386 processors (and their clones) was dropped with the Sarge "
+"(r3.1) release of Debian<footnote> <para> We have long tried to avoid this, "
+"but in the end it was necessary due a unfortunate series of issues with the "
+"compiler and the kernel, starting with an bug in the C++ ABI provided by "
+"GCC. You should still be able to run Debian GNU/Linux on actual 80386 "
+"processors if you compile your own kernel and compile all packages from "
+"source, but that is beyond the scope of this manual. </para> </footnote>. "
+"(No version of Linux has ever supported the 286 or earlier chips in the "
+"series.) All i486 and later processors are still supported<footnote> <para> "
+"Many Debian packages will actually run slightly faster on modern computers "
+"as a positive side effect of dropping support for these old chips. The i486, "
+"introduced in 1989, has three opcodes (bswap, cmpxchg, and xadd) which the "
+"i386, introduced in 1986, did not have. Previously, these could not be "
+"easily used by most Debian packages; now they can. </para> </footnote>."
msgstr ""
"然而,Debian GNU/Linux &releasename; 将 <emphasis>不</emphasis> 运行在 386 或"
"更早的处理器上。尽管体系命名为 \"i386\",Debian Sarge 已经 <emphasis>放弃</"
@@ -3647,14 +3646,28 @@ msgstr "网络"
#: hardware.xml:2065
#, no-c-format
msgid ""
-"You can also <emphasis>boot</emphasis> your system over the network. <phrase "
-"arch=\"mips\">This is the preferred installation technique for Mips.</phrase>"
+"The network can be used during the installtion to retrieve files needed for "
+"the installation. Whether the network is used or not depends on the "
+"installation method you choose and your answers to certain questions that "
+"will be asked during the installation. The installation system supports most "
+"types of network connection (including PPPoE, but not ISDN or PPP), via "
+"either HTTP or FTP. After the installation is completed, you can also "
+"configure your system to use ISDN and PPP."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:2075
+#, fuzzy, no-c-format
+msgid ""
+"You can also <emphasis>boot</emphasis> the installation system over the "
+"network. <phrase arch=\"mips\">This is the preferred installation technique "
+"for &arch-title;.</phrase>"
msgstr ""
"您还可以从网络 <emphasis>启动(boot)</emphasis> 系统。<phrase arch=\"mips\">这"
"是在 Mips 下推荐的安装技术</phrase>"
#. Tag: para
-#: hardware.xml:2071
+#: hardware.xml:2081
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -3663,29 +3676,18 @@ msgstr ""
"无盘安装,使用网络从局域网启动,并用 NFS 挂载所有的本地文件系统,是另一种选"
"择。"
-#. Tag: para
-#: hardware.xml:2076
-#, no-c-format
-msgid ""
-"After the operating system kernel is installed, you can install the rest of "
-"your system via any sort of network connection (including PPP after "
-"installation of the base system), via FTP or HTTP."
-msgstr ""
-"在安装了操作系统的内核以后,您可以使用任何一种网络连接方式(包括安装完基本系统"
-"以后使用 PPP) 通过 FTP 或 HTTP 完成剩余的系统安装任务。"
-
#. Tag: title
-#: hardware.xml:2085
+#: hardware.xml:2089
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:2087
-#, no-c-format
+#: hardware.xml:2091
+#, fuzzy, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
-"&debian; without using the &d-i; described in the rest of the manual. This "
+"&debian; without using the &d-i; described in the rest of this manual. This "
"kind of install may be useful for users with otherwise unsupported hardware "
"or on hosts which can't afford downtime. If you are interested in this "
"technique, skip to the <xref linkend=\"linux-upgrade\"/>."
@@ -3695,13 +3697,13 @@ msgstr ""
"户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/>。"
#. Tag: title
-#: hardware.xml:2099
+#: hardware.xml:2103
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:2101
+#: hardware.xml:2105
#, no-c-format
msgid ""
"The Debian boot disks contain a kernel which is built to maximize the number "
@@ -3717,7 +3719,7 @@ msgstr ""
"设计,这将使得 Debian 可以在尽可能多的硬件上安装。"
#. Tag: para
-#: hardware.xml:2111
+#: hardware.xml:2115
#, no-c-format
msgid ""
"Generally, the Debian installation system includes support for floppies, IDE "
@@ -3729,7 +3731,7 @@ msgstr ""
"制器和驱动器、USB 和火线。文件系统支持 FAT、Win-32 FAT 扩展(VFAT)、NTFS。"
#. Tag: para
-#: hardware.xml:2118
+#: hardware.xml:2122
#, no-c-format
msgid ""
"Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -3746,7 +3748,7 @@ msgstr ""
"ulink> 以获得更详细信息。"
#. Tag: para
-#: hardware.xml:2128
+#: hardware.xml:2132
#, no-c-format
msgid ""
"Pretty much all storage systems supported by the Linux kernel are supported "
@@ -3762,7 +3764,7 @@ msgstr ""
"支持 Atari(FAT) 文件系统。Amigas 支持 FAT 文件系统,HFS 则是受模块支持。"
#. Tag: para
-#: hardware.xml:2138
+#: hardware.xml:2142
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3784,7 +3786,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:2171
+#: hardware.xml:2175
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3799,7 +3801,7 @@ msgstr ""
"Jensen 启动的信息)"
#. Tag: para
-#: hardware.xml:2180
+#: hardware.xml:2184
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3810,7 +3812,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:2186
+#: hardware.xml:2190
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3821,7 +3823,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:2192
+#: hardware.xml:2196
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3829,7 +3831,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:2197
+#: hardware.xml:2201
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3841,13 +3843,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:2214
+#: hardware.xml:2218
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:2215
+#: hardware.xml:2219
#, no-c-format
msgid ""
"Linux supports a large variety of hardware devices such as mice, printers, "
@@ -3858,7 +3860,7 @@ msgstr ""
"而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:2221
+#: hardware.xml:2225
#, fuzzy, no-c-format
msgid ""
"USB hardware generally works fine, only some USB keyboards may require "
@@ -3868,7 +3870,7 @@ msgstr ""
"\"usb-keyboard-config\"/>)。"
#. Tag: para
-#: hardware.xml:2227
+#: hardware.xml:2231
#, no-c-format
msgid ""
"Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -3879,7 +3881,7 @@ msgstr ""
"Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
#. Tag: para
-#: hardware.xml:2233
+#: hardware.xml:2237
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -3890,7 +3892,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:2239
+#: hardware.xml:2243
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3901,7 +3903,7 @@ msgstr ""
"口。Broadcom BCM91480B 开发板有四个 64 位 PCI 插槽。"
#. Tag: para
-#: hardware.xml:2245
+#: hardware.xml:2249
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3914,13 +3916,13 @@ msgstr ""
"备,但 Qube 上有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:2255
+#: hardware.xml:2259
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/Linux"
msgstr "特别为 GNU/Linux 采购硬件"
#. Tag: para
-#: hardware.xml:2257
+#: hardware.xml:2261
#, no-c-format
msgid ""
"There are several vendors, who ship systems with Debian or other "
@@ -3934,7 +3936,7 @@ msgstr ""
"因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:2265
+#: hardware.xml:2269
#, no-c-format
msgid ""
"Unfortunately, it's quite rare to find any vendor shipping new &arch-title; "
@@ -3942,7 +3944,7 @@ msgid ""
msgstr "不幸的是,很少会有厂商出售新 &arch-title; 机器。"
#. Tag: para
-#: hardware.xml:2270
+#: hardware.xml:2274
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -3956,7 +3958,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:2278
+#: hardware.xml:2282
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with Linux bundled, or even a "
@@ -3970,13 +3972,13 @@ msgstr ""
"他)知道您是在为一个 Linux 系统采购设备。请支持对 Linux 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:2289
+#: hardware.xml:2293
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:2290
+#: hardware.xml:2294
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -3988,7 +3990,7 @@ msgstr ""
"不公开的契约才能接触文档,以阻止我们发布 Linux 驱动程序源代码。"
#. Tag: para
-#: hardware.xml:2297
+#: hardware.xml:2301
#, no-c-format
msgid ""
"Another example is the proprietary hardware in the older Macintosh line. In "
@@ -4005,7 +4007,7 @@ msgstr ""
"之,这就是为什么向 Macintosh 移植 Linux 的进度总是滞后于其他移植版的原因。"
#. Tag: para
-#: hardware.xml:2308
+#: hardware.xml:2312
#, no-c-format
msgid ""
"Since we haven't been granted access to the documentation on these devices, "
@@ -4018,13 +4020,13 @@ msgstr ""
"软件社区也是一个重要的市场。"
#. Tag: title
-#: hardware.xml:2320
+#: hardware.xml:2324
#, no-c-format
msgid "Windows-specific Hardware"
msgstr "Windows 专用硬件"
#. Tag: para
-#: hardware.xml:2321
+#: hardware.xml:2325
#, no-c-format
msgid ""
"A disturbing trend is the proliferation of Windows-specific modems and "
@@ -4046,7 +4048,7 @@ msgstr ""
"等功能的保留内嵌处理器的设备昂贵。"
#. Tag: para
-#: hardware.xml:2334
+#: hardware.xml:2338
#, no-c-format
msgid ""
"You should avoid Windows-specific hardware for two reasons. The first is "
@@ -4077,7 +4079,7 @@ msgstr ""
"是 Windows 2000 或 XP,都要忍受这些制造商克扣内嵌处理器造成的性能下降。"
#. Tag: para
-#: hardware.xml:2355
+#: hardware.xml:2359
#, no-c-format
msgid ""
"You can help improve this situation by encouraging these manufacturers to "
@@ -4091,29 +4093,22 @@ msgstr ""
"hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>。"
#. Tag: title
-#: hardware.xml:2372
+#: hardware.xml:2376
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:2374
+#: hardware.xml:2378
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
-"hard disk space. For a minimal console-based system (all standard packages), "
-"250MB is required. If you want to install a reasonable amount of software, "
-"including the X Window System, and some development programs and libraries, "
-"you'll need at least 400MB. For a more or less complete desktop system, "
-"you'll need a few gigabytes."
+"hard disk space. Note that these are really bare-minimum numbers. For more "
+"realistic figures, see <xref linkend=\"minimum-hardware-reqts\"/>."
msgstr ""
-"您需要至少 &minimum-memory; 的内存和 &minimum-fs-size; 硬盘空间。对最小的基于"
-"控制台的系统(包括所有标准软件包)需要250MB。如果您要安装适当的软件,包括 X "
-"Window 系统,以及一些开发工具和库,需要至少400MB。对于一个基本的桌面系统,需"
-"要几个 G 的空间。"
#. Tag: para
-#: hardware.xml:2383
+#: hardware.xml:2384
#, no-c-format
msgid ""
"On the Amiga the size of FastRAM is relevant towards the total memory "
@@ -4128,7 +4123,7 @@ msgstr ""
"的内核可以自动禁止 16 位的 RAM。"
#. Tag: para
-#: hardware.xml:2392
+#: hardware.xml:2393
#, no-c-format
msgid ""
"On the Atari, both ST-RAM and Fast RAM (TT-RAM) are used by Linux. Many "
@@ -4141,7 +4136,7 @@ msgstr ""
"MB 的 ST-RAM。您需要额外的 12 MB 或更多的 TT-RAM。"
#. Tag: para
-#: hardware.xml:2400
+#: hardware.xml:2401
#, no-c-format
msgid ""
"On the Macintosh, care should be taken on machines with RAM-based video "
@@ -4154,19 +4149,19 @@ msgstr ""
"要 4 MB。"
#. Tag: emphasis
-#: hardware.xml:2410
+#: hardware.xml:2411
#, no-c-format
msgid "FIXME: is this still true?"
msgstr "FIXME: is this still true?"
#. Tag: title
-#: hardware.xml:2421
+#: hardware.xml:2422
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:2422
+#: hardware.xml:2423
#, fuzzy, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the Linux kernel should "
@@ -4181,7 +4176,7 @@ msgstr ""
"解详细信息。"
#. Tag: para
-#: hardware.xml:2434
+#: hardware.xml:2435
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -4189,37 +4184,37 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2440
+#: hardware.xml:2441
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:2445
+#: hardware.xml:2446
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:2450
+#: hardware.xml:2451
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:2455
+#: hardware.xml:2456
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:2460
+#: hardware.xml:2461
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:2467
+#: hardware.xml:2468
#, no-c-format
msgid ""
"Due to kernel limitations only the onboard network interfaces on DECstations "
@@ -4229,31 +4224,31 @@ msgstr ""
"还 不能工作。"
#. Tag: para
-#: hardware.xml:2473
+#: hardware.xml:2474
#, no-c-format
msgid "The list of supported network devices is:"
msgstr ""
#. Tag: para
-#: hardware.xml:2478
+#: hardware.xml:2479
#, no-c-format
msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
msgstr "Channel to Channel (CTC) 和 ESCON connection (实际或模拟)"
#. Tag: para
-#: hardware.xml:2483
+#: hardware.xml:2484
#, no-c-format
msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
#. Tag: para
-#: hardware.xml:2488
+#: hardware.xml:2489
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:2497
+#: hardware.xml:2498
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -4266,7 +4261,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2507
+#: hardware.xml:2508
#, fuzzy, no-c-format
msgid ""
"As for ISDN, the D-channel protocol for the (old) German 1TR6 is not "
@@ -4277,13 +4272,13 @@ msgstr ""
"ISDN 板也不被 &d-i; 支持。"
#. Tag: title
-#: hardware.xml:2516
+#: hardware.xml:2517
#, no-c-format
msgid "Drivers Requiring Firmware"
msgstr ""
#. Tag: para
-#: hardware.xml:2517
+#: hardware.xml:2518
#, no-c-format
msgid ""
"The installation system currently does not support retrieving firmware. This "
@@ -4292,7 +4287,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2523
+#: hardware.xml:2524
#, no-c-format
msgid ""
"If there is no other NIC you can use during the installation, it is still "
@@ -4306,7 +4301,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2534
+#: hardware.xml:2535
#, no-c-format
msgid ""
"If the driver itself <emphasis>is</emphasis> supported, you may also be able "
@@ -4317,13 +4312,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:2546
+#: hardware.xml:2547
#, no-c-format
msgid "Wireless Network Cards"
msgstr ""
#. Tag: para
-#: hardware.xml:2547
+#: hardware.xml:2548
#, no-c-format
msgid ""
"Wireless NICs are in general supported as well, with one big proviso. A lot "
@@ -4333,7 +4328,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2554
+#: hardware.xml:2555
#, no-c-format
msgid ""
"If there is no other NIC you can use during the installation, it is still "
@@ -4342,7 +4337,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2560
+#: hardware.xml:2561
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a Debian package. "
@@ -4354,13 +4349,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:2574
+#: hardware.xml:2575
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr ""
#. Tag: para
-#: hardware.xml:2575
+#: hardware.xml:2576
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -4368,13 +4363,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:2582
+#: hardware.xml:2583
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr ""
#. Tag: para
-#: hardware.xml:2584
+#: hardware.xml:2585
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -4386,7 +4381,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2594
+#: hardware.xml:2595
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -4399,19 +4394,40 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:2609
+#: hardware.xml:2610
#, no-c-format
msgid "Sun B100 blade"
msgstr ""
#. Tag: para
-#: hardware.xml:2611
+#: hardware.xml:2612
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
"blade systems."
msgstr ""
+#~ msgid ""
+#~ "After the operating system kernel is installed, you can install the rest "
+#~ "of your system via any sort of network connection (including PPP after "
+#~ "installation of the base system), via FTP or HTTP."
+#~ msgstr ""
+#~ "在安装了操作系统的内核以后,您可以使用任何一种网络连接方式(包括安装完基本"
+#~ "系统以后使用 PPP) 通过 FTP 或 HTTP 完成剩余的系统安装任务。"
+
+#~ msgid ""
+#~ "You must have at least &minimum-memory; of memory and &minimum-fs-size; "
+#~ "of hard disk space. For a minimal console-based system (all standard "
+#~ "packages), 250MB is required. If you want to install a reasonable amount "
+#~ "of software, including the X Window System, and some development programs "
+#~ "and libraries, you'll need at least 400MB. For a more or less complete "
+#~ "desktop system, you'll need a few gigabytes."
+#~ msgstr ""
+#~ "您需要至少 &minimum-memory; 的内存和 &minimum-fs-size; 硬盘空间。对最小的"
+#~ "基于控制台的系统(包括所有标准软件包)需要250MB。如果您要安装适当的软件,包"
+#~ "括 X Window 系统,以及一些开发工具和库,需要至少400MB。对于一个基本的桌面"
+#~ "系统,需要几个 G 的空间。"
+
#, fuzzy
#~ msgid ""
#~ "The following network interface cards are supported directly by the "
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 53c8de967..999ee925a 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-12-31 03:15+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-09-04 10:13+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -878,7 +878,7 @@ msgstr ""
# index.docbook:645, index.docbook:739
#. Tag: title
-#: install-methods.xml:662 install-methods.xml:754
+#: install-methods.xml:662 install-methods.xml:751
#, no-c-format
msgid "USB stick partitioning on &arch-title;"
msgstr "在 &arch-title; 上为 USB 闪盘分区"
@@ -980,22 +980,19 @@ msgstr ""
#, no-c-format
msgid ""
"The <filename>syslinux.cfg</filename> configuration file should contain the "
-"following two lines: <informalexample><screen>\n"
-"default vmlinuz\n"
-"append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n"
-"</screen></informalexample> Please note that the <userinput>ramdisk_size</"
-"userinput> parameter may need to be increased, depending on the image you "
-"are booting."
+"following two lines:"
msgstr ""
-"<filename>syslinux.cfg</filename> 配置文件应该含有下列两行: "
-"<informalexample><screen>\n"
+
+#. Tag: screen
+#: install-methods.xml:741
+#, no-c-format
+msgid ""
"default vmlinuz\n"
-"append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n"
-"</screen></informalexample> 请注意,根据所启动的内存映像的大小,在必要的时"
-"候,您可能需要增大<userinput>ramdisk_size</userinput> 参数的数值。"
+"append initrd=initrd.gz"
+msgstr ""
#. Tag: para
-#: install-methods.xml:755
+#: install-methods.xml:752
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1020,7 +1017,7 @@ msgstr ""
"command> 命令包含在 <classname>hfsutils</classname> Debian 包中。"
#. Tag: para
-#: install-methods.xml:771
+#: install-methods.xml:768
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1035,7 +1032,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:780
+#: install-methods.xml:777
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1069,7 +1066,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:796
+#: install-methods.xml:793
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and copy "
@@ -1079,37 +1076,37 @@ msgstr ""
"从 Debain 文件库拷贝到闪盘上:"
#. Tag: para
-#: install-methods.xml:802
+#: install-methods.xml:799
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:807
+#: install-methods.xml:804
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:812
+#: install-methods.xml:809
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:817
+#: install-methods.xml:814
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:822
+#: install-methods.xml:819
#, no-c-format
msgid "Optional kernel modules"
msgstr "可选的内核模块"
#. Tag: para
-#: install-methods.xml:829
+#: install-methods.xml:826
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1145,13 +1142,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:845
+#: install-methods.xml:842
#, no-c-format
msgid "Adding an ISO image"
msgstr "添加 ISO 映像"
#. Tag: para
-#: install-methods.xml:846
+#: install-methods.xml:843
#, no-c-format
msgid ""
"The installer will look for a Debian ISO image on the stick as its source "
@@ -1165,7 +1162,7 @@ msgstr ""
"盘内(确定选择适合的那个)。映像文件的后缀名必须是 <filename>.iso</filename>。"
#. Tag: para
-#: install-methods.xml:854
+#: install-methods.xml:851
#, no-c-format
msgid ""
"If you want to install over the network, without using an ISO image, you "
@@ -1180,7 +1177,7 @@ msgstr ""
"gz</filename> 并不包含网络支持。"
#. Tag: para
-#: install-methods.xml:863
+#: install-methods.xml:860
#, no-c-format
msgid ""
"When you are done, unmount the USB memory stick (<userinput>umount /mnt</"
@@ -1189,13 +1186,13 @@ msgstr ""
"当您完成后,卸载 USB 闪盘(<userinput>umount /mnt</userinput>)并打开写保护。"
#. Tag: title
-#: install-methods.xml:873
+#: install-methods.xml:870
#, no-c-format
msgid "Booting the USB stick"
msgstr "从 USB 闪盘启动"
#. Tag: para
-#: install-methods.xml:874
+#: install-methods.xml:871
#, no-c-format
msgid ""
"If your system refuses to boot from the memory stick, the stick may contain "
@@ -1207,19 +1204,19 @@ msgstr ""
"自 <classname>mbr</classname> 软件包:"
#. Tag: screen
-#: install-methods.xml:881
+#: install-methods.xml:878
#, no-c-format
msgid "# install-mbr /dev/<replaceable>sda</replaceable>"
msgstr "# install-mbr /dev/<replaceable>sda</replaceable>"
#. Tag: title
-#: install-methods.xml:892
+#: install-methods.xml:889
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:893
+#: install-methods.xml:890
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1230,7 +1227,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:899
+#: install-methods.xml:896
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1243,13 +1240,13 @@ msgstr ""
"不清。"
#. Tag: para
-#: install-methods.xml:906
+#: install-methods.xml:903
#, no-c-format
msgid "The installer cannot boot from files on an NTFS file system."
msgstr "安装程序无法从 NTFS 文件系统上进行引导。"
#. Tag: para
-#: install-methods.xml:910
+#: install-methods.xml:907
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1269,7 +1266,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:921
+#: install-methods.xml:918
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1280,7 +1277,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:930
+#: install-methods.xml:927
#, no-c-format
msgid ""
"Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1289,7 +1286,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:932
+#: install-methods.xml:929
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1299,7 +1296,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:938
+#: install-methods.xml:935
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1310,7 +1307,7 @@ msgstr ""
"被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:944
+#: install-methods.xml:941
#, no-c-format
msgid ""
"Copy the following files from the Debian archives to a convenient location "
@@ -1320,19 +1317,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:951
+#: install-methods.xml:948
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:956
+#: install-methods.xml:953
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:963
+#: install-methods.xml:960
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1340,13 +1337,13 @@ msgid ""
msgstr "最后,要配置启动引导器,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:973
+#: install-methods.xml:970
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:974
+#: install-methods.xml:971
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1368,7 +1365,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:987
+#: install-methods.xml:984
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1395,13 +1392,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1007
+#: install-methods.xml:1004
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1008
+#: install-methods.xml:1005
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1419,7 +1416,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1019
+#: install-methods.xml:1016
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1432,31 +1429,31 @@ msgstr ""
"盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1029
+#: install-methods.xml:1026
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1034
+#: install-methods.xml:1031
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1039
+#: install-methods.xml:1036
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1044
+#: install-methods.xml:1041
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1049
+#: install-methods.xml:1046
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1470,19 +1467,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1057
+#: install-methods.xml:1054
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1070
+#: install-methods.xml:1067
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1071
+#: install-methods.xml:1068
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1496,7 +1493,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1079
+#: install-methods.xml:1076
#, fuzzy, no-c-format
msgid ""
"You need to setup a TFTP server, and for many machines a DHCP server<phrase "
@@ -1508,7 +1505,7 @@ msgstr ""
"condition=\"supports-dhcp\">,又或 DHCP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1086
+#: install-methods.xml:1083
#, fuzzy, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1531,7 +1528,7 @@ msgstr ""
"向后兼容的 BOOTP 拓展。有一些系统只能通过 DHCP 来配置。</phrase>"
#. Tag: para
-#: install-methods.xml:1103
+#: install-methods.xml:1100
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1542,7 +1539,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1109
+#: install-methods.xml:1106
#, no-c-format
msgid ""
"Unlike the Open Firmware found on Sparc and PowerPC machines, the SRM "
@@ -1563,7 +1560,7 @@ msgstr ""
"footnote>。您也可以直接在 SRM 控制台中直接输入网络接口的 IP 配置。"
#. Tag: para
-#: install-methods.xml:1126
+#: install-methods.xml:1123
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1573,7 +1570,7 @@ msgstr ""
"<classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1131
+#: install-methods.xml:1128
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1587,7 +1584,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1139
+#: install-methods.xml:1136
#, no-c-format
msgid ""
"To use the Pre-boot Execution Environment (PXE) method of TFTP booting, you "
@@ -1601,13 +1598,13 @@ msgstr ""
"求,我们推荐 <classname>tftpd-hpa</classname>。"
#. Tag: title
-#: install-methods.xml:1157
+#: install-methods.xml:1154
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1158
+#: install-methods.xml:1155
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1625,7 +1622,7 @@ msgstr ""
"ifconfig eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1170
+#: install-methods.xml:1167
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1648,13 +1645,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1192
+#: install-methods.xml:1189
#, fuzzy, no-c-format
msgid "Setting up a BOOTP server"
msgstr "设置 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1193
+#: install-methods.xml:1190
#, fuzzy, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1669,7 +1666,7 @@ msgstr ""
"classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:1201
+#: install-methods.xml:1198
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1731,7 +1728,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1234
+#: install-methods.xml:1231
#, fuzzy, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1751,13 +1748,13 @@ msgstr ""
"是:<userinput>/etc/init.d/dhcpd restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1255
+#: install-methods.xml:1252
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1256
+#: install-methods.xml:1253
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
@@ -1767,7 +1764,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: install-methods.xml:1263
+#: install-methods.xml:1260
#, fuzzy, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1817,7 +1814,7 @@ msgstr ""
"件。"
#. Tag: para
-#: install-methods.xml:1265
+#: install-methods.xml:1262
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1833,7 +1830,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1275
+#: install-methods.xml:1272
#, fuzzy, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1843,13 +1840,13 @@ msgstr ""
"它:<userinput>/etc/init.d/dhcpd restart</userinput>作为其配置文件。"
#. Tag: title
-#: install-methods.xml:1283
+#: install-methods.xml:1280
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1284
+#: install-methods.xml:1281
#, fuzzy, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1921,13 +1918,13 @@ msgstr ""
"<xref linkend=\"tftp-images\"/> )。"
#. Tag: title
-#: install-methods.xml:1300
+#: install-methods.xml:1297
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1301
+#: install-methods.xml:1298
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -1945,7 +1942,7 @@ msgstr ""
"</screen></informalexample> Debian 包通常在安装后会自动把这条设置好。"
#. Tag: para
-#: install-methods.xml:1313
+#: install-methods.xml:1310
#, no-c-format
msgid ""
"Historically TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1957,7 +1954,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:1323
+#: install-methods.xml:1320
#, fuzzy, no-c-format
msgid ""
"Look in <filename>/etc/inetd.conf</filename> and remember the directory "
@@ -1982,7 +1979,7 @@ msgstr ""
"<replaceable>inetd-pid</replaceable></userinput>。"
#. Tag: para
-#: install-methods.xml:1341
+#: install-methods.xml:1338
#, no-c-format
msgid ""
"If you intend to install Debian on an SGI machine and your TFTP server is a "
@@ -2010,13 +2007,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1363
+#: install-methods.xml:1360
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1364
+#: install-methods.xml:1361
#, fuzzy, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2032,7 +2029,7 @@ msgstr ""
"一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1373
+#: install-methods.xml:1370
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2049,7 +2046,7 @@ msgstr ""
"录。"
#. Tag: para
-#: install-methods.xml:1382
+#: install-methods.xml:1379
#, fuzzy, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2064,7 +2061,7 @@ msgstr ""
"动所需的文件名传递至<command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1390
+#: install-methods.xml:1387
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2079,13 +2076,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1402
+#: install-methods.xml:1399
#, no-c-format
msgid "DECstation TFTP Images"
msgstr "DECstation TFTP 映像文件"
#. Tag: para
-#: install-methods.xml:1403
+#: install-methods.xml:1400
#, no-c-format
msgid ""
"For DECstations, there are tftpimage files for each subarchitecture, which "
@@ -2102,7 +2099,7 @@ msgstr ""
"tftpboot.img</userinput>。"
#. Tag: para
-#: install-methods.xml:1413
+#: install-methods.xml:1410
#, no-c-format
msgid ""
"The DECstation firmware boots by TFTP with the command <userinput>boot "
@@ -2119,13 +2116,13 @@ msgstr ""
"按照如下语法加入:"
#. Tag: userinput
-#: install-methods.xml:1425
+#: install-methods.xml:1422
#, no-c-format
msgid "boot #/tftp/filename param1=value1 param2=value2 ..."
msgstr "boot #/tftp/filename param1=value1 param2=value2 ..."
#. Tag: para
-#: install-methods.xml:1427
+#: install-methods.xml:1424
#, no-c-format
msgid ""
"Several DECstation firmware revisions show a problem with regard to net "
@@ -2159,13 +2156,13 @@ msgstr ""
"www.netbsd.org/Ports/pmax/board-list.html#proms\"></ulink>。"
#. Tag: title
-#: install-methods.xml:1465
+#: install-methods.xml:1462
#, no-c-format
msgid "Alpha TFTP Booting"
msgstr "Alpha TFTP 引导"
#. Tag: para
-#: install-methods.xml:1466
+#: install-methods.xml:1463
#, no-c-format
msgid ""
"On Alpha, you must specify the filename (as a relative path to the boot "
@@ -2186,13 +2183,13 @@ msgstr ""
"个文件名。"
#. Tag: title
-#: install-methods.xml:1481
+#: install-methods.xml:1478
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1482
+#: install-methods.xml:1479
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2220,7 +2217,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1498
+#: install-methods.xml:1495
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2230,7 +2227,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:1505
+#: install-methods.xml:1502
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2243,13 +2240,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1516
+#: install-methods.xml:1513
#, no-c-format
msgid "BVM/Motorola TFTP Booting"
msgstr "BVM/Motorola TFTP 引导"
#. Tag: para
-#: install-methods.xml:1517
+#: install-methods.xml:1514
#, no-c-format
msgid ""
"For BVM and Motorola VMEbus systems copy the files &bvme6000-tftp-files; to "
@@ -2259,7 +2256,7 @@ msgstr ""
"到 <filename>/tftpboot/</filename>。"
#. Tag: para
-#: install-methods.xml:1522
+#: install-methods.xml:1519
#, no-c-format
msgid ""
"Next, configure your boot ROMs or BOOTP server to initially load the "
@@ -2274,13 +2271,13 @@ msgstr ""
"体系的系统特殊配置信息。"
#. Tag: title
-#: install-methods.xml:1534
+#: install-methods.xml:1531
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1535
+#: install-methods.xml:1532
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2294,13 +2291,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1547
+#: install-methods.xml:1544
#, no-c-format
msgid "Broadcom BCM91250A and BCM91480B TFTP Booting"
msgstr "Broadcom BCM91250A 与 BCM91480B TFTP 引导"
#. Tag: para
-#: install-methods.xml:1548
+#: install-methods.xml:1545
#, no-c-format
msgid ""
"You don't have to configure DHCP in a special way because you'll pass the "
@@ -2309,13 +2306,13 @@ msgstr ""
"您不需要通过特殊方法设置 DHCP,因为您将传递文件的完全路径至装载的 CFE 。"
#. Tag: title
-#: install-methods.xml:1653
+#: install-methods.xml:1650
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1654
+#: install-methods.xml:1651
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2330,13 +2327,13 @@ msgstr ""
"<classname>autoinstall</classname>,以及 Debian 安装程序本身。"
#. Tag: title
-#: install-methods.xml:1667
+#: install-methods.xml:1664
#, no-c-format
msgid "Automatic Installation Using the Debian Installer"
msgstr "使用 Debian 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1668
+#: install-methods.xml:1665
#, no-c-format
msgid ""
"The Debian Installer supports automating installs via preconfiguration "
@@ -2348,7 +2345,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1675
+#: install-methods.xml:1672
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2356,3 +2353,19 @@ msgid ""
msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
+
+#~ msgid ""
+#~ "The <filename>syslinux.cfg</filename> configuration file should contain "
+#~ "the following two lines: <informalexample><screen>\n"
+#~ "default vmlinuz\n"
+#~ "append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n"
+#~ "</screen></informalexample> Please note that the <userinput>ramdisk_size</"
+#~ "userinput> parameter may need to be increased, depending on the image you "
+#~ "are booting."
+#~ msgstr ""
+#~ "<filename>syslinux.cfg</filename> 配置文件应该含有下列两行: "
+#~ "<informalexample><screen>\n"
+#~ "default vmlinuz\n"
+#~ "append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw\n"
+#~ "</screen></informalexample> 请注意,根据所启动的内存映像的大小,在必要的时"
+#~ "候,您可能需要增大<userinput>ramdisk_size</userinput> 参数的数值。"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index aa2b74c7e..b3ac2bf21 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.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-10-29 14:49+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-10-31 21:20+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -363,7 +363,9 @@ msgid ""
"Once the installer starts, you will be greeted with an initial screen. Press "
"&enterkey; to boot, or read the instructions for other boot methods and "
"parameters (see <xref linkend=\"boot-parms\"/>)."
-msgstr "一旦安装程序运行,会有一个初始画面迎接您。按 &enterkey; 启动系统;或者先阅读一下其它的启动方式以及各种参数的说明(参阅 <xref linkend=\"boot-parms\"/>)。"
+msgstr ""
+"一旦安装程序运行,会有一个初始画面迎接您。按 &enterkey; 启动系统;或者先阅读"
+"一下其它的启动方式以及各种参数的说明(参阅 <xref linkend=\"boot-parms\"/>)。"
#. Tag: para
#: installation-howto.xml:218
@@ -514,19 +516,20 @@ msgstr "请给我们发一份安装报告"
#. Tag: para
#: installation-howto.xml:299
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"If you successfully managed an installation with &d-i;, please take time to "
"provide us with a report. The simplest way to do so is to install the "
-"reportbug package (<command>apt-get install reportbug</command>), and run "
-"<command>reportbug installation-report</command>."
+"reportbug package (<command>apt-get install reportbug</command>), configure "
+"<classname>reportbug</classname> as explained in <xref linkend=\"mail-"
+"outgoing\"/>, and run <command>reportbug installation-report</command>."
msgstr ""
"如果您用 &d-i; 安装成功,请抽空给我们写一份报告。有一个最简单的方法,即安装 "
"report bug 软件包(<command>apt-get install reportbug</command>),然后执行"
"<command>reportbug installation-report</command>。"
#. Tag: para
-#: installation-howto.xml:307
+#: installation-howto.xml:309
#, no-c-format
msgid ""
"If you did not complete the install, you probably found a bug in debian-"
@@ -541,13 +544,13 @@ msgstr ""
"\"problem-report\"/>。"
#. Tag: title
-#: installation-howto.xml:319
-#, no-c-format
-msgid "And finally.."
+#: installation-howto.xml:321
+#, fuzzy, no-c-format
+msgid "And finally&hellip;"
msgstr "末了……"
#. Tag: para
-#: installation-howto.xml:320
+#: installation-howto.xml:322
#, no-c-format
msgid ""
"We hope that your Debian installation is pleasant and that you find Debian "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 1e0f6adb5..899015756 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-12-31 03:15+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-10-31 21:30+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -209,15 +209,16 @@ msgstr ""
#. Tag: para
#: preparing.xml:147
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"The installer software, <classname>debian-installer</classname>, is the "
"primary concern of this manual. It detects hardware and loads appropriate "
"drivers, uses <classname>dhcp-client</classname> to set up the network "
-"connection, and runs <classname>debootstrap</classname> to install the base "
-"system packages. Many more actors play smaller parts in this process, but "
-"<classname>debian-installer</classname> has completed its task when you load "
-"the new system for the first time."
+"connection, runs <classname>debootstrap</classname> to install the base "
+"system packages, and runs <classname>tasksel</classname> to allow you to "
+"install certain additional software. Many more actors play smaller parts in "
+"this process, but <classname>debian-installer</classname> has completed its "
+"task when you load the new system for the first time."
msgstr ""
"安装软件,<classname>debian-installer</classname>,是本手册的关注焦点。她将探"
"测硬件并挂载相应的驱动程序,还要指导 <classname>dhcp-client</classname> 去设"
@@ -226,7 +227,7 @@ msgstr ""
"installer</classname> 将一直到您第一次启动新系统时才完成她的使命。"
#. Tag: para
-#: preparing.xml:157
+#: preparing.xml:159
#, no-c-format
msgid ""
"To tune the system to your needs, <classname>tasksel</classname> allows you "
@@ -237,27 +238,24 @@ msgstr ""
"的软件包集合,例如 Web 服务器或一个桌面环境。"
#. Tag: para
-#: preparing.xml:163
+#: preparing.xml:165
#, no-c-format
msgid ""
-"When <classname>debian-installer</classname> finishes, before the first "
-"system load, you have only a very basic command line driven system. The "
-"graphical interface which displays windows on your monitor will not be "
-"installed unless you select it with <classname>tasksel</classname>. It's "
-"optional because many &debian; systems are servers which don't really have "
-"any need for a graphical user interface to do their job."
+"One important option during the installation is whether or not to install a "
+"graphical desktop environment, consisting of the X11 window system and one "
+"of the available graphical desktop environments. If you choose not to select "
+"the <quote>Desktop environment</quote> task, you will only have a relatively "
+"basic, command line driven system. Installing the Desktop environment task "
+"is optional because it requires a fairly large amount of disk space, and "
+"because many &debian; systems are servers which don't really have any need "
+"for a graphical user interface to do their job."
msgstr ""
-"当 <classname>debian-installer</classname> 程序运行结束,系统首次加载之前,您"
-"只有一个非常基本的基于命令行的系统。除非您在最后一个步骤里用 "
-"<classname>tasksel</classname> 选择了能在您的显示器上显示窗口的图形界面,否则"
-"它将不会被自动安装。因为许多 &debian; 系统是被用作服务器,它们的工作根本不需"
-"要任何图形化的用户界面,所以它在这里只是一个可选项。"
#. Tag: para
-#: preparing.xml:172
-#, no-c-format
+#: preparing.xml:177
+#, fuzzy, no-c-format
msgid ""
-"Just be aware that the X system is completely separate from "
+"Just be aware that the X11 window system is completely separate from "
"<classname>debian-installer</classname>, and in fact is much more "
"complicated. Installation and trouble shooting of the X window installation "
"is not within the scope of this manual."
@@ -267,24 +265,24 @@ msgstr ""
"内。"
#. Tag: title
-#: preparing.xml:188
+#: preparing.xml:192
#, no-c-format
msgid "Back Up Your Existing Data!"
msgstr "记得备份您所有的数据!"
#. Tag: para
-#: preparing.xml:189
-#, no-c-format
+#: preparing.xml:193
+#, fuzzy, no-c-format
msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system has been "
"installed on your computer, it's quite likely you will need to re-partition "
"your disk to make room for &debian;. Anytime you partition your disk, you "
-"should count on losing everything on the disk, no matter what program you "
-"use to do it. The programs used in installation are quite reliable and most "
-"have seen years of use; but they are also quite powerful and a false move "
-"can cost you. Even after backing up be careful and think about your answers "
-"and actions. Two minutes of thinking can save hours of unnecessary work."
+"run a risk of losing everything on the disk, no matter what program you use "
+"to do it. The programs used in installation are quite reliable and most have "
+"seen years of use; but they are also quite powerful and a false move can "
+"cost you. Even after backing up, be careful and think about your answers and "
+"actions. Two minutes of thinking can save hours of unnecessary work."
msgstr ""
"开始安装之前,请确定您已经把系统中所有数据都进行了备份。除了购买机器时预装的"
"操作系统以外,如果这是您计算机上的第一个其他操作系统,很可能您得对硬盘进行重"
@@ -295,7 +293,7 @@ msgstr ""
"节省几个小时的不必要的恢复工作。"
#. Tag: para
-#: preparing.xml:202
+#: preparing.xml:206
#, no-c-format
msgid ""
"If you are creating a multi-boot system, make sure that you have the "
@@ -310,7 +308,7 @@ msgstr ""
"上的文件。"
#. Tag: para
-#: preparing.xml:213
+#: preparing.xml:217
#, no-c-format
msgid ""
"With the exception of the BVM and Motorola VMEbus computers, the only "
@@ -327,37 +325,37 @@ msgstr ""
"quote>引导存储器是必须的。"
#. Tag: title
-#: preparing.xml:231
+#: preparing.xml:235
#, no-c-format
msgid "Information You Will Need"
msgstr "一些有用的信息"
#. Tag: title
-#: preparing.xml:234
+#: preparing.xml:238
#, no-c-format
msgid "Documentation"
msgstr "文档"
#. Tag: title
-#: preparing.xml:237
+#: preparing.xml:241
#, no-c-format
msgid "Installation Manual"
msgstr "安装手册"
#. Tag: para
-#: preparing.xml:239
+#: preparing.xml:243
#, no-c-format
msgid "This document you are now reading, in plain ASCII, HTML or PDF format."
msgstr "您正在阅读的文档,是纯文本、HTML 或者 PDF 格式。"
#. Tag: itemizedlist
-#: preparing.xml:245
+#: preparing.xml:249
#, no-c-format
msgid "&list-install-manual-files;"
msgstr "&list-install-manual-files;"
#. Tag: para
-#: preparing.xml:251
+#: preparing.xml:255
#, no-c-format
msgid ""
"The document you are now reading, which is the official version of the "
@@ -370,7 +368,7 @@ msgstr ""
"</ulink>。"
#. Tag: para
-#: preparing.xml:260
+#: preparing.xml:264
#, no-c-format
msgid ""
"The document you are now reading, which is a development version of the "
@@ -381,56 +379,56 @@ msgstr ""
"\"&url-d-i-alioth-manual;\">各种文件格式和不同语种的翻译</ulink>。"
#. Tag: title
-#: preparing.xml:272
+#: preparing.xml:276
#, no-c-format
msgid "Hardware documentation"
msgstr "硬件文档"
#. Tag: para
-#: preparing.xml:273
+#: preparing.xml:277
#, no-c-format
msgid ""
"Often contains useful information on configuring or using your hardware."
msgstr "通常包含设置和使用您硬件的有用信息。"
#. Tag: ulink
-#: preparing.xml:284
+#: preparing.xml:288
#, no-c-format
msgid "Linux Hardware Compatibility HOWTO"
msgstr "Linux 硬件兼容性指南"
#. Tag: ulink
-#: preparing.xml:290
+#: preparing.xml:294
#, no-c-format
msgid "Linux/m68k FAQ"
msgstr "Linux/m68k FAQ"
#. Tag: ulink
-#: preparing.xml:296
+#: preparing.xml:300
#, no-c-format
msgid "Linux/Alpha FAQ"
msgstr "Linux/Alpha FAQ"
#. Tag: ulink
-#: preparing.xml:302
+#: preparing.xml:306
#, no-c-format
msgid "Linux for SPARC Processors FAQ"
msgstr "Linux for SPARC Processors FAQ"
#. Tag: ulink
-#: preparing.xml:308
+#: preparing.xml:312
#, no-c-format
msgid "Linux/Mips website"
msgstr "Linux/Mips website"
#. Tag: title
-#: preparing.xml:317
+#: preparing.xml:321
#, no-c-format
msgid "&arch-title; Hardware References"
msgstr "&arch-title; Hardware References"
#. Tag: para
-#: preparing.xml:318
+#: preparing.xml:322
#, no-c-format
msgid ""
"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
@@ -440,13 +438,13 @@ msgstr ""
"Console, tape, z90 crypto, chandev, network)"
#. Tag: ulink
-#: preparing.xml:330
+#: preparing.xml:334
#, no-c-format
msgid "Device Drivers and Installation Commands"
msgstr "设备驱动程序与安装命令"
#. Tag: para
-#: preparing.xml:335
+#: preparing.xml:339
#, no-c-format
msgid ""
"IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -455,13 +453,13 @@ msgstr ""
"IBM Redbook 讲述了如何将 Linux 与 zSeries 的 z/VM 和 &arch-title; 硬件组合。"
#. Tag: ulink
-#: preparing.xml:345
+#: preparing.xml:349
#, no-c-format
msgid "Linux for &arch-title;"
msgstr "用于 &arch-title; 的 Linux"
#. Tag: para
-#: preparing.xml:351
+#: preparing.xml:355
#, no-c-format
msgid ""
"IBM Redbook describing the Linux distributions available for the mainframe. "
@@ -472,19 +470,19 @@ msgstr ""
"节,但对于所有的 &arch-title; 发行版,基本的安装概念是相同的。"
#. Tag: ulink
-#: preparing.xml:362
+#: preparing.xml:366
#, no-c-format
msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
msgstr "Linux for IBM eServer zSeries and &arch-title;: Distributions"
#. Tag: title
-#: preparing.xml:372
+#: preparing.xml:376
#, no-c-format
msgid "Finding Sources of Hardware Information"
msgstr "提供硬件信息的资源"
#. Tag: para
-#: preparing.xml:373
+#: preparing.xml:377
#, no-c-format
msgid ""
"In many cases, the installer will be able to automatically detect your "
@@ -495,19 +493,19 @@ msgstr ""
"熟悉一下您的硬件比较好。"
#. Tag: para
-#: preparing.xml:379
+#: preparing.xml:383
#, no-c-format
msgid "Hardware information can be gathered from:"
msgstr "获取硬件信息的途径有:"
#. Tag: para
-#: preparing.xml:386
+#: preparing.xml:390
#, no-c-format
msgid "The manuals that come with each piece of hardware."
msgstr "每个硬件附带的手册。"
#. Tag: para
-#: preparing.xml:391
+#: preparing.xml:395
#, no-c-format
msgid ""
"The BIOS setup screens of your computer. You can view these screens when you "
@@ -518,19 +516,19 @@ msgstr ""
"从您的手册确认组合键。通常,它是 <keycap>Delete</keycap> 键。"
#. Tag: para
-#: preparing.xml:398
+#: preparing.xml:402
#, no-c-format
msgid "The cases and boxes for each piece of hardware."
msgstr "每个硬件的包装盒。"
#. Tag: para
-#: preparing.xml:404
+#: preparing.xml:408
#, no-c-format
msgid "The System window in the Windows Control Panel."
msgstr "Windows 控制面板里面的系统窗口。"
#. Tag: para
-#: preparing.xml:410
+#: preparing.xml:414
#, no-c-format
msgid ""
"System commands or tools in another operating system, including file manager "
@@ -541,7 +539,7 @@ msgstr ""
"盘特别有用。"
#. Tag: para
-#: preparing.xml:417
+#: preparing.xml:421
#, no-c-format
msgid ""
"Your system administrator or Internet Service Provider. These sources can "
@@ -551,185 +549,185 @@ msgstr ""
"息。"
#. Tag: title
-#: preparing.xml:429
+#: preparing.xml:433
#, no-c-format
msgid "Hardware Information Needed for an Install"
msgstr "安装所需的硬件信息"
#. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:437
#, no-c-format
msgid "Hardware"
msgstr "硬件"
#. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:437
#, no-c-format
msgid "Information You Might Need"
msgstr "您需要了解的信息"
#. Tag: entry
-#: preparing.xml:439
+#: preparing.xml:443
#, no-c-format
msgid "Hard Drives"
msgstr "硬盘"
#. Tag: entry
-#: preparing.xml:440
+#: preparing.xml:444
#, no-c-format
msgid "How many you have."
msgstr "拥有的容量"
#. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:446
#, no-c-format
msgid "Their order on the system."
msgstr "它们在系统上的次序"
#. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:449
#, no-c-format
msgid "Whether IDE or SCSI (most computers are IDE)."
msgstr "是 IDE 还是 SCSI(大多数计算机上是 IDE)"
#. Tag: entry
-#: preparing.xml:448
+#: preparing.xml:452
#, no-c-format
msgid "Whether IDE or SCSI (most m68k computers are SCSI)."
msgstr "是 IDE 还是 SCSI(大多数 m68k 计算机上是 SCSI)。"
# index.docbook:445, index.docbook:497
#. Tag: entry
-#: preparing.xml:450 preparing.xml:502
+#: preparing.xml:454 preparing.xml:506
#, no-c-format
msgid "Available free space."
msgstr "可用空间"
#. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:455
#, no-c-format
msgid "Partitions."
msgstr "分区。"
#. Tag: entry
-#: preparing.xml:453
+#: preparing.xml:457
#, no-c-format
msgid "Partitions where other operating systems are installed."
msgstr "安装有其他操作系统的分区。"
#. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:461
#, no-c-format
msgid "Monitor"
msgstr "显示器"
# index.docbook:453, index.docbook:473, index.docbook:479, index.docbook:485
#. Tag: entry
-#: preparing.xml:458 preparing.xml:478 preparing.xml:484 preparing.xml:490
+#: preparing.xml:462 preparing.xml:482 preparing.xml:488 preparing.xml:494
#, no-c-format
msgid "Model and manufacturer."
msgstr "型号与制造商。"
#. Tag: entry
-#: preparing.xml:460
+#: preparing.xml:464
#, no-c-format
msgid "Resolutions supported."
msgstr "支持的分辨率。"
#. Tag: entry
-#: preparing.xml:461
+#: preparing.xml:465
#, no-c-format
msgid "Horizontal refresh rate."
msgstr "水平扫描频率。"
#. Tag: entry
-#: preparing.xml:462
+#: preparing.xml:466
#, no-c-format
msgid "Vertical refresh rate."
msgstr "垂直扫描频率。"
#. Tag: entry
-#: preparing.xml:464
+#: preparing.xml:468
#, no-c-format
msgid "Color depth (number of colors) supported."
msgstr "支持的颜色深度(颜色数)"
#. Tag: entry
-#: preparing.xml:466
+#: preparing.xml:470
#, no-c-format
msgid "Screen size."
msgstr "屏幕尺寸。"
#. Tag: entry
-#: preparing.xml:469
+#: preparing.xml:473
#, no-c-format
msgid "Mouse"
msgstr "鼠标"
#. Tag: entry
-#: preparing.xml:470
+#: preparing.xml:474
#, no-c-format
msgid "Type: serial, PS/2, or USB."
msgstr "类型:串口、PS/2 或 USB。"
#. Tag: entry
-#: preparing.xml:472
+#: preparing.xml:476
#, no-c-format
msgid "Port."
msgstr "端口。"
#. Tag: entry
-#: preparing.xml:473
+#: preparing.xml:477
#, no-c-format
msgid "Manufacturer."
msgstr "制造商。"
#. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:478
#, no-c-format
msgid "Number of buttons."
msgstr "按键数。"
# index.docbook:472, index.docbook:500
#. Tag: entry
-#: preparing.xml:477 preparing.xml:505
+#: preparing.xml:481 preparing.xml:509
#, no-c-format
msgid "Network"
msgstr "网络"
# index.docbook:475, index.docbook:501
#. Tag: entry
-#: preparing.xml:480 preparing.xml:506
+#: preparing.xml:484 preparing.xml:510
#, no-c-format
msgid "Type of adapter."
msgstr "适配器类型。"
#. Tag: entry
-#: preparing.xml:483
+#: preparing.xml:487
#, no-c-format
msgid "Printer"
msgstr "打印机"
#. Tag: entry
-#: preparing.xml:486
+#: preparing.xml:490
#, no-c-format
msgid "Printing resolutions supported."
msgstr "支持的打印分辨率。"
#. Tag: entry
-#: preparing.xml:489
+#: preparing.xml:493
#, no-c-format
msgid "Video Card"
msgstr "视频卡"
#. Tag: entry
-#: preparing.xml:492
+#: preparing.xml:496
#, no-c-format
msgid "Video RAM available."
msgstr "可用显存"
#. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:498
#, no-c-format
msgid ""
"Resolutions and color depths supported (these should be checked against your "
@@ -737,37 +735,37 @@ msgid ""
msgstr "支持的分辨率和颜色数(还需检验您显示器的能力)。"
#. Tag: entry
-#: preparing.xml:499
+#: preparing.xml:503
#, no-c-format
msgid "DASD"
msgstr "DASD"
#. Tag: entry
-#: preparing.xml:500
+#: preparing.xml:504
#, no-c-format
msgid "Device number(s)."
msgstr "设备数。"
#. Tag: entry
-#: preparing.xml:508
+#: preparing.xml:512
#, no-c-format
msgid "Device numbers."
msgstr "设备数。"
#. Tag: entry
-#: preparing.xml:509
+#: preparing.xml:513
#, no-c-format
msgid "Relative adapter number for OSA cards."
msgstr "OSA 卡的相对适配器号。"
#. Tag: title
-#: preparing.xml:517
+#: preparing.xml:521
#, no-c-format
msgid "Hardware Compatibility"
msgstr "硬件兼容性"
#. Tag: para
-#: preparing.xml:519
+#: preparing.xml:523
#, no-c-format
msgid ""
"Many brand name products work without trouble on Linux. Moreover, hardware "
@@ -778,7 +776,7 @@ msgstr ""
"改善。然而,Linux 仍然不能像某些操作系统那样可以在各种不同的硬件上运行。"
#. Tag: para
-#: preparing.xml:525
+#: preparing.xml:529
#, no-c-format
msgid ""
"In particular, Linux usually cannot run hardware that requires a running "
@@ -786,7 +784,7 @@ msgid ""
msgstr "特别是,Linux 通常不能驱动那些需要某些版本 Windows 才运行的硬件上。"
#. Tag: para
-#: preparing.xml:530
+#: preparing.xml:534
#, no-c-format
msgid ""
"Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -799,7 +797,7 @@ msgstr ""
"上。因此,它们很快就会被废弃。"
#. Tag: para
-#: preparing.xml:537
+#: preparing.xml:541
#, no-c-format
msgid ""
"So called win-modems are the most common type of this hardware. However, "
@@ -809,19 +807,19 @@ msgstr ""
"格的。"
#. Tag: para
-#: preparing.xml:542
+#: preparing.xml:546
#, no-c-format
msgid "You can check hardware compatibility by:"
msgstr "您可以通过以下方式检验硬件兼容性:"
#. Tag: para
-#: preparing.xml:547
+#: preparing.xml:551
#, no-c-format
msgid "Checking manufacturers' web sites for new drivers."
msgstr "检查制造商的网站来得到新的驱动程序。"
#. Tag: para
-#: preparing.xml:552
+#: preparing.xml:556
#, no-c-format
msgid ""
"Looking at web sites or manuals for information about emulation. Lesser "
@@ -831,7 +829,7 @@ msgstr ""
"序或者设置。"
#. Tag: para
-#: preparing.xml:559
+#: preparing.xml:563
#, no-c-format
msgid ""
"Checking hardware compatibility lists for Linux on web sites dedicated to "
@@ -839,19 +837,19 @@ msgid ""
msgstr "检查您计算机体系的 Linux 兼容性列表网站。"
#. Tag: para
-#: preparing.xml:565
+#: preparing.xml:569
#, no-c-format
msgid "Searching the Internet for other users' experiences."
msgstr "搜索互联网查找其他用户的经验。"
#. Tag: title
-#: preparing.xml:576
+#: preparing.xml:580
#, no-c-format
msgid "Network Settings"
msgstr "网络设置"
#. Tag: para
-#: preparing.xml:578
+#: preparing.xml:582
#, no-c-format
msgid ""
"If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -862,31 +860,31 @@ msgstr ""
"号连接),您需要向您的网络系统管理员咨询这项信息。"
#. Tag: para
-#: preparing.xml:585
+#: preparing.xml:589
#, no-c-format
msgid "Your host name (you may be able to decide this on your own)."
msgstr "您的主机名(您也许可以自己决定)。"
#. Tag: para
-#: preparing.xml:590
+#: preparing.xml:594
#, no-c-format
msgid "Your domain name."
msgstr "您的域名。"
#. Tag: para
-#: preparing.xml:595
+#: preparing.xml:599
#, no-c-format
msgid "Your computer's IP address."
msgstr "您的计算机 IP 地址。"
#. Tag: para
-#: preparing.xml:600
+#: preparing.xml:604
#, no-c-format
msgid "The netmask to use with your network."
msgstr "您网络的网络掩码。"
#. Tag: para
-#: preparing.xml:605
+#: preparing.xml:609
#, no-c-format
msgid ""
"The IP address of the default gateway system you should route to, if your "
@@ -895,7 +893,7 @@ msgstr ""
"路由经过的默认网关的 IP 地址,如果您的网络 <emphasis>有</emphasis> 网关的话。"
#. Tag: para
-#: preparing.xml:611
+#: preparing.xml:615
#, no-c-format
msgid ""
"The system on your network that you should use as a DNS (Domain Name "
@@ -903,7 +901,7 @@ msgid ""
msgstr "您的网络中作为 DNS(域名服务) 服务器的系统。"
#. Tag: para
-#: preparing.xml:619
+#: preparing.xml:623
#, no-c-format
msgid ""
"On the other hand, if your administrator tells you that a DHCP server is "
@@ -915,31 +913,31 @@ msgstr ""
"需了解这项信息,因为 DHCP 服务器会在安装过程中直接提供。"
#. Tag: para
-#: preparing.xml:626
+#: preparing.xml:630
#, no-c-format
msgid "If you use a wireless network, you should also find out:"
msgstr "如果您有一个无线网络,您应该找出:"
#. Tag: para
-#: preparing.xml:631
+#: preparing.xml:635
#, no-c-format
msgid "ESSID of your wireless network."
msgstr "您的无线网络的 ESSID。"
#. Tag: para
-#: preparing.xml:636
+#: preparing.xml:640
#, no-c-format
msgid "WEP security key (if applicable)."
msgstr "WEP 安全 key(如果可用)。"
#. Tag: title
-#: preparing.xml:653
+#: preparing.xml:657
#, no-c-format
msgid "Meeting Minimum Hardware Requirements"
msgstr "满足最低的硬件要求"
#. Tag: para
-#: preparing.xml:654
+#: preparing.xml:658
#, no-c-format
msgid ""
"Once you have gathered information about your computer's hardware, check "
@@ -950,7 +948,7 @@ msgstr ""
"愿以偿,安装上系统。"
#. Tag: para
-#: preparing.xml:660
+#: preparing.xml:664
#, no-c-format
msgid ""
"Depending on your needs, you might manage with less than some of the "
@@ -961,17 +959,16 @@ msgstr ""
"建议的话,多数用户会安装失败。"
#. Tag: para
-#: preparing.xml:666
-#, no-c-format
+#: preparing.xml:670
+#, fuzzy, no-c-format
msgid ""
-"A Pentium 100 is the minimum recommended for desktop systems, and a Pentium "
-"II-300 for a Server."
+"A Pentium 4, 1GHz system is the minimum recommended for a desktop systems."
msgstr ""
"奔腾 100 是桌面系统的最低推荐配置,而 奔腾 II-300 则是服务器要求的最低推荐配"
"置。"
#. Tag: para
-#: preparing.xml:671
+#: preparing.xml:675
#, no-c-format
msgid ""
"A 68030 or better processor is recommended for m68k installs. You may get by "
@@ -981,190 +978,139 @@ msgstr ""
"间就能完成安装。"
#. Tag: para
-#: preparing.xml:676
-#, no-c-format
-msgid ""
-"Any OldWorld or NewWorld PowerPC can serve well as a Desktop System. For "
-"servers, a minimum 132-Mhz machine is recommended."
+#: preparing.xml:680
+#, fuzzy, no-c-format
+msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
msgstr ""
"任何一台 OldWorld 或 NewWorld PowerPC 都可以用作一个不错的桌面系统。要是作服"
"务器的话,建议至少要 132 Mhz 的机器才行。"
#. Tag: title
-#: preparing.xml:685
+#: preparing.xml:687
#, no-c-format
msgid "Recommended Minimum System Requirements"
msgstr "推荐的最低系统配置"
#. Tag: entry
-#: preparing.xml:689
+#: preparing.xml:691
#, no-c-format
msgid "Install Type"
msgstr "安装类别"
#. Tag: entry
-#: preparing.xml:689
+#: preparing.xml:692
+#, no-c-format
+msgid "RAM (minimal)"
+msgstr ""
+
+#. Tag: entry
+#: preparing.xml:693
#, no-c-format
-msgid "<entry>RAM</entry>"
-msgstr "<entry>内存</entry>"
+msgid "RAM (recommended)"
+msgstr ""
#. Tag: entry
-#: preparing.xml:689
+#: preparing.xml:694
#, no-c-format
msgid "Hard Drive"
msgstr "硬盘"
#. Tag: entry
-#: preparing.xml:695
+#: preparing.xml:700
#, no-c-format
msgid "No desktop"
msgstr "无桌面的系统"
#. Tag: entry
-#: preparing.xml:696
-#, no-c-format
-msgid "24 megabytes"
-msgstr "24 M"
-
-#. Tag: entry
-#: preparing.xml:697
-#, no-c-format
-msgid "450 megabytes"
-msgstr "450 M"
-
-#. Tag: entry
-#: preparing.xml:699
-#, no-c-format
-msgid "With Desktop"
-msgstr "桌面系统"
-
-#. Tag: entry
-#: preparing.xml:700
+#: preparing.xml:701 preparing.xml:706
#, no-c-format
msgid "64 megabytes"
msgstr "64 M"
#. Tag: entry
-#: preparing.xml:701
+#: preparing.xml:702
+#, fuzzy, no-c-format
+msgid "256 megabytes"
+msgstr "24 M"
+
+#. Tag: entry
+#: preparing.xml:703
#, no-c-format
msgid "1 gigabyte"
msgstr "1 G"
#. Tag: entry
-#: preparing.xml:703
+#: preparing.xml:705
#, no-c-format
-msgid "Server"
-msgstr "服务器"
+msgid "With Desktop"
+msgstr "桌面系统"
#. Tag: entry
-#: preparing.xml:704
-#, no-c-format
-msgid "128 megabytes"
+#: preparing.xml:707
+#, fuzzy, no-c-format
+msgid "512 megabytes"
msgstr "128 M"
#. Tag: entry
-#: preparing.xml:705
-#, no-c-format
-msgid "4 gigabytes"
-msgstr "4 G"
-
-#. Tag: para
-#: preparing.xml:710
-#, no-c-format
-msgid ""
-"Here is a sampling of some common Debian system configurations. You can also "
-"get an idea of the disk space used by related groups of programs by "
-"referring to <xref linkend=\"tasksel-size-list\"/>."
-msgstr ""
-"这里有些常规 Debian 系统配置的样本。要了解各类软件需要占多大的硬盘空间,请参"
-"考<xref linkend=\"tasksel-size-list\"/>。"
-
-#. Tag: term
-#: preparing.xml:720
-#, no-c-format
-msgid "Standard Server"
-msgstr "常规服务器"
+#: preparing.xml:708
+#, fuzzy, no-c-format
+msgid "5 gigabyte"
+msgstr "1 G"
#. Tag: para
-#: preparing.xml:721
+#: preparing.xml:713
#, no-c-format
msgid ""
-"This is a small server profile, useful for a stripped down server which does "
-"not have a lot of niceties for shell users. It includes an FTP server, a web "
-"server, DNS, NIS, and POP. For these 100MB of disk space would suffice, and "
-"then you would need to add space for any data you serve up."
+"The actual minimum memory requirements are a lot less then the numbers "
+"listed in this table. Depending on the architecture, it is possible to "
+"install Debian with as little as 20MB (for s390) to 48MB (for i386 and "
+"amd64). The same goes for the disk space requirements, especially if you "
+"pick and choose which applications to install; see <xref linkend=\"tasksel-"
+"size-list\"/> for additional information on disk space requirements."
msgstr ""
-"这里有一台小型服务器范例,它适用于精简型服务器,即没有为 shell 的用户安装过多"
-"合用称手的软件。这类服务器 安装有:一个 FTP 服务、一个 web 服务、DNS、NIS 以"
-"及 POP 服务。这些服务总共需要用掉 100MB 的磁盘空间,您还需要另外算上服务所需"
-"的 数据占用的空间。"
-
-#. Tag: term
-#: preparing.xml:733
-#, no-c-format
-msgid "Desktop"
-msgstr "桌面"
#. Tag: para
-#: preparing.xml:734
+#: preparing.xml:723
#, no-c-format
msgid ""
-"A standard desktop box, including the X window system, full desktop "
-"environments, sound, editors, etc. You'll need about 2GB using the standard "
-"desktop task, though it can be done in far less."
+"It is possible to run a graphical desktop environment on older or low-end "
+"systems, but in that case it is recommended to install a window manager that "
+"is less resource-hungry than those of the GNOME or KDE desktop environments; "
+"alternatives include <classname>icewm</classname> and <classname>wmaker</"
+"classname>, but there are others to choose from."
msgstr ""
-"标准的桌面用机安装有 X 窗口系统、完整的桌面环境、音频软件、编辑器等。这些软件"
-"包将总共需要约 2G 空间,尽管也可以不用这么多。"
-
-#. Tag: term
-#: preparing.xml:744
-#, no-c-format
-msgid "Work Console"
-msgstr "工作控制台"
#. Tag: para
-#: preparing.xml:745
+#: preparing.xml:732
#, no-c-format
msgid ""
-"A more stripped-down user machine, without the X window system or X "
-"applications. Possibly suitable for a laptop or mobile computer. The size is "
-"around 140MB."
+"It is practically impossible to give general memory or disk space "
+"requirements for server installations as those very much depend on what the "
+"server is to be used for."
msgstr ""
-"这是被高度精简的用户机器,它没有安装 X 窗口系统或者 X 软件。可能适用于笔记本"
-"电脑或者手持计算机。其所需空间约为 140MB。"
-
-#. Tag: term
-#: preparing.xml:755
-#, no-c-format
-msgid "Developer"
-msgstr "开发人员"
#. Tag: para
-#: preparing.xml:756
+#: preparing.xml:738
#, no-c-format
msgid ""
-"A desktop setup with all the development packages, such as Perl, C, C++, "
-"etc. Size is around 475MB. Assuming you are adding X11 and some additional "
-"packages for other uses, you should plan around 800MB for this type of "
-"machine."
+"Remember that these sizes don't include all the other materials which are "
+"usually to be found, such as user files, mail, and data. It is always best "
+"to be generous when considering the space for your own files and data."
msgstr ""
-"这是包括所有开发软件包的桌面设置,例如 Perl、C、C++ 等。其所需空间约为 "
-"475MB。若是您为了其它用途,而另行安装了 X11 和其它的软件包,那么您需要为这类"
-"机器规划出约 800MB 空间。"
#. Tag: para
-#: preparing.xml:766
-#, no-c-format
+#: preparing.xml:745
+#, fuzzy, no-c-format
msgid ""
-"Remember that these sizes don't include all the other materials which are "
-"usually to be found, such as user files, mail, and data. It is always best "
-"to be generous when considering the space for your own files and data. "
-"Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents like "
-"logfiles. The <command>dpkg</command> files (with information on all "
-"installed packages) can easily consume 20MB. Also, <command>apt-get</"
-"command> puts downloaded packages here before they are installed. You should "
-"usually allocate at least 100MB for <filename>/var</filename>."
+"Disk space required for the smooth operation of the &debian; system itself "
+"is taken into account in these recommended system requirements. Notably, the "
+"<filename>/var</filename> partition contains a lot of state information "
+"specific to Debian in addition to its regular contents, like logfiles. The "
+"<command>dpkg</command> files (with information on all installed packages) "
+"can easily consume 40MB. Also, <command>apt-get</command> puts downloaded "
+"packages here before they are installed. You should usually allocate at "
+"least 200MB for <filename>/var</filename>, and a lot more if you install a "
+"graphical desktop environment."
msgstr ""
"要提醒您的是上面说的空间大小并没有把其它任何资料数据包含在内。这通常包含用户"
"的文件、信件或者用户的数据。一般来说,最好在为您自己的文件和数据分配空间时,"
@@ -1175,13 +1121,13 @@ msgstr ""
"var</filename>。"
#. Tag: title
-#: preparing.xml:790
+#: preparing.xml:769
#, no-c-format
msgid "Pre-Partitioning for Multi-Boot Systems"
msgstr "为多重启动系统事先分区"
#. Tag: para
-#: preparing.xml:791
+#: preparing.xml:770
#, no-c-format
msgid ""
"Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1194,7 +1140,7 @@ msgstr ""
"间里安置家具,那么这不会对其它房间有任何影响。"
#. Tag: para
-#: preparing.xml:798
+#: preparing.xml:777
#, no-c-format
msgid ""
"Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1206,7 +1152,7 @@ msgstr ""
"机。"
#. Tag: para
-#: preparing.xml:804
+#: preparing.xml:783
#, no-c-format
msgid ""
"If you already have an operating system on your system <phrase arch=\"x86\"> "
@@ -1231,7 +1177,7 @@ msgstr ""
"您要为 Debian 的根目录准备一个专用的分区。"
#. Tag: para
-#: preparing.xml:831
+#: preparing.xml:810
#, no-c-format
msgid ""
"You can find information about your current partition setup by using a "
@@ -1249,7 +1195,7 @@ msgstr ""
"phrase>。分区工具总会提供一种办法让您查看现有的分区情况,而不作任何改动。"
#. Tag: para
-#: preparing.xml:841
+#: preparing.xml:820
#, no-c-format
msgid ""
"In general, changing a partition with a file system already on it will "
@@ -1263,13 +1209,13 @@ msgstr ""
"最好在把挡路的家具都移开,否则就要冒家具被毁坏的危险。"
#. Tag: emphasis
-#: preparing.xml:851
+#: preparing.xml:830
#, no-c-format
msgid "FIXME: write about HP-UX disks?"
msgstr "FIXME: write about HP-UX disks?"
#. Tag: para
-#: preparing.xml:853
+#: preparing.xml:832
#, no-c-format
msgid ""
"If your computer has more than one hard disk, you may want to dedicate one "
@@ -1282,7 +1228,7 @@ msgstr ""
"序自带的分区程序会 漂亮地完成这个任务。"
#. Tag: para
-#: preparing.xml:860
+#: preparing.xml:839
#, no-c-format
msgid ""
"If your machine has only one hard disk, and you would like to completely "
@@ -1306,7 +1252,7 @@ msgstr ""
"可以有几个办法可选,比如原先系统的安装磁带或 CD。"
#. Tag: para
-#: preparing.xml:875
+#: preparing.xml:854
#, no-c-format
msgid ""
"If your machine already has multiple partitions, and enough space can be "
@@ -1322,7 +1268,7 @@ msgstr ""
"情形。比如,分区表中现有分区的顺序问题,这也许会令您不得不在安装前先分好区。"
#. Tag: para
-#: preparing.xml:885
+#: preparing.xml:864
#, no-c-format
msgid ""
"If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
@@ -1333,7 +1279,7 @@ msgstr ""
"用 Debian 安装程序中的分区工具来重新调整文件系统的大小。"
#. Tag: para
-#: preparing.xml:891
+#: preparing.xml:870
#, no-c-format
msgid ""
"If none of the above apply, you'll need to partition your hard disk before "
@@ -1352,7 +1298,7 @@ msgstr ""
"身的分区。"
#. Tag: para
-#: preparing.xml:903
+#: preparing.xml:882
#, no-c-format
msgid ""
"If you are going to install more than one operating system on the same "
@@ -1365,7 +1311,7 @@ msgstr ""
"也可能会怂恿您重新格式化不属于它们自己的分区。"
#. Tag: para
-#: preparing.xml:911
+#: preparing.xml:890
#, no-c-format
msgid ""
"You can recover from these actions or avoid them, but installing the native "
@@ -1375,7 +1321,7 @@ msgstr ""
"能够帮您免除这些烦恼。"
#. Tag: para
-#: preparing.xml:916
+#: preparing.xml:895
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian; the Linux "
@@ -1394,7 +1340,7 @@ msgstr ""
"Linux 的分区工具来删除当初预留的分区,再用 Linux 的分区取而代之。"
#. Tag: para
-#: preparing.xml:928
+#: preparing.xml:907
#, no-c-format
msgid ""
"If you currently have one hard disk with one partition (a common setup for "
@@ -1405,13 +1351,13 @@ msgstr ""
"希望能多重启动原有的操作系统和 Debian,那么您就需要:"
#. Tag: para
-#: preparing.xml:935
+#: preparing.xml:914
#, no-c-format
msgid "Back up everything on the computer."
msgstr "备份计算机里所有的数据。"
#. Tag: para
-#: preparing.xml:940
+#: preparing.xml:919
#, no-c-format
msgid ""
"Boot from the native operating system installer media such as CD-ROM or "
@@ -1424,7 +1370,7 @@ msgstr ""
"的 MacOS 系统。</phrase>"
#. Tag: para
-#: preparing.xml:950
+#: preparing.xml:929
#, no-c-format
msgid ""
"Use the native partitioning tools to create native system partition(s). "
@@ -1434,13 +1380,13 @@ msgstr ""
"区,或者腾出一块空闲空间。"
#. Tag: para
-#: preparing.xml:957
+#: preparing.xml:936
#, no-c-format
msgid "Install the native operating system on its new partition."
msgstr "把原有的操作系统安装到属于它的新分区上。"
#. Tag: para
-#: preparing.xml:962
+#: preparing.xml:941
#, no-c-format
msgid ""
"Boot back into the native system to verify everything's OK, and to download "
@@ -1449,19 +1395,19 @@ msgstr ""
"启动到原有的操作系统,以确保一切正常,再下载 Debian 安装程序的启动文件。"
#. Tag: para
-#: preparing.xml:968
+#: preparing.xml:947
#, no-c-format
msgid "Boot the Debian installer to continue installing Debian."
msgstr "启动 Debian 安装程序,并继续安装 Debian。"
#. Tag: title
-#: preparing.xml:982
+#: preparing.xml:961
#, no-c-format
msgid "Partitioning in Tru64 UNIX"
msgstr "Tru64 UNIX 下分区"
#. Tag: para
-#: preparing.xml:983
+#: preparing.xml:962
#, no-c-format
msgid ""
"Tru64 UNIX, formerly known as Digital UNIX, which is in turn formerly known "
@@ -1483,7 +1429,7 @@ msgstr ""
"filename> 是在 Linux 里的名称。"
#. Tag: para
-#: preparing.xml:995
+#: preparing.xml:974
#, no-c-format
msgid ""
"Partitions in a Tru64 disk label may overlap. Moreover, if this disk will be "
@@ -1504,7 +1450,7 @@ msgstr ""
"磁盘。完成安装之后,Tru64 的磁盘分区可以挂载到 Debian 之下。"
#. Tag: para
-#: preparing.xml:1008
+#: preparing.xml:987
#, no-c-format
msgid ""
"Another conventional requirement is for the <quote>a</quote> partition to "
@@ -1520,7 +1466,7 @@ msgstr ""
"会破坏数据。"
#. Tag: para
-#: preparing.xml:1017
+#: preparing.xml:996
#, no-c-format
msgid ""
"It is possible, and indeed quite reasonable, to share a swap partition "
@@ -1536,7 +1482,7 @@ msgstr ""
"启动脚本里面运行,时间是在用 <command>swapon -a</command> 添加交换分区之前。"
#. Tag: para
-#: preparing.xml:1026
+#: preparing.xml:1005
#, no-c-format
msgid ""
"If you want to mount UNIX partitions under Linux, note that Digital UNIX can "
@@ -1547,13 +1493,13 @@ msgstr ""
"统类型,UFS 和 AdvFS,而 Linux 只能识别前者。"
#. Tag: title
-#: preparing.xml:1035
+#: preparing.xml:1014
#, no-c-format
msgid "Partitioning in Windows NT"
msgstr "Windows NT 下分区"
#. Tag: para
-#: preparing.xml:1037
+#: preparing.xml:1016
#, fuzzy, no-c-format
msgid ""
"Windows NT uses the PC-style partition table. If you are manipulating "
@@ -1574,7 +1520,7 @@ msgstr ""
"样做,这个标志会破坏该分区上的信息。"
#. Tag: para
-#: preparing.xml:1050
+#: preparing.xml:1029
#, no-c-format
msgid ""
"If you plan to boot Linux from an ARC/AlphaBIOS/ARCSBIOS console, you will "
@@ -1590,13 +1536,13 @@ msgstr ""
"有 MILO,或者从其他介质安装,Debian 仍然可以从 ARC 启动。"
#. Tag: title
-#: preparing.xml:1067
+#: preparing.xml:1046
#, no-c-format
msgid "Partitioning From DOS or Windows"
msgstr "从 DOS 或 Windows 分区"
#. Tag: para
-#: preparing.xml:1068
+#: preparing.xml:1047
#, no-c-format
msgid ""
"If you are manipulating existing FAT or NTFS partitions, it is recommended "
@@ -1609,7 +1555,7 @@ msgstr ""
"者 Windows 分区,一般来说,Linux 的分区软件会做得更好。"
#. Tag: para
-#: preparing.xml:1076
+#: preparing.xml:1055
#, fuzzy, no-c-format
msgid ""
"But if you have a large IDE disk, and are not using LBA addressing, overlay "
@@ -1627,13 +1573,13 @@ msgstr ""
"此,您可能需要移动硬盘上的 FAT 或 NTFS 分区。"
#. Tag: title
-#: preparing.xml:1090
+#: preparing.xml:1069
#, no-c-format
msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
#. Tag: para
-#: preparing.xml:1093
+#: preparing.xml:1072
#, no-c-format
msgid ""
"One of the most common installations is onto a system that already contains "
@@ -1654,7 +1600,7 @@ msgstr ""
"数情况下您并不需要使用下面的方法。"
#. Tag: para
-#: preparing.xml:1105
+#: preparing.xml:1084
#, no-c-format
msgid ""
"Before going any further, you should have decided how you will be dividing "
@@ -1670,7 +1616,7 @@ msgstr ""
"交换分区或者放置文件系统。"
#. Tag: para
-#: preparing.xml:1114
+#: preparing.xml:1093
#, no-c-format
msgid ""
"The idea is to move all the data on the partition to the beginning, before "
@@ -1685,7 +1631,7 @@ msgstr ""
"内,尽量不要往分区的后部写数据。否则就会减少从能该分区分出去的空间大小。"
#. Tag: para
-#: preparing.xml:1123
+#: preparing.xml:1102
#, no-c-format
msgid ""
"The first thing needed is a copy of <command>fips</command> which is "
@@ -1709,7 +1655,7 @@ msgstr ""
"emphasis>请先做一张启动盘并好好阅读那份文档。"
#. Tag: para
-#: preparing.xml:1136
+#: preparing.xml:1115
#, no-c-format
msgid ""
"The next thing needed is to move all the data to the beginning of the "
@@ -1728,7 +1674,7 @@ msgstr ""
"VFAT 分区。"
#. Tag: para
-#: preparing.xml:1146
+#: preparing.xml:1125
#, no-c-format
msgid ""
"After running the defragmenter (which can take a while on a large disk), "
@@ -1740,7 +1686,7 @@ msgstr ""
"<filename>a:\\fips</filename> 然后按照提示操作。"
#. Tag: para
-#: preparing.xml:1152
+#: preparing.xml:1131
#, no-c-format
msgid ""
"Note that there are many other partition managers out there, in case "
@@ -1750,13 +1696,13 @@ msgstr ""
"可供差遣。"
#. Tag: title
-#: preparing.xml:1160
+#: preparing.xml:1139
#, no-c-format
msgid "Partitioning for DOS"
msgstr "为 DOS 分区"
#. Tag: para
-#: preparing.xml:1162
+#: preparing.xml:1141
#, no-c-format
msgid ""
"If you are partitioning for DOS drives, or changing the size of DOS "
@@ -1772,7 +1718,7 @@ msgstr ""
"或 Windows 中发现的各种古怪的错误。"
#. Tag: para
-#: preparing.xml:1170
+#: preparing.xml:1149
#, no-c-format
msgid ""
"Apparently, whenever you create or resize a partition for DOS use, it's a "
@@ -1785,19 +1731,19 @@ msgstr ""
"做:"
#. Tag: screen
-#: preparing.xml:1177
+#: preparing.xml:1156
#, no-c-format
msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
#. Tag: title
-#: preparing.xml:1188
+#: preparing.xml:1167
#, no-c-format
msgid "Partitioning in AmigaOS"
msgstr "在 AmigaOS 下分区"
#. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1168
#, no-c-format
msgid ""
"If you are running AmigaOS, you can use the <command>HDToolBox</command> "
@@ -1807,13 +1753,13 @@ msgstr ""
"整您的分区。"
#. Tag: title
-#: preparing.xml:1197
+#: preparing.xml:1176
#, no-c-format
msgid "Partitioning in Atari TOS"
msgstr "在 Atari TOS 下分区"
#. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1177
#, no-c-format
msgid ""
"Atari partition IDs are three ASCII characters, use <quote>LNX</quote> for "
@@ -1832,7 +1778,7 @@ msgstr ""
"得整个磁盘无法访问。"
#. Tag: para
-#: preparing.xml:1209
+#: preparing.xml:1188
#, no-c-format
msgid ""
"There are a multitude of third party partitioning tools available (the Atari "
@@ -1846,7 +1792,7 @@ msgstr ""
"command> (来自 Hard+Soft GmBH)。"
#. Tag: para
-#: preparing.xml:1218
+#: preparing.xml:1197
#, no-c-format
msgid ""
"Start <command>SCSITool</command> and select the disk you want to partition "
@@ -1856,7 +1802,7 @@ msgstr ""
"guimenu> 菜单中的 <guimenuitem>select</guimenuitem>)。"
#. Tag: para
-#: preparing.xml:1224
+#: preparing.xml:1203
#, no-c-format
msgid ""
"From the <guimenu>Partition</guimenu> menu, select either <guimenuitem>New</"
@@ -1872,7 +1818,7 @@ msgstr ""
"<guimenuitem>New</guimenuitem> 大概是最佳选择。"
#. Tag: para
-#: preparing.xml:1234
+#: preparing.xml:1213
#, no-c-format
msgid ""
"For the <guimenuitem>New</guimenuitem> choice, select <guilabel>existing</"
@@ -1890,7 +1836,7 @@ msgstr ""
"口。"
#. Tag: para
-#: preparing.xml:1246
+#: preparing.xml:1225
#, no-c-format
msgid ""
"For the <guimenuitem>Change</guimenuitem> option, select the partition to "
@@ -1905,7 +1851,7 @@ msgstr ""
"窗口。"
#. Tag: para
-#: preparing.xml:1256
+#: preparing.xml:1235
#, no-c-format
msgid ""
"Write down the Linux names for each of the partitions you created or changed "
@@ -1915,7 +1861,7 @@ msgstr ""
"linkend=\"device-names\"/>。"
#. Tag: para
-#: preparing.xml:1262
+#: preparing.xml:1241
#, no-c-format
msgid ""
"Quit <command>SCSITool</command> using the <guimenuitem>Quit</guimenuitem> "
@@ -1930,7 +1876,7 @@ msgstr ""
"告诉过您需要备份磁盘上的所有数据,不是吗?)。"
#. Tag: para
-#: preparing.xml:1274
+#: preparing.xml:1253
#, no-c-format
msgid ""
"There is a partitioning tool for Linux/m68k called <command>atari-fdisk</"
@@ -1949,13 +1895,13 @@ msgstr ""
"意分区类型的分区编辑器。也许还有其他的,请选择一个符合您要求的工具。"
#. Tag: title
-#: preparing.xml:1289
+#: preparing.xml:1268
#, no-c-format
msgid "Partitioning in MacOS"
msgstr "在 MacOS 下分区"
#. Tag: para
-#: preparing.xml:1290
+#: preparing.xml:1269
#, no-c-format
msgid ""
"Partitioning tools for Macintosh tested include <command>pdisk</command>, "
@@ -1976,7 +1922,7 @@ msgstr ""
"\"http://www.euronet.nl/users/ernstoud/patch.html\"></ulink>)。"
#. Tag: para
-#: preparing.xml:1301
+#: preparing.xml:1280
#, fuzzy, no-c-format
msgid ""
"For IDE based Macs, you need to use <command>Apple Drive Setup</command> to "
@@ -1990,24 +1936,21 @@ msgstr ""
"从 MkLinux FTP 服务器获得。"
#. Tag: title
-#: preparing.xml:1317
+#: preparing.xml:1296
#, no-c-format
msgid "Partitioning from SunOS"
msgstr "在 SunOS 下分区"
#. Tag: para
-#: preparing.xml:1319
+#: preparing.xml:1298
#, fuzzy, no-c-format
msgid ""
"It's perfectly fine to partition from SunOS; in fact, if you intend to run "
"both SunOS and Debian on the same machine, it is recommended that you "
"partition using SunOS prior to installing Debian. The Linux kernel "
-"understands Sun disk labels, so there are no problems there. Just make sure "
-"you leave room for the Debian root partition within the first 1GB area of "
-"the boot disk. You can also place the kernel image on a UFS partition if "
-"that is easier than putting the root partition there. SILO supports booting "
-"Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), romfs or iso9660 "
-"(CDROM) partitions."
+"understands Sun disk labels, so there are no problems there. SILO supports "
+"booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), romfs or "
+"iso9660 (CDROM) partitions."
msgstr ""
"从 SunOS 分区非常完美。事实上,如果您倾向在同一台计算机上使用 SunOS 和 "
"Debian,推荐在安装 Debian 之前使用 SunOS 进行分区。Linux 内核可以识别 Sun 的"
@@ -2017,13 +1960,13 @@ msgstr ""
"启动 Linux 和 SunOS。"
#. Tag: title
-#: preparing.xml:1334
+#: preparing.xml:1310
#, no-c-format
msgid "Partitioning from Linux or another OS"
msgstr "从 Linux 或其他 OS 分区"
#. Tag: para
-#: preparing.xml:1336
+#: preparing.xml:1312
#, no-c-format
msgid ""
"Whatever system you are using to partition, make sure you create a "
@@ -2043,7 +1986,7 @@ msgstr ""
"系)格式化过的磁盘,您必须创建新的磁盘标签,不然会有磁盘排列问题出现。"
#. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1324
#, no-c-format
msgid ""
"You will probably be using <command>SILO</command> as your boot loader (the "
@@ -2056,13 +1999,13 @@ msgstr ""
"linkend=\"partitioning\"/>。"
#. Tag: title
-#: preparing.xml:1363
+#: preparing.xml:1339
#, no-c-format
msgid "MacOS/OSX Partitioning"
msgstr "在 MacOS/OSX 下分区"
#. Tag: para
-#: preparing.xml:1365
+#: preparing.xml:1341
#, no-c-format
msgid ""
"The <application>Apple Drive Setup</application> application can be found in "
@@ -2077,7 +2020,7 @@ msgstr ""
"Setup</application> 中。"
#. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1348
#, no-c-format
msgid ""
"Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -2088,7 +2031,7 @@ msgstr ""
"无关紧要,在后面的 &debian; 安装程序中,它会被删除并替换。"
#. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1354
#, no-c-format
msgid ""
"If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -2112,7 +2055,7 @@ msgstr ""
"问。"
#. Tag: para
-#: preparing.xml:1391
+#: preparing.xml:1367
#, no-c-format
msgid ""
"GNU/Linux is unable to access information on UFS partitions, but does "
@@ -2128,13 +2071,13 @@ msgstr ""
"系统间共享信息。HFS,HFS+ 和 MS-DOS FAT 分区都能被 MacOS 和 Linux 支持。"
#. Tag: title
-#: preparing.xml:1411
+#: preparing.xml:1387
#, no-c-format
msgid "Pre-Installation Hardware and Operating System Setup"
msgstr "安装前的硬件和操作系统的相关设置"
#. Tag: para
-#: preparing.xml:1412
+#: preparing.xml:1388
#, no-c-format
msgid ""
"This section will walk you through pre-installation hardware setup, if any, "
@@ -2153,13 +2096,13 @@ msgstr ""
"可靠性。"
#. Tag: title
-#: preparing.xml:1434
+#: preparing.xml:1410
#, no-c-format
msgid "Invoking the BIOS Set-Up Menu"
msgstr "BIOS 设置菜单的使用"
#. Tag: para
-#: preparing.xml:1436
+#: preparing.xml:1412
#, no-c-format
msgid ""
"BIOS provides the basic functions needed to boot your machine to allow your "
@@ -2174,7 +2117,7 @@ msgstr ""
"常性的系统崩溃或者根本无法安装 Debian。"
#. Tag: para
-#: preparing.xml:1445
+#: preparing.xml:1421
#, no-c-format
msgid ""
"The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -2187,25 +2130,25 @@ msgstr ""
"quote>) 设置菜单取决于 BIOS 软件的作者是谁:"
#. Tag: term
-#: preparing.xml:1459
+#: preparing.xml:1435
#, no-c-format
msgid "AMI BIOS"
msgstr "AMI BIOS"
#. Tag: para
-#: preparing.xml:1460
+#: preparing.xml:1436
#, no-c-format
msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
msgstr "<keycap>Delete</keycap> 键,在 POST(开机自检) 过程中"
#. Tag: term
-#: preparing.xml:1468
+#: preparing.xml:1444
#, no-c-format
msgid "Award BIOS"
msgstr "Award BIOS"
#. Tag: para
-#: preparing.xml:1469
+#: preparing.xml:1445
#, no-c-format
msgid ""
"<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2215,25 +2158,25 @@ msgstr ""
"keycombo>,或 <keycap>Delete</keycap>键,在 POST 过程中"
#. Tag: term
-#: preparing.xml:1478
+#: preparing.xml:1454
#, no-c-format
msgid "DTK BIOS"
msgstr "DTK BIOS"
#. Tag: para
-#: preparing.xml:1479
+#: preparing.xml:1455
#, no-c-format
msgid "<keycap>Esc</keycap> key during the POST"
msgstr "<keycap>Esc</keycap>键,在 POST 过程中"
#. Tag: term
-#: preparing.xml:1486
+#: preparing.xml:1462
#, no-c-format
msgid "IBM PS/2 BIOS"
msgstr "IBM PS/2 BIOS"
#. Tag: para
-#: preparing.xml:1487
+#: preparing.xml:1463
#, no-c-format
msgid ""
"<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -2245,13 +2188,13 @@ msgstr ""
"keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
#. Tag: term
-#: preparing.xml:1501
+#: preparing.xml:1477
#, no-c-format
msgid "Phoenix BIOS"
msgstr "Phoenix BIOS"
#. Tag: para
-#: preparing.xml:1502
+#: preparing.xml:1478
#, no-c-format
msgid ""
"<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -2263,7 +2206,7 @@ msgstr ""
"keycap> </keycombo> 或 <keycap>F1</keycap>"
#. Tag: para
-#: preparing.xml:1518
+#: preparing.xml:1494
#, no-c-format
msgid ""
"Information on invoking other BIOS routines can be found in <ulink url="
@@ -2273,7 +2216,7 @@ msgstr ""
"invoking-bios-info;\"></ulink>。"
#. Tag: para
-#: preparing.xml:1523
+#: preparing.xml:1499
#, no-c-format
msgid ""
"Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -2289,13 +2232,13 @@ msgstr ""
# index.docbook:1522, index.docbook:1865
#. Tag: title
-#: preparing.xml:1534 preparing.xml:1878
+#: preparing.xml:1510 preparing.xml:1854
#, no-c-format
msgid "Boot Device Selection"
msgstr "选择引导设备"
#. Tag: para
-#: preparing.xml:1536
+#: preparing.xml:1512
#, no-c-format
msgid ""
"Many BIOS set-up menus allow you to select the devices that will be used to "
@@ -2313,7 +2256,7 @@ msgstr ""
"的话,就能让您从软盘或者 CD-ROM 引导。这是安装 Debian 最常用的两个引导设备。"
#. Tag: para
-#: preparing.xml:1547
+#: preparing.xml:1523
#, no-c-format
msgid ""
"If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2325,7 +2268,7 @@ msgstr ""
"从 CD-ROM 引导系统。"
#. Tag: para
-#: preparing.xml:1554
+#: preparing.xml:1530
#, no-c-format
msgid ""
"Another popular option is to boot from a USB storage device (also called a "
@@ -2340,7 +2283,7 @@ msgstr ""
"<quote>USB-ZIP</quote> 引导。"
#. Tag: para
-#: preparing.xml:1562
+#: preparing.xml:1538
#, no-c-format
msgid ""
"Here are some details about how to set the boot order. Remember to reset the "
@@ -2351,13 +2294,13 @@ msgstr ""
"来的启动顺序,这样,您就能像以前一样从硬盘启动了。"
#. Tag: title
-#: preparing.xml:1571
+#: preparing.xml:1547
#, no-c-format
msgid "Changing the Boot Order on IDE Computers"
msgstr "修改 IDE 接口计算机的引导顺序"
#. Tag: para
-#: preparing.xml:1574
+#: preparing.xml:1550
#, no-c-format
msgid ""
"As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2369,7 +2312,7 @@ msgstr ""
"关文档。"
#. Tag: para
-#: preparing.xml:1581
+#: preparing.xml:1557
#, no-c-format
msgid ""
"Find the boot sequence in the setup utility. Its location depends on your "
@@ -2379,19 +2322,19 @@ msgstr ""
"有关。不管如何,您要找的是列有驱动器名的栏位。"
#. Tag: para
-#: preparing.xml:1586
+#: preparing.xml:1562
#, no-c-format
msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
msgstr "对 IDE 机器而言,列表里常见的表项是 C、A、cdrom 或者 A、C、cdrom。"
#. Tag: para
-#: preparing.xml:1591
+#: preparing.xml:1567
#, no-c-format
msgid "C is the hard drive, and A is the floppy drive."
msgstr "C 就是硬盘,而 A 则是软驱。"
#. Tag: para
-#: preparing.xml:1597
+#: preparing.xml:1573
#, no-c-format
msgid ""
"Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2402,7 +2345,7 @@ msgstr ""
"keycap>或者 <keycap>Page Down</keycap> 键能够循环地选中可能的选项。"
#. Tag: para
-#: preparing.xml:1605
+#: preparing.xml:1581
#, no-c-format
msgid ""
"Save your changes. Instructions on the screen tell you how to save the "
@@ -2410,20 +2353,20 @@ msgid ""
msgstr "然后,保存您对设置的修改。屏幕上的提示会告诉您如何才能保存您的配置。"
#. Tag: title
-#: preparing.xml:1615
+#: preparing.xml:1591
#, no-c-format
msgid "Changing the Boot Order on SCSI Computers"
msgstr "修改 SCSI 接口计算机的引导顺序"
#. Tag: para
-#: preparing.xml:1619
+#: preparing.xml:1595
#, no-c-format
msgid ""
"As your computer starts, press the keys to enter the SCSI setup utility."
msgstr "当您的计算机启动时,可以按下某些键进入 SCSI 的设置软件。"
#. Tag: para
-#: preparing.xml:1624
+#: preparing.xml:1600
#, no-c-format
msgid ""
"You can start the SCSI setup utility after the memory check and the message "
@@ -2433,7 +2376,7 @@ msgstr ""
"提示的时候,启动 SCSI 设置软件。"
#. Tag: para
-#: preparing.xml:1630
+#: preparing.xml:1606
#, no-c-format
msgid ""
"The keystrokes you need depend on the utility. Often, it is "
@@ -2445,20 +2388,20 @@ msgstr ""
"的相关文档。"
#. Tag: para
-#: preparing.xml:1638
+#: preparing.xml:1614
#, no-c-format
msgid "Find the utility for changing the boot order."
msgstr "找到用来修改引导顺序的工具软件。"
#. Tag: para
-#: preparing.xml:1643
+#: preparing.xml:1619
#, no-c-format
msgid ""
"Set the utility so that the SCSI ID of the CD drive is first on the list."
msgstr "通过这个工具软件修改设置,让光盘驱动器的 SCSI ID 排在列表的首位。"
#. Tag: para
-#: preparing.xml:1649
+#: preparing.xml:1625
#, no-c-format
msgid ""
"Save your changes. Instructions on the screen tell you how to save the "
@@ -2468,19 +2411,19 @@ msgstr ""
"需要按下 <keycap>F10</keycap>。"
#. Tag: title
-#: preparing.xml:1663
+#: preparing.xml:1639
#, no-c-format
msgid "Miscellaneous BIOS Settings"
msgstr "BIOS 设置的其余项目"
#. Tag: title
-#: preparing.xml:1665
+#: preparing.xml:1641
#, no-c-format
msgid "CD-ROM Settings"
msgstr "CD-ROM 的设置"
#. Tag: para
-#: preparing.xml:1666
+#: preparing.xml:1642
#, no-c-format
msgid ""
"Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2493,13 +2436,13 @@ msgstr ""
"userinput> 的错误提示,那么就有可能是您的设置问题了。"
#. Tag: title
-#: preparing.xml:1676
+#: preparing.xml:1652
#, no-c-format
msgid "Extended vs. Expanded Memory"
msgstr "扩展内存与扩充内存"
#. Tag: para
-#: preparing.xml:1677
+#: preparing.xml:1653
#, no-c-format
msgid ""
"If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2512,13 +2455,13 @@ msgstr ""
"得尽量小。Linux 需要使用扩展内存,但无法利用扩充内存。"
#. Tag: title
-#: preparing.xml:1687
+#: preparing.xml:1663
#, no-c-format
msgid "Virus Protection"
msgstr "病毒保护"
#. Tag: para
-#: preparing.xml:1688
+#: preparing.xml:1664
#, no-c-format
msgid ""
"Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2540,13 +2483,13 @@ msgstr ""
"区(MBR)了。</para> </footnote>。"
#. Tag: title
-#: preparing.xml:1709
+#: preparing.xml:1685
#, no-c-format
msgid "Shadow RAM"
msgstr "影像内存"
#. Tag: para
-#: preparing.xml:1710
+#: preparing.xml:1686
#, no-c-format
msgid ""
"Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2568,13 +2511,13 @@ msgstr ""
"内存。而继续开启影像内存则有可能妨碍 Linux 存取硬件设备。"
#. Tag: title
-#: preparing.xml:1727
+#: preparing.xml:1703
#, no-c-format
msgid "Memory Hole"
msgstr "内存空洞"
#. Tag: para
-#: preparing.xml:1728
+#: preparing.xml:1704
#, no-c-format
msgid ""
"If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2585,7 +2528,7 @@ msgstr ""
"它。如果您有那么多内存的话,Linux 就会认为在那儿应该能找到内存块。"
#. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1710
#, no-c-format
msgid ""
"We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2604,13 +2547,13 @@ msgstr ""
"常,否则的话就不行。"
#. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1726
#, no-c-format
msgid "Advanced Power Management"
msgstr "高级电源管理"
#. Tag: para
-#: preparing.xml:1751
+#: preparing.xml:1727
#, no-c-format
msgid ""
"If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2624,13 +2567,13 @@ msgstr ""
"器。Linux 可以接管所有这些模式的控制权,而且能比 BIOS 的电源管理做得更好。"
#. Tag: title
-#: preparing.xml:1769
+#: preparing.xml:1745
#, no-c-format
msgid "Firmware Revisions and Existing OS Setup"
msgstr "固件修订版和已有的 OS 配置"
#. Tag: para
-#: preparing.xml:1771
+#: preparing.xml:1747
#, no-c-format
msgid ""
"&arch-title; machines are generally self-configuring and do not require "
@@ -2650,13 +2593,13 @@ msgstr ""
"BVMBug boot ROM 不属于 BVM 系统的标准配置,但可用从 BVM 免费获取。"
#. Tag: title
-#: preparing.xml:1794
+#: preparing.xml:1770
#, no-c-format
msgid "Invoking OpenFirmware"
msgstr "使用 OpenFireware"
#. Tag: para
-#: preparing.xml:1795
+#: preparing.xml:1771
#, no-c-format
msgid ""
"There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2670,7 +2613,7 @@ msgstr ""
"关的硬件文档。"
#. Tag: para
-#: preparing.xml:1803
+#: preparing.xml:1779
#, no-c-format
msgid ""
"On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2687,7 +2630,7 @@ msgstr ""
"powerpc-faq;\"></ulink> 了解更多提示。"
#. Tag: para
-#: preparing.xml:1812
+#: preparing.xml:1788
#, no-c-format
msgid ""
"The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2709,7 +2652,7 @@ msgstr ""
"调制解调器端口连接到另外一台电脑上的终端程序来与 OpenFirmware 交互。"
#. Tag: para
-#: preparing.xml:1825
+#: preparing.xml:1801
#, no-c-format
msgid ""
"The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2729,13 +2672,13 @@ msgstr ""
"nvram。"
#. Tag: title
-#: preparing.xml:1845
+#: preparing.xml:1821
#, no-c-format
msgid "Invoking OpenBoot"
msgstr "使用 OpenBoot"
#. Tag: para
-#: preparing.xml:1847
+#: preparing.xml:1823
#, no-c-format
msgid ""
"OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2749,7 +2692,7 @@ msgstr ""
"机做很多事情,如诊断和简单脚本。"
#. Tag: para
-#: preparing.xml:1855
+#: preparing.xml:1831
#, no-c-format
msgid ""
"To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2768,7 +2711,7 @@ msgstr ""
"<keycap>n</keycap> 键得到新风格的提示符。"
#. Tag: para
-#: preparing.xml:1867
+#: preparing.xml:1843
#, no-c-format
msgid ""
"If you are using a serial console, send a break to the machine. With "
@@ -2782,7 +2725,7 @@ msgstr ""
"档。"
#. Tag: para
-#: preparing.xml:1880
+#: preparing.xml:1856
#, no-c-format
msgid ""
"You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2800,7 +2743,7 @@ msgstr ""
"Reference</ulink>。"
#. Tag: para
-#: preparing.xml:1890
+#: preparing.xml:1866
#, fuzzy, no-c-format
msgid ""
"Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2839,7 +2782,7 @@ msgstr ""
"url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
#. Tag: para
-#: preparing.xml:1913
+#: preparing.xml:1889
#, no-c-format
msgid ""
"To boot from a specific device, use the command <userinput>boot "
@@ -2868,19 +2811,19 @@ msgstr ""
"</screen></informalexample> 或在 Solaris下执行:"
#. Tag: screen
-#: preparing.xml:1932
+#: preparing.xml:1908
#, no-c-format
msgid "eeprom boot-device=disk1:1"
msgstr "eeprom boot-device=disk1:1"
#. Tag: title
-#: preparing.xml:1942
+#: preparing.xml:1918
#, no-c-format
msgid "BIOS Setup"
msgstr "BIOS 设置"
#. Tag: para
-#: preparing.xml:1943
+#: preparing.xml:1919
#, no-c-format
msgid ""
"In order to install &debian; on a &arch-title; or zSeries machine you have "
@@ -2899,7 +2842,7 @@ msgstr ""
"程方式使用。这归因于该系统上的 3215/3270 控制台是线型,而不是字符型的。"
#. Tag: para
-#: preparing.xml:1955
+#: preparing.xml:1931
#, no-c-format
msgid ""
"Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2917,7 +2860,7 @@ msgstr ""
"上的 HMC 启动。"
#. Tag: para
-#: preparing.xml:1965
+#: preparing.xml:1941
#, fuzzy, no-c-format
msgid ""
"Before you actually perform an installation, you have to go over some design "
@@ -2937,13 +2880,13 @@ msgstr ""
"再返回本文档查看 Debian 规格的安装步骤。"
#. Tag: title
-#: preparing.xml:1982
+#: preparing.xml:1958
#, no-c-format
msgid "Native and LPAR installations"
msgstr "本地化(Native)和 LPAR 安装"
#. Tag: para
-#: preparing.xml:1983
+#: preparing.xml:1959
#, no-c-format
msgid ""
"Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2959,13 +2902,13 @@ msgstr ""
"如何为 Linux 建立 LPAR 的部分。"
#. Tag: title
-#: preparing.xml:1997
+#: preparing.xml:1973
#, no-c-format
msgid "Installation as a VM guest"
msgstr "作为一个 VM guest 安装"
#. Tag: para
-#: preparing.xml:1999
+#: preparing.xml:1975
#, no-c-format
msgid ""
"Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2981,7 +2924,7 @@ msgstr ""
"如何为运行 Linux 建立 VM guest 的部分。"
#. Tag: para
-#: preparing.xml:2009
+#: preparing.xml:1985
#, no-c-format
msgid ""
"You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2994,13 +2937,13 @@ msgstr ""
"是以固定 80 字符记录长度的二近制形式进行传输。"
#. Tag: title
-#: preparing.xml:2021
+#: preparing.xml:1997
#, no-c-format
msgid "Setting up an installation server"
msgstr "建立安装服务器"
#. Tag: para
-#: preparing.xml:2023
+#: preparing.xml:1999
#, no-c-format
msgid ""
"If you don't have a connection to the Internet (either directly or via a web "
@@ -3013,7 +2956,7 @@ msgstr ""
"HTTP 或 FTP 访问。"
#. Tag: para
-#: preparing.xml:2031
+#: preparing.xml:2007
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
@@ -3025,19 +2968,19 @@ msgstr ""
"立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
#. Tag: emphasis
-#: preparing.xml:2040
+#: preparing.xml:2016
#, no-c-format
msgid "FIXME: more information needed &mdash; from a Redbook?"
msgstr "FIXME: more information needed &mdash; from a Redbook?"
#. Tag: title
-#: preparing.xml:2047
+#: preparing.xml:2023
#, no-c-format
msgid "Hardware Issues to Watch Out For"
msgstr "需要留心的硬件问题"
#. Tag: para
-#: preparing.xml:2049
+#: preparing.xml:2025
#, no-c-format
msgid ""
"Atari TT RAM boards are notorious for RAM problems under Linux; if you "
@@ -3052,13 +2995,13 @@ msgstr ""
"description of this needed. </emphasis></phrase>"
#. Tag: title
-#: preparing.xml:2064
+#: preparing.xml:2040
#, no-c-format
msgid "USB BIOS support and keyboards"
msgstr "USB BIOS 支持与键盘"
#. Tag: para
-#: preparing.xml:2065
+#: preparing.xml:2041
#, no-c-format
msgid ""
"If you have no AT-style keyboard and only a USB model, you may need to "
@@ -3076,13 +3019,13 @@ msgstr ""
"keyboard support</quote>选项。"
#. Tag: title
-#: preparing.xml:2079
+#: preparing.xml:2055
#, fuzzy, no-c-format
msgid "Display-visibility on OldWorld Powermacs"
msgstr "在 OldWorld Powermacs 上正常显示"
#. Tag: para
-#: preparing.xml:2081
+#: preparing.xml:2057
#, fuzzy, no-c-format
msgid ""
"Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -3101,6 +3044,90 @@ msgstr ""
"为 256 色,替代 <quote>thousands</quote> 或 <quote>millions</quote>。"
#~ msgid ""
+#~ "When <classname>debian-installer</classname> finishes, before the first "
+#~ "system load, you have only a very basic command line driven system. The "
+#~ "graphical interface which displays windows on your monitor will not be "
+#~ "installed unless you select it with <classname>tasksel</classname>. It's "
+#~ "optional because many &debian; systems are servers which don't really "
+#~ "have any need for a graphical user interface to do their job."
+#~ msgstr ""
+#~ "当 <classname>debian-installer</classname> 程序运行结束,系统首次加载之"
+#~ "前,您只有一个非常基本的基于命令行的系统。除非您在最后一个步骤里用 "
+#~ "<classname>tasksel</classname> 选择了能在您的显示器上显示窗口的图形界面,"
+#~ "否则它将不会被自动安装。因为许多 &debian; 系统是被用作服务器,它们的工作根"
+#~ "本不需要任何图形化的用户界面,所以它在这里只是一个可选项。"
+
+#~ msgid "<entry>RAM</entry>"
+#~ msgstr "<entry>内存</entry>"
+
+#~ msgid "450 megabytes"
+#~ msgstr "450 M"
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#~ msgid "4 gigabytes"
+#~ msgstr "4 G"
+
+#~ msgid ""
+#~ "Here is a sampling of some common Debian system configurations. You can "
+#~ "also get an idea of the disk space used by related groups of programs by "
+#~ "referring to <xref linkend=\"tasksel-size-list\"/>."
+#~ msgstr ""
+#~ "这里有些常规 Debian 系统配置的样本。要了解各类软件需要占多大的硬盘空间,请"
+#~ "参考<xref linkend=\"tasksel-size-list\"/>。"
+
+#~ msgid "Standard Server"
+#~ msgstr "常规服务器"
+
+#~ msgid ""
+#~ "This is a small server profile, useful for a stripped down server which "
+#~ "does not have a lot of niceties for shell users. It includes an FTP "
+#~ "server, a web server, DNS, NIS, and POP. For these 100MB of disk space "
+#~ "would suffice, and then you would need to add space for any data you "
+#~ "serve up."
+#~ msgstr ""
+#~ "这里有一台小型服务器范例,它适用于精简型服务器,即没有为 shell 的用户安装"
+#~ "过多合用称手的软件。这类服务器 安装有:一个 FTP 服务、一个 web 服务、DNS、"
+#~ "NIS 以及 POP 服务。这些服务总共需要用掉 100MB 的磁盘空间,您还需要另外算上"
+#~ "服务所需的 数据占用的空间。"
+
+#~ msgid "Desktop"
+#~ msgstr "桌面"
+
+#~ msgid ""
+#~ "A standard desktop box, including the X window system, full desktop "
+#~ "environments, sound, editors, etc. You'll need about 2GB using the "
+#~ "standard desktop task, though it can be done in far less."
+#~ msgstr ""
+#~ "标准的桌面用机安装有 X 窗口系统、完整的桌面环境、音频软件、编辑器等。这些"
+#~ "软件包将总共需要约 2G 空间,尽管也可以不用这么多。"
+
+#~ msgid "Work Console"
+#~ msgstr "工作控制台"
+
+#~ msgid ""
+#~ "A more stripped-down user machine, without the X window system or X "
+#~ "applications. Possibly suitable for a laptop or mobile computer. The size "
+#~ "is around 140MB."
+#~ msgstr ""
+#~ "这是被高度精简的用户机器,它没有安装 X 窗口系统或者 X 软件。可能适用于笔记"
+#~ "本电脑或者手持计算机。其所需空间约为 140MB。"
+
+#~ msgid "Developer"
+#~ msgstr "开发人员"
+
+#~ msgid ""
+#~ "A desktop setup with all the development packages, such as Perl, C, C++, "
+#~ "etc. Size is around 475MB. Assuming you are adding X11 and some "
+#~ "additional packages for other uses, you should plan around 800MB for this "
+#~ "type of machine."
+#~ msgstr ""
+#~ "这是包括所有开发软件包的桌面设置,例如 Perl、C、C++ 等。其所需空间约为 "
+#~ "475MB。若是您为了其它用途,而另行安装了 X11 和其它的软件包,那么您需要为这"
+#~ "类机器规划出约 800MB 空间。"
+
+#~ msgid ""
#~ "Many people have tried operating their 90 MHz CPU at 100 MHz, etc. It "
#~ "sometimes works, but is sensitive to temperature and other factors and "
#~ "can actually damage your system. One of the authors of this document over-"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index f5d185299..cab79a089 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-12-31 19:17+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-10-31 21:52+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -437,18 +437,30 @@ msgid "Disk Space Needed for Tasks"
msgstr "各软件集所需的磁盘空间"
#. Tag: para
-#: random-bits.xml:189
-#, no-c-format
+#: random-bits.xml:194
+#, fuzzy, no-c-format
msgid ""
-"The base installation for i386 using the default 2.6 kernel, including all "
-"standard packages, requires 585MB of disk space. A minimal base "
-"installation, without the standard task selected, will take 365MB."
+"A standard installation for the i386 architecture, including all standard "
+"packages and using the default 2.6 kernel, takes up 442MB of disk space. A "
+"minimal base installation, without the <quote>Standard system</quote> task "
+"selected, will take 230MB."
msgstr ""
"对于 i386 架构,基本安装默认使用 2.6 内核,包含了所有的标准软件包,需要 "
"585MB 磁盘空间。最小化的基本安装,没有选择标准任务,需要 365MB。"
#. Tag: para
-#: random-bits.xml:196
+#: random-bits.xml:202
+#, no-c-format
+msgid ""
+"In both cases this is the actual disk space used <emphasis>after</emphasis> "
+"the installation is finished and any temporary files deleted. It also does "
+"not take into account overhead used by the file system, for example for "
+"journal files. This means that significantly more disk space is needed both "
+"<emphasis>during</emphasis> the installation and for normal system use."
+msgstr ""
+
+#. Tag: para
+#: random-bits.xml:211
#, no-c-format
msgid ""
"The following table lists sizes reported by aptitude for the tasks listed in "
@@ -461,231 +473,247 @@ msgstr ""
"装后所占的空间,可能会小于这两个软件集分别安装所占的空间。"
#. Tag: para
-#: random-bits.xml:203
-#, no-c-format
+#: random-bits.xml:218
+#, fuzzy, no-c-format
msgid ""
"Note that you will need to add the sizes listed in the table to the size of "
-"the base installation when determining the size of partitions. Most of the "
-"size listed as <quote>Installed size</quote> will end up in <filename>/usr</"
-"filename>; the size listed as <quote>Download size</quote> is (temporarily) "
-"required in <filename>/var</filename>."
+"the standard installation when determining the size of partitions. Most of "
+"the size listed as <quote>Installed size</quote> will end up in <filename>/"
+"usr</filename> and in <filename>/lib</filename>; the size listed as "
+"<quote>Download size</quote> is (temporarily) required in <filename>/var</"
+"filename>."
msgstr ""
"注意您需要将表格中列出的尺寸加上基本安装尺寸以决定分区的大小。多数列出的尺寸"
"如<quote>安装尺寸</quote>将用在 <filename>/usr</filename>;列在<quote>下载尺"
"寸</quote>是(临时地)用在 <filename>/var</filename>。"
#. Tag: entry
-#: random-bits.xml:216
+#: random-bits.xml:232
#, no-c-format
msgid "Task"
msgstr "任务"
#. Tag: entry
-#: random-bits.xml:217
+#: random-bits.xml:233
#, no-c-format
msgid "Installed size (MB)"
msgstr "安装尺寸 (MB)"
#. Tag: entry
-#: random-bits.xml:218
+#: random-bits.xml:234
#, no-c-format
msgid "Download size (MB)"
msgstr "下载尺寸 (MB)"
#. Tag: entry
-#: random-bits.xml:219
+#: random-bits.xml:235
#, no-c-format
msgid "Space needed to install (MB)"
msgstr "用于安装所需空间 (MB)"
#. Tag: entry
-#: random-bits.xml:225
+#: random-bits.xml:241
#, no-c-format
-msgid "Desktop"
-msgstr "桌面"
+msgid "Desktop environment"
+msgstr ""
#. Tag: entry
-#: random-bits.xml:226
-#, no-c-format
-msgid "1258"
-msgstr "1258"
+#: random-bits.xml:242
+#, fuzzy, no-c-format
+msgid "1267"
+msgstr "1676"
#. Tag: entry
-#: random-bits.xml:227
-#, no-c-format
-msgid "<entry>418</entry>"
-msgstr "<entry>418</entry>"
+#: random-bits.xml:243
+#, fuzzy, no-c-format
+msgid "<entry>420</entry>"
+msgstr "<entry>421</entry>"
#. Tag: entry
-#: random-bits.xml:228
-#, no-c-format
-msgid "1676"
+#: random-bits.xml:244
+#, fuzzy, no-c-format
+msgid "1667"
msgstr "1676"
#. Tag: entry
-#: random-bits.xml:232
+#: random-bits.xml:248
#, no-c-format
msgid "Laptop"
msgstr "便携机"
-#. Tag: entry
-#: random-bits.xml:233 random-bits.xml:242
+#. Tag: para
+#: random-bits.xml:250
#, no-c-format
-msgid "<entry>46</entry>"
-msgstr "<entry>46</entry>"
+msgid ""
+"There is a large overlap of the Laptop task with the Destop environment "
+"task. If you install both, the Laptop task will only require a few MB "
+"additional disk space."
+msgstr ""
#. Tag: entry
-#: random-bits.xml:234
+#: random-bits.xml:257
#, no-c-format
-msgid "<entry>16</entry>"
-msgstr "<entry>16</entry>"
+msgid "<entry>50</entry>"
+msgstr "<entry>50</entry>"
#. Tag: entry
-#: random-bits.xml:235
-#, no-c-format
-msgid "<entry>62</entry>"
-msgstr "<entry>62</entry>"
+#: random-bits.xml:258
+#, fuzzy, no-c-format
+msgid "<entry>17</entry>"
+msgstr "<entry>1</entry>"
#. Tag: entry
-#: random-bits.xml:239
+#: random-bits.xml:259
+#, fuzzy, no-c-format
+msgid "<entry>67</entry>"
+msgstr "<entry>46</entry>"
+
+#. Tag: entry
+#: random-bits.xml:263
#, no-c-format
msgid "Web server"
msgstr "Web 服务器"
#. Tag: entry
-#: random-bits.xml:240
+#: random-bits.xml:264
#, no-c-format
msgid "<entry>35</entry>"
msgstr "<entry>35</entry>"
#. Tag: entry
-#: random-bits.xml:241
+#: random-bits.xml:265
#, no-c-format
msgid "<entry>11</entry>"
msgstr "<entry>11</entry>"
#. Tag: entry
-#: random-bits.xml:246
+#: random-bits.xml:266
+#, no-c-format
+msgid "<entry>46</entry>"
+msgstr "<entry>46</entry>"
+
+#. Tag: entry
+#: random-bits.xml:270
#, no-c-format
msgid "Print server"
msgstr "打印服务器"
#. Tag: entry
-#: random-bits.xml:247
-#, no-c-format
-msgid "<entry>326</entry>"
-msgstr "<entry>326</entry>"
+#: random-bits.xml:271
+#, fuzzy, no-c-format
+msgid "<entry>277</entry>"
+msgstr "<entry>2</entry>"
#. Tag: entry
-#: random-bits.xml:248
-#, no-c-format
-msgid "<entry>95</entry>"
+#: random-bits.xml:272
+#, fuzzy, no-c-format
+msgid "<entry>79</entry>"
msgstr "<entry>95</entry>"
#. Tag: entry
-#: random-bits.xml:249
-#, no-c-format
-msgid "<entry>421</entry>"
-msgstr "<entry>421</entry>"
+#: random-bits.xml:273
+#, fuzzy, no-c-format
+msgid "<entry>356</entry>"
+msgstr "<entry>35</entry>"
#. Tag: entry
-#: random-bits.xml:253
+#: random-bits.xml:277
#, no-c-format
msgid "DNS server"
msgstr "DNS 服务器"
#. Tag: entry
-#: random-bits.xml:254
+#: random-bits.xml:278
#, no-c-format
msgid "<entry>2</entry>"
msgstr "<entry>2</entry>"
#. Tag: entry
-#: random-bits.xml:255
+#: random-bits.xml:279
#, no-c-format
msgid "<entry>1</entry>"
msgstr "<entry>1</entry>"
#. Tag: entry
-#: random-bits.xml:256
+#: random-bits.xml:280
#, no-c-format
msgid "<entry>3</entry>"
msgstr "<entry>3</entry>"
#. Tag: entry
-#: random-bits.xml:260
+#: random-bits.xml:284
#, no-c-format
msgid "File server"
msgstr "文件服务器"
#. Tag: entry
-#: random-bits.xml:261
-#, no-c-format
-msgid "<entry>50</entry>"
-msgstr "<entry>50</entry>"
+#: random-bits.xml:285
+#, fuzzy, no-c-format
+msgid "<entry>49</entry>"
+msgstr "<entry>46</entry>"
#. Tag: entry
-#: random-bits.xml:262
+#: random-bits.xml:286
#, no-c-format
msgid "<entry>21</entry>"
msgstr "<entry>21</entry>"
#. Tag: entry
-#: random-bits.xml:263
-#, no-c-format
-msgid "<entry>71</entry>"
-msgstr "<entry>71</entry>"
+#: random-bits.xml:287
+#, fuzzy, no-c-format
+msgid "<entry>70</entry>"
+msgstr "<entry>50</entry>"
#. Tag: entry
-#: random-bits.xml:267
+#: random-bits.xml:291
#, no-c-format
msgid "Mail server"
msgstr "邮件服务器"
#. Tag: entry
-#: random-bits.xml:268
+#: random-bits.xml:292
#, no-c-format
msgid "<entry>13</entry>"
msgstr "<entry>13</entry>"
#. Tag: entry
-#: random-bits.xml:269
+#: random-bits.xml:293
#, no-c-format
msgid "<entry>5</entry>"
msgstr "<entry>5</entry>"
#. Tag: entry
-#: random-bits.xml:270
+#: random-bits.xml:294
#, no-c-format
msgid "<entry>18</entry>"
msgstr "<entry>18</entry>"
#. Tag: entry
-#: random-bits.xml:274
+#: random-bits.xml:298
#, no-c-format
msgid "SQL database"
msgstr "SQL 数据库"
#. Tag: entry
-#: random-bits.xml:275
+#: random-bits.xml:299
#, no-c-format
msgid "<entry>24</entry>"
msgstr "<entry>24</entry>"
#. Tag: entry
-#: random-bits.xml:276
+#: random-bits.xml:300
#, no-c-format
msgid "<entry>8</entry>"
msgstr "<entry>8</entry>"
#. Tag: entry
-#: random-bits.xml:277
+#: random-bits.xml:301
#, no-c-format
msgid "<entry>32</entry>"
msgstr "<entry>32</entry>"
#. Tag: para
-#: random-bits.xml:283
+#: random-bits.xml:307
#, no-c-format
msgid ""
"The <emphasis>Desktop</emphasis> task will install the GNOME desktop "
@@ -693,7 +721,7 @@ msgid ""
msgstr "<emphasis>桌面</emphasis> 任务将同时安装 GNOME 桌面环境。"
#. Tag: para
-#: random-bits.xml:290
+#: random-bits.xml:314
#, no-c-format
msgid ""
"If you install in a language other than English, <command>tasksel</command> "
@@ -706,13 +734,13 @@ msgstr ""
"不同;您应该给 200MB 以上的空间用于下载和安装。"
#. Tag: title
-#: random-bits.xml:305
+#: random-bits.xml:329
#, no-c-format
msgid "Installing &debian; from a Unix/Linux System"
msgstr "通过 Unix/Linux 系统来安装 &debian;"
#. Tag: para
-#: random-bits.xml:307
+#: random-bits.xml:331
#, no-c-format
msgid ""
"This section explains how to install &debian; from an existing Unix or Linux "
@@ -733,7 +761,7 @@ msgstr ""
"中输入的。"
#. Tag: para
-#: random-bits.xml:319
+#: random-bits.xml:343
#, no-c-format
msgid ""
"Once you've got the new Debian system configured to your preference, you can "
@@ -748,13 +776,13 @@ msgstr ""
"过任何引导或者安装介质完成安装的权宜之计。"
#. Tag: title
-#: random-bits.xml:331
+#: random-bits.xml:355
#, no-c-format
msgid "Getting Started"
msgstr "准备运动"
#. Tag: para
-#: random-bits.xml:332
+#: random-bits.xml:356
#, fuzzy, no-c-format
msgid ""
"With your current *nix partitioning tools, repartition the hard drive as "
@@ -768,7 +796,7 @@ msgstr ""
"X,就需要至少 300MB 的空间了。"
#. Tag: para
-#: random-bits.xml:340
+#: random-bits.xml:364
#, fuzzy, no-c-format
msgid ""
"Next, create file systems on the partitions. For example, to create an ext3 "
@@ -786,7 +814,7 @@ msgstr ""
"userinput>。"
#. Tag: para
-#: random-bits.xml:350
+#: random-bits.xml:374
#, fuzzy, no-c-format
msgid ""
"Initialize and activate swap (substitute the partition number for your "
@@ -809,7 +837,7 @@ msgstr ""
"统)。挂载点的名称是任意的,后面的步骤将会用到它。"
#. Tag: screen
-#: random-bits.xml:362
+#: random-bits.xml:386
#, fuzzy, no-c-format
msgid ""
"# mkdir /mnt/debinst\n"
@@ -819,7 +847,7 @@ msgstr ""
"# mount /dev/hda6 /mnt/debinst"
#. Tag: para
-#: random-bits.xml:365
+#: random-bits.xml:389
#, no-c-format
msgid ""
"If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -830,13 +858,13 @@ msgstr ""
"手动创建和加载这些目录。"
#. Tag: title
-#: random-bits.xml:375
+#: random-bits.xml:399
#, no-c-format
msgid "Install <command>debootstrap</command>"
msgstr "安装 <command>debootstrap</command>"
#. Tag: para
-#: random-bits.xml:376
+#: random-bits.xml:400
#, no-c-format
msgid ""
"The utility used by the Debian installer, and recognized as the official way "
@@ -859,7 +887,7 @@ msgstr ""
"<command>debootstrap</command>。"
#. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:430
#, no-c-format
msgid ""
"Or, you can use the following procedure to install it manually. Make a work "
@@ -884,7 +912,7 @@ msgstr ""
"并解压获得该文件。把二进制文件安装到系统中,您必须要拥有 root 的权限。"
#. Tag: screen
-#: random-bits.xml:421
+#: random-bits.xml:445
#, no-c-format
msgid ""
"# ar -x debootstrap_0.X.X_all.deb\n"
@@ -896,13 +924,13 @@ msgstr ""
"# zcat /full-path-to-work/work/data.tar.gz | tar xv"
#. Tag: title
-#: random-bits.xml:427
+#: random-bits.xml:451
#, no-c-format
msgid "Run <command>debootstrap</command>"
msgstr "运行 <command>debootstrap</command>"
#. Tag: para
-#: random-bits.xml:428
+#: random-bits.xml:452
#, no-c-format
msgid ""
"<command>debootstrap</command> can download the needed files directly from "
@@ -918,7 +946,7 @@ msgstr ""
"README.mirrors\"></ulink>。"
#. Tag: para
-#: random-bits.xml:437
+#: random-bits.xml:461
#, no-c-format
msgid ""
"If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
@@ -930,7 +958,7 @@ msgstr ""
"debian/</userinput>"
#. Tag: para
-#: random-bits.xml:443
+#: random-bits.xml:467
#, fuzzy, no-c-format
msgid ""
"Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -950,7 +978,7 @@ msgstr ""
"<userinput>sparc</userinput>。"
#. Tag: screen
-#: random-bits.xml:461
+#: random-bits.xml:485
#, fuzzy, no-c-format
msgid ""
"# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -960,13 +988,13 @@ msgstr ""
"http://http.us.debian.org/debian"
#. Tag: title
-#: random-bits.xml:467
+#: random-bits.xml:491
#, no-c-format
msgid "Configure The Base System"
msgstr "基系统的配置"
#. Tag: para
-#: random-bits.xml:468
+#: random-bits.xml:492
#, no-c-format
msgid ""
"Now you've got a real Debian system, though rather lean, on disk. "
@@ -977,19 +1005,19 @@ msgid ""
msgstr ""
#. Tag: screen
-#: random-bits.xml:478
+#: random-bits.xml:502
#, no-c-format
msgid "# export TERM=<replaceable>xterm-color</replaceable>"
msgstr ""
#. Tag: title
-#: random-bits.xml:483
+#: random-bits.xml:507
#, no-c-format
msgid "Mount Partitions"
msgstr "分区的挂载"
#. Tag: para
-#: random-bits.xml:484
+#: random-bits.xml:508
#, fuzzy, no-c-format
msgid ""
"You need to create <filename>/etc/fstab</filename>. "
@@ -1060,13 +1088,13 @@ msgstr ""
"a</userinput>,那么请一定要再接着做之前先把 proc 挂载好:"
#. Tag: screen
-#: random-bits.xml:510
+#: random-bits.xml:534
#, no-c-format
msgid "# mount -t proc proc /proc"
msgstr "# mount -t proc proc /proc"
#. Tag: para
-#: random-bits.xml:512
+#: random-bits.xml:536
#, no-c-format
msgid ""
"The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1077,19 +1105,19 @@ msgstr ""
"chroot: 以为加载 proc。"
#. Tag: screen
-#: random-bits.xml:518
+#: random-bits.xml:542
#, no-c-format
msgid "# mount -t proc proc /mnt/debinst/proc"
msgstr "# mount -t proc proc /mnt/debinst/proc"
#. Tag: title
-#: random-bits.xml:524
+#: random-bits.xml:548
#, fuzzy, no-c-format
msgid "Setting Timezone"
msgstr "建立源"
#. Tag: para
-#: random-bits.xml:525
+#: random-bits.xml:549
#, no-c-format
msgid ""
"An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1099,7 +1127,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: random-bits.xml:532
+#: random-bits.xml:556
#, no-c-format
msgid ""
"# editor /etc/default/rcS\n"
@@ -1107,13 +1135,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: random-bits.xml:538
+#: random-bits.xml:562
#, no-c-format
msgid "Configure Networking"
msgstr "网络的配置"
#. Tag: para
-#: random-bits.xml:539
+#: random-bits.xml:563
#, fuzzy, no-c-format
msgid ""
"To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1221,13 +1249,13 @@ msgstr ""
"统启动时,每块网卡就能获得您所预期的 interface 名称了 (eth0、eth1 等等)。"
#. Tag: title
-#: random-bits.xml:580
+#: random-bits.xml:604
#, fuzzy, no-c-format
msgid "Configure Apt"
msgstr "网络的配置"
#. Tag: para
-#: random-bits.xml:581
+#: random-bits.xml:605
#, no-c-format
msgid ""
"Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1243,13 +1271,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: random-bits.xml:597
+#: random-bits.xml:621
#, fuzzy, no-c-format
msgid "Configure Locales and Keyboard"
msgstr "键盘的配置"
#. Tag: para
-#: random-bits.xml:598
+#: random-bits.xml:622
#, fuzzy, no-c-format
msgid ""
"To configure your locale settings to use a language other than English, "
@@ -1270,7 +1298,7 @@ msgstr ""
"locale 之前,请先参阅相应的本地化指南(localization HOWTO)。"
#. Tag: screen
-#: random-bits.xml:608
+#: random-bits.xml:632
#, fuzzy, no-c-format
msgid ""
"# aptitude install console-data\n"
@@ -1278,7 +1306,7 @@ msgid ""
msgstr "# dpkg-reconfigure console-data"
#. Tag: para
-#: random-bits.xml:610
+#: random-bits.xml:634
#, no-c-format
msgid ""
"Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1286,13 +1314,13 @@ msgid ""
msgstr "注意,在 chroot 里面不能设置键盘,但重新启动以后可以。"
#. Tag: title
-#: random-bits.xml:620
+#: random-bits.xml:644
#, no-c-format
msgid "Install a Kernel"
msgstr "内核的安装"
#. Tag: para
-#: random-bits.xml:621
+#: random-bits.xml:645
#, fuzzy, no-c-format
msgid ""
"If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1304,13 +1332,13 @@ msgstr ""
"</screen></informalexample> 接下来使用所选包名来安装。"
#. Tag: screen
-#: random-bits.xml:626
+#: random-bits.xml:650
#, no-c-format
msgid "# apt-cache search linux-image"
msgstr ""
#. Tag: para
-#: random-bits.xml:628
+#: random-bits.xml:652
#, no-c-format
msgid ""
"If you intend to use a pre-packaged kernel, you may want to create the "
@@ -1319,7 +1347,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: random-bits.xml:634
+#: random-bits.xml:658
#, no-c-format
msgid ""
"# Kernel image management overrides\n"
@@ -1333,7 +1361,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: random-bits.xml:636
+#: random-bits.xml:660
#, no-c-format
msgid ""
"For detailed information about this file and the various options, consult "
@@ -1343,7 +1371,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: random-bits.xml:643
+#: random-bits.xml:667
#, no-c-format
msgid ""
"If you intend to use <classname>grub</classname> as your bootloader, you can "
@@ -1358,7 +1386,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: random-bits.xml:655
+#: random-bits.xml:679
#, no-c-format
msgid ""
"Then install the kernel package of your choice using its package name. "
@@ -1371,13 +1399,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: random-bits.xml:669
+#: random-bits.xml:693
#, no-c-format
msgid "Set up the Boot Loader"
msgstr "Boot Loader 的设置"
#. Tag: para
-#: random-bits.xml:670
+#: random-bits.xml:694
#, no-c-format
msgid ""
"To make your &debian; system bootable, set up your boot loader to load the "
@@ -1390,7 +1418,7 @@ msgstr ""
"loader,因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
#. Tag: para
-#: random-bits.xml:677
+#: random-bits.xml:701
#, fuzzy, no-c-format
msgid ""
"Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1411,7 +1439,7 @@ msgstr ""
"它就会用哪个系统里的 <filename>lilo.conf</filename> )。"
#. Tag: para
-#: random-bits.xml:689
+#: random-bits.xml:713
#, no-c-format
msgid ""
"Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1426,13 +1454,13 @@ msgid ""
msgstr ""
#. Tag: para
-#: random-bits.xml:699
+#: random-bits.xml:723
#, 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:703
+#: random-bits.xml:727
#, fuzzy, no-c-format
msgid ""
"boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1452,7 +1480,7 @@ msgstr ""
"label=Debian"
#. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:729
#, no-c-format
msgid ""
"Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1470,7 +1498,7 @@ msgstr ""
"filename> )。"
#. Tag: para
-#: random-bits.xml:715
+#: random-bits.xml:739
#, no-c-format
msgid ""
"Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1500,13 +1528,13 @@ msgstr ""
"userinput> 换成 <userinput>hd:</userinput>。"
#. Tag: title
-#: random-bits.xml:728
+#: random-bits.xml:752
#, no-c-format
msgid "Finishing touches"
msgstr ""
#. Tag: para
-#: random-bits.xml:729
+#: random-bits.xml:753
#, no-c-format
msgid ""
"As mentioned earlier, the installed system will be very basic. If you would "
@@ -1519,7 +1547,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: random-bits.xml:740
+#: random-bits.xml:764
#, no-c-format
msgid ""
"After the installation there will be a lot of downloaded packages in "
@@ -1528,19 +1556,19 @@ msgid ""
msgstr ""
#. Tag: screen
-#: random-bits.xml:746
+#: random-bits.xml:770
#, no-c-format
msgid "# aptitude clean"
msgstr ""
#. Tag: title
-#: random-bits.xml:757
+#: random-bits.xml:781
#, no-c-format
msgid "Installing &debian; over Parallel Line IP (PLIP)"
msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;"
#. Tag: para
-#: random-bits.xml:759
+#: random-bits.xml:783
#, no-c-format
msgid ""
"This section explains how to install &debian; on a computer without an "
@@ -1553,7 +1581,7 @@ msgstr ""
"具有 Debian 镜像的网络(例如,互联网)。"
#. Tag: para
-#: random-bits.xml:767
+#: random-bits.xml:791
#, no-c-format
msgid ""
"In the example in this appendix we will set up a PLIP connection using a "
@@ -1567,7 +1595,7 @@ msgstr ""
"IP 地址(这些地址在您的网络地址空间里面未被占用)。"
#. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:799
#, no-c-format
msgid ""
"The PLIP connection set up during the installation will also be available "
@@ -1578,7 +1606,7 @@ msgstr ""
"linkend=\"boot-new\"/>)。"
#. Tag: para
-#: random-bits.xml:780
+#: random-bits.xml:804
#, no-c-format
msgid ""
"Before you start, you will need to check the BIOS configuration (IO base "
@@ -1590,13 +1618,13 @@ msgstr ""
"为 <literal>io=0x378</literal>,<literal>irq=7</literal>。"
#. Tag: title
-#: random-bits.xml:790
+#: random-bits.xml:814
#, no-c-format
msgid "Requirements"
msgstr "需求"
#. Tag: para
-#: random-bits.xml:793
+#: random-bits.xml:817
#, no-c-format
msgid ""
"A target computer, called <emphasis>target</emphasis>, where Debian will be "
@@ -1604,13 +1632,13 @@ msgid ""
msgstr "目标计算机,称为 <emphasis>target</emphasis>,将安装 Debian 在上面。"
#. Tag: para
-#: random-bits.xml:799
+#: random-bits.xml:823
#, no-c-format
msgid "System installation media; see <xref linkend=\"installation-media\"/>."
msgstr "系统安装介质;参阅 <xref linkend=\"installation-media\"/>。"
#. Tag: para
-#: random-bits.xml:804
+#: random-bits.xml:828
#, no-c-format
msgid ""
"Another computer connected to the Internet, called <emphasis>source</"
@@ -1619,7 +1647,7 @@ msgstr ""
"另外一台连接到互联网的计算机,称为 <emphasis>source</emphasis>,功能是网关。"
#. Tag: para
-#: random-bits.xml:810
+#: random-bits.xml:834
#, no-c-format
msgid ""
"A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1630,13 +1658,13 @@ msgstr ""
"Install-HOWTO</ulink> 了解这种线的更多信息,以及如何自己制作。"
#. Tag: title
-#: random-bits.xml:822
+#: random-bits.xml:846
#, no-c-format
msgid "Setting up source"
msgstr "建立源"
#. Tag: para
-#: random-bits.xml:823
+#: random-bits.xml:847
#, no-c-format
msgid ""
"The following shell script is a simple example of how to configure the "
@@ -1646,7 +1674,7 @@ msgstr ""
"算机。"
#. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:852
#, no-c-format
msgid ""
"#!/bin/sh\n"
@@ -1688,13 +1716,13 @@ msgstr ""
"echo 1 > /proc/sys/net/ipv4/ip_forward"
#. Tag: title
-#: random-bits.xml:834
+#: random-bits.xml:858
#, no-c-format
msgid "Installing target"
msgstr "安装目标"
#. Tag: para
-#: random-bits.xml:835
+#: random-bits.xml:859
#, no-c-format
msgid ""
"Boot the installation media. The installation needs to be run in expert "
@@ -1718,13 +1746,13 @@ msgstr ""
"</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
#. Tag: guimenuitem
-#: random-bits.xml:854
+#: random-bits.xml:878
#, no-c-format
msgid "Load installer components from CD"
msgstr "从光盘加载安装组件"
#. Tag: para
-#: random-bits.xml:856
+#: random-bits.xml:880
#, no-c-format
msgid ""
"Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1734,13 +1762,13 @@ msgstr ""
"用 PLIP 驱动。"
#. Tag: guimenuitem
-#: random-bits.xml:864
+#: random-bits.xml:888
#, no-c-format
msgid "Detect network hardware"
msgstr "侦测网络硬件"
#. Tag: para
-#: random-bits.xml:869
+#: random-bits.xml:893
#, no-c-format
msgid ""
"If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1753,7 +1781,7 @@ msgstr ""
"系统没有网卡,安装程序不会显示该列表。"
#. Tag: para
-#: random-bits.xml:878
+#: random-bits.xml:902
#, no-c-format
msgid ""
"Because no network card was detected/selected earlier, the installer will "
@@ -1764,19 +1792,19 @@ msgstr ""
"<userinput>plip</userinput> 模块。"
#. Tag: guimenuitem
-#: random-bits.xml:890
+#: random-bits.xml:914
#, no-c-format
msgid "Configure the network"
msgstr "配置网络"
#. Tag: para
-#: random-bits.xml:893
+#: random-bits.xml:917
#, no-c-format
msgid "Auto-configure network with DHCP: No"
msgstr "Auto-configure network with DHCP: No"
#. Tag: para
-#: random-bits.xml:898
+#: random-bits.xml:922
#, no-c-format
msgid ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1784,7 +1812,7 @@ msgstr ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
#. Tag: para
-#: random-bits.xml:903
+#: random-bits.xml:927
#, no-c-format
msgid ""
"Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -1794,7 +1822,7 @@ msgstr ""
"userinput>"
#. Tag: para
-#: random-bits.xml:909
+#: random-bits.xml:933
#, no-c-format
msgid ""
"Name server addresses: you can enter the same addresses used on source (see "
@@ -1803,6 +1831,27 @@ msgstr ""
"Name server addresses: 您可以使用与源计算机相同的地址 (参阅 <filename>/etc/"
"resolv.conf</filename>)"
+#~ msgid "Desktop"
+#~ msgstr "桌面"
+
+#~ msgid "1258"
+#~ msgstr "1258"
+
+#~ msgid "<entry>418</entry>"
+#~ msgstr "<entry>418</entry>"
+
+#~ msgid "<entry>16</entry>"
+#~ msgstr "<entry>16</entry>"
+
+#~ msgid "<entry>62</entry>"
+#~ msgstr "<entry>62</entry>"
+
+#~ msgid "<entry>326</entry>"
+#~ msgstr "<entry>326</entry>"
+
+#~ msgid "<entry>71</entry>"
+#~ msgstr "<entry>71</entry>"
+
#~ msgid ""
#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
#~ "replaceable>"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index c3f3d0b91..f6cd0a2a6 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-12-31 03:15+0000\n"
+"POT-Creation-Date: 2007-01-01 11:02+0000\n"
"PO-Revision-Date: 2006-11-22 16:46+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2910,7 +2910,7 @@ msgstr ""
"务所需的空间。"
#. Tag: para
-#: using-d-i.xml:2014
+#: using-d-i.xml:2016
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -2921,7 +2921,7 @@ msgstr ""
"些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2021
+#: using-d-i.xml:2023
#, fuzzy, no-c-format
msgid ""
"The <quote>Desktop environment</quote> task will install the GNOME desktop "
@@ -2932,7 +2932,7 @@ msgstr ""
"供的选项不能选其他的桌面环境,比如 KDE。"
#. Tag: para
-#: using-d-i.xml:2027
+#: using-d-i.xml:2031
#, no-c-format
msgid ""
"It is possible to get the installer to install KDE by using preseeding (see "
@@ -2946,7 +2946,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2038
+#: using-d-i.xml:2042
#, no-c-format
msgid ""
"The various server tasks will install software roughly as follows. DNS "
@@ -2958,7 +2958,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2050
+#: using-d-i.xml:2054
#, fuzzy, no-c-format
msgid ""
"Once you've selected your tasks, select <guibutton>OK</guibutton>. At this "
@@ -2969,7 +2969,7 @@ msgstr ""
"command> 将安装您选中的软件包。"
#. Tag: para
-#: using-d-i.xml:2057
+#: using-d-i.xml:2061
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -2977,7 +2977,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2063
+#: using-d-i.xml:2067
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -2989,7 +2989,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2072
+#: using-d-i.xml:2076
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -3001,7 +3001,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2081
+#: using-d-i.xml:2085
#, no-c-format
msgid ""
"Each package you selected with <command>tasksel</command> is downloaded, "
@@ -3014,13 +3014,13 @@ msgstr ""
"序需要用户提供信息,它会在此过程中给出提示。"
#. Tag: title
-#: using-d-i.xml:2094
+#: using-d-i.xml:2098
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2096
+#: using-d-i.xml:2100
#, fuzzy, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -3033,13 +3033,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2111
+#: using-d-i.xml:2115
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2113
+#: using-d-i.xml:2117
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -3053,7 +3053,7 @@ msgstr ""
"计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2121
+#: using-d-i.xml:2125
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -3067,13 +3067,13 @@ msgstr ""
"理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2139
+#: using-d-i.xml:2143
#, no-c-format
msgid "Install <command>aboot</command> on a Hard Disk"
msgstr "安装 <command>aboot</command> 到硬盘上"
#. Tag: para
-#: using-d-i.xml:2140
+#: using-d-i.xml:2144
#, fuzzy, no-c-format
msgid ""
"If you have booted from SRM and you select this option, the installer will "
@@ -3093,13 +3093,13 @@ msgstr ""
"Linux。"
#. Tag: title
-#: using-d-i.xml:2160
+#: using-d-i.xml:2164
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2161
+#: using-d-i.xml:2165
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3114,19 +3114,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2170
+#: using-d-i.xml:2174
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2182
+#: using-d-i.xml:2186
#, no-c-format
msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2184
+#: using-d-i.xml:2188
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3137,7 +3137,7 @@ msgstr ""
"定的 boot loader,它对新手来说是个不错的缺省选择。对老鸟来说,它也同样适合。"
#. Tag: para
-#: using-d-i.xml:2190
+#: using-d-i.xml:2194
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3149,7 +3149,7 @@ msgstr ""
"息,请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2196
+#: using-d-i.xml:2200
#, no-c-format
msgid ""
"If you do not want to install grub at all, use the Back button to get to the "
@@ -3159,13 +3159,13 @@ msgstr ""
"动引导器。"
#. Tag: title
-#: using-d-i.xml:2210
+#: using-d-i.xml:2214
#, no-c-format
msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2212
+#: using-d-i.xml:2216
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3181,7 +3181,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2222
+#: using-d-i.xml:2226
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -3194,7 +3194,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2230
+#: using-d-i.xml:2234
#, fuzzy, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3202,13 +3202,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择来安装 <command>LILO</command> 启动加载器:"
#. Tag: term
-#: using-d-i.xml:2237
+#: using-d-i.xml:2241
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2237
+#: using-d-i.xml:2241
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -3216,13 +3216,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2244
+#: using-d-i.xml:2248
#, no-c-format
msgid "new Debian partition"
msgstr "新 Debian 分区"
#. Tag: para
-#: using-d-i.xml:2244
+#: using-d-i.xml:2248
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3233,13 +3233,13 @@ msgstr ""
"新 Debian 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2253
+#: using-d-i.xml:2257
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2253
+#: using-d-i.xml:2257
#, no-c-format
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
@@ -3256,7 +3256,7 @@ msgstr ""
"<filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2265
+#: using-d-i.xml:2269
#, fuzzy, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3271,13 +3271,13 @@ msgstr ""
"息,请参阅 <xref linkend=\"reactivating-win\"/>。"
#. Tag: title
-#: using-d-i.xml:2281
+#: using-d-i.xml:2285
#, no-c-format
msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2283
+#: using-d-i.xml:2287
#, fuzzy, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3302,7 +3302,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2299
+#: using-d-i.xml:2303
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3317,13 +3317,13 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2311
+#: using-d-i.xml:2315
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2313
+#: using-d-i.xml:2317
#, fuzzy, no-c-format
msgid ""
"The criteria for selecting a partition is that it is FAT format filesystem "
@@ -3339,13 +3339,13 @@ msgstr ""
"有内容!"
#. Tag: title
-#: using-d-i.xml:2328
+#: using-d-i.xml:2332
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2330
+#: using-d-i.xml:2334
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3371,13 +3371,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2352
+#: using-d-i.xml:2356
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2353
+#: using-d-i.xml:2357
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -3388,13 +3388,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2362
+#: using-d-i.xml:2366
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2363
+#: using-d-i.xml:2367
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3407,13 +3407,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2373
+#: using-d-i.xml:2377
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2374
+#: using-d-i.xml:2378
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3426,13 +3426,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2386
+#: using-d-i.xml:2390
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2387
+#: using-d-i.xml:2391
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -3443,13 +3443,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2397
+#: using-d-i.xml:2401
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2398
+#: using-d-i.xml:2402
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3462,13 +3462,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2418
+#: using-d-i.xml:2422
#, no-c-format
msgid "<command>arcboot</command>-installer"
msgstr "<command>arcboot</command>-installer"
#. Tag: para
-#: using-d-i.xml:2419
+#: using-d-i.xml:2423
#, no-c-format
msgid ""
"The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -3508,13 +3508,13 @@ msgstr ""
"</screen></informalexample> ,然后键入 <command>boot</command>。"
#. Tag: replaceable
-#: using-d-i.xml:2438
+#: using-d-i.xml:2442
#, no-c-format
msgid "scsi"
msgstr "scsi"
#. Tag: para
-#: using-d-i.xml:2439
+#: using-d-i.xml:2443
#, no-c-format
msgid ""
"is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -3522,13 +3522,13 @@ msgid ""
msgstr "是启动的 SCSI 总线,<userinput>0</userinput> 为板载控制器"
#. Tag: replaceable
-#: using-d-i.xml:2447
+#: using-d-i.xml:2451
#, no-c-format
msgid "disk"
msgstr "disk"
#. Tag: para
-#: using-d-i.xml:2448
+#: using-d-i.xml:2452
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -3537,13 +3537,13 @@ msgstr "硬盘的 SCSI ID,<command>arcboot</command> 安装在其上"
# index.docbook:1643, index.docbook:1712
#. Tag: replaceable
-#: using-d-i.xml:2456 using-d-i.xml:2525
+#: using-d-i.xml:2460 using-d-i.xml:2529
#, no-c-format
msgid "partnr"
msgstr "partnr"
#. Tag: para
-#: using-d-i.xml:2457
+#: using-d-i.xml:2461
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -3551,13 +3551,13 @@ msgid ""
msgstr "分区号,<filename>/etc/arcboot.conf</filename> 处于该分区"
#. Tag: replaceable
-#: using-d-i.xml:2465
+#: using-d-i.xml:2469
#, no-c-format
msgid "config"
msgstr "config"
#. Tag: para
-#: using-d-i.xml:2466
+#: using-d-i.xml:2470
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -3567,13 +3567,13 @@ msgstr ""
"quote> 。"
#. Tag: title
-#: using-d-i.xml:2487
+#: using-d-i.xml:2491
#, no-c-format
msgid "<command>delo</command>-installer"
msgstr "<command>delo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2488
+#: using-d-i.xml:2492
#, no-c-format
msgid ""
"The boot loader on DECstations is <command>DELO</command>. It has to be "
@@ -3599,13 +3599,13 @@ msgstr ""
"</screen></informalexample> 。"
#. Tag: replaceable
-#: using-d-i.xml:2507
+#: using-d-i.xml:2511
#, no-c-format
msgid "<replaceable>#</replaceable>"
msgstr "<replaceable>#</replaceable>"
#. Tag: para
-#: using-d-i.xml:2508
+#: using-d-i.xml:2512
#, no-c-format
msgid ""
"is the TurboChannel device to be booted from, on most DECstations this is "
@@ -3615,20 +3615,20 @@ msgstr ""
"userinput>"
#. Tag: replaceable
-#: using-d-i.xml:2516
+#: using-d-i.xml:2520
#, no-c-format
msgid "<replaceable>id</replaceable>"
msgstr "<replaceable>id</replaceable>"
#. Tag: para
-#: using-d-i.xml:2517
+#: using-d-i.xml:2521
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>DELO</command> is installed"
msgstr "硬盘上的 SCSI ID,<command>DELO</command> 安装在其上"
#. Tag: para
-#: using-d-i.xml:2526
+#: using-d-i.xml:2530
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/delo.conf</filename> "
@@ -3636,13 +3636,13 @@ msgid ""
msgstr "分区号,<filename>/etc/delo.conf</filename> 处于此分区"
#. Tag: replaceable
-#: using-d-i.xml:2534
+#: using-d-i.xml:2538
#, no-c-format
msgid "name"
msgstr "name"
#. Tag: para
-#: using-d-i.xml:2535
+#: using-d-i.xml:2539
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/delo.conf</"
@@ -3652,7 +3652,7 @@ msgstr ""
"quote>"
#. Tag: para
-#: using-d-i.xml:2545
+#: using-d-i.xml:2549
#, no-c-format
msgid ""
"In case <filename>/etc/delo.conf</filename> is on the first partition on the "
@@ -3662,19 +3662,19 @@ msgstr ""
"认的设置,但也可以用"
#. Tag: screen
-#: using-d-i.xml:2551
+#: using-d-i.xml:2555
#, no-c-format
msgid "<userinput>boot #/rz<replaceable>id</replaceable></userinput>"
msgstr "<userinput>boot #/rz<replaceable>id</replaceable></userinput>"
#. Tag: title
-#: using-d-i.xml:2561
+#: using-d-i.xml:2565
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2562
+#: using-d-i.xml:2566
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -3692,13 +3692,13 @@ msgstr ""
"设为启动 &debian;。"
#. Tag: title
-#: using-d-i.xml:2580
+#: using-d-i.xml:2584
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2581
+#: using-d-i.xml:2585
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -3711,13 +3711,13 @@ msgstr ""
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
#. Tag: title
-#: using-d-i.xml:2597
+#: using-d-i.xml:2601
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:2598
+#: using-d-i.xml:2602
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -3732,13 +3732,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:2615
+#: using-d-i.xml:2619
#, no-c-format
msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2617
+#: using-d-i.xml:2621
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -3765,13 +3765,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:2642
+#: using-d-i.xml:2646
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用启动引导器继续进行"
#. Tag: para
-#: using-d-i.xml:2644
+#: using-d-i.xml:2648
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -3787,7 +3787,7 @@ msgstr ""
"护,以用于启动 GNU/Linux。</phrase>"
#. Tag: para
-#: using-d-i.xml:2653
+#: using-d-i.xml:2657
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -3806,13 +3806,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:2670
+#: using-d-i.xml:2674
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:2671
+#: using-d-i.xml:2675
#, no-c-format
msgid ""
"These are the last bits to do before rebooting to your new system. It mostly "
@@ -3820,13 +3820,13 @@ msgid ""
msgstr "这是在您启动新系统之前的最后一些工作。主要进行一些 &d-i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:2683
+#: using-d-i.xml:2687
#, no-c-format
msgid "Finish the Installation and Reboot"
msgstr "完成安装并重启"
#. Tag: para
-#: using-d-i.xml:2685
+#: using-d-i.xml:2689
#, no-c-format
msgid ""
"This is the last step in the initial Debian installation process. You will "
@@ -3838,7 +3838,7 @@ msgstr ""
"等)。安装程序将做最后几分钟的任务,然后启动到您的新 Debian 系统。"
#. Tag: para
-#: using-d-i.xml:2692
+#: using-d-i.xml:2696
#, no-c-format
msgid ""
"Select the <guimenuitem>Finish the installation</guimenuitem> menu item "
@@ -3851,13 +3851,13 @@ msgstr ""
"安装步骤第一步里选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:2706
+#: using-d-i.xml:2710
#, no-c-format
msgid "Miscellaneous"
msgstr "杂项"
#. Tag: para
-#: using-d-i.xml:2707
+#: using-d-i.xml:2711
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -3868,13 +3868,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:2720
+#: using-d-i.xml:2724
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:2722
+#: using-d-i.xml:2726
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -3885,7 +3885,7 @@ msgstr ""
"<filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:2729
+#: using-d-i.xml:2733
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -3899,13 +3899,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:2749
+#: using-d-i.xml:2753
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:2751
+#: using-d-i.xml:2755
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -3921,7 +3921,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2769
+#: using-d-i.xml:2773
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -3931,7 +3931,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2776
+#: using-d-i.xml:2780
#, fuzzy, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -3947,7 +3947,7 @@ msgstr ""
"shell 有一些好用的特性,如自动完成与历史纪录。"
#. Tag: para
-#: using-d-i.xml:2785
+#: using-d-i.xml:2789
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -3956,7 +3956,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2792
+#: using-d-i.xml:2796
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -3965,7 +3965,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2798
+#: using-d-i.xml:2802
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -3975,13 +3975,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:2813
+#: using-d-i.xml:2817
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:2815
+#: using-d-i.xml:2819
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -3996,7 +3996,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:2825
+#: using-d-i.xml:2829
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -4016,7 +4016,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:2838
+#: using-d-i.xml:2842
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -4024,7 +4024,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:2843
+#: using-d-i.xml:2847
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4044,7 +4044,7 @@ msgstr ""
"quote>。"
#. Tag: para
-#: using-d-i.xml:2855
+#: using-d-i.xml:2859
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -4055,7 +4055,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:2861
+#: using-d-i.xml:2865
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4083,7 +4083,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:2878
+#: using-d-i.xml:2882
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -4099,7 +4099,7 @@ msgstr ""
"再重新来过。"
#. Tag: para
-#: using-d-i.xml:2887
+#: using-d-i.xml:2891
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -4116,7 +4116,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:2897
+#: using-d-i.xml:2901
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -4129,7 +4129,7 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: para
-#: using-d-i.xml:2905
+#: using-d-i.xml:2909
#, no-c-format
msgid ""
"Also, if you are running the SSH session from an X terminal, you should not "