summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po224
-rw-r--r--po/zh_CN/hardware.po470
-rw-r--r--po/zh_CN/install-methods.po325
-rw-r--r--po/zh_CN/preseed.po318
4 files changed, 732 insertions, 605 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index f427e8802..9a5dcd744 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: 2009-11-08 01:11+0000\n"
+"POT-Creation-Date: 2009-11-18 01:11+0000\n"
"PO-Revision-Date: 2009-08-01 14:15+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2769,7 +2769,7 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2272 boot-installer.xml:2551
+#: boot-installer.xml:2272 boot-installer.xml:2568
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
@@ -3148,30 +3148,64 @@ msgstr ""
#. Tag: term
#: boot-installer.xml:2525
+#, fuzzy, no-c-format
+#| msgid "debian-installer/locale (locale)"
+msgid "debian-installer/language (language)"
+msgstr "debian-installer/locale (locale)"
+
+#. Tag: term
+#: boot-installer.xml:2526
+#, fuzzy, no-c-format
+#| msgid "debian-installer/theme (theme)"
+msgid "debian-installer/country (country)"
+msgstr "debian-installer/theme (theme)"
+
+#. Tag: term
+#: boot-installer.xml:2527
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2526
+#: boot-installer.xml:2528
+#, no-c-format
+msgid ""
+"There are two ways to specify the language, country and locale to use for "
+"the installation and the installed system."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2533
#, no-c-format
msgid ""
-"Can be used to set both the language and country for the installation. This "
-"will only work if the locale is supported in Debian. For example, use "
-"<userinput>locale=de_CH</userinput> to select German as language and "
-"Switzerland as country."
+"The first and easiest is to pass only the parameter <literal>locale</"
+"literal>. Language and country will then be derived from its value. You can "
+"for example use <userinput>locale=de_CH</userinput> to select German as "
+"language and Switzerland as country (<literal>de_CH.UTF-8</literal> will be "
+"set as default locale for the installed system). Limitation is that not all "
+"possible combinations of language, country and locale can be achieved this "
+"way."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2542
+#, no-c-format
+msgid ""
+"The second, more flexible option is to specify <literal>language</literal> "
+"and <literal>country</literal> separately. In this case <literal>locale</"
+"literal> can optionally be added to specify a specific default locale for "
+"the installed system. Example: <userinput>language=en country=DE "
+"locale=en_GB.UTF-8</userinput>."
msgstr ""
-"可用来设置安装的语言和国家。它只在该 locale 被 Debian 支持时工作。例如,使用 "
-"<userinput>locale=de_CH</userinput> 选择德语作为语言,并且瑞士作为国家。"
#. Tag: term
-#: boot-installer.xml:2537
+#: boot-installer.xml:2554
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2538
+#: boot-installer.xml:2555
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3186,7 +3220,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2552
+#: boot-installer.xml:2569
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3195,13 +3229,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2561
+#: boot-installer.xml:2578
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2562
+#: boot-installer.xml:2579
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3216,13 +3250,13 @@ msgstr ""
"使用该协议。注意,您必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2575
+#: boot-installer.xml:2592
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2576
+#: boot-installer.xml:2593
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3233,13 +3267,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2590
+#: boot-installer.xml:2607
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2591
+#: boot-installer.xml:2608
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3259,7 +3293,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2604
+#: boot-installer.xml:2621
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3271,7 +3305,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2611
+#: boot-installer.xml:2628
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3291,19 +3325,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2621
+#: boot-installer.xml:2638
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2627
+#: boot-installer.xml:2644
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2628
+#: boot-installer.xml:2645
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3318,7 +3352,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2637
+#: boot-installer.xml:2654
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3332,7 +3366,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2645
+#: boot-installer.xml:2662
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3344,19 +3378,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2662
+#: boot-installer.xml:2679
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2667
+#: boot-installer.xml:2684
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2668
+#: boot-installer.xml:2685
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3368,7 +3402,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2675
+#: boot-installer.xml:2692
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3379,13 +3413,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2681
+#: boot-installer.xml:2698
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2686
+#: boot-installer.xml:2703
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3393,7 +3427,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2692
+#: boot-installer.xml:2709
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3406,7 +3440,7 @@ msgstr ""
"的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2702
+#: boot-installer.xml:2719
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3417,7 +3451,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2708
+#: boot-installer.xml:2725
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3425,13 +3459,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2716
+#: boot-installer.xml:2733
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2719
+#: boot-installer.xml:2736
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3439,7 +3473,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:2725
+#: boot-installer.xml:2742
#, no-c-format
msgid ""
"If your system boots correctly from the CD-ROM, it does not necessarily mean "
@@ -3450,7 +3484,7 @@ msgstr ""
"准确一点,CD-ROM 驱动器所连接的控制器)。"
#. Tag: para
-#: boot-installer.xml:2732
+#: boot-installer.xml:2749
#, no-c-format
msgid ""
"Some older CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3460,19 +3494,19 @@ msgstr ""
"常工作。"
#. Tag: title
-#: boot-installer.xml:2743
+#: boot-installer.xml:2760
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2744
+#: boot-installer.xml:2761
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2749
+#: boot-installer.xml:2766
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (older systems "
@@ -3482,7 +3516,7 @@ msgstr ""
"持您所使用的介质。"
#. Tag: para
-#: boot-installer.xml:2755
+#: boot-installer.xml:2772
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3506,7 +3540,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2768
+#: boot-installer.xml:2785
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3528,7 +3562,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2773
+#: boot-installer.xml:2790
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3545,7 +3579,7 @@ msgstr ""
"Linux 知识。要执行命令,您应该首先切换到第二虚拟控制台(VT2),并激活 shell。"
#. Tag: para
-#: boot-installer.xml:2785
+#: boot-installer.xml:2802
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3557,7 +3591,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2792
+#: boot-installer.xml:2809
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3585,7 +3619,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:2806
+#: boot-installer.xml:2823
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3597,7 +3631,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:2814
+#: boot-installer.xml:2831
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3612,7 +3646,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:2824
+#: boot-installer.xml:2841
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3637,7 +3671,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:2839
+#: boot-installer.xml:2856
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3649,13 +3683,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:2854
+#: boot-installer.xml:2871
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:2856
+#: boot-installer.xml:2873
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install Debian seems to "
@@ -3664,7 +3698,7 @@ msgstr ""
"对于用软盘安装 Debian 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:2861
+#: boot-installer.xml:2878
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3680,7 +3714,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:2870
+#: boot-installer.xml:2887
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3695,7 +3729,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:2879
+#: boot-installer.xml:2896
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3706,7 +3740,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:2885
+#: boot-installer.xml:2902
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -3717,7 +3751,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:2891
+#: boot-installer.xml:2908
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3728,13 +3762,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:2900
+#: boot-installer.xml:2917
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:2902
+#: boot-installer.xml:2919
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3747,7 +3781,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:2909
+#: boot-installer.xml:2926
#, no-c-format
msgid ""
"Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -3758,7 +3792,7 @@ msgstr ""
"arch=\"x86\">内置调制解调器、声卡以及即插即用设备特别容易引起问题。</phrase>"
#. Tag: para
-#: boot-installer.xml:2915
+#: boot-installer.xml:2932
#, no-c-format
msgid ""
"If you have a large amount of memory installed in your machine, more than "
@@ -3771,13 +3805,13 @@ msgstr ""
"<userinput>mem=512m</userinput>。"
#. Tag: title
-#: boot-installer.xml:2926 boot-installer.xml:3028
+#: boot-installer.xml:2943 boot-installer.xml:3045
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:2927
+#: boot-installer.xml:2944
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3785,7 +3819,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:2932
+#: boot-installer.xml:2949
#, no-c-format
msgid ""
"Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -3796,7 +3830,7 @@ msgstr ""
"息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:2938
+#: boot-installer.xml:2955
#, no-c-format
msgid ""
"On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -3814,7 +3848,7 @@ msgstr ""
"replaceable>,<replaceable>sectors</replaceable></userinput>。"
#. Tag: para
-#: boot-installer.xml:2947
+#: boot-installer.xml:2964
#, no-c-format
msgid ""
"If you have a very old machine, and the kernel hangs after saying "
@@ -3827,7 +3861,7 @@ msgstr ""
"userinput> 参数来取消这个测试。"
#. Tag: para
-#: boot-installer.xml:2954
+#: boot-installer.xml:2971
#, no-c-format
msgid ""
"Some systems (especially laptops) that have a native resolution that is not "
@@ -3850,7 +3884,7 @@ msgstr ""
"boot 参数 <userinput>fb=false</userinput>。"
#. Tag: para
-#: boot-installer.xml:2972
+#: boot-installer.xml:2989
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3868,13 +3902,13 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:2986
+#: boot-installer.xml:3003
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:2987
+#: boot-installer.xml:3004
#, no-c-format
msgid ""
"Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -3892,7 +3926,7 @@ msgstr ""
"段。"
#. Tag: para
-#: boot-installer.xml:2997
+#: boot-installer.xml:3014
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3912,13 +3946,13 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: title
-#: boot-installer.xml:3014
+#: boot-installer.xml:3031
#, no-c-format
msgid "System Freeze while Loading USB Modules"
msgstr "在装入 USB 模块时系统停止"
#. Tag: para
-#: boot-installer.xml:3015
+#: boot-installer.xml:3032
#, no-c-format
msgid ""
"The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -3934,19 +3968,19 @@ msgstr ""
"<userinput>nousb</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:3029
+#: boot-installer.xml:3046
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:3035
+#: boot-installer.xml:3052
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3036
+#: boot-installer.xml:3053
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -3970,7 +4004,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3050
+#: boot-installer.xml:3067
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -3983,13 +4017,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3061
+#: boot-installer.xml:3078
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3062
+#: boot-installer.xml:3079
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4000,19 +4034,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3068
+#: boot-installer.xml:3085
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3077
+#: boot-installer.xml:3094
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3079
+#: boot-installer.xml:3096
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4045,13 +4079,13 @@ msgstr ""
">)。"
#. Tag: title
-#: boot-installer.xml:3104
+#: boot-installer.xml:3121
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3105
+#: boot-installer.xml:3122
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4068,7 +4102,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3116
+#: boot-installer.xml:3133
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4079,13 +4113,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3127
+#: boot-installer.xml:3144
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3128
+#: boot-installer.xml:3145
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4097,7 +4131,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3135
+#: boot-installer.xml:3152
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4108,7 +4142,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3141
+#: boot-installer.xml:3158
#, no-c-format
msgid ""
"If you have a working Debian system, the easiest way to send an installation "
@@ -4126,7 +4160,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3151
+#: boot-installer.xml:3168
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
@@ -4212,6 +4246,16 @@ msgstr ""
"</screen></informalexample> 在 bug 报告中,请说明问题所在,包括内核挂起时最后"
"见到的内核消息。描述进入问题状态所进行的步骤。"
+#~ msgid ""
+#~ "Can be used to set both the language and country for the installation. "
+#~ "This will only work if the locale is supported in Debian. For example, "
+#~ "use <userinput>locale=de_CH</userinput> to select German as language and "
+#~ "Switzerland as country."
+#~ msgstr ""
+#~ "可用来设置安装的语言和国家。它只在该 locale 被 Debian 支持时工作。例如,使"
+#~ "用 <userinput>locale=de_CH</userinput> 选择德语作为语言,并且瑞士作为国"
+#~ "家。"
+
#~ msgid "Alpha Console Firmware"
#~ msgstr "Alpha 控制台固件"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index bd956b7b4..16bc169e2 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: 2009-11-02 22:19+0000\n"
+"POT-Creation-Date: 2009-11-18 01:11+0000\n"
"PO-Revision-Date: 2009-08-01 14:25+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -477,14 +477,14 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:210 hardware.xml:246 hardware.xml:350 hardware.xml:369
-#: hardware.xml:452 hardware.xml:510 hardware.xml:563
+#: hardware.xml:210 hardware.xml:246 hardware.xml:352 hardware.xml:371
+#: hardware.xml:454 hardware.xml:512 hardware.xml:565
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
#. Tag: para
-#: hardware.xml:211 hardware.xml:370
+#: hardware.xml:211 hardware.xml:372
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -496,7 +496,7 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:219 hardware.xml:378 hardware.xml:487
+#: hardware.xml:219 hardware.xml:380 hardware.xml:489
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
@@ -593,13 +593,21 @@ msgstr "Kirkwood"
#. Tag: para
#: hardware.xml:302
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
+#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
+#| "currently support the following Kirkwood based devices: <ulink url=\"&url-"
+#| "arm-cyrius-sheevaplug;\">SheevaPlug</ulink> and <ulink url=\"&url-arm-"
+#| "cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)."
msgid ""
"Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
"CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently "
-"support the following Kirkwood based devices: <ulink url=\"&url-arm-cyrius-"
-"sheevaplug;\">SheevaPlug</ulink> and <ulink url=\"&url-arm-cyrius-qnap-"
-"kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)."
+"support the following Kirkwood based devices: OpenRD (OpenRD-Base and OpenRD-"
+"Client), <ulink url=\"&url-arm-cyrius-sheevaplug;\">SheevaPlug</ulink> and "
+"<ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-"
+"110, TS-119, TS-210, TS-219 and TS-219P; the TS-410 and TS-419P are not yet "
+"supported)."
msgstr ""
"Kirkwood 是 Marvell 的 SoC (system on a chip) 产品,芯片上集成了 ARM CPU、以"
"太网、SATA、USB,以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood 的设"
@@ -608,13 +616,13 @@ msgstr ""
"and TS-219)。"
#. Tag: term
-#: hardware.xml:315
+#: hardware.xml:317
#, no-c-format
msgid "Orion5x"
msgstr "Orion5x"
#. Tag: para
-#: hardware.xml:316
+#: hardware.xml:318
#, no-c-format
msgid ""
"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
@@ -633,13 +641,13 @@ msgstr ""
"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
#. Tag: term
-#: hardware.xml:331
+#: hardware.xml:333
#, no-c-format
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:332
+#: hardware.xml:334
#, no-c-format
msgid ""
"The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -649,7 +657,7 @@ msgstr ""
"Debian 是一个不错的方法。"
#. Tag: para
-#: hardware.xml:351
+#: hardware.xml:353
#, no-c-format
msgid ""
"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -665,7 +673,7 @@ msgstr ""
"位的 userland。"
#. Tag: para
-#: hardware.xml:379
+#: hardware.xml:381
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -678,7 +686,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:386
+#: hardware.xml:388
#, no-c-format
msgid ""
"However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run on "
@@ -712,7 +720,7 @@ msgstr ""
"para> </footnote>。"
#. Tag: para
-#: hardware.xml:419
+#: hardware.xml:421
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel EM64T "
@@ -723,13 +731,13 @@ msgstr ""
"的安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:428
+#: hardware.xml:430
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:429
+#: hardware.xml:431
#, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
@@ -743,7 +751,7 @@ msgstr ""
"年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:453
+#: hardware.xml:455
#, no-c-format
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
@@ -773,7 +781,7 @@ msgstr ""
"debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:488
+#: hardware.xml:490
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -786,7 +794,7 @@ msgstr ""
"R5000。"
#. Tag: para
-#: hardware.xml:494
+#: hardware.xml:496
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -797,7 +805,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:511
+#: hardware.xml:513
#, no-c-format
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
@@ -824,13 +832,13 @@ msgstr ""
"list</ulink>。"
#. Tag: title
-#: hardware.xml:539
+#: hardware.xml:541
#, no-c-format
msgid "CPU/Machine types"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:541
+#: hardware.xml:543
#, no-c-format
msgid ""
"All MIPS based Cobalt machines are supported with the exception of the Qube "
@@ -838,19 +846,19 @@ msgid ""
msgstr "除了 Qube 2700 (Qube 1),其他所有基于 MIPS 的 Cobalt 机器都获得支持。"
#. Tag: title
-#: hardware.xml:549
+#: hardware.xml:551
#, no-c-format
msgid "Supported console options"
msgstr "支持的控制台选项"
#. Tag: para
-#: hardware.xml:550
+#: hardware.xml:552
#, no-c-format
msgid "Cobalt machines use 115200 bps."
msgstr "使用 115200 bps 的 Cobalt 机器。"
#. Tag: para
-#: hardware.xml:564
+#: hardware.xml:566
#, no-c-format
msgid ""
"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
@@ -860,13 +868,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:585
+#: hardware.xml:587
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:587
+#: hardware.xml:589
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in Debian, based on the CPU "
@@ -874,13 +882,13 @@ msgid ""
msgstr "在 Debian 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:594
+#: hardware.xml:596
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:595
+#: hardware.xml:597
#, no-c-format
msgid ""
"Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
@@ -891,19 +899,19 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:605
+#: hardware.xml:607
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:606
+#: hardware.xml:608
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:610
+#: hardware.xml:612
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -915,7 +923,7 @@ msgstr ""
"270。"
#. Tag: para
-#: hardware.xml:616
+#: hardware.xml:618
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -925,7 +933,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:621
+#: hardware.xml:623
#, no-c-format
msgid ""
"Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
@@ -934,13 +942,13 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: title
-#: hardware.xml:655
+#: hardware.xml:657
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:657
+#: hardware.xml:659
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -953,7 +961,7 @@ msgstr ""
"(Debian 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:664
+#: hardware.xml:666
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -966,7 +974,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:672
+#: hardware.xml:674
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -981,7 +989,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:680
+#: hardware.xml:682
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -996,384 +1004,384 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:696 hardware.xml:831 hardware.xml:875 hardware.xml:904
+#: hardware.xml:698 hardware.xml:833 hardware.xml:877 hardware.xml:906
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:697
+#: hardware.xml:699
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:703
+#: hardware.xml:705
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:704
+#: hardware.xml:706
#, no-c-format
msgid "iMac Bondi Blue, 5 Flavors, Slot Loading"
msgstr "iMac Bondi Blue, 5 Flavors, Slot Loading"
# index.docbook:1249, index.docbook:1252, index.docbook:1255, index.docbook:1258, index.docbook:1261, index.docbook:1264, index.docbook:1267, index.docbook:1270, index.docbook:1273, index.docbook:1276, index.docbook:1279, index.docbook:1282, index.docbook:1285, index.docbook:1288, index.docbook:1291, index.docbook:1294
#. Tag: entry
-#: hardware.xml:705 hardware.xml:708 hardware.xml:711 hardware.xml:714
-#: hardware.xml:717 hardware.xml:720 hardware.xml:723 hardware.xml:726
-#: hardware.xml:729 hardware.xml:732 hardware.xml:735 hardware.xml:738
-#: hardware.xml:741 hardware.xml:744 hardware.xml:747 hardware.xml:750
+#: hardware.xml:707 hardware.xml:710 hardware.xml:713 hardware.xml:716
+#: hardware.xml:719 hardware.xml:722 hardware.xml:725 hardware.xml:728
+#: hardware.xml:731 hardware.xml:734 hardware.xml:737 hardware.xml:740
+#: hardware.xml:743 hardware.xml:746 hardware.xml:749 hardware.xml:752
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:707
+#: hardware.xml:709
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:710
+#: hardware.xml:712
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:713
+#: hardware.xml:715
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:716
+#: hardware.xml:718
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:719
+#: hardware.xml:721
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:722
+#: hardware.xml:724
#, no-c-format
msgid "Power Macintosh Blue and White (B&amp;W) G3"
msgstr "Power Macintosh Blue and White (B&amp;W) G3"
#. Tag: entry
-#: hardware.xml:725
+#: hardware.xml:727
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:728
+#: hardware.xml:730
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:731
+#: hardware.xml:733
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:734
+#: hardware.xml:736
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:737
+#: hardware.xml:739
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:740
+#: hardware.xml:742
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:743
+#: hardware.xml:745
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:746
+#: hardware.xml:748
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:749
+#: hardware.xml:751
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:752
+#: hardware.xml:754
#, no-c-format
msgid "Performa 4400, 54xx, 5500"
msgstr "Performa 4400, 54xx, 5500"
# index.docbook:1297, index.docbook:1300, index.docbook:1303, index.docbook:1306, index.docbook:1309, index.docbook:1312, index.docbook:1315, index.docbook:1318, index.docbook:1321, index.docbook:1324, index.docbook:1327, index.docbook:1330, index.docbook:1336, index.docbook:1339, index.docbook:1345, index.docbook:1351, index.docbook:1357
#. Tag: entry
-#: hardware.xml:753 hardware.xml:756 hardware.xml:759 hardware.xml:762
-#: hardware.xml:765 hardware.xml:768 hardware.xml:771 hardware.xml:774
-#: hardware.xml:777 hardware.xml:780 hardware.xml:783 hardware.xml:786
-#: hardware.xml:792 hardware.xml:795 hardware.xml:801 hardware.xml:807
-#: hardware.xml:813
+#: hardware.xml:755 hardware.xml:758 hardware.xml:761 hardware.xml:764
+#: hardware.xml:767 hardware.xml:770 hardware.xml:773 hardware.xml:776
+#: hardware.xml:779 hardware.xml:782 hardware.xml:785 hardware.xml:788
+#: hardware.xml:794 hardware.xml:797 hardware.xml:803 hardware.xml:809
+#: hardware.xml:815
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:755
+#: hardware.xml:757
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:758
+#: hardware.xml:760
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:761
+#: hardware.xml:763
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:764
+#: hardware.xml:766
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:767
+#: hardware.xml:769
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:770
+#: hardware.xml:772
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:773
+#: hardware.xml:775
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:776
+#: hardware.xml:778
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:779
+#: hardware.xml:781
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:782
+#: hardware.xml:784
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:785
+#: hardware.xml:787
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:790
+#: hardware.xml:792
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:791
+#: hardware.xml:793
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:794
+#: hardware.xml:796
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:799
+#: hardware.xml:801
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:800
+#: hardware.xml:802
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:805
+#: hardware.xml:807
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:806
+#: hardware.xml:808
#, no-c-format
msgid "APS Tech M*Power 604e/2000"
msgstr "APS Tech M*Power 604e/2000"
# index.docbook:1355, index.docbook:1381
#. Tag: entry
-#: hardware.xml:811 hardware.xml:837
+#: hardware.xml:813 hardware.xml:839
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:812
+#: hardware.xml:814
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:821
+#: hardware.xml:823
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:838
+#: hardware.xml:840
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:840
+#: hardware.xml:842
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:842
+#: hardware.xml:844
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:844
+#: hardware.xml:846
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:846
+#: hardware.xml:848
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:850 hardware.xml:881
+#: hardware.xml:852 hardware.xml:883
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:851
+#: hardware.xml:853
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:853
+#: hardware.xml:855
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:855
+#: hardware.xml:857
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:857
+#: hardware.xml:859
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:865
+#: hardware.xml:867
#, no-c-format
msgid "CHRP subarchitecture (unsupported)"
msgstr "CHRP 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:882
+#: hardware.xml:884
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:885
+#: hardware.xml:887
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:886
+#: hardware.xml:888
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: title
-#: hardware.xml:894
+#: hardware.xml:896
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:910
+#: hardware.xml:912
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:911
+#: hardware.xml:913
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:919
+#: hardware.xml:921
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:921
+#: hardware.xml:923
#, no-c-format
msgid ""
"NuBus systems are not currently supported by Debian/powerpc. The monolithic "
@@ -1397,13 +1405,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:958
+#: hardware.xml:960
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:960
+#: hardware.xml:962
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1419,7 +1427,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:969
+#: hardware.xml:971
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1434,7 +1442,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:977
+#: hardware.xml:979
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1445,13 +1453,13 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:993
+#: hardware.xml:995
#, no-c-format
msgid "S/390 and zSeries machine types"
msgstr "S/390 与 zSeries 机器类型"
#. Tag: para
-#: hardware.xml:994
+#: hardware.xml:996
#, no-c-format
msgid ""
"Complete information regarding supported S/390 and zSeries machines can be "
@@ -1473,13 +1481,13 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:1016
+#: hardware.xml:1018
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1017
+#: hardware.xml:1019
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1491,13 +1499,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1028
+#: hardware.xml:1030
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1030
+#: hardware.xml:1032
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1510,7 +1518,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1037
+#: hardware.xml:1039
#, no-c-format
msgid ""
"The last Debian release to support sparc32 was Etch, but even then only for "
@@ -1521,13 +1529,13 @@ msgstr ""
"位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1047
+#: hardware.xml:1049
#, no-c-format
msgid "<term>sun4u</term>"
msgstr "<term>sun4u</term>"
#. Tag: para
-#: hardware.xml:1049
+#: hardware.xml:1051
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1543,13 +1551,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1062
+#: hardware.xml:1064
#, no-c-format
msgid "<term>sun4v</term>"
msgstr "<term>sun4v</term>"
#. Tag: para
-#: hardware.xml:1064
+#: hardware.xml:1066
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1562,7 +1570,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1075
+#: hardware.xml:1077
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1572,13 +1580,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1084
+#: hardware.xml:1086
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1085
+#: hardware.xml:1087
#, no-c-format
msgid ""
"Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1593,13 +1601,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1097 hardware.xml:1120 hardware.xml:1140 hardware.xml:1163
+#: hardware.xml:1099 hardware.xml:1122 hardware.xml:1142 hardware.xml:1165
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1098
+#: hardware.xml:1100
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1615,7 +1623,7 @@ msgstr ""
"一些性能。在普通系统中使用时几乎不会察觉。"
#. Tag: para
-#: hardware.xml:1107
+#: hardware.xml:1109
#, no-c-format
msgid ""
"In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1631,7 +1639,7 @@ msgstr ""
"选择 <quote>&smp-config-option;</quote>。"
#. Tag: para
-#: hardware.xml:1122
+#: hardware.xml:1124
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1647,7 +1655,7 @@ msgstr ""
"的数量(或者处理器核心数),并在单内核系统上自动关闭 SMP 的功能。"
#. Tag: para
-#: hardware.xml:1131
+#: hardware.xml:1133
#, no-c-format
msgid ""
"The 486 flavour of the Debian kernel image packages for &arch-title; is not "
@@ -1655,7 +1663,7 @@ msgid ""
msgstr "&arch-title; 的 486 Debian 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1141
+#: hardware.xml:1143
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1670,7 +1678,7 @@ msgstr ""
"只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1150
+#: hardware.xml:1152
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -1686,7 +1694,7 @@ msgstr ""
"config-option;</quote>。"
#. Tag: para
-#: hardware.xml:1164
+#: hardware.xml:1166
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1702,7 +1710,7 @@ msgstr ""
"因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1174
+#: hardware.xml:1176
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -1713,7 +1721,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1180
+#: hardware.xml:1182
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP. You can find a "
@@ -1728,13 +1736,13 @@ msgstr ""
"quote>。"
#. Tag: title
-#: hardware.xml:1191
+#: hardware.xml:1193
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1192
+#: hardware.xml:1194
#, no-c-format
msgid ""
"You should be using a VGA-compatible display interface for the console "
@@ -1748,7 +1756,7 @@ msgstr ""
"的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
-#: hardware.xml:1200
+#: hardware.xml:1202
#, no-c-format
msgid ""
"Debian's support for graphical interfaces is determined by the underlying "
@@ -1762,13 +1770,13 @@ msgstr ""
"<ulink url=\"&url-xorg;\"></ulink>。Debian &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1209
+#: hardware.xml:1211
#, no-c-format
msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
#. Tag: para
-#: hardware.xml:1214
+#: hardware.xml:1216
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1787,7 +1795,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1224
+#: hardware.xml:1226
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1810,13 +1818,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1246
+#: hardware.xml:1248
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1247
+#: hardware.xml:1249
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the Linux kernel should "
@@ -1830,7 +1838,7 @@ msgstr ""
"<phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>"
#. Tag: para
-#: hardware.xml:1256
+#: hardware.xml:1258
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1838,61 +1846,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1262
+#: hardware.xml:1264
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1267
+#: hardware.xml:1269
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1272
+#: hardware.xml:1274
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1277
+#: hardware.xml:1279
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1282
+#: hardware.xml:1284
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1289
+#: hardware.xml:1291
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1294
+#: hardware.xml:1296
#, 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:1299
+#: hardware.xml:1301
#, 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:1304
+#: hardware.xml:1306
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -1910,19 +1918,19 @@ msgstr ""
"址获得。"
#. Tag: para
-#: hardware.xml:1323
+#: hardware.xml:1325
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1330
+#: hardware.xml:1332
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1331
+#: hardware.xml:1333
#, no-c-format
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -1936,7 +1944,7 @@ msgstr ""
"的网卡,不能在安装系统中使用。"
#. Tag: para
-#: hardware.xml:1339
+#: hardware.xml:1341
#, no-c-format
msgid ""
"The use of wireless networking during installation is still under "
@@ -1954,7 +1962,7 @@ msgstr ""
"您可以在安装完成之后(重新启动)安装驱动程序和固件,手动配置网络。"
#. Tag: para
-#: hardware.xml:1351
+#: hardware.xml:1353
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a Debian package. "
@@ -1970,13 +1978,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1365
+#: hardware.xml:1367
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1366
+#: hardware.xml:1368
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -1984,13 +1992,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1373
+#: hardware.xml:1375
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2006,7 +2014,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1385
+#: hardware.xml:1387
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2019,7 +2027,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1393
+#: hardware.xml:1395
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2036,13 +2044,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1406
+#: hardware.xml:1408
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1408
+#: hardware.xml:1410
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2051,13 +2059,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1423
+#: hardware.xml:1425
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1424
+#: hardware.xml:1426
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2074,13 +2082,13 @@ msgstr ""
"<classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1438
+#: hardware.xml:1440
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1439
+#: hardware.xml:1441
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is determined by the "
@@ -2099,13 +2107,13 @@ msgstr ""
"&release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1459
+#: hardware.xml:1461
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1460
+#: hardware.xml:1462
#, no-c-format
msgid ""
"Linux supports a large variety of hardware devices such as mice, printers, "
@@ -2116,7 +2124,7 @@ msgstr ""
"而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1466
+#: hardware.xml:1468
#, no-c-format
msgid ""
"USB hardware generally works fine, only some USB keyboards may require "
@@ -2126,7 +2134,7 @@ msgstr ""
"\"hardware-issues\"/>)。"
#. Tag: para
-#: hardware.xml:1472
+#: hardware.xml:1474
#, no-c-format
msgid ""
"Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2137,7 +2145,7 @@ msgstr ""
"Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
#. Tag: para
-#: hardware.xml:1478
+#: hardware.xml:1480
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -2148,7 +2156,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:1484
+#: hardware.xml:1486
#, no-c-format
msgid ""
"The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2156,13 +2164,13 @@ msgid ""
msgstr "Cobalt RaQ 不支持外加设备,但 Qube 有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:1496
+#: hardware.xml:1498
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1497
+#: hardware.xml:1499
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -2177,7 +2185,7 @@ msgstr ""
"说很常见,但有些 USB 设备甚至是硬盘控制器也需要固件(fireware)。"
#. Tag: para
-#: hardware.xml:1505
+#: hardware.xml:1507
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2192,7 +2200,7 @@ msgstr ""
"法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1514
+#: hardware.xml:1516
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -2208,13 +2216,13 @@ msgstr ""
"息。"
#. Tag: title
-#: hardware.xml:1530
+#: hardware.xml:1532
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/Linux"
msgstr "特别为 GNU/Linux 采购硬件"
#. Tag: para
-#: hardware.xml:1532
+#: hardware.xml:1534
#, no-c-format
msgid ""
"There are several vendors, who ship systems with Debian or other "
@@ -2228,7 +2236,7 @@ msgstr ""
"因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1540
+#: hardware.xml:1542
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2242,7 +2250,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1548
+#: hardware.xml:1550
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with Linux bundled, or even a "
@@ -2256,13 +2264,13 @@ msgstr ""
"他)知道您是在为一个 Linux 系统采购设备。请支持对 Linux 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1559
+#: hardware.xml:1561
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1560
+#: hardware.xml:1562
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2274,7 +2282,7 @@ msgstr ""
"不公开的契约才能接触文档,以阻止我们发布 Linux 驱动程序源代码。"
#. Tag: para
-#: hardware.xml:1567
+#: hardware.xml:1569
#, no-c-format
msgid ""
"Since we haven't been granted access to the documentation on these devices, "
@@ -2287,13 +2295,13 @@ msgstr ""
"软件社区也是一个重要的市场。"
#. Tag: title
-#: hardware.xml:1579
+#: hardware.xml:1581
#, no-c-format
msgid "Windows-specific Hardware"
msgstr "Windows 专用硬件"
#. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
#, no-c-format
msgid ""
"A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2315,7 +2323,7 @@ msgstr ""
"等功能的保留内嵌处理器的设备昂贵。"
#. Tag: para
-#: hardware.xml:1593
+#: hardware.xml:1595
#, no-c-format
msgid ""
"You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2346,7 +2354,7 @@ msgstr ""
"Windows 2000 或 XP,都要忍受这些制造商克扣内嵌处理器造成的性能下降。"
#. Tag: para
-#: hardware.xml:1614
+#: hardware.xml:1616
#, no-c-format
msgid ""
"You can help improve this situation by encouraging these manufacturers to "
@@ -2360,13 +2368,13 @@ msgstr ""
"hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>。"
#. Tag: title
-#: hardware.xml:1631
+#: hardware.xml:1633
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -2381,13 +2389,13 @@ msgstr ""
"\"/>,并列出了每种类型的优缺点。当您阅读那一章的时候,可能要返回来参考本页。"
#. Tag: title
-#: hardware.xml:1644
+#: hardware.xml:1646
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1645
+#: hardware.xml:1647
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2398,19 +2406,19 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1651
+#: hardware.xml:1653
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1658
+#: hardware.xml:1660
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1660
+#: hardware.xml:1662
#, no-c-format
msgid ""
"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2423,7 +2431,7 @@ msgstr ""
"IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
#. Tag: para
-#: hardware.xml:1667
+#: hardware.xml:1669
#, no-c-format
msgid ""
"CD-ROM based installation is supported for some architectures. On machines "
@@ -2441,7 +2449,7 @@ msgstr ""
"installer\"/>。"
#. Tag: para
-#: hardware.xml:1679
+#: hardware.xml:1681
#, no-c-format
msgid ""
"SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2452,7 +2460,7 @@ msgstr ""
"\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
#. Tag: para
-#: hardware.xml:1685
+#: hardware.xml:1687
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2462,13 +2470,13 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:1690
+#: hardware.xml:1692
#, no-c-format
msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:1694
+#: hardware.xml:1696
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2486,13 +2494,13 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:1708
+#: hardware.xml:1710
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:1710
+#: hardware.xml:1712
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -2503,7 +2511,7 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: hardware.xml:1716
+#: hardware.xml:1718
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2513,13 +2521,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:1724
+#: hardware.xml:1726
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
#, no-c-format
msgid ""
"Many Debian boxes need their floppy and/or CD-ROM drives only for setting up "
@@ -2534,13 +2542,13 @@ msgstr ""
"系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
#. Tag: title
-#: hardware.xml:1738
+#: hardware.xml:1740
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1740
+#: hardware.xml:1742
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -2557,7 +2565,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:1750
+#: hardware.xml:1752
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2568,7 +2576,7 @@ msgstr ""
"\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:1756
+#: hardware.xml:1758
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -2578,13 +2586,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:1764
+#: hardware.xml:1766
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:1766
+#: hardware.xml:1768
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -2598,13 +2606,13 @@ msgstr ""
"户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/>。"
#. Tag: title
-#: hardware.xml:1778
+#: hardware.xml:1780
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:1780
+#: hardware.xml:1782
#, no-c-format
msgid ""
"The Debian boot disks contain a kernel which is built to maximize the number "
@@ -2620,7 +2628,7 @@ msgstr ""
"设计,这将使得 Debian 可以在尽可能多的硬件上安装。"
#. Tag: para
-#: hardware.xml:1790
+#: hardware.xml:1792
#, no-c-format
msgid ""
"Generally, the Debian installation system includes support for floppies, IDE "
@@ -2633,7 +2641,7 @@ msgstr ""
"Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
#, no-c-format
msgid ""
"Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2648,7 +2656,7 @@ msgstr ""
"HOWTO</ulink> 以获得更详细信息。"
#. Tag: para
-#: hardware.xml:1805
+#: hardware.xml:1807
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2670,7 +2678,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:1838
+#: hardware.xml:1840
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2681,7 +2689,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:1844
+#: hardware.xml:1846
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2692,7 +2700,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:1850
+#: hardware.xml:1852
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2700,7 +2708,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:1855
+#: hardware.xml:1857
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2712,13 +2720,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:1872
+#: hardware.xml:1874
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:1874
+#: hardware.xml:1876
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2731,7 +2739,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:1881
+#: hardware.xml:1883
#, no-c-format
msgid ""
"Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 8f439c5cf..783f7972a 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: 2009-11-08 01:11+0000\n"
+"POT-Creation-Date: 2009-11-18 01:11+0000\n"
"PO-Revision-Date: 2009-08-01 14:31+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -250,21 +250,37 @@ msgstr "QNAP Turbo Station 安装文件"
#: install-methods.xml:174
#, no-c-format
msgid ""
-"The QNAP Turbo Station (TS-109, TS-209 and TS-409) requires a kernel and "
-"ramdisk which can be obtained from &qnap-orion-firmware-img;. A script is provided "
-"to write these images to flash."
+"The installation files for the QNAP Turbo Station consist of a kernel and "
+"ramdisk as well as a script to write these images to flash. You can obtain "
+"the installation files for QNAP TS-109 and TS-209 from &qnap-orion-firmware-"
+"img; and for QNAP TS-110, TS-119, TS-210, TS-219, TS-219P from &qnap-"
+"kirkwood-firmware-img;."
msgstr ""
-"QNAP Turbo Station (TS-109, TS-209 和 TS-409) 需要内核和 ramdisk,这些可从 "
-"&qnap-orion-firmware-img; 获得。有一个脚本用于将这些映象写到 flash 里面。"
#. Tag: title
-#: install-methods.xml:224
+#: install-methods.xml:186
+#, fuzzy, no-c-format
+#| msgid "Alpha Installation Files"
+msgid "SheevaPlug and OpenRD Installation Files"
+msgstr "Alpha 的安装文件"
+
+#. Tag: para
+#: install-methods.xml:187
+#, no-c-format
+msgid ""
+"The installation files for the Marvell SheevaPlug and OpenRD devices consist "
+"of a kernel and initrd for U-Boot. You can obtain these files from &kirkwood-"
+"marvell-firmware-img;."
+msgstr ""
+
+#. Tag: title
+#: install-methods.xml:237
#, no-c-format
msgid "Creating an IPL tape"
msgstr "创建一个 IPL 磁带"
#. Tag: para
-#: install-methods.xml:226
+#: install-methods.xml:239
#, no-c-format
msgid ""
"If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
@@ -285,13 +301,13 @@ msgstr ""
"linkend=\"where-files\"/>,"
#. Tag: title
-#: install-methods.xml:250
+#: install-methods.xml:263
#, no-c-format
msgid "Creating Floppies from Disk Images"
msgstr "从软盘映像创建引导软盘"
#. Tag: para
-#: install-methods.xml:251
+#: install-methods.xml:264
#, no-c-format
msgid ""
"Bootable floppy disks are generally used as a last resort to boot the "
@@ -301,7 +317,7 @@ msgstr ""
"最后一种方法。"
#. Tag: para
-#: install-methods.xml:256
+#: install-methods.xml:269
#, no-c-format
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -309,7 +325,7 @@ msgid ""
msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
#. Tag: para
-#: install-methods.xml:261
+#: install-methods.xml:274
#, no-c-format
msgid ""
"Disk images are files containing the complete contents of a floppy disk in "
@@ -327,7 +343,7 @@ msgstr ""
"按扇区拷贝</emphasis>放到软盘中。"
#. Tag: para
-#: install-methods.xml:272
+#: install-methods.xml:285
#, no-c-format
msgid ""
"There are different techniques for creating floppies from disk images. This "
@@ -338,7 +354,7 @@ msgstr ""
"像创建引导软盘。"
#. Tag: para
-#: install-methods.xml:278
+#: install-methods.xml:291
#, no-c-format
msgid ""
"Before you can create the floppies, you will first need to download them "
@@ -351,7 +367,7 @@ msgstr ""
"DVD,软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
#. Tag: para
-#: install-methods.xml:286
+#: install-methods.xml:299
#, no-c-format
msgid ""
"No matter which method you use to create your floppies, you should remember "
@@ -362,13 +378,13 @@ msgstr ""
"保内容不会在无意被抹掉。"
#. Tag: title
-#: install-methods.xml:294
+#: install-methods.xml:307
#, no-c-format
msgid "Writing Disk Images From a Linux or Unix System"
msgstr "从 Linux 或者 Unix 系统写软盘映像"
#. Tag: para
-#: install-methods.xml:295
+#: install-methods.xml:308
#, no-c-format
msgid ""
"To write the floppy disk image files to the floppy disks, you will probably "
@@ -400,7 +416,7 @@ msgstr ""
"(Solaris 系统中使用 <command>eject</command> 命令,请参见其手册)</phrase>。"
#. Tag: para
-#: install-methods.xml:316
+#: install-methods.xml:329
#, no-c-format
msgid ""
"Some systems attempt to automatically mount a floppy disk when you place it "
@@ -430,7 +446,7 @@ msgstr ""
"统,请咨询您的系统管理员)。</phrase>"
#. Tag: para
-#: install-methods.xml:337
+#: install-methods.xml:350
#, no-c-format
msgid ""
"If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -441,13 +457,13 @@ msgstr ""
"command> 命令能够很好地对此进行控制,当然您可能需要先安装它。"
#. Tag: title
-#: install-methods.xml:355
+#: install-methods.xml:368
#, no-c-format
msgid "Writing Disk Images From DOS, Windows, or OS/2"
msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
#. Tag: para
-#: install-methods.xml:357
+#: install-methods.xml:370
#, no-c-format
msgid ""
"If you have access to an i386 or amd64 machine, you can use one of the "
@@ -456,7 +472,7 @@ msgstr ""
"如果您能操作一台 i386 或 amd64 机器,可以使用如下方法之一往软盘拷贝映像文件。"
#. Tag: para
-#: install-methods.xml:362
+#: install-methods.xml:375
#, no-c-format
msgid ""
"The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -470,7 +486,7 @@ msgstr ""
"或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
#. Tag: para
-#: install-methods.xml:370
+#: install-methods.xml:383
#, no-c-format
msgid ""
"The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -481,7 +497,7 @@ msgstr ""
"可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
#. Tag: para
-#: install-methods.xml:376
+#: install-methods.xml:389
#, no-c-format
msgid ""
"These tools can be found on the Official Debian CD-ROMs under the <filename>/"
@@ -491,13 +507,13 @@ msgstr ""
"下。"
#. Tag: title
-#: install-methods.xml:389
+#: install-methods.xml:402
#, no-c-format
msgid "Writing Disk Images From MacOS"
msgstr "在 MacOS 上写磁盘映像"
#. Tag: para
-#: install-methods.xml:390
+#: install-methods.xml:403
#, no-c-format
msgid ""
"An AppleScript, <application>Make Debian Floppy</application>, is available "
@@ -517,7 +533,7 @@ msgstr ""
"的确想要清空磁盘并写入磁盘映像。"
#. Tag: para
-#: install-methods.xml:401
+#: install-methods.xml:414
#, no-c-format
msgid ""
"You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -530,13 +546,13 @@ msgstr ""
"您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
#. Tag: title
-#: install-methods.xml:412
+#: install-methods.xml:425
#, no-c-format
msgid "Writing Disk Images with <command>Disk Copy</command>"
msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#. Tag: para
-#: install-methods.xml:413
+#: install-methods.xml:426
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
@@ -549,7 +565,7 @@ msgstr ""
"像文件的情况。"
#. Tag: para
-#: install-methods.xml:422
+#: install-methods.xml:435
#, no-c-format
msgid ""
"Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -559,7 +575,7 @@ msgstr ""
"且用它打开 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:429
+#: install-methods.xml:442
#, no-c-format
msgid ""
"Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -570,7 +586,7 @@ msgstr ""
"<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
#. Tag: para
-#: install-methods.xml:436
+#: install-methods.xml:449
#, no-c-format
msgid ""
"<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -585,7 +601,7 @@ msgstr ""
"会删除引导区。"
#. Tag: para
-#: install-methods.xml:445
+#: install-methods.xml:458
#, no-c-format
msgid ""
"Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -597,7 +613,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: install-methods.xml:452
+#: install-methods.xml:465
#, no-c-format
msgid ""
"Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -612,13 +628,13 @@ msgstr ""
"删除它。完成后它应该会弹出软盘。"
#. Tag: title
-#: install-methods.xml:467
+#: install-methods.xml:480
#, no-c-format
msgid "Writing Disk Images with <command>suntar</command>"
msgstr "写磁盘映像:使用<command>suntar</command>"
#. Tag: para
-#: install-methods.xml:471
+#: install-methods.xml:484
#, no-c-format
msgid ""
"Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -631,21 +647,21 @@ msgstr ""
"userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
#. Tag: para
-#: install-methods.xml:479
+#: install-methods.xml:492
#, no-c-format
msgid ""
"Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
msgstr "按照要求插入软盘,然后点击 &enterkey; (从0扇区开始)。"
#. Tag: para
-#: install-methods.xml:485
+#: install-methods.xml:498
#, no-c-format
msgid ""
"Select the <filename>root.bin</filename> file in the file-opening dialog."
msgstr "在打开文件对话框中选择 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:490
+#: install-methods.xml:503
#, no-c-format
msgid ""
"After the floppy has been created successfully, select <menuchoice> "
@@ -658,7 +674,7 @@ msgstr ""
"换别的软盘试试。"
#. Tag: para
-#: install-methods.xml:498
+#: install-methods.xml:511
#, no-c-format
msgid ""
"Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -669,13 +685,13 @@ msgstr ""
"然在 MacOS 中挂载了它,MacOS 将会将其毁坏。"
#. Tag: title
-#: install-methods.xml:517
+#: install-methods.xml:530
#, no-c-format
msgid "Preparing Files for USB Memory Stick Booting"
msgstr "为从 U 盘引导准备文件"
#. Tag: para
-#: install-methods.xml:519
+#: install-methods.xml:532
#, no-c-format
msgid ""
"There are two installation methods possible when booting from USB stick. The "
@@ -687,7 +703,7 @@ msgstr ""
"制到 U 盘作为软件包的源,并可以结合其他镜像。第二种方式更常用一些。"
#. Tag: para
-#: install-methods.xml:527
+#: install-methods.xml:540
#, no-c-format
msgid ""
"For the first installation method you'll need to download an installer image "
@@ -700,7 +716,7 @@ msgstr ""
"灵活方法</quote>复制文件到 U 盘。"
#. Tag: para
-#: install-methods.xml:535
+#: install-methods.xml:548
#, no-c-format
msgid ""
"Installation images for the second installation method can be found in the "
@@ -723,7 +739,7 @@ msgstr ""
"para> </footnote>。"
#. Tag: para
-#: install-methods.xml:554
+#: install-methods.xml:567
#, no-c-format
msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -744,7 +760,7 @@ msgstr ""
"护开关。"
#. Tag: para
-#: install-methods.xml:568
+#: install-methods.xml:581
#, no-c-format
msgid ""
"The procedures described in this section will destroy anything already on "
@@ -756,7 +772,7 @@ msgstr ""
"搞错,比如写成硬盘,将造成该设备上的所有信息丢失。"
#. Tag: para
-#: install-methods.xml:576
+#: install-methods.xml:589
#, no-c-format
msgid ""
"Note that the USB stick should be at least 256 MB in size (smaller setups "
@@ -766,13 +782,13 @@ msgstr ""
"linkend=\"usb-copy-flexible\"/>)。"
#. Tag: title
-#: install-methods.xml:584
+#: install-methods.xml:597
#, no-c-format
msgid "Copying the files &mdash; the easy way"
msgstr "复制文件 &mdash; 轻松的途径"
#. Tag: para
-#: install-methods.xml:585
+#: install-methods.xml:598
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -787,7 +803,7 @@ msgstr ""
"classname> 和对应的配置文件。</phrase>"
#. Tag: para
-#: install-methods.xml:594
+#: install-methods.xml:607
#, no-c-format
msgid ""
"Note that, although convenient, this method does have one major "
@@ -804,19 +820,19 @@ msgstr ""
"使用较小的 businesscard 或 netinst CD 映象。"
#. Tag: para
-#: install-methods.xml:604
+#: install-methods.xml:617
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:608
+#: install-methods.xml:621
#, no-c-format
msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
#. Tag: para
-#: install-methods.xml:610
+#: install-methods.xml:623
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -827,13 +843,13 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:616
+#: install-methods.xml:629
#, no-c-format
msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
-#: install-methods.xml:618
+#: install-methods.xml:631
#, no-c-format
msgid ""
"After that, mount the USB memory stick <phrase arch=\"x86\">"
@@ -854,13 +870,13 @@ msgstr ""
"userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:635
+#: install-methods.xml:648
#, no-c-format
msgid "Copying the files &mdash; the flexible way"
msgstr "复制文件 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:636
+#: install-methods.xml:649
#, no-c-format
msgid ""
"If you like more flexibility or just want to know what's going on, you "
@@ -873,13 +889,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:651 install-methods.xml:763
+#: install-methods.xml:664 install-methods.xml:776
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:652
+#: install-methods.xml:665
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -887,7 +903,7 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:657
+#: install-methods.xml:670
#, fuzzy, no-c-format
#| msgid ""
#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
@@ -920,7 +936,7 @@ msgstr ""
"classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:676
+#: install-methods.xml:689
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -937,7 +953,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:686
+#: install-methods.xml:699
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -960,13 +976,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:703 install-methods.xml:810
+#: install-methods.xml:716 install-methods.xml:823
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:704
+#: install-methods.xml:717
#, fuzzy, no-c-format
#| msgid ""
#| "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</"
@@ -1000,7 +1016,7 @@ msgstr ""
"件名,请注意 <classname>syslinux</classname> 只遵循 DOS (8.3) 命名方式。"
#. Tag: para
-#: install-methods.xml:728
+#: install-methods.xml:741
#, fuzzy, no-c-format
#| msgid ""
#| "Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1014,7 +1030,8 @@ msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
"file, which at a bare minimum should contain the following two lines (change "
"the name of the kernel binary to <quote><filename>linux</filename></quote> "
-"if you used a <filename>netboot</filename> image): <informalexample><screen>\n"
+"if you used a <filename>netboot</filename> image): "
+"<informalexample><screen>\n"
"default vmlinuz\n"
"append initrd=initrd.gz\n"
"</screen></informalexample> For the graphical installer you should add "
@@ -1028,7 +1045,7 @@ msgstr ""
"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> 到第二行尾部。"
#. Tag: para
-#: install-methods.xml:740
+#: install-methods.xml:753
#, fuzzy, no-c-format
#| msgid ""
#| "If you used an <filename>hd-media</filename> image, you should now copy a "
@@ -1049,7 +1066,7 @@ msgstr ""
"载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:764
+#: install-methods.xml:777
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1076,7 +1093,7 @@ msgstr ""
"command> 命令包含在 Debian 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:781
+#: install-methods.xml:794
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1091,7 +1108,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:790
+#: install-methods.xml:803
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1125,7 +1142,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:811
+#: install-methods.xml:824
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1135,31 +1152,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:818
+#: install-methods.xml:831
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:823
+#: install-methods.xml:836
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:828
+#: install-methods.xml:841
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:833
+#: install-methods.xml:846
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:840
+#: install-methods.xml:853
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1195,7 +1212,7 @@ msgstr ""
"的大小。"
#. Tag: para
-#: install-methods.xml:850
+#: install-methods.xml:863
#, no-c-format
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy a "
@@ -1208,13 +1225,13 @@ msgstr ""
"载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: title
-#: install-methods.xml:865
+#: install-methods.xml:878
#, no-c-format
msgid "Booting the USB stick"
msgstr "从 U 盘启动"
#. Tag: para
-#: install-methods.xml:866
+#: install-methods.xml:879
#, no-c-format
msgid ""
"If your system refuses to boot from the memory stick, the stick may contain "
@@ -1226,19 +1243,19 @@ msgstr ""
"<classname>mbr</classname> 软件包:"
#. Tag: screen
-#: install-methods.xml:873
+#: install-methods.xml:886
#, no-c-format
msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"
#. Tag: title
-#: install-methods.xml:884
+#: install-methods.xml:897
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:885
+#: install-methods.xml:898
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1249,7 +1266,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:891
+#: install-methods.xml:904
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1262,13 +1279,13 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:898
+#: install-methods.xml:911
#, no-c-format
msgid "The installer cannot boot from files on an NTFS file system."
msgstr "安装程序无法从 NTFS 文件系统上进行引导。"
#. Tag: para
-#: install-methods.xml:902
+#: install-methods.xml:915
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1288,7 +1305,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:913
+#: install-methods.xml:926
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1299,7 +1316,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:922
+#: install-methods.xml:935
#, no-c-format
msgid ""
"Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1308,7 +1325,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:924
+#: install-methods.xml:937
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1318,7 +1335,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:930
+#: install-methods.xml:943
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1329,7 +1346,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:936
+#: install-methods.xml:949
#, no-c-format
msgid ""
"Copy the following files from the Debian archives to a convenient location "
@@ -1339,19 +1356,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:943
+#: install-methods.xml:956
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:948
+#: install-methods.xml:961
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:955
+#: install-methods.xml:968
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1359,13 +1376,13 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:965
+#: install-methods.xml:978
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:966
+#: install-methods.xml:979
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1387,7 +1404,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:979
+#: install-methods.xml:992
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1414,13 +1431,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:999
+#: install-methods.xml:1012
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1000
+#: install-methods.xml:1013
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1438,7 +1455,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1011
+#: install-methods.xml:1024
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1451,31 +1468,31 @@ msgstr ""
"盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1021 install-methods.xml:1359
+#: install-methods.xml:1034 install-methods.xml:1372
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1026 install-methods.xml:1364
+#: install-methods.xml:1039 install-methods.xml:1377
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1031 install-methods.xml:1369
+#: install-methods.xml:1044 install-methods.xml:1382
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1036 install-methods.xml:1374
+#: install-methods.xml:1049 install-methods.xml:1387
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1041
+#: install-methods.xml:1054
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1489,19 +1506,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1049
+#: install-methods.xml:1062
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1062
+#: install-methods.xml:1075
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1063
+#: install-methods.xml:1076
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1515,7 +1532,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1071
+#: install-methods.xml:1084
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1527,7 +1544,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1078
+#: install-methods.xml:1091
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1546,7 +1563,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1092
+#: install-methods.xml:1105
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1557,7 +1574,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1098
+#: install-methods.xml:1111
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1567,7 +1584,7 @@ msgstr ""
"<classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1103
+#: install-methods.xml:1116
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1581,7 +1598,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1111
+#: install-methods.xml:1124
#, no-c-format
msgid ""
"To use the Pre-boot Execution Environment (PXE) method of TFTP booting, you "
@@ -1595,13 +1612,13 @@ msgstr ""
"求,我们推荐 <classname>tftpd-hpa</classname>。"
#. Tag: title
-#: install-methods.xml:1129
+#: install-methods.xml:1142
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1130
+#: install-methods.xml:1143
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1619,7 +1636,7 @@ msgstr ""
"ifconfig eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1142
+#: install-methods.xml:1155
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1642,13 +1659,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1164
+#: install-methods.xml:1177
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1165
+#: install-methods.xml:1178
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1663,7 +1680,7 @@ msgstr ""
"server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1173
+#: install-methods.xml:1186
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1725,7 +1742,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1206
+#: install-methods.xml:1219
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1747,13 +1764,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1228
+#: install-methods.xml:1241
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1229
+#: install-methods.xml:1242
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
@@ -1766,7 +1783,7 @@ msgstr ""
"文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1236
+#: install-methods.xml:1249
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1810,7 +1827,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1238
+#: install-methods.xml:1251
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1826,7 +1843,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1248
+#: install-methods.xml:1261
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1836,13 +1853,13 @@ msgstr ""
"<userinput>/etc/init.d/dhcpd3-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1256
+#: install-methods.xml:1269
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1257
+#: install-methods.xml:1270
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1912,13 +1929,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1273
+#: install-methods.xml:1286
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1274
+#: install-methods.xml:1287
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -1936,7 +1953,7 @@ msgstr ""
"</screen></informalexample> Debian 包通常在安装后会自动把这条设置好。"
#. Tag: para
-#: install-methods.xml:1286
+#: install-methods.xml:1299
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1953,7 +1970,7 @@ msgstr ""
"整一下配置文件示例。"
#. Tag: para
-#: install-methods.xml:1296
+#: install-methods.xml:1309
#, no-c-format
msgid ""
"Look in <filename>/etc/inetd.conf</filename> and remember the directory "
@@ -1982,7 +1999,7 @@ msgstr ""
"<replaceable>inetd-pid</replaceable></userinput>。"
#. Tag: para
-#: install-methods.xml:1316
+#: install-methods.xml:1329
#, no-c-format
msgid ""
"If you intend to install Debian on an SGI machine and your TFTP server is a "
@@ -2010,13 +2027,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1338
+#: install-methods.xml:1351
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1339
+#: install-methods.xml:1352
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2031,7 +2048,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1348
+#: install-methods.xml:1361
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2046,13 +2063,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1379
+#: install-methods.xml:1392
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1384
+#: install-methods.xml:1397
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2067,7 +2084,7 @@ msgstr ""
"所需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1392
+#: install-methods.xml:1405
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2082,13 +2099,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1404
+#: install-methods.xml:1417
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1405
+#: install-methods.xml:1418
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2116,7 +2133,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1421
+#: install-methods.xml:1434
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2128,7 +2145,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1428
+#: install-methods.xml:1441
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2141,13 +2158,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1439
+#: install-methods.xml:1452
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1440
+#: install-methods.xml:1453
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2161,13 +2178,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1548
+#: install-methods.xml:1561
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1549
+#: install-methods.xml:1562
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2182,13 +2199,13 @@ msgstr ""
"<classname>autoinstall</classname>,以及 Debian 安装程序本身。"
#. Tag: title
-#: install-methods.xml:1562
+#: install-methods.xml:1575
#, no-c-format
msgid "Automatic Installation Using the Debian Installer"
msgstr "使用 Debian 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1563
+#: install-methods.xml:1576
#, no-c-format
msgid ""
"The Debian Installer supports automating installs via preconfiguration "
@@ -2200,7 +2217,7 @@ msgstr ""
"质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1570
+#: install-methods.xml:1583
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2209,8 +2226,14 @@ msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
-#~ msgid "Alpha Installation Files"
-#~ msgstr "Alpha 的安装文件"
+#~ msgid ""
+#~ "The QNAP Turbo Station (TS-109, TS-209 and TS-409) requires a kernel and "
+#~ "ramdisk which can be obtained from &qnap-orion-firmware-img;. A script is "
+#~ "provided to write these images to flash."
+#~ msgstr ""
+#~ "QNAP Turbo Station (TS-109, TS-209 和 TS-409) 需要内核和 ramdisk,这些可"
+#~ "从 &qnap-orion-firmware-img; 获得。有一个脚本用于将这些映象写到 flash 里"
+#~ "面。"
#~ msgid ""
#~ "If you choose to boot from ARC console firmware using <command>MILO</"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 780429c55..d469bd1ff 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2009-11-08 01:11+0000\n"
+"POT-Creation-Date: 2009-11-18 01:11+0000\n"
"PO-Revision-Date: 2009-09-12 09:50+0800\n"
"Last-Translator: Ji YongGang <jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -26,7 +26,7 @@ msgid ""
msgstr "本附录说明如何预置 &d-i; 中提问的答案,让安装过程自动化。"
#. Tag: para
-#: preseed.xml:23 preseed.xml:667
+#: preseed.xml:23 preseed.xml:669
#, no-c-format
msgid ""
"The configuration fragments used in this appendix are also available as an "
@@ -106,7 +106,7 @@ msgid "initrd"
msgstr "initrd"
#. Tag: entry
-#: preseed.xml:70 preseed.xml:514
+#: preseed.xml:70 preseed.xml:516
#, no-c-format
msgid "file"
msgstr "file"
@@ -769,113 +769,139 @@ msgstr "debian-installer/framebuffer"
#. Tag: entry
#: preseed.xml:512
#, no-c-format
+msgid "language"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:512
+#, fuzzy, no-c-format
+#| msgid "debian-installer/locale"
+msgid "debian-installer/language"
+msgstr "debian-installer/locale"
+
+#. Tag: entry
+#: preseed.xml:513
+#, no-c-format
+msgid "country"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:513
+#, fuzzy, no-c-format
+#| msgid "debian-installer/locale"
+msgid "debian-installer/country"
+msgstr "debian-installer/locale"
+
+#. Tag: entry
+#: preseed.xml:514
+#, no-c-format
msgid "locale"
msgstr "locale"
#. Tag: entry
-#: preseed.xml:512
+#: preseed.xml:514
#, no-c-format
msgid "debian-installer/locale"
msgstr "debian-installer/locale"
#. Tag: entry
-#: preseed.xml:513
+#: preseed.xml:515
#, no-c-format
msgid "priority"
msgstr "priority"
#. Tag: entry
-#: preseed.xml:513
+#: preseed.xml:515
#, no-c-format
msgid "debconf/priority"
msgstr "debconf/priority"
#. Tag: entry
-#: preseed.xml:514
+#: preseed.xml:516
#, no-c-format
msgid "preseed/file"
msgstr "preseed/file"
#. Tag: entry
-#: preseed.xml:515
+#: preseed.xml:517
#, no-c-format
msgid "<entry>url</entry>"
msgstr "<entry>url</entry>"
#. Tag: entry
-#: preseed.xml:515
+#: preseed.xml:517
#, no-c-format
msgid "preseed/url"
msgstr "preseed/url"
#. Tag: entry
-#: preseed.xml:516
+#: preseed.xml:518
#, no-c-format
msgid "interface"
msgstr "interface"
#. Tag: entry
-#: preseed.xml:516
+#: preseed.xml:518
#, no-c-format
msgid "netcfg/choose_interface"
msgstr "netcfg/choose_interface"
#. Tag: entry
-#: preseed.xml:517
+#: preseed.xml:519
#, no-c-format
msgid "hostname&nbsp;&nbsp;&nbsp;"
msgstr "hostname&nbsp;&nbsp;&nbsp;"
#. Tag: entry
-#: preseed.xml:517
+#: preseed.xml:519
#, no-c-format
msgid "netcfg/get_hostname"
msgstr "netcfg/get_hostname"
#. Tag: entry
-#: preseed.xml:518
+#: preseed.xml:520
#, no-c-format
msgid "domain"
msgstr "domain"
#. Tag: entry
-#: preseed.xml:518
+#: preseed.xml:520
#, no-c-format
msgid "netcfg/get_domain"
msgstr "netcfg/get_domain"
#. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:521
#, no-c-format
msgid "protocol"
msgstr "protocol"
#. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:521
#, no-c-format
msgid "mirror/protocol"
msgstr "mirror/protocol"
#. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:522
#, no-c-format
msgid "suite"
msgstr "suite"
#. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:522
#, no-c-format
msgid "mirror/suite"
msgstr "mirror/suite"
#. Tag: title
-#: preseed.xml:527
+#: preseed.xml:529
#, no-c-format
msgid "Using a DHCP server to specify preconfiguration files"
msgstr "使用 DHCP 服务器指定预置文件"
#. Tag: para
-#: preseed.xml:528
+#: preseed.xml:530
#, no-c-format
msgid ""
"It's also possible to use DHCP to specify a preconfiguration file to "
@@ -892,7 +918,7 @@ msgstr ""
"务器第 3 版(Debian 里面是 dhcp3-server 软件包)。"
#. Tag: screen
-#: preseed.xml:539
+#: preseed.xml:541
#, no-c-format
msgid ""
"if substring (option vendor-class-identifier, 0, 3) = \"d-i\" {\n"
@@ -904,7 +930,7 @@ msgstr ""
"}"
#. Tag: para
-#: preseed.xml:541
+#: preseed.xml:543
#, no-c-format
msgid ""
"Note that the above example limits this filename to DHCP clients that "
@@ -917,7 +943,7 @@ msgstr ""
"段,以避免预置网络中的其他安装。"
#. Tag: para
-#: preseed.xml:548
+#: preseed.xml:550
#, no-c-format
msgid ""
"A good way to use the DHCP preseeding is to only preseed values specific to "
@@ -931,13 +957,13 @@ msgstr ""
"行。使用 DHCP 预置进行完整的 Debian 自动安装应该特别小心。"
#. Tag: title
-#: preseed.xml:562
+#: preseed.xml:564
#, no-c-format
msgid "Creating a preconfiguration file"
msgstr "创建预置文件"
#. Tag: para
-#: preseed.xml:563
+#: preseed.xml:565
#, no-c-format
msgid ""
"The preconfiguration file is in the format used by the <command>debconf-set-"
@@ -948,21 +974,21 @@ msgstr ""
"文件中每一行的格式为:"
#. Tag: screen
-#: preseed.xml:569
+#: preseed.xml:571
#, no-c-format
msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
msgstr ""
"&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
#. Tag: para
-#: preseed.xml:571
+#: preseed.xml:573
#, no-c-format
msgid ""
"There are a few rules to keep in mind when writing a preconfiguration file."
msgstr "编写预置文件的时候要留意几条规则。"
#. Tag: para
-#: preseed.xml:578
+#: preseed.xml:580
#, no-c-format
msgid ""
"Put only a single space or tab between type and value: any additional "
@@ -971,7 +997,7 @@ msgstr ""
"在类型和值之间只有一个空格或者 tab:任何额外的空格将被解释为值的一部分。"
#. Tag: para
-#: preseed.xml:582
+#: preseed.xml:584
#, no-c-format
msgid ""
"A line can be split into multiple lines by appending a backslash "
@@ -985,7 +1011,7 @@ msgstr ""
"割的行连接时会把行首和行尾的空格缩减为一个空格,再组成单独一行。"
#. Tag: para
-#: preseed.xml:589
+#: preseed.xml:591
#, no-c-format
msgid ""
"For debconf variables (templates) used in the installer itself, the owner "
@@ -1001,7 +1027,7 @@ msgstr ""
"debconf 数据库里面。"
#. Tag: para
-#: preseed.xml:597
+#: preseed.xml:599
#, no-c-format
msgid ""
"Most questions need to be preseeded using the values valid in English and "
@@ -1012,7 +1038,7 @@ msgstr ""
"<classname>partman</classname>),需要使用翻译过的值。"
#. Tag: para
-#: preseed.xml:603
+#: preseed.xml:605
#, no-c-format
msgid ""
"Some questions take a code as value instead of the English text that is "
@@ -1020,7 +1046,7 @@ msgid ""
msgstr "有些问题在安装过程中显示值的代码而不是英文文本。"
#. Tag: para
-#: preseed.xml:609
+#: preseed.xml:611
#, no-c-format
msgid ""
"The easiest way to create a preconfiguration file is to use the example file "
@@ -1030,7 +1056,7 @@ msgstr ""
"\"preseed-contents\"/>。"
#. Tag: para
-#: preseed.xml:614
+#: preseed.xml:616
#, no-c-format
msgid ""
"An alternative method is to do a manual installation and then, after "
@@ -1043,7 +1069,7 @@ msgstr ""
"程序的 cdebconf 数据库到一个文件:"
#. Tag: screen
-#: preseed.xml:621
+#: preseed.xml:623
#, no-c-format
msgid ""
"$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -1053,7 +1079,7 @@ msgstr ""
"$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
#. Tag: para
-#: preseed.xml:623
+#: preseed.xml:625
#, no-c-format
msgid ""
"However, a file generated in this manner will have some items that should "
@@ -1064,7 +1090,7 @@ msgstr ""
"始。"
#. Tag: para
-#: preseed.xml:631
+#: preseed.xml:633
#, no-c-format
msgid ""
"This method relies on the fact that, at the end of the installation, the "
@@ -1078,7 +1104,7 @@ msgstr ""
"感的信息,默认只为 root 可读。"
#. Tag: para
-#: preseed.xml:639
+#: preseed.xml:641
#, no-c-format
msgid ""
"The directory <filename>/var/log/installer</filename> and all files in it "
@@ -1089,7 +1115,7 @@ msgstr ""
"log/installer</filename> 目录及其中的文件将从您的系统中删除。"
#. Tag: para
-#: preseed.xml:647
+#: preseed.xml:649
#, no-c-format
msgid ""
"To check possible values for questions, you can use <command>nano</command> "
@@ -1104,7 +1130,7 @@ msgstr ""
"值。"
#. Tag: para
-#: preseed.xml:655
+#: preseed.xml:657
#, no-c-format
msgid ""
"To check if the format of your preconfiguration file is valid before "
@@ -1115,13 +1141,13 @@ msgstr ""
"selections -c <replaceable>preseed.cfg</replaceable></command> 命令。"
#. Tag: title
-#: preseed.xml:666
+#: preseed.xml:668
#, no-c-format
msgid "Contents of the preconfiguration file (for &releasename;)"
msgstr "预置文件的内容(&releasename;)"
#. Tag: para
-#: preseed.xml:672
+#: preseed.xml:674
#, no-c-format
msgid ""
"Note that this example is based on an installation for the Intel x86 "
@@ -1135,13 +1161,13 @@ msgstr ""
"debconf 设置替换。"
#. Tag: title
-#: preseed.xml:683
+#: preseed.xml:685
#, no-c-format
msgid "Localization"
msgstr "本地化"
#. Tag: para
-#: preseed.xml:684
+#: preseed.xml:686
#, no-c-format
msgid ""
"Setting localization values will only work if you are using initrd "
@@ -1151,7 +1177,7 @@ msgstr ""
"设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
#. Tag: para
-#: preseed.xml:690
+#: preseed.xml:692
#, no-c-format
msgid ""
"The locale can be used to specify both language and country and can be any "
@@ -1166,18 +1192,37 @@ msgstr ""
"数上指定本地,比如使用 <userinput>locale=<replaceable>en_US</replaceable></"
"userinput>。"
+#. Tag: para
+#: preseed.xml:701
+#, no-c-format
+msgid ""
+"Although this method is very easy to use, it does not allow preseeding of "
+"all possible combinations of language, country and locale<footnote> <para> "
+"Preseeding <literal>locale</literal> to <userinput>en_NL</userinput> would "
+"for example result in <literal>en_US.UTF-8</literal> as default locale for "
+"the installed system. If e.g. <literal>en_GB.UTF-8</literal> is preferred "
+"instead, the values will need to be preseeded individually. </para> </"
+"footnote>. So alternatively the values can be preseeded individually. "
+"Language and country can also be specified as boot parameters."
+msgstr ""
+
#. Tag: screen
-#: preseed.xml:699
+#: preseed.xml:716
#, no-c-format
msgid ""
-"# Locale sets language and country.\n"
-"d-i debian-installer/locale string en_US"
+"# Preseeding only locale sets language, country and locale.\n"
+"d-i debian-installer/locale string en_US\n"
+"\n"
+"# The values can also be preseeded individually for greater flexibility.\n"
+"#d-i debian-installer/language string en\n"
+"#d-i debian-installer/country string NL\n"
+"#d-i debian-installer/locale string en_GB.UTF-8\n"
+"# Optionally specify additional locales to be generated.\n"
+"#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
msgstr ""
-"# Locale sets language and country.\n"
-"d-i debian-installer/locale string en_US"
#. Tag: para
-#: preseed.xml:701
+#: preseed.xml:718
#, no-c-format
msgid ""
"Keyboard configuration consists of selecting a keyboard architecture and a "
@@ -1189,7 +1234,7 @@ msgstr ""
"因此通常不必预置。keymap 必须对 &d-i; 所选择的键盘体系有效。"
#. Tag: screen
-#: preseed.xml:708
+#: preseed.xml:725
#, no-c-format
msgid ""
"# Keyboard selection.\n"
@@ -1205,7 +1250,7 @@ msgstr ""
"#d-i console-keymaps-usb/keymap select mac-usb-us"
#. Tag: para
-#: preseed.xml:710
+#: preseed.xml:727
#, no-c-format
msgid ""
"To skip keyboard configuration, preseed <classname>console-tools/archs</"
@@ -1216,7 +1261,7 @@ msgstr ""
"tools/archs</classname>。这将导致内核 keymap 保持活动。"
#. Tag: para
-#: preseed.xml:719
+#: preseed.xml:736
#, no-c-format
msgid ""
"The changes in the input layer for 2.6 kernels have made the keyboard "
@@ -1227,13 +1272,13 @@ msgstr ""
"<quote>PC</quote> (<userinput>at</userinput>) keymap。"
#. Tag: title
-#: preseed.xml:729
+#: preseed.xml:746
#, no-c-format
msgid "Network configuration"
msgstr "网络设置"
#. Tag: para
-#: preseed.xml:730
+#: preseed.xml:747
#, no-c-format
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
@@ -1246,7 +1291,7 @@ msgstr ""
"助。如果您计划从网络加载预置文件,应该使用传递网络设置给内核引导参数的方式。"
#. Tag: para
-#: preseed.xml:738
+#: preseed.xml:755
#, no-c-format
msgid ""
"If you need to pick a particular interface when netbooting before loading a "
@@ -1257,7 +1302,7 @@ msgstr ""
"<userinput>interface=<replaceable>eth1</replaceable></userinput>。"
#. Tag: para
-#: preseed.xml:744
+#: preseed.xml:761
#, no-c-format
msgid ""
"Although preseeding the network configuration is normally not possible when "
@@ -1273,19 +1318,19 @@ msgstr ""
"再运行一次,这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面:"
#. Tag: screen
-#: preseed.xml:754
+#: preseed.xml:771
#, no-c-format
msgid "killall.sh; netcfg"
msgstr "killall.sh; netcfg"
#. Tag: para
-#: preseed.xml:756
+#: preseed.xml:773
#, no-c-format
msgid "The following debconf variables are relevant for network configuration."
msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
-#: preseed.xml:762
+#: preseed.xml:779
#, no-c-format
msgid ""
"# Disable network configuration entirely. This is useful for cdrom\n"
@@ -1387,7 +1432,7 @@ msgstr ""
"#d-i hw-detect/load_firmware boolean true"
#. Tag: para
-#: preseed.xml:764
+#: preseed.xml:781
#, no-c-format
msgid ""
"Please note that <command>netcfg</command> will automatically determine the "
@@ -1406,13 +1451,13 @@ msgstr ""
"quote> 确定不使用网关。"
#. Tag: title
-#: preseed.xml:780
+#: preseed.xml:797
#, no-c-format
msgid "Network console"
msgstr "网络控制台"
#. Tag: screen
-#: preseed.xml:782
+#: preseed.xml:799
#, no-c-format
msgid ""
"# Use the following settings if you wish to make use of the network-console\n"
@@ -1430,13 +1475,13 @@ msgstr ""
"#d-i network-console/password-again password r00tme"
#. Tag: title
-#: preseed.xml:787
+#: preseed.xml:804
#, no-c-format
msgid "Mirror settings"
msgstr "镜像设置"
#. Tag: para
-#: preseed.xml:788
+#: preseed.xml:805
#, no-c-format
msgid ""
"Depending on the installation method you use, a mirror may be used to "
@@ -1448,7 +1493,7 @@ msgstr ""
"安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
#. Tag: para
-#: preseed.xml:795
+#: preseed.xml:812
#, no-c-format
msgid ""
"The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1457,7 +1502,7 @@ msgstr ""
"参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
#. Tag: para
-#: preseed.xml:800
+#: preseed.xml:817
#, fuzzy, no-c-format
#| msgid ""
#| "The parameter <classname>mirror/udeb/suite</classname> determines the "
@@ -1481,7 +1526,7 @@ msgstr ""
"suite</classname> 的值相同。"
#. Tag: screen
-#: preseed.xml:811
+#: preseed.xml:828
#, no-c-format
msgid ""
"# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1509,13 +1554,13 @@ msgstr ""
"#d-i mirror/udeb/suite string testing"
#. Tag: title
-#: preseed.xml:816
+#: preseed.xml:833
#, no-c-format
msgid "Clock and time zone setup"
msgstr "时钟与时区设置"
#. Tag: screen
-#: preseed.xml:818
+#: preseed.xml:835
#, no-c-format
msgid ""
"# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1543,13 +1588,13 @@ msgstr ""
"#d-i clock-setup/ntp-server string ntp.example.com"
#. Tag: title
-#: preseed.xml:823
+#: preseed.xml:840
#, no-c-format
msgid "Partitioning"
msgstr "分区"
#. Tag: para
-#: preseed.xml:824
+#: preseed.xml:841
#, no-c-format
msgid ""
"Using preseeding to partition the harddisk is very much limited to what is "
@@ -1565,7 +1610,7 @@ msgstr ""
"磁盘。"
#. Tag: para
-#: preseed.xml:835
+#: preseed.xml:852
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1576,7 +1621,7 @@ msgstr ""
"确的那一个。"
#. Tag: screen
-#: preseed.xml:843
+#: preseed.xml:860
#, no-c-format
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
@@ -1704,13 +1749,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:848
+#: preseed.xml:865
#, no-c-format
msgid "Partitioning using RAID"
msgstr "使用 RAID 分区"
#. Tag: para
-#: preseed.xml:849
+#: preseed.xml:866
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1724,7 +1769,7 @@ msgstr ""
"阵列中的所有设备;参见 <xref linkend=\"preseed-bootloader\"/>。"
#. Tag: para
-#: preseed.xml:859
+#: preseed.xml:876
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1738,7 +1783,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: screen
-#: preseed.xml:869
+#: preseed.xml:886
#, no-c-format
msgid ""
"# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1836,13 +1881,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:874
+#: preseed.xml:891
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "分区挂载控制"
#. Tag: para
-#: preseed.xml:875
+#: preseed.xml:892
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -1858,7 +1903,7 @@ msgstr ""
"系统仍然使用 UUID 方式挂载。"
#. Tag: para
-#: preseed.xml:884
+#: preseed.xml:901
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -1868,7 +1913,7 @@ msgstr ""
"挂载。"
#. Tag: para
-#: preseed.xml:891
+#: preseed.xml:908
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -1882,7 +1927,7 @@ msgstr ""
"后会出现一些随机的情况。"
#. Tag: screen
-#: preseed.xml:901
+#: preseed.xml:918
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -1900,13 +1945,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:906
+#: preseed.xml:923
#, no-c-format
msgid "Base system installation"
msgstr "基本系统安装"
#. Tag: para
-#: preseed.xml:907
+#: preseed.xml:924
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -1915,7 +1960,7 @@ msgid ""
msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
#. Tag: screen
-#: preseed.xml:914
+#: preseed.xml:931
#, fuzzy, no-c-format
#| msgid ""
#| "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1951,13 +1996,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:919
+#: preseed.xml:936
#, no-c-format
msgid "Account setup"
msgstr "帐号设置"
#. Tag: para
-#: preseed.xml:920
+#: preseed.xml:937
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -1968,7 +2013,7 @@ msgstr ""
"或 MD5 <emphasis>哈希</emphasis> 值。"
#. Tag: para
-#: preseed.xml:927
+#: preseed.xml:944
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1981,7 +2026,7 @@ msgstr ""
"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
#. Tag: screen
-#: preseed.xml:937
+#: preseed.xml:954
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2039,7 +2084,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:939
+#: preseed.xml:956
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2056,26 +2101,26 @@ msgstr ""
"root 登录(例如使用 SSH key 认证或 sudo)。"
#. Tag: para
-#: preseed.xml:949
+#: preseed.xml:966
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "下面的命令可用于生成密码的 MD5 值。"
#. Tag: screen
-#: preseed.xml:953
+#: preseed.xml:970
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:959
+#: preseed.xml:976
#, no-c-format
msgid "Apt setup"
msgstr "设置 apt"
#. Tag: para
-#: preseed.xml:960
+#: preseed.xml:977
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2088,7 +2133,7 @@ msgstr ""
"仓库。"
#. Tag: screen
-#: preseed.xml:968
+#: preseed.xml:985
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2146,13 +2191,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated string true"
#. Tag: title
-#: preseed.xml:973
+#: preseed.xml:990
#, no-c-format
msgid "Package selection"
msgstr "选择软件包"
#. Tag: para
-#: preseed.xml:974
+#: preseed.xml:991
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2160,73 +2205,73 @@ msgid ""
msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括:"
#. Tag: userinput
-#: preseed.xml:983
+#: preseed.xml:1000
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:986
+#: preseed.xml:1003
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:989
+#: preseed.xml:1006
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:992
+#: preseed.xml:1009
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:995
+#: preseed.xml:1012
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:998
+#: preseed.xml:1015
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1001
+#: preseed.xml:1018
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1004
+#: preseed.xml:1021
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1007
+#: preseed.xml:1024
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1010
+#: preseed.xml:1027
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1013
+#: preseed.xml:1030
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1017
+#: preseed.xml:1034
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2237,7 +2282,7 @@ msgstr ""
"<userinput>standard</userinput> 任务。"
#. Tag: para
-#: preseed.xml:1023
+#: preseed.xml:1040
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2251,7 +2296,7 @@ msgstr ""
"命令行上使用。"
#. Tag: screen
-#: preseed.xml:1033
+#: preseed.xml:1050
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2322,13 +2367,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1038
+#: preseed.xml:1055
#, no-c-format
msgid "Boot loader installation"
msgstr "安装 bootloader"
#. Tag: screen
-#: preseed.xml:1040
+#: preseed.xml:1057
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2404,7 +2449,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1042
+#: preseed.xml:1059
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2416,13 +2461,13 @@ msgstr ""
"令。"
#. Tag: title
-#: preseed.xml:1052
+#: preseed.xml:1069
#, no-c-format
msgid "Finishing up the installation"
msgstr "完成安装"
#. Tag: screen
-#: preseed.xml:1054
+#: preseed.xml:1071
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2462,13 +2507,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1059
+#: preseed.xml:1076
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:1061
+#: preseed.xml:1078
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2488,19 +2533,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1068
+#: preseed.xml:1085
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:1071
+#: preseed.xml:1088
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "安装过程中运行用户命令"
#. Tag: para
-#: preseed.xml:1072
+#: preseed.xml:1089
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2510,7 +2555,7 @@ msgstr ""
"本。"
#. Tag: screen
-#: preseed.xml:1080
+#: preseed.xml:1097
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2558,13 +2603,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1102
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "使用预置修改默认值"
#. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1103
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2588,7 +2633,7 @@ msgstr ""
"这对于测试和调试您的预置文件很有帮助。"
#. Tag: para
-#: preseed.xml:1100
+#: preseed.xml:1117
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2601,7 +2646,7 @@ msgstr ""
"\"preseed-bootparms\"/> 的脚注。"
#. Tag: para
-#: preseed.xml:1107
+#: preseed.xml:1124
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2622,13 +2667,13 @@ msgstr ""
"在安装时显示出来的问题对应的参数,而不是<quote>内部的</quote>参数。"
#. Tag: title
-#: preseed.xml:1121
+#: preseed.xml:1138
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "预置文件链"
#. Tag: para
-#: preseed.xml:1122
+#: preseed.xml:1139
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2642,7 +2687,7 @@ msgstr ""
"外的文件里面。"
#. Tag: screen
-#: preseed.xml:1132
+#: preseed.xml:1149
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2692,7 +2737,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1134
+#: preseed.xml:1151
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
@@ -2705,3 +2750,10 @@ msgstr ""
"也可以通过在前面设置 preseed/url 从 initrd 或者文件预置链载进入网络预置。这将"
"使网络预置在网络连通时执行。您应该小心使用,因为这是两种预置,意味着您有机会"
"执行 preseed/early 命令,第二个可以在网络连通后使用。"
+
+#~ msgid ""
+#~ "# Locale sets language and country.\n"
+#~ "d-i debian-installer/locale string en_US"
+#~ msgstr ""
+#~ "# Locale sets language and country.\n"
+#~ "d-i debian-installer/locale string en_US"