summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2012-07-20 12:29:06 +0000
committerHolger Wansing <linux@wansing-online.de>2012-07-20 12:29:06 +0000
commita58a98bfb613258e0f334bc6fd23882bd7854138 (patch)
tree02b6bf779d56f9cfc4e469bc82ee20b9b6572e62 /po/zh_CN
parenta6936535802189242ada242ead703c81d57881a2 (diff)
downloadinstallation-guide-a58a98bfb613258e0f334bc6fd23882bd7854138.zip
Regenerating po files:
- merge_xml - update_pot - update_po ro|pt|ru|sv|zh_TW|fi|el|zh_CN|es|ko|hu|vi
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po1241
-rw-r--r--po/zh_CN/hardware.po670
-rw-r--r--po/zh_CN/install-methods.po683
-rw-r--r--po/zh_CN/installation-howto.po108
-rw-r--r--po/zh_CN/partitioning.po170
-rw-r--r--po/zh_CN/post-install.po165
-rw-r--r--po/zh_CN/preparing.po44
-rw-r--r--po/zh_CN/preseed.po576
-rw-r--r--po/zh_CN/random-bits.po237
-rw-r--r--po/zh_CN/using-d-i.po847
10 files changed, 2678 insertions, 2063 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 6adf5020b..5094fe43b 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: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-07-01 14:46+0000\n"
"PO-Revision-Date: 2010-10-26 20:28+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -56,8 +56,8 @@ msgstr "从 TFTP 引导"
# index.docbook:432, index.docbook:786, index.docbook:1338, index.docbook:1819, index.docbook:2242, index.docbook:2338
#. Tag: para
-#: boot-installer.xml:43 boot-installer.xml:653 boot-installer.xml:1192
-#: boot-installer.xml:1683 boot-installer.xml:1792
+#: boot-installer.xml:43 boot-installer.xml:583 boot-installer.xml:1125
+#: boot-installer.xml:1626 boot-installer.xml:1735
#, no-c-format
msgid ""
"Booting from the network requires that you have a network connection and a "
@@ -68,8 +68,8 @@ msgstr ""
# index.docbook:437, index.docbook:791, index.docbook:1343, index.docbook:1824, index.docbook:2247, index.docbook:2343
#. Tag: para
-#: boot-installer.xml:48 boot-installer.xml:658 boot-installer.xml:1197
-#: boot-installer.xml:1688 boot-installer.xml:1797
+#: boot-installer.xml:48 boot-installer.xml:588 boot-installer.xml:1130
+#: boot-installer.xml:1631 boot-installer.xml:1740
#, no-c-format
msgid ""
"Older systems such as the 715 might require the use of an RBOOT server "
@@ -78,8 +78,8 @@ msgstr "较早的系统比如 715 也许需要使用一台 RBOOT 服务器来取
# index.docbook:442, index.docbook:796, index.docbook:1348, index.docbook:1829, index.docbook:2252, index.docbook:2348
#. Tag: para
-#: boot-installer.xml:53 boot-installer.xml:663 boot-installer.xml:1202
-#: boot-installer.xml:1693 boot-installer.xml:1802
+#: boot-installer.xml:53 boot-installer.xml:593 boot-installer.xml:1135
+#: boot-installer.xml:1636 boot-installer.xml:1745
#, no-c-format
msgid ""
"The installation method to support network booting is described in <xref "
@@ -94,8 +94,8 @@ msgstr "从 CD 光盘上引导"
# index.docbook:531, index.docbook:584, index.docbook:957, index.docbook:1776, index.docbook:2024, index.docbook:2378
#. Tag: para
-#: boot-installer.xml:70 boot-installer.xml:340 boot-installer.xml:811
-#: boot-installer.xml:1469 boot-installer.xml:1831
+#: boot-installer.xml:70 boot-installer.xml:248 boot-installer.xml:744
+#: boot-installer.xml:1402 boot-installer.xml:1774
#, no-c-format
msgid ""
"The easiest route for most people will be to use a set of &debian; CDs. If "
@@ -111,8 +111,8 @@ msgstr ""
# index.docbook:542, index.docbook:595, index.docbook:968, index.docbook:1787, index.docbook:2035, index.docbook:2389
#. Tag: para
-#: boot-installer.xml:81 boot-installer.xml:351 boot-installer.xml:822
-#: boot-installer.xml:1480 boot-installer.xml:1842
+#: boot-installer.xml:81 boot-installer.xml:259 boot-installer.xml:755
+#: boot-installer.xml:1413 boot-installer.xml:1785
#, no-c-format
msgid ""
"Note that certain CD drives may require special drivers, and thus be "
@@ -127,8 +127,8 @@ msgstr ""
# index.docbook:550, index.docbook:603, index.docbook:976, index.docbook:1795, index.docbook:2043, index.docbook:2397
#. Tag: para
-#: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
-#: boot-installer.xml:1488 boot-installer.xml:1850
+#: boot-installer.xml:89 boot-installer.xml:267 boot-installer.xml:763
+#: boot-installer.xml:1421 boot-installer.xml:1793
#, no-c-format
msgid ""
"Even if you cannot boot from CD-ROM, you can probably install the &debian; "
@@ -143,8 +143,8 @@ msgstr ""
# index.docbook:558, index.docbook:611, index.docbook:984, index.docbook:1803, index.docbook:2051, index.docbook:2405
#. Tag: para
-#: boot-installer.xml:97 boot-installer.xml:367 boot-installer.xml:838
-#: boot-installer.xml:1496 boot-installer.xml:1858
+#: boot-installer.xml:97 boot-installer.xml:275 boot-installer.xml:771
+#: boot-installer.xml:1429 boot-installer.xml:1801
#, no-c-format
msgid ""
"If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -181,114 +181,13 @@ msgstr ""
"的设备。所以要特别小心并精确地进行下面的步骤。"
#. Tag: title
-#: boot-installer.xml:130
-#, no-c-format
-msgid "Booting the NSLU2"
-msgstr "引导 NSLU2"
-
-#. Tag: para
#: boot-installer.xml:131
#, no-c-format
-msgid "There are three ways how to put the installer firmware into flash:"
-msgstr "有三种方式可以将安装程序的固件放入闪存:"
-
-#. Tag: title
-#: boot-installer.xml:137
-#, no-c-format
-msgid "Using the NSLU2 web interface"
-msgstr "使用 NSLU2 的 web 界面"
-
-#. Tag: para
-#: boot-installer.xml:138
-#, no-c-format
-msgid ""
-"Go to the administration section and choose the menu item <literal>Upgrade</"
-"literal>. You can then browse your disk for the installer image you have "
-"previously downloaded. Then press the <literal>Start Upgrade</literal> "
-"button, confirm, wait for a few minutes and confirm again. The system will "
-"then boot straight into the installer."
-msgstr ""
-"进入管理部分然后选择菜单项 <literal>Upgrade</literal>。接着从您的磁盘上找到前"
-"面下载安装程序映像。然后按下 <literal>Start Upgrade</literal> 按钮,确认,等"
-"几分钟再次确认。系统将直接启动进入安装程序。"
-
-#. Tag: title
-#: boot-installer.xml:149
-#, no-c-format
-msgid "Via the network using Linux/Unix"
-msgstr "通过网络使用 Linux/Unix"
-
-#. Tag: para
-#: boot-installer.xml:150
-#, no-c-format
-msgid ""
-"You can use <command>upslug2</command> from any Linux or Unix machine to "
-"upgrade the machine via the network. This software is packaged for &debian;. "
-"First, you have to put your NSLU2 in upgrade mode: <orderedlist> "
-"<listitem><para> Disconnect any disks and/or devices from the USB ports. </"
-"para></listitem> <listitem><para> Power off the NSLU2 </para></listitem> "
-"<listitem><para> Press and hold the reset button (accessible through the "
-"small hole on the back just above the power input). </para></listitem> "
-"<listitem><para> Press and release the power button to power on the NSLU2. </"
-"para></listitem> <listitem><para> Wait for 10 seconds watching the ready/"
-"status LED. After 10 seconds it will change from amber to red. Immediately "
-"release the reset button. </para></listitem> <listitem><para> The NSLU2 "
-"ready/status LED will flash alternately red/green (there is a 1 second delay "
-"before the first green). The NSLU2 is now in upgrade mode. </para></"
-"listitem> </orderedlist> See the <ulink url=\"http://www.nslu2-linux.org/"
-"wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux pages</ulink> if you have "
-"problems with this. Once your NSLU2 is in upgrade mode, you can flash the "
-"new image: <informalexample><screen>\n"
-"sudo upslug2 -i di-nslu2.bin\n"
-"</screen></informalexample> Note that the tool also shows the MAC address of "
-"your NSLU2, which may come in handy to configure your DHCP server. After the "
-"whole image has been written and verified, the system will automatically "
-"reboot. Make sure you connect your USB disk again now, otherwise the "
-"installer won't be able to find it."
-msgstr ""
-"您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络来升"
-"级机器。&debian; 下有该软件包。首先,您必须将 NSLU2 置于升级模式: "
-"<orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</"
-"para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> "
-"<listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></"
-"listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></listitem> "
-"<listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥珀色变成红"
-"色。立即松开复位按钮。 </para></listitem> <listitem><para> NSLU2 就绪/状态 "
-"LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延迟)。NSLU2 现在处于升级"
-"模式。</para></listitem> </orderedlist> 如果您遇到问题,请参考 <ulink url="
-"\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
-"pages</ulink>。一旦 NSLU2 处于升级模式,您就可以刷人新的映像:"
-"<informalexample><screen>\n"
-"sudo upslug2 -i di-nslu2.bin\n"
-"</screen></informalexample> 注意,该工具还会显示 NSLU2 的 MAC 地址,它可以用"
-"来配置 DHCP 服务器。整个映像写入和检验后,系统将自动重启。确保 USB 磁盘再次连"
-"接,否则将无法找到安装程序。"
-
-#. Tag: title
-#: boot-installer.xml:211
-#, no-c-format
-msgid "Via the network using Windows"
-msgstr "通过网络使用 Windows"
-
-#. Tag: para
-#: boot-installer.xml:212
-#, no-c-format
-msgid ""
-"There is <ulink url=\"http://www.everbesthk.com/8-download/sercomm/firmware/"
-"all_router_utility.zip\">a tool</ulink> for Windows to upgrade the firmware "
-"via the network."
-msgstr ""
-"有一个 <ulink url=\"http://www.everbesthk.com/8-download/sercomm/firmware/"
-"all_router_utility.zip\">工具</ulink> 用于 Windows 通过网络升级固件。"
-
-#. Tag: title
-#: boot-installer.xml:223
-#, no-c-format
msgid "Booting the SS4000-E"
msgstr "引导 SS4000-E"
#. Tag: para
-#: boot-installer.xml:224
+#: boot-installer.xml:132
#, no-c-format
msgid ""
"Due to limitations in the SS4000-E firmware, it unfortunately is not "
@@ -307,7 +206,7 @@ msgstr ""
"\"> <para> 这种电缆过去常用在桌面电脑内置的 9 针串口上。</para> </footnote>。"
#. Tag: para
-#: boot-installer.xml:245
+#: boot-installer.xml:153
#, no-c-format
msgid ""
"To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
@@ -324,13 +223,13 @@ msgstr ""
"上的串口是 <filename>/dev/ttyS0</filename>,请使用下列命令行:"
#. Tag: screen
-#: boot-installer.xml:257
+#: boot-installer.xml:165
#, no-c-format
msgid "cu -lttyS0 -s115200"
msgstr "cu -lttyS0 -s115200"
#. Tag: para
-#: boot-installer.xml:259
+#: boot-installer.xml:167
#, no-c-format
msgid ""
"If using Windows, you may want to consider using the program "
@@ -341,13 +240,13 @@ msgstr ""
"置波特率为 115200、8 位字长、无停止位和一个奇偶校验位。"
#. Tag: para
-#: boot-installer.xml:265
+#: boot-installer.xml:173
#, no-c-format
msgid "When the machine boots, you will see the following line of output:"
msgstr "机器引导后,您可以看到下列输出内容:"
#. Tag: screen
-#: boot-installer.xml:271
+#: boot-installer.xml:179
#, no-c-format
msgid ""
"No network interfaces found\n"
@@ -361,7 +260,7 @@ msgstr ""
"== Executing boot script in 1.000 seconds - enter ^C to abort"
#. Tag: para
-#: boot-installer.xml:273
+#: boot-installer.xml:181
#, no-c-format
msgid ""
"At this point, hit Control-C to interrupt the boot loader<footnote id=\"arm-"
@@ -374,7 +273,7 @@ msgstr ""
"着出现 RedBoot 提示符,键入下面命令:"
#. Tag: screen
-#: boot-installer.xml:286
+#: boot-installer.xml:194
#, no-c-format
msgid ""
"load -v -r -b 0x01800000 -m ymodem ramdisk.gz\n"
@@ -388,7 +287,7 @@ msgstr ""
"0x01800000"
#. Tag: para
-#: boot-installer.xml:288
+#: boot-installer.xml:196
#, no-c-format
msgid ""
"After every <command>load</command> command, the system will expect a file "
@@ -404,7 +303,7 @@ msgstr ""
"initrd.gz</command> 或 <command>sb vmlinuz</command>。"
#. Tag: para
-#: boot-installer.xml:297
+#: boot-installer.xml:205
#, no-c-format
msgid ""
"Alternatively, it is possible to load the kernel and ramdisk using HTTP "
@@ -415,7 +314,7 @@ msgstr ""
"求网络内有一台 HTTP 服务器。做法是,首先将 bootloader 切换到 RAM 模式:"
#. Tag: screen
-#: boot-installer.xml:303
+#: boot-installer.xml:211
#, no-c-format
msgid ""
"fis load rammode\n"
@@ -425,10 +324,14 @@ msgstr ""
"g"
#. Tag: para
-#: boot-installer.xml:305
-#, no-c-format
+#: boot-installer.xml:213
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This will seemingly restart the machine; but in reality, it loads reboot "
+#| "to RAM and restarts it from there. Not doing this step will cause the "
+#| "system to hang in the necessary ip_address step that comes next."
msgid ""
-"This will seemingly restart the machine; but in reality, it loads reboot to "
+"This will seemingly restart the machine; but in reality, it loads redboot to "
"RAM and restarts it from there. Not doing this step will cause the system to "
"hang in the necessary ip_address step that comes next."
msgstr ""
@@ -436,7 +339,7 @@ msgstr ""
"将导致系统在接下来需要 ip_address 时挂起。"
#. Tag: para
-#: boot-installer.xml:311
+#: boot-installer.xml:219
#, no-c-format
msgid ""
"You will need to hit Ctrl-C again to interrupt the boot. Then: "
@@ -464,39 +367,56 @@ msgstr ""
"ramdisk 文件的 HTTP 服务器 IP 地址。"
#. Tag: para
-#: boot-installer.xml:321
+#: boot-installer.xml:229
#, no-c-format
msgid "The installer will now start as usual."
msgstr "安装程序将正常启动。"
# index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
#. Tag: title
-#: boot-installer.xml:334 boot-installer.xml:805 boot-installer.xml:1463
-#: boot-installer.xml:1825
+#: boot-installer.xml:242 boot-installer.xml:738 boot-installer.xml:1396
+#: boot-installer.xml:1768
#, no-c-format
msgid "Booting from a CD-ROM"
msgstr "从 CD-ROM 启动"
#. Tag: title
-#: boot-installer.xml:441
+#: boot-installer.xml:349
#, no-c-format
msgid "Booting from Windows"
msgstr "从 Windows 引导"
#. Tag: para
-#: boot-installer.xml:442
+#: boot-installer.xml:350
#, no-c-format
+msgid "To start the installer from Windows, you can either"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:355
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM "
+#| "or USB memory stick installation media as described in <xref linkend="
+#| "\"official-cdrom\"/> and <xref linkend=\"boot-usb-files\"/>."
msgid ""
-"To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM or "
-"USB memory stick installation media as described in <xref linkend=\"official-"
-"cdrom\"/> and <xref linkend=\"boot-usb-files\"/>."
+"obtain CD-ROM/DVD-ROM or USB memory stick installation media as described in "
+"<xref linkend=\"official-cdrom\"/> and <xref linkend=\"boot-usb-files\"/>, or"
msgstr ""
"为了从 Windows 启动安装程序,您首先需要按照 <xref linkend=\"official-cdrom\"/"
"> 和 <xref linkend=\"boot-usb-files\"/> 所述获取 CD-ROM/DVD-ROM 或者 USB 存储"
"卡安装介质。"
#. Tag: para
-#: boot-installer.xml:448
+#: boot-installer.xml:361
+#, no-c-format
+msgid ""
+"download a standalone Windows executable, which is available as tools/win32-"
+"loader/stable/win32-loader.exe on the &debian; mirrors,"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:369
#, no-c-format
msgid ""
"If you use an installation CD or DVD, a pre-installation program should be "
@@ -510,23 +430,27 @@ msgstr ""
"<command>setup.exe</command> 程序。"
#. Tag: para
-#: boot-installer.xml:456
-#, no-c-format
+#: boot-installer.xml:377
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the program has been started, a few preliminary questions will be "
+#| "asked and the system will be prepared to start the &debian-gnu; installer."
msgid ""
"After the program has been started, a few preliminary questions will be "
-"asked and the system will be prepared to start the &debian-gnu; installer."
+"asked and the system will be prepared to reboot into the &debian-gnu; "
+"installer."
msgstr ""
"程序运行后,会先询问一些预备问题,接着系统就准备开始启动 &debian-gnu; 安装程"
"序了。"
#. Tag: title
-#: boot-installer.xml:465
+#: boot-installer.xml:387
#, no-c-format
msgid "Booting from DOS"
msgstr "从 DOS 引导"
#. Tag: para
-#: boot-installer.xml:466
+#: boot-installer.xml:388
#, no-c-format
msgid ""
"Boot into DOS (not Windows). To do this, you can for instance boot from a "
@@ -534,7 +458,7 @@ msgid ""
msgstr "要启动到 DOS (非 Windows),您可以从一个用于恢复或诊断的磁盘引导。"
#. Tag: para
-#: boot-installer.xml:471
+#: boot-installer.xml:393
#, no-c-format
msgid ""
"If you can access the installation CD, change the current drive to the CD-"
@@ -551,7 +475,7 @@ msgstr ""
"\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
#. Tag: para
-#: boot-installer.xml:481
+#: boot-installer.xml:403
#, no-c-format
msgid ""
"Enter the subdirectory for the flavor you chose, e.g., "
@@ -572,14 +496,14 @@ msgstr ""
"会加载并运行安装程序。"
#. Tag: title
-#: boot-installer.xml:499
+#: boot-installer.xml:421
#, no-c-format
msgid ""
"Booting from Linux Using <command>LILO</command> or <command>GRUB</command>"
msgstr "引导 Linux 使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: boot-installer.xml:502
+#: boot-installer.xml:424
#, no-c-format
msgid ""
"To boot the installer from hard disk, you must first download and place the "
@@ -589,7 +513,7 @@ msgstr ""
"<xref linkend=\"boot-drive-files\"/>。"
#. Tag: para
-#: boot-installer.xml:507
+#: boot-installer.xml:429
#, no-c-format
msgid ""
"If you intend to use the hard drive only for booting and then download "
@@ -605,7 +529,7 @@ msgstr ""
"您重新分区用于引导的硬盘,需要小心操作。"
#. Tag: para
-#: boot-installer.xml:517
+#: boot-installer.xml:439
#, no-c-format
msgid ""
"Alternatively, if you intend to keep an existing partition on the hard drive "
@@ -621,7 +545,7 @@ msgstr ""
"以从硬盘引导,并从 CD/DVD 映像文件上安装,而不使用网络。"
#. Tag: para
-#: boot-installer.xml:526
+#: boot-installer.xml:448
#, no-c-format
msgid ""
"For <command>LILO</command>, you will need to configure two essential things "
@@ -639,7 +563,7 @@ msgstr ""
"lilo.conf</filename> 的例子:"
#. Tag: screen
-#: boot-installer.xml:547
+#: boot-installer.xml:469
#, no-c-format
msgid ""
"image=/boot/newinstall/vmlinuz\n"
@@ -651,7 +575,7 @@ msgstr ""
" initrd=/boot/newinstall/initrd.gz"
#. Tag: para
-#: boot-installer.xml:547
+#: boot-installer.xml:469
#, no-c-format
msgid ""
"For more details, refer to the <citerefentry><refentrytitle>initrd</"
@@ -666,10 +590,16 @@ msgstr ""
"行 <userinput>lilo</userinput> 并且重新启动。"
#. Tag: para
-#: boot-installer.xml:556
-#, no-c-format
+#: boot-installer.xml:478
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The procedure for <command>GRUB</command> is quite similar. Locate your "
+#| "<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
+#| "directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an "
+#| "entry for the installer, for example (assuming <filename>/boot</filename> "
+#| "is on the first partition of the first disk in the system):"
msgid ""
-"The procedure for <command>GRUB</command> is quite similar. Locate your "
+"The procedure for <command>GRUB1</command> is quite similar. Locate your "
"<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
"directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an "
"entry for the installer, for example (assuming <filename>/boot</filename> is "
@@ -681,7 +611,7 @@ msgstr ""
"boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
#. Tag: screen
-#: boot-installer.xml:564
+#: boot-installer.xml:486
#, no-c-format
msgid ""
"title New Install\n"
@@ -695,7 +625,48 @@ msgstr ""
"initrd /boot/newinstall/initrd.gz"
#. Tag: para
-#: boot-installer.xml:566
+#: boot-installer.xml:488
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The procedure for <command>GRUB</command> is quite similar. Locate your "
+#| "<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
+#| "directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an "
+#| "entry for the installer, for example (assuming <filename>/boot</filename> "
+#| "is on the first partition of the first disk in the system):"
+msgid ""
+"The procedure for <command>GRUB2</command> is very similar. The file is "
+"named <filename>grub.cfg</filename> instead of <filename>menu.lst</"
+"filename>. An entry for the installer would be for instance for example:"
+msgstr ""
+"使用 <command>GRUB</command> 的过程也类似。在 <filename>/boot/grub/</"
+"filename> 目录下找到 <filename>menu.lst</filename> (或者位于 <filename>/boot/"
+"boot/grub/</filename>),然后给安装程序增添一个入口,例如(假设 <filename>/"
+"boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
+
+#. Tag: screen
+#: boot-installer.xml:494
+#, fuzzy, no-c-format
+#| msgid ""
+#| "title New Install\n"
+#| "root (hd0,0)\n"
+#| "kernel /boot/newinstall/vmlinuz\n"
+#| "initrd /boot/newinstall/initrd.gz"
+msgid ""
+"menuentry 'New Install' {\n"
+"insmod part_msdos\n"
+"insmod ext2\n"
+"set root='(hd0,msdos1)'\n"
+"linux /boot/newinstall/vmlinuz\n"
+"initrd /boot/newinstall/initrd.gz\n"
+"}"
+msgstr ""
+"title New Install\n"
+"root (hd0,0)\n"
+"kernel /boot/newinstall/vmlinuz\n"
+"initrd /boot/newinstall/initrd.gz"
+
+#. Tag: para
+#: boot-installer.xml:496
#, no-c-format
msgid ""
"From here on, there should be no difference between <command>GRUB</command> "
@@ -706,13 +677,13 @@ msgstr ""
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:575
+#: boot-installer.xml:505
#, no-c-format
msgid "Booting from USB Memory Stick"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:576
+#: boot-installer.xml:506
#, no-c-format
msgid ""
"Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
@@ -728,14 +699,14 @@ msgstr ""
# index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
#. Tag: title
-#: boot-installer.xml:589 boot-installer.xml:1732
+#: boot-installer.xml:519 boot-installer.xml:1675
#, no-c-format
msgid "Booting from Floppies"
msgstr "从软盘引导"
# index.docbook:724, index.docbook:2286
#. Tag: para
-#: boot-installer.xml:590 boot-installer.xml:1740
+#: boot-installer.xml:520 boot-installer.xml:1683
#, no-c-format
msgid ""
"You will have already downloaded the floppy images you needed and created "
@@ -745,7 +716,7 @@ msgstr ""
"\"create-floppy\"/>。"
#. Tag: para
-#: boot-installer.xml:597
+#: boot-installer.xml:527
#, no-c-format
msgid ""
"To boot from the installer boot floppy, place it in the primary floppy "
@@ -755,7 +726,7 @@ msgstr ""
"开。"
#. Tag: para
-#: boot-installer.xml:603
+#: boot-installer.xml:533
#, no-c-format
msgid ""
"For installing from an LS-120 drive (ATAPI version) with a set of floppies, "
@@ -771,7 +742,7 @@ msgstr ""
"(master),那么在提示符下输入 <userinput>install root=/dev/hdc</userinput>。"
#. Tag: para
-#: boot-installer.xml:613
+#: boot-installer.xml:543
#, no-c-format
msgid ""
"Note that on some machines, <keycombo><keycap>Control</keycap> <keycap>Alt</"
@@ -786,7 +757,7 @@ msgstr ""
"选择。在其它情况下,请在引导时使用硬重启。"
#. Tag: para
-#: boot-installer.xml:622
+#: boot-installer.xml:552
#, no-c-format
msgid ""
"The floppy disk will be accessed, and you should then see a screen that "
@@ -796,7 +767,7 @@ msgstr ""
"</prompt> 提示符。"
#. Tag: para
-#: boot-installer.xml:628
+#: boot-installer.xml:558
#, no-c-format
msgid ""
"Once you press &enterkey;, you should see the message "
@@ -812,7 +783,7 @@ msgstr ""
"下面 <xref linkend=\"kernel-msgs\"/> 可以找到。"
#. Tag: para
-#: boot-installer.xml:637
+#: boot-installer.xml:567
#, no-c-format
msgid ""
"After booting from the boot floppy, the root floppy is requested. Insert the "
@@ -825,26 +796,26 @@ msgstr ""
# index.docbook:274, index.docbook:780, index.docbook:1320, index.docbook:1813, index.docbook:1896, index.docbook:2236, index.docbook:2332
#. Tag: title
-#: boot-installer.xml:647 boot-installer.xml:1174 boot-installer.xml:1315
-#: boot-installer.xml:1369 boot-installer.xml:1677 boot-installer.xml:1786
+#: boot-installer.xml:577 boot-installer.xml:1107 boot-installer.xml:1248
+#: boot-installer.xml:1302 boot-installer.xml:1620 boot-installer.xml:1729
#, no-c-format
msgid "Booting with TFTP"
msgstr "用 TFTP 引导"
#. Tag: para
-#: boot-installer.xml:671
+#: boot-installer.xml:601
#, no-c-format
msgid "There are various ways to do a TFTP boot on i386."
msgstr "在 i386 体系上有很多方法用 TFTP 进行引导。"
#. Tag: title
-#: boot-installer.xml:677
+#: boot-installer.xml:607
#, no-c-format
msgid "NIC or Motherboard that support PXE"
msgstr "支持 PXE 的网卡或者主板"
#. Tag: para
-#: boot-installer.xml:678
+#: boot-installer.xml:608
#, no-c-format
msgid ""
"It could be that your Network Interface Card or Motherboard provides PXE "
@@ -857,13 +828,13 @@ msgstr ""
"引导。"
#. Tag: title
-#: boot-installer.xml:689
+#: boot-installer.xml:619
#, no-c-format
msgid "NIC with Network BootROM"
msgstr "网络 BootROM 的网卡"
#. Tag: para
-#: boot-installer.xml:690
+#: boot-installer.xml:620
#, no-c-format
msgid ""
"It could be that your Network Interface Card provides TFTP boot "
@@ -871,7 +842,7 @@ msgid ""
msgstr "您的网卡很有可能提供了 TFTP 引导功能。"
#. Tag: para
-#: boot-installer.xml:695
+#: boot-installer.xml:625
#, no-c-format
msgid ""
"Let us (<email>&email-debian-boot-list;</email>) know how did you manage it. "
@@ -881,13 +852,13 @@ msgstr ""
"文档。"
#. Tag: title
-#: boot-installer.xml:703
+#: boot-installer.xml:633
#, no-c-format
msgid "Etherboot"
msgstr "Etherboot"
#. Tag: para
-#: boot-installer.xml:704
+#: boot-installer.xml:634
#, no-c-format
msgid ""
"The <ulink url=\"http://www.etherboot.org\">etherboot project</ulink> "
@@ -898,14 +869,28 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:714
+#: boot-installer.xml:644
#, no-c-format
msgid "The Boot Screen"
msgstr "引导界面"
#. Tag: para
-#: boot-installer.xml:715
-#, no-c-format
+#: boot-installer.xml:645
+#, fuzzy, no-c-format
+#| msgid ""
+#| "When the installer boots, you should be presented with a friendly "
+#| "graphical screen showing the &debian; logo and a menu: "
+#| "<informalexample><screen>\n"
+#| "Installer boot menu\n"
+#| "\n"
+#| "Install\n"
+#| "Graphical install\n"
+#| "Advanced options >\n"
+#| "Help\n"
+#| "\n"
+#| "Press ENTER to boot or TAB to edit a menu entry\n"
+#| "</screen></informalexample> Depending on the installation method you are "
+#| "using, the <quote>Graphical install</quote> option may not be available."
msgid ""
"When the installer boots, you should be presented with a friendly graphical "
"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
@@ -913,12 +898,15 @@ msgid ""
"\n"
"Install\n"
"Graphical install\n"
-"Advanced options >\n"
+"Advanced options >\n"
"Help\n"
+"Install with speech synthesis\n"
"\n"
"Press ENTER to boot or TAB to edit a menu entry\n"
"</screen></informalexample> Depending on the installation method you are "
-"using, the <quote>Graphical install</quote> option may not be available."
+"using, the <quote>Graphical install</quote> option may not be available. Bi-"
+"arch images additionally have a 64 bit variant for each install option, "
+"right below it, thus almost doubling the number of options."
msgstr ""
"安装程序引导后,您应该看到友好的图形界面显示出 &debian; 图标和一个菜单:"
"<informalexample><screen>\n"
@@ -934,12 +922,18 @@ msgstr ""
"install</quote> 选项可能不会出现。"
#. Tag: para
-#: boot-installer.xml:725
-#, no-c-format
+#: boot-installer.xml:657
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For a normal installation, select either the <quote>Install</quote> or "
+#| "the <quote>Graphical install</quote> entry &mdash; using either the arrow "
+#| "keys on your keyboard or by typing the first (highlighted) letter &mdash; "
+#| "and press &enterkey; to boot the installer."
msgid ""
"For a normal installation, select either the <quote>Install</quote> or the "
"<quote>Graphical install</quote> entry &mdash; using either the arrow keys "
-"on your keyboard or by typing the first (highlighted) letter &mdash; and "
+"on your keyboard or by typing the first (highlighted) letter, the "
+"<quote>Install</quote> entry is already selected by default &mdash; and "
"press &enterkey; to boot the installer."
msgstr ""
"普通安装,选择 <quote>Install</quote> 或者 <quote>Graphical install</quote> "
@@ -947,7 +941,7 @@ msgstr ""
"&enterkey; 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:732
+#: boot-installer.xml:665
#, no-c-format
msgid ""
"The <quote>Advanced options</quote> entry gives access to a second menu that "
@@ -958,7 +952,7 @@ msgstr ""
"expert 模式、rescue 模式和自动安装。"
#. Tag: para
-#: boot-installer.xml:738
+#: boot-installer.xml:671
#, no-c-format
msgid ""
"If you wish or need to add any boot parameters for either the installer or "
@@ -974,7 +968,7 @@ msgstr ""
"您所做的修改。"
#. Tag: para
-#: boot-installer.xml:747
+#: boot-installer.xml:680
#, no-c-format
msgid ""
"Choosing the <quote>Help</quote> entry will result in the first help screen "
@@ -1005,7 +999,7 @@ msgstr ""
"(例如:<userinput>install fb=false</userinput>)。"
#. Tag: para
-#: boot-installer.xml:766
+#: boot-installer.xml:699
#, no-c-format
msgid ""
"The keyboard is assumed to have a default American English layout at this "
@@ -1021,7 +1015,7 @@ msgstr ""
"说明了如何找到要使用正确的键。"
#. Tag: para
-#: boot-installer.xml:776
+#: boot-installer.xml:709
#, no-c-format
msgid ""
"If you are using a system that has the BIOS configured to use serial "
@@ -1039,7 +1033,7 @@ msgstr ""
"Assistant</quote> (IRA)。"
#. Tag: para
-#: boot-installer.xml:786
+#: boot-installer.xml:719
#, no-c-format
msgid ""
"To bypass the graphical boot screen you can either blindly press &escapekey; "
@@ -1057,13 +1051,13 @@ msgstr ""
"userinput>,这在帮助里面有说明。"
#. Tag: title
-#: boot-installer.xml:846
+#: boot-installer.xml:779
#, no-c-format
msgid "CD Contents"
msgstr "CD 的内容"
#. Tag: para
-#: boot-installer.xml:848
+#: boot-installer.xml:781
#, no-c-format
msgid ""
"There are three basic variations of &debian; Install CDs. The "
@@ -1084,7 +1078,7 @@ msgstr ""
"光盘套件,则可以不使用网络就能安装大量软件包,建立完整的系统。"
#. Tag: para
-#: boot-installer.xml:864
+#: boot-installer.xml:797
#, no-c-format
msgid ""
"The IA-64 architecture uses the next generation Extensible Firmware "
@@ -1107,7 +1101,7 @@ msgstr ""
"MBR 或者引导块记录。"
#. Tag: para
-#: boot-installer.xml:880
+#: boot-installer.xml:813
#, no-c-format
msgid ""
"The &debian; Installer CD contains a small EFI partition where the "
@@ -1122,7 +1116,7 @@ msgstr ""
"说明如下。"
#. Tag: para
-#: boot-installer.xml:889
+#: boot-installer.xml:822
#, no-c-format
msgid ""
"Most of the details of how <command>ELILO</command> actually loads and "
@@ -1141,7 +1135,7 @@ msgstr ""
"查一个 EFI 分区是否合适。"
#. Tag: para
-#: boot-installer.xml:901
+#: boot-installer.xml:834
#, no-c-format
msgid ""
"The EFI Boot Manager is presented as the last step of the firmware "
@@ -1161,13 +1155,13 @@ msgstr ""
"用第一个,当然,该选项不可用或者 CD 由于某种原因没法启动,使用第二个。"
#. Tag: title
-#: boot-installer.xml:920
+#: boot-installer.xml:853
#, no-c-format
msgid "IMPORTANT"
msgstr "重要"
#. Tag: para
-#: boot-installer.xml:921
+#: boot-installer.xml:854
#, no-c-format
msgid ""
"The EFI Boot Manager will select a default boot action, typically the first "
@@ -1184,13 +1178,13 @@ msgstr ""
"command>返回 Boot Manager。"
#. Tag: title
-#: boot-installer.xml:933
+#: boot-installer.xml:866
#, no-c-format
msgid "Option 1: Booting from the Boot Option Maintenance Menu"
msgstr "选项 1: 从 Boot Option Maintenance Menu 启动"
#. Tag: para
-#: boot-installer.xml:940
+#: boot-installer.xml:873
#, no-c-format
msgid ""
"Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1201,7 +1195,7 @@ msgstr ""
"Boot Manager 页面和菜单。"
#. Tag: para
-#: boot-installer.xml:946
+#: boot-installer.xml:879
#, no-c-format
msgid ""
"Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
@@ -1211,7 +1205,7 @@ msgstr ""
"<command>ENTER</command>。会显示一个新菜单。"
#. Tag: para
-#: boot-installer.xml:952
+#: boot-installer.xml:885
#, no-c-format
msgid ""
"Select <command>Boot From a File</command> from the menu with the arrow keys "
@@ -1227,7 +1221,7 @@ msgstr ""
"Boot</command>标签。如果您检查菜单行其他部分,会看到对应的设备和控制器信息。"
#. Tag: para
-#: boot-installer.xml:963
+#: boot-installer.xml:896
#, no-c-format
msgid ""
"You can choose either of the entries that refer to the CD/DVD drive. Select "
@@ -1243,7 +1237,7 @@ msgstr ""
"的 CD 目录列表,要求您进行(额外的)下一步。"
#. Tag: para
-#: boot-installer.xml:974
+#: boot-installer.xml:907
#, no-c-format
msgid ""
"You will only need this step if you chose <command>Debian Inst [Acpi ...</"
@@ -1257,7 +1251,7 @@ msgstr ""
"择,并按下 <command>ENTER</command>。这将进入启动步骤。"
#. Tag: para
-#: boot-installer.xml:986
+#: boot-installer.xml:919
#, no-c-format
msgid ""
"These steps start the &debian; boot loader which will display a menu page "
@@ -1268,13 +1262,13 @@ msgstr ""
"进入选择启动内核和选项。"
#. Tag: title
-#: boot-installer.xml:996
+#: boot-installer.xml:929
#, no-c-format
msgid "Option 2: Booting from the EFI Shell"
msgstr "选项 2: 从 EFI Shell 启动"
#. Tag: para
-#: boot-installer.xml:997
+#: boot-installer.xml:930
#, no-c-format
msgid ""
"If, for some reason, option 1 is not successful, reboot the machine and when "
@@ -1287,7 +1281,7 @@ msgstr ""
"来引导 &debian; 安装程序 CD :"
#. Tag: para
-#: boot-installer.xml:1008
+#: boot-installer.xml:941
#, no-c-format
msgid ""
"Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1296,7 +1290,7 @@ msgid ""
msgstr "把 CD 放入 DVD/CD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1014
+#: boot-installer.xml:947
#, no-c-format
msgid ""
"Select <command>EFI Shell</command> from the menu with the arrow keys and "
@@ -1316,7 +1310,7 @@ msgstr ""
"用于初始化 CD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1028
+#: boot-installer.xml:961
#, no-c-format
msgid ""
"Examine the output from the shell looking for the CDROM drive. It is most "
@@ -1329,7 +1323,7 @@ msgstr ""
"<filename>fs<replaceable>n</replaceable></filename>。"
#. Tag: para
-#: boot-installer.xml:1035
+#: boot-installer.xml:968
#, no-c-format
msgid ""
"Enter <command>fs<replaceable>n</replaceable>:</command> and press "
@@ -1342,7 +1336,7 @@ msgstr ""
"光盘的分区号。Shell 现在将在提示符下显示分区号。"
#. Tag: para
-#: boot-installer.xml:1042
+#: boot-installer.xml:975
#, no-c-format
msgid ""
"Enter <command>elilo</command> and press <command>ENTER</command>. This will "
@@ -1352,7 +1346,7 @@ msgstr ""
"骤。"
#. Tag: para
-#: boot-installer.xml:1049
+#: boot-installer.xml:982
#, no-c-format
msgid ""
"As with option 1, these steps start the &debian; boot loader which will "
@@ -1366,13 +1360,13 @@ msgstr ""
"replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
#. Tag: title
-#: boot-installer.xml:1063
+#: boot-installer.xml:996
#, no-c-format
msgid "Installing using a Serial Console"
msgstr "使用串口控制台安装"
#. Tag: para
-#: boot-installer.xml:1065
+#: boot-installer.xml:998
#, no-c-format
msgid ""
"You may choose to perform an install using a monitor and keyboard or using a "
@@ -1390,7 +1384,7 @@ msgstr ""
"置。"
#. Tag: para
-#: boot-installer.xml:1076
+#: boot-installer.xml:1009
#, no-c-format
msgid ""
"In most circumstances, you will want the installer to use the same baud rate "
@@ -1402,7 +1396,7 @@ msgstr ""
"置,可以通过命令 <command>baud</command> 在 EFI shell 获得。"
#. Tag: para
-#: boot-installer.xml:1083
+#: boot-installer.xml:1016
#, no-c-format
msgid ""
"If there is not an option available that is configured for the serial device "
@@ -1417,7 +1411,7 @@ msgstr ""
"窗口。"
#. Tag: para
-#: boot-installer.xml:1094
+#: boot-installer.xml:1027
#, no-c-format
msgid ""
"Most IA-64 boxes ship with a default console setting of 9600 baud. This "
@@ -1432,7 +1426,7 @@ msgstr ""
"装。参考 <classname>Params</classname> 帮助菜单,获得启动文本模式安装的指导。"
#. Tag: para
-#: boot-installer.xml:1103
+#: boot-installer.xml:1036
#, no-c-format
msgid ""
"If you select the wrong console type, you will be able to select the kernel "
@@ -1444,13 +1438,13 @@ msgstr ""
"核启动后死掉,只有重新启动才能开始安装。"
#. Tag: title
-#: boot-installer.xml:1112
+#: boot-installer.xml:1045
#, no-c-format
msgid "Selecting the Boot Kernel and Options"
msgstr "选择启动内核与选项"
#. Tag: para
-#: boot-installer.xml:1114
+#: boot-installer.xml:1047
#, no-c-format
msgid ""
"The boot loader will display a form with a menu list and a text window with "
@@ -1467,7 +1461,7 @@ msgstr ""
"<classname>Params</classname>窗口解释命令行参数。"
#. Tag: para
-#: boot-installer.xml:1126
+#: boot-installer.xml:1059
#, no-c-format
msgid ""
"Consult the <classname>General</classname> help screen for the description "
@@ -1487,7 +1481,7 @@ msgstr ""
"始安装:"
#. Tag: para
-#: boot-installer.xml:1144
+#: boot-installer.xml:1077
#, no-c-format
msgid ""
"Select the kernel version and installation mode most appropriate to your "
@@ -1495,7 +1489,7 @@ msgid ""
msgstr "使用方向键选择您需要的内核版本和适合的安装模式。"
#. Tag: para
-#: boot-installer.xml:1149
+#: boot-installer.xml:1082
#, no-c-format
msgid ""
"Enter any boot parameters by typing at the keyboard. The text will be "
@@ -1506,7 +1500,7 @@ msgstr ""
"控制台)指定的。"
#. Tag: para
-#: boot-installer.xml:1156
+#: boot-installer.xml:1089
#, no-c-format
msgid ""
"Press <command>ENTER</command>. This will load and start the kernel. The "
@@ -1517,7 +1511,7 @@ msgstr ""
"一个屏幕显示常规的初始化信息。"
#. Tag: para
-#: boot-installer.xml:1165 boot-installer.xml:1301
+#: boot-installer.xml:1098 boot-installer.xml:1234
#, no-c-format
msgid ""
"Proceed to the next chapter to continue the installation where you will set "
@@ -1525,7 +1519,7 @@ msgid ""
msgstr "进入到下一章继续安装本地语言,网络和磁盘分区。"
#. Tag: para
-#: boot-installer.xml:1176
+#: boot-installer.xml:1109
#, no-c-format
msgid ""
"Booting an IA-64 system from the network is similar to a CD boot. The only "
@@ -1542,7 +1536,7 @@ msgstr ""
"器。"
#. Tag: para
-#: boot-installer.xml:1210
+#: boot-installer.xml:1143
#, no-c-format
msgid ""
"Network booting an IA-64 system requires two architecture-specific actions. "
@@ -1555,13 +1549,13 @@ msgstr ""
"必须在 EFI boot manager 下定义来打开网络的装入。"
#. Tag: title
-#: boot-installer.xml:1221
+#: boot-installer.xml:1154
#, no-c-format
msgid "Configuring the Server"
msgstr "配置网络服务器"
#. Tag: para
-#: boot-installer.xml:1222
+#: boot-installer.xml:1155
#, no-c-format
msgid ""
"A suitable TFTP entry for network booting an IA-64 system looks something "
@@ -1585,7 +1579,7 @@ msgstr ""
"在客户端运行。"
#. Tag: para
-#: boot-installer.xml:1232
+#: boot-installer.xml:1165
#, no-c-format
msgid ""
"Extract the <filename>netboot.tar.gz</filename> file into the directory used "
@@ -1600,7 +1594,7 @@ msgstr ""
"它包括 IA-64 系统需要的启动文件。"
#. Tag: screen
-#: boot-installer.xml:1242
+#: boot-installer.xml:1175
#, no-c-format
msgid ""
"# cd /var/lib/tftp\n"
@@ -1618,7 +1612,7 @@ msgstr ""
"[...]"
#. Tag: para
-#: boot-installer.xml:1242
+#: boot-installer.xml:1175
#, no-c-format
msgid ""
"The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
@@ -1637,13 +1631,13 @@ msgstr ""
"filename>。请查看 <classname>elilo</classname> 软件包附带的文档以获得细节。"
#. Tag: title
-#: boot-installer.xml:1259
+#: boot-installer.xml:1192
#, no-c-format
msgid "Configuring the Client"
msgstr "配置客户机"
#. Tag: para
-#: boot-installer.xml:1260
+#: boot-installer.xml:1193
#, no-c-format
msgid ""
"To configure the client to support TFTP booting, start by booting to EFI and "
@@ -1670,7 +1664,7 @@ msgstr ""
"DHCP 查询,然后会从服务器装入 <filename>elilo.efi</filename>。"
#. Tag: para
-#: boot-installer.xml:1292
+#: boot-installer.xml:1225
#, no-c-format
msgid ""
"The boot loader will display its prompt after it has downloaded and "
@@ -1685,13 +1679,13 @@ msgstr ""
# index.docbook:1899, index.docbook:1946
#. Tag: title
-#: boot-installer.xml:1318 boot-installer.xml:1342
+#: boot-installer.xml:1251 boot-installer.xml:1275
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: boot-installer.xml:1319
+#: boot-installer.xml:1252
#, no-c-format
msgid ""
"After entering the command monitor use <informalexample><screen>\n"
@@ -1713,13 +1707,13 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:1339 boot-installer.xml:1406 boot-installer.xml:2007
+#: boot-installer.xml:1272 boot-installer.xml:1339 boot-installer.xml:1973
#, no-c-format
msgid "Boot Parameters"
msgstr "引导参数"
#. Tag: para
-#: boot-installer.xml:1343
+#: boot-installer.xml:1276
#, no-c-format
msgid ""
"On SGI machines you can append boot parameters to the <command>bootp():</"
@@ -1729,7 +1723,7 @@ msgstr ""
"参数。"
#. Tag: para
-#: boot-installer.xml:1348
+#: boot-installer.xml:1281
#, no-c-format
msgid ""
"Following the <command>bootp():</command> command you can give the path and "
@@ -1747,20 +1741,20 @@ msgstr ""
"command>:"
#. Tag: screen
-#: boot-installer.xml:1358
+#: boot-installer.xml:1291
#, no-c-format
msgid "bootp(): append=\"root=/dev/sda1\""
msgstr "bootp(): append=\"root=/dev/sda1\""
# index.docbook:1899, index.docbook:1946
#. Tag: title
-#: boot-installer.xml:1372 boot-installer.xml:1409
+#: boot-installer.xml:1305 boot-installer.xml:1342
#, no-c-format
msgid "Cobalt TFTP Booting"
msgstr "Cobalt TFTP 引导"
#. Tag: para
-#: boot-installer.xml:1373
+#: boot-installer.xml:1306
#, no-c-format
msgid ""
"Strictly speaking, Cobalt does not use TFTP but NFS to boot. You need to "
@@ -1775,7 +1769,7 @@ msgstr ""
"键,机器就从 NFS 网络启动。它会在显示器上显示几个选项。有下面两种安装方法:"
#. Tag: para
-#: boot-installer.xml:1383
+#: boot-installer.xml:1316
#, no-c-format
msgid ""
"Via SSH (default): In this case, the installer will configure the network "
@@ -1789,7 +1783,7 @@ msgstr ""
"到机器就可以开始安装。"
#. Tag: para
-#: boot-installer.xml:1392
+#: boot-installer.xml:1325
#, no-c-format
msgid ""
"Via serial console: Using a null modem cable, you can connect to the serial "
@@ -1800,7 +1794,7 @@ msgstr ""
"115200 bps) 然后进行安装。"
#. Tag: para
-#: boot-installer.xml:1410
+#: boot-installer.xml:1343
#, no-c-format
msgid ""
"You cannot pass any boot parameters directly. Instead, you have to edit the "
@@ -1811,13 +1805,13 @@ msgstr ""
"default.colo</filename> 文件,将参数给 <replaceable>args</replaceable> 变量。"
#. Tag: title
-#: boot-installer.xml:1425
+#: boot-installer.xml:1358
#, no-c-format
msgid "s390 Limitations"
msgstr "s390 的限制"
#. Tag: para
-#: boot-installer.xml:1426
+#: boot-installer.xml:1359
#, no-c-format
msgid ""
"In order to run the installation system a working network setup and ssh "
@@ -1825,7 +1819,7 @@ msgid ""
msgstr "为了在 S/390 上安装系统,需要一个工作的网络设置和 ssh 会话。"
#. Tag: para
-#: boot-installer.xml:1431
+#: boot-installer.xml:1364
#, no-c-format
msgid ""
"The booting process starts with a network setup that prompts you for several "
@@ -1837,13 +1831,13 @@ msgstr ""
"一个 ssh 会话登录进入系统,并且开始一个标准系统安装。"
#. Tag: title
-#: boot-installer.xml:1442
+#: boot-installer.xml:1375
#, no-c-format
msgid "s390 Boot Parameters"
msgstr "s390 引导参数"
#. Tag: para
-#: boot-installer.xml:1443
+#: boot-installer.xml:1376
#, no-c-format
msgid ""
"On S/390 you can append boot parameters in the parm file. This file can "
@@ -1855,15 +1849,22 @@ msgstr ""
"映像。"
#. Tag: para
-#: boot-installer.xml:1503
-#, no-c-format
+#: boot-installer.xml:1436
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Currently, the only &arch-title; subarchitectures that support CD-ROM "
+#| "booting are PReP (though not all systems) and New World PowerMacs. On "
+#| "PowerMacs, hold the <keycap>c</keycap> key, or else the combination of "
+#| "<keycap>Command</keycap>, <keycap>Option</keycap>, <keycap>Shift</"
+#| "keycap>, and <keycap>Delete</keycap> keys together while booting to boot "
+#| "from the CD-ROM."
msgid ""
"Currently, the only &arch-title; subarchitectures that support CD-ROM "
-"booting are PReP (though not all systems) and New World PowerMacs. On "
+"booting are PReP/CHRP (though not all systems) and New World PowerMacs. On "
"PowerMacs, hold the <keycap>c</keycap> key, or else the combination of "
"<keycap>Command</keycap>, <keycap>Option</keycap>, <keycap>Shift</keycap>, "
-"and <keycap>Delete</keycap> keys together while booting to boot from the CD-"
-"ROM."
+"and <keycap>Delete</keycap> keys together while booting to boot from the "
+"factory default CD/DVD drive."
msgstr ""
"当前来说,&arch-title; 下的子体系结构只有 PReP(不是所有的系统) 和 New World "
"PowerMacs 支持 CD 光盘引导。在 PowerMacs 下,从 CD 光盘引导时,按住 "
@@ -1871,7 +1872,25 @@ msgstr ""
"keycap>、<keycap>Shift</keycap> 和 <keycap>Delete</keycap>。"
#. Tag: para
-#: boot-installer.xml:1512
+#: boot-installer.xml:1445
+#, no-c-format
+msgid ""
+"To boot a PowerMac from an external Firewire CD/DVD drive invoke Open "
+"Firmware prompt first (see <xref linkend=\"invoking-openfirmware\"/>), then "
+"type <informalexample><screen>\n"
+"0 &gt; boot fw/node/sbp-2/disk:,\\install\\yaboot\n"
+"</screen></informalexample> for an alternative way to boot from the internal "
+"factory default CD/DVD drive type"
+msgstr ""
+
+#. Tag: screen
+#: boot-installer.xml:1456
+#, no-c-format
+msgid "0 &gt; boot cd:,\\install\\yaboot"
+msgstr "0 &gt; boot cd:,\\install\\yaboot"
+
+#. Tag: para
+#: boot-installer.xml:1458
#, no-c-format
msgid ""
"OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
@@ -1886,35 +1905,29 @@ msgstr ""
"安装程序 从 CD 上选择所需要的文件。"
#. Tag: para
-#: boot-installer.xml:1521
+#: boot-installer.xml:1467
#, no-c-format
msgid ""
-"If your system doesn't boot directly from CD-ROM, you can still use the CD-"
-"ROM to install the system. On NewWorlds, you can also use an OpenFirmware "
-"command to boot from the CD-ROM manually. Follow the instructions in <xref "
-"linkend=\"boot-newworld\"/> for booting from the hard disk, except use the "
-"path to <command>yaboot</command> on the CD at the OF prompt, such as"
+"To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> key "
+"immediately after pressing the power-on button, when SmartFirmware prompt "
+"appears, type"
msgstr ""
-"如果您的系统不支持直接从 CD 光盘启动,仍然可以采用 CD 光盘来安装系统。在 "
-"NewWorlds 上面,可以使用一个 OpenFirmware 命令来手工从 CD 光盘引导。按照 "
-"<xref linkend=\"boot-newworld\"/> 的方法从硬盘来进行引导,只是在 OF 提示符下"
-"使用 CD 上的 <command>yaboot</command> 路径,比如:"
#. Tag: screen
-#: boot-installer.xml:1530
+#: boot-installer.xml:1473
#, no-c-format
-msgid "0 &gt; boot cd:,\\install\\yaboot"
-msgstr "0 &gt; boot cd:,\\install\\yaboot"
+msgid "boot cd install/pegasos"
+msgstr ""
#. Tag: title
-#: boot-installer.xml:1536
+#: boot-installer.xml:1479
#, no-c-format
msgid "Booting from Hard Disk"
msgstr "从硬盘引导"
# index.docbook:1591, index.docbook:2097
#. Tag: para
-#: boot-installer.xml:1542
+#: boot-installer.xml:1485
#, no-c-format
msgid ""
"Booting from an existing operating system is often a convenient option; for "
@@ -1925,7 +1938,7 @@ msgstr ""
# index.docbook:1597, index.docbook:2103
#. Tag: para
-#: boot-installer.xml:1548
+#: boot-installer.xml:1491
#, no-c-format
msgid ""
"To boot the installer from hard disk, you will have already completed "
@@ -1936,13 +1949,13 @@ msgstr ""
"下载并且安置所需文件。"
#. Tag: title
-#: boot-installer.xml:1568
+#: boot-installer.xml:1511
#, no-c-format
msgid "Booting OldWorld PowerMacs from MacOS"
msgstr "从 OldWorld PowerMacs 的 MacOS 上引导"
#. Tag: para
-#: boot-installer.xml:1569
+#: boot-installer.xml:1512
#, no-c-format
msgid ""
"If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
@@ -1963,13 +1976,13 @@ msgstr ""
"序。"
#. Tag: title
-#: boot-installer.xml:1587
+#: boot-installer.xml:1530
#, no-c-format
msgid "Booting NewWorld Macs from OpenFirmware"
msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
#. Tag: para
-#: boot-installer.xml:1588
+#: boot-installer.xml:1531
#, no-c-format
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
@@ -2010,19 +2023,19 @@ msgstr ""
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:1620
+#: boot-installer.xml:1563
#, no-c-format
msgid "Booting from USB memory stick"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:1621
+#: boot-installer.xml:1564
#, no-c-format
msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
msgstr "当前,New World PowerMac 系统支持从 USB 引导。"
#. Tag: para
-#: boot-installer.xml:1627
+#: boot-installer.xml:1570
#, no-c-format
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
@@ -2035,7 +2048,7 @@ msgstr ""
"Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
#. Tag: para
-#: boot-installer.xml:1636
+#: boot-installer.xml:1579
#, no-c-format
msgid ""
"You will need to work out where the USB storage device appears in the device "
@@ -2056,7 +2069,7 @@ msgstr ""
"disk@1</filename> 。"
#. Tag: para
-#: boot-installer.xml:1648
+#: boot-installer.xml:1591
#, no-c-format
msgid ""
"Having worked out the device path, use a command like this to boot the "
@@ -2080,7 +2093,7 @@ msgstr ""
"command>。"
#. Tag: para
-#: boot-installer.xml:1662
+#: boot-installer.xml:1605
#, no-c-format
msgid ""
"The system should now boot up, and you should be presented with the "
@@ -2091,7 +2104,7 @@ msgstr ""
"动参数,或者只按下 &enterkey;。"
#. Tag: para
-#: boot-installer.xml:1668
+#: boot-installer.xml:1611
#, no-c-format
msgid ""
"This boot method is new, and may be difficult to get to work on some "
@@ -2102,13 +2115,13 @@ msgstr ""
"下安装报告,参阅 <xref linkend=\"submit-bug\"/>。"
#. Tag: para
-#: boot-installer.xml:1701
+#: boot-installer.xml:1644
#, no-c-format
msgid "Currently, PReP and New World PowerMac systems support netbooting."
msgstr "目前来说,PReP 以及 New World PowerMac 系统支持网络引导。"
#. Tag: para
-#: boot-installer.xml:1705
+#: boot-installer.xml:1648
#, no-c-format
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
@@ -2141,7 +2154,7 @@ msgstr ""
"<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
#. Tag: para
-#: boot-installer.xml:1733
+#: boot-installer.xml:1676
#, no-c-format
msgid ""
"Booting from floppies is supported for &arch-title;, although it is "
@@ -2153,7 +2166,7 @@ msgstr ""
"没有安装 软盘驱动器,并且附带的 USB 软盘并不支持引导。"
#. Tag: para
-#: boot-installer.xml:1745
+#: boot-installer.xml:1688
#, no-c-format
msgid ""
"To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
@@ -2164,7 +2177,7 @@ msgstr ""
"按下电源开关前把它放到软盘驱动器内。"
#. Tag: para
-#: boot-installer.xml:1751
+#: boot-installer.xml:1694
#, no-c-format
msgid ""
"For those not familiar with Macintosh floppy operations: a floppy placed in "
@@ -2176,7 +2189,7 @@ msgstr ""
"序。一个 没有有效引导系统的软盘将回被弹出,并且机器将检查硬盘分区。"
#. Tag: para
-#: boot-installer.xml:1758
+#: boot-installer.xml:1701
#, no-c-format
msgid ""
"After booting, the <filename>root.bin</filename> floppy is requested. Insert "
@@ -2187,13 +2200,13 @@ msgstr ""
"&enterkey;。安装程序将在根系统被装入内存后自动启动。"
#. Tag: title
-#: boot-installer.xml:1769
+#: boot-installer.xml:1712
#, no-c-format
msgid "PowerPC Boot Parameters"
msgstr "PowerPC 引导参数"
#. Tag: para
-#: boot-installer.xml:1770
+#: boot-installer.xml:1713
#, no-c-format
msgid ""
"Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
@@ -2208,7 +2221,7 @@ msgstr ""
"128 来说,请改变其值为 <userinput>video=aty128fb:vmode:6</userinput> 。"
#. Tag: para
-#: boot-installer.xml:1810
+#: boot-installer.xml:1753
#, no-c-format
msgid ""
"On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -2227,7 +2240,7 @@ msgstr ""
"i; 。"
#. Tag: para
-#: boot-installer.xml:1865
+#: boot-installer.xml:1808
#, no-c-format
msgid ""
"Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -2239,13 +2252,13 @@ msgstr ""
"盘)。"
#. Tag: title
-#: boot-installer.xml:1874
+#: boot-installer.xml:1817
#, no-c-format
msgid "IDPROM Messages"
msgstr "IDPROM 消息"
#. Tag: para
-#: boot-installer.xml:1875
+#: boot-installer.xml:1818
#, no-c-format
msgid ""
"If you cannot boot because you get messages about a problem with "
@@ -2259,25 +2272,37 @@ msgstr ""
"nvram-faq;\">Sun NVRAM FAQ</ulink> 以获得更多信息。"
#. Tag: title
-#: boot-installer.xml:1894
+#: boot-installer.xml:1837
#, no-c-format
msgid "Accessibility"
msgstr "辅助功能"
#. Tag: para
-#: boot-installer.xml:1895
-#, no-c-format
+#: boot-installer.xml:1838
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Some users may need specific support because of e.g. some visual "
+#| "impairment. <phrase arch=\"ia64;powerpc;x86\">USB braille displays are "
+#| "detected automatically, but most other</phrase> <phrase arch=\"arm;hppa;"
+#| "mips;mipsel;sparc\">Most</phrase> accessibility features have to be "
+#| "enabled manually. <phrase arch=\"x86\">On machines that support it, the "
+#| "boot menu emits a beep when it is ready to receive keystrokes.</phrase> "
+#| "Some boot parameters can <phrase arch=\"x86\">then</phrase> be appended "
+#| "to enable accessibility features<phrase arch=\"x86\"> (see also <xref "
+#| "linkend=\"boot-screen\"/>)</phrase>. Note that on most architectures the "
+#| "boot loader interprets your keyboard as a QWERTY keyboard."
msgid ""
"Some users may need specific support because of e.g. some visual impairment. "
"<phrase arch=\"ia64;powerpc;x86\">USB braille displays are detected "
-"automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;"
-"sparc\">Most</phrase> accessibility features have to be enabled manually. "
-"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep "
-"when it is ready to receive keystrokes.</phrase> Some boot parameters can "
-"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility "
-"features<phrase arch=\"x86\"> (see also <xref linkend=\"boot-screen\"/>)</"
-"phrase>. Note that on most architectures the boot loader interprets your "
-"keyboard as a QWERTY keyboard."
+"automatically (not serial displays connected via a serial-to-USB converter), "
+"but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">Most</"
+"phrase> accessibility features have to be enabled manually. <phrase arch="
+"\"x86\">On machines that support it, the boot menu emits a beep when it is "
+"ready to receive keystrokes.</phrase> Some boot parameters can <phrase arch="
+"\"x86\">then</phrase> be appended to enable accessibility features<phrase "
+"arch=\"x86\"> (see also <xref linkend=\"boot-screen\"/>)</phrase>. Note that "
+"on most architectures the boot loader interprets your keyboard as a QWERTY "
+"keyboard."
msgstr ""
"一些用户,比如有视觉障碍的,可能需要特别的支持。<phrase arch=\"ia64;powerpc;"
"x86\">USB 盲文点字显示器(braille displays)可以自动检测到,但多数情况下其他的"
@@ -2289,13 +2314,13 @@ msgstr ""
"loader 将视您的键盘为 QWERTY 布局。"
#. Tag: title
-#: boot-installer.xml:1914
+#: boot-installer.xml:1858
#, no-c-format
msgid "USB Braille Displays"
msgstr "USB 盲文点显器"
#. Tag: para
-#: boot-installer.xml:1915
+#: boot-installer.xml:1859
#, no-c-format
msgid ""
"USB braille displays should be automatically detected. A textual version of "
@@ -2314,14 +2339,31 @@ msgstr ""
"website</ulink> 可以找到盲文点显器的键绑定文档。"
#. Tag: title
-#: boot-installer.xml:1930
+#: boot-installer.xml:1874
#, no-c-format
msgid "Serial Braille Displays"
msgstr "串口盲文点显器"
#. Tag: para
-#: boot-installer.xml:1931
-#, no-c-format
+#: boot-installer.xml:1875
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Serial braille displays cannot safely be automatically detected (since "
+#| "that may damage some of them). You thus need to append the "
+#| "<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
+#| "replaceable>,<replaceable>table</replaceable></userinput> boot parameter "
+#| "to tell <classname>brltty</classname> which driver it should use. "
+#| "<replaceable>driver</replaceable> should be replaced by the two-letter "
+#| "driver code for your terminal (see the <ulink url=\"&url-brltty-manual;"
+#| "\">driver code list</ulink>). <replaceable>port</replaceable> should be "
+#| "replaced by the name of the serial port the display is connected to, "
+#| "<userinput>ttyS0</userinput> is the default. <replaceable>table</"
+#| "replaceable> is the name of the braille table to be used (see the <ulink "
+#| "url=\"&url-brltty-manual;\">table code list</ulink>); the English table "
+#| "is the default. Note that the table can be changed later by entering the "
+#| "preference menu. Documentation on key bindings for braille devices is "
+#| "available on the <ulink url=\"&url-brltty-driver-help;"
+#| "\"><classname>brltty</classname> website</ulink>."
msgid ""
"Serial braille displays cannot safely be automatically detected (since that "
"may damage some of them). You thus need to append the "
@@ -2330,15 +2372,16 @@ msgid ""
"tell <classname>brltty</classname> which driver it should use. "
"<replaceable>driver</replaceable> should be replaced by the two-letter "
"driver code for your terminal (see the <ulink url=\"&url-brltty-manual;"
-"\">driver code list</ulink>). <replaceable>port</replaceable> should be "
+"\">BRLTTY manual</ulink>). <replaceable>port</replaceable> should be "
"replaced by the name of the serial port the display is connected to, "
-"<userinput>ttyS0</userinput> is the default. <replaceable>table</"
-"replaceable> is the name of the braille table to be used (see the <ulink url="
-"\"&url-brltty-manual;\">table code list</ulink>); the English table is "
-"the default. Note that the table can be changed later by entering the "
-"preference menu. Documentation on key bindings for braille devices is "
-"available on the <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</"
-"classname> website</ulink>."
+"<userinput>ttyS0</userinput> is the default, <userinput>ttyUSB0</userinput> "
+"can be typically used when using a serial-to-USB converter. "
+"<replaceable>table</replaceable> is the name of the braille table to be used "
+"(see the <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>); the "
+"English table is the default. Note that the table can be changed later by "
+"entering the preference menu. Documentation on key bindings for braille "
+"devices is available on the <ulink url=\"&url-brltty-driver-help;"
+"\"><classname>brltty</classname> website</ulink>."
msgstr ""
"系统无法安全地检测到串口盲文点显器(因为这可能会导致某些损坏)。您需要添加 "
"<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
@@ -2348,30 +2391,51 @@ msgstr ""
"brltty-driver-codes;\">driver code list</ulink>)。<replaceable>port</"
"replaceable> 应该替换为该设备连接使用的串口名,默认为 <userinput>ttyS0</"
"userinput>。 <replaceable>table</replaceable> 是使用的 braille table 名(参阅 "
-"<ulink url=\"&url-brltty-manual;\">table code list</ulink>);默认为英"
-"语。注意该表可以在后续菜单中选择修改。该设备的键绑定文档可以在 <ulink url="
-"\"&url-brltty-driver-help;\"><classname>brltty</classname> website</ulink> 找"
-"到。"
+"<ulink url=\"&url-brltty-manual;\">table code list</ulink>);默认为英语。注意"
+"该表可以在后续菜单中选择修改。该设备的键绑定文档可以在 <ulink url=\"&url-"
+"brltty-driver-help;\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
-#: boot-installer.xml:1953
+#: boot-installer.xml:1897 boot-installer.xml:2872
+#, fuzzy, no-c-format
+#| msgid "Hardware Speech Synthesis"
+msgid "Software Speech Synthesis"
+msgstr "硬件语音合成(Hardware Speech Synthesis)"
+
+#. Tag: para
+#: boot-installer.xml:1898
+#, no-c-format
+msgid ""
+"Support for software speech synthesis can be activated by selecting it in "
+"the boot menu by typing <userinput>s</userinput> &enterkey;. The first "
+"question (language) is spoken in english, and the remainder of installation "
+"is spoken in the selected language (if available in <classname>espeak</"
+"classname>)."
+msgstr ""
+
+#. Tag: title
+#: boot-installer.xml:1909
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1954
-#, no-c-format
+#: boot-installer.xml:1910
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Support for hardware speech synthesis devices is available only alongside "
+#| "support for graphical installer. You thus need to select the "
+#| "<quote>Graphical install</quote> entry in the boot menu."
msgid ""
"Support for hardware speech synthesis devices is available only alongside "
-"support for graphical installer. You thus need to select the "
-"<quote>Graphical install</quote> entry in the boot menu."
+"support for graphical installer. You thus need to select a <quote>Graphical "
+"install</quote> entry in the boot menu."
msgstr ""
"对于硬件语音合成设备的支持只在图形界面安装程序下有效。您需要在引导菜单里面选"
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:1960
+#: boot-installer.xml:1916
#, no-c-format
msgid ""
"Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2391,13 +2455,13 @@ msgstr ""
"对于语音合成设备的支持也会被自动安装到最终系统里面。"
#. Tag: title
-#: boot-installer.xml:1975
+#: boot-installer.xml:1931
#, no-c-format
msgid "Board Devices"
msgstr "板卡设备"
#. Tag: para
-#: boot-installer.xml:1976
+#: boot-installer.xml:1932
#, no-c-format
msgid ""
"Some accessibility devices are actual boards that are plugged inside the "
@@ -2412,7 +2476,7 @@ msgstr ""
"数量。"
#. Tag: para
-#: boot-installer.xml:1984
+#: boot-installer.xml:1940
#, no-c-format
msgid ""
"If desired a textual version of the bootloader can be activated before "
@@ -2422,13 +2486,13 @@ msgstr ""
"userinput> &enterkey;。"
#. Tag: title
-#: boot-installer.xml:1992
+#: boot-installer.xml:1948
#, no-c-format
msgid "High-Contrast Theme"
msgstr "高亮主题"
#. Tag: para
-#: boot-installer.xml:1993
+#: boot-installer.xml:1949
#, no-c-format
msgid ""
"For users with low vision, the installer can use a high-contrast theme that "
@@ -2438,8 +2502,22 @@ msgstr ""
"对于视力弱的用户,安装程序可以使用高亮主题增加可读性。打开它,设置 "
"<userinput>theme=dark</userinput> 引导参数即可。"
+#. Tag: title
+#: boot-installer.xml:1958
+#, no-c-format
+msgid "Preseeding"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:1959
+#, no-c-format
+msgid ""
+"Alternatively, &debian; can be installed completely automatically by using "
+"preseeding. This is documented in <xref linkend=\"appendix-preseed\"/>."
+msgstr ""
+
#. Tag: para
-#: boot-installer.xml:2008
+#: boot-installer.xml:1974
#, no-c-format
msgid ""
"Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2452,7 +2530,7 @@ msgstr ""
"要给内核一点小小的帮助。"
#. Tag: para
-#: boot-installer.xml:2015
+#: boot-installer.xml:1981
#, no-c-format
msgid ""
"If this is the first time you're booting the system, try the default boot "
@@ -2465,7 +2543,7 @@ msgstr ""
"的硬件特定参数。"
#. Tag: para
-#: boot-installer.xml:2022
+#: boot-installer.xml:1988
#, no-c-format
msgid ""
"Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2480,7 +2558,7 @@ msgstr ""
"linkend=\"boot-troubleshooting\"/>。"
#. Tag: para
-#: boot-installer.xml:2031
+#: boot-installer.xml:1997
#, no-c-format
msgid ""
"When the kernel boots, a message <informalexample><screen>\n"
@@ -2507,7 +2585,7 @@ msgstr ""
"64MB 内存。"
#. Tag: para
-#: boot-installer.xml:2047
+#: boot-installer.xml:2013
#, no-c-format
msgid ""
"If you are booting with a serial console, generally the kernel will "
@@ -2536,7 +2614,7 @@ msgstr ""
"para> </footnote>。"
#. Tag: para
-#: boot-installer.xml:2071
+#: boot-installer.xml:2037
#, no-c-format
msgid ""
"For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2549,13 +2627,13 @@ msgstr ""
"<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
#. Tag: title
-#: boot-installer.xml:2082
+#: boot-installer.xml:2048
#, no-c-format
msgid "&debian; Installer Parameters"
msgstr "&debian; 安装程序的参数"
#. Tag: para
-#: boot-installer.xml:2083
+#: boot-installer.xml:2049
#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
@@ -2568,7 +2646,7 @@ msgstr ""
"para> </footnote>,它们很有用。"
#. Tag: para
-#: boot-installer.xml:2096
+#: boot-installer.xml:2062
#, no-c-format
msgid ""
"A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2582,19 +2660,19 @@ msgstr ""
"用简写。"
#. Tag: term
-#: boot-installer.xml:2108
+#: boot-installer.xml:2074
#, no-c-format
msgid "debconf/priority (priority)"
msgstr "debconf/priority (priority)"
#. Tag: para
-#: boot-installer.xml:2109
+#: boot-installer.xml:2075
#, no-c-format
msgid "This parameter sets the lowest priority of messages to be displayed."
msgstr "这些参数设置将设置显示的信息为最低的级别。"
#. Tag: para
-#: boot-installer.xml:2113
+#: boot-installer.xml:2079
#, no-c-format
msgid ""
"The default installation uses <userinput>priority=high</userinput>. This "
@@ -2607,7 +2685,7 @@ msgstr ""
"将按照要求调整优先级别。"
#. Tag: para
-#: boot-installer.xml:2120
+#: boot-installer.xml:2086
#, no-c-format
msgid ""
"If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2625,14 +2703,29 @@ msgstr ""
"且尝试正确无误地执行各项事宜。"
#. Tag: term
-#: boot-installer.xml:2134
+#: boot-installer.xml:2100
#, no-c-format
msgid "DEBIAN_FRONTEND"
msgstr "DEBIAN_FRONTEND"
#. Tag: para
-#: boot-installer.xml:2135
-#, no-c-format
+#: boot-installer.xml:2101
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This boot parameter controls the type of user interface used for the "
+#| "installer. The current possible parameter settings are: <itemizedlist> "
+#| "<listitem> <para><userinput>DEBIAN_FRONTEND=noninteractive</userinput></"
+#| "para> </listitem><listitem> <para><userinput>DEBIAN_FRONTEND=text</"
+#| "userinput></para> </listitem><listitem> "
+#| "<para><userinput>DEBIAN_FRONTEND=newt</userinput></para> </"
+#| "listitem><listitem> <para><userinput>DEBIAN_FRONTEND=gtk</userinput></"
+#| "para> </listitem> </itemizedlist> The default frontend is "
+#| "<userinput>DEBIAN_FRONTEND=newt</userinput>. "
+#| "<userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for serial "
+#| "console installs. Generally, only the <userinput>newt</userinput> "
+#| "frontend is available on default install media. On architectures that "
+#| "support it, the graphical installer uses the <userinput>gtk</userinput> "
+#| "frontend."
msgid ""
"This boot parameter controls the type of user interface used for the "
"installer. The current possible parameter settings are: <itemizedlist> "
@@ -2644,9 +2737,11 @@ msgid ""
"</listitem> </itemizedlist> The default frontend is "
"<userinput>DEBIAN_FRONTEND=newt</userinput>. "
"<userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for serial "
-"console installs. Generally, only the <userinput>newt</userinput> frontend "
-"is available on default install media. On architectures that support it, the "
-"graphical installer uses the <userinput>gtk</userinput> frontend."
+"console installs. Some specialized types of install media may only offer a "
+"limited selection of frontends, but the <userinput>newt</userinput> and "
+"<userinput>text</userinput> frontends are available on most default install "
+"media. On architectures that support it, the graphical installer uses the "
+"<userinput>gtk</userinput> frontend."
msgstr ""
"这个引导参数控制用于安装程序的用户界面的类型。当前可能参数设置有:"
"<itemizedlist> <listitem> <para><userinput>DEBIAN_FRONTEND=noninteractive</"
@@ -2661,13 +2756,13 @@ msgstr ""
"用。图形安装程序可以在所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
-#: boot-installer.xml:2164
+#: boot-installer.xml:2132
#, no-c-format
msgid "BOOT_DEBUG"
msgstr "BOOT_DEBUG"
#. Tag: para
-#: boot-installer.xml:2165
+#: boot-installer.xml:2133
#, no-c-format
msgid ""
"Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2679,49 +2774,49 @@ msgstr ""
"debug shell。(退出 shell 以后会继续引导过程。)"
#. Tag: userinput
-#: boot-installer.xml:2174
+#: boot-installer.xml:2142
#, no-c-format
msgid "BOOT_DEBUG=0"
msgstr "BOOT_DEBUG=0"
#. Tag: para
-#: boot-installer.xml:2175
+#: boot-installer.xml:2143
#, no-c-format
msgid "This is the default."
msgstr "此为默认。"
#. Tag: userinput
-#: boot-installer.xml:2179
+#: boot-installer.xml:2147
#, no-c-format
msgid "BOOT_DEBUG=1"
msgstr "BOOT_DEBUG=1"
#. Tag: para
-#: boot-installer.xml:2180
+#: boot-installer.xml:2148
#, no-c-format
msgid "More verbose than usual."
msgstr "更多的信息。"
#. Tag: userinput
-#: boot-installer.xml:2184
+#: boot-installer.xml:2152
#, no-c-format
msgid "BOOT_DEBUG=2"
msgstr "BOOT_DEBUG=2"
#. Tag: para
-#: boot-installer.xml:2185
+#: boot-installer.xml:2153
#, no-c-format
msgid "Lots of debugging information."
msgstr "大量的调试信息。"
#. Tag: userinput
-#: boot-installer.xml:2189
+#: boot-installer.xml:2157
#, no-c-format
msgid "BOOT_DEBUG=3"
msgstr "BOOT_DEBUG=3"
#. Tag: para
-#: boot-installer.xml:2190
+#: boot-installer.xml:2158
#, no-c-format
msgid ""
"Shells are run at various points in the boot process to allow detailed "
@@ -2731,13 +2826,13 @@ msgstr ""
"Shell 将继续引导过程。"
#. Tag: term
-#: boot-installer.xml:2204
+#: boot-installer.xml:2172
#, no-c-format
msgid "INSTALL_MEDIA_DEV"
msgstr "INSTALL_MEDIA_DEV"
#. Tag: para
-#: boot-installer.xml:2205
+#: boot-installer.xml:2173
#, no-c-format
msgid ""
"The value of the parameter is the path to the device to load the &debian; "
@@ -2748,7 +2843,7 @@ msgstr ""
"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
#. Tag: para
-#: boot-installer.xml:2211
+#: boot-installer.xml:2179
#, no-c-format
msgid ""
"The boot floppy, which normally scans all floppies it can to find the root "
@@ -2757,13 +2852,34 @@ msgstr ""
"引导软盘通常会扫描所有的软盘来找到根软盘,可以通过此参数设置只查找一个设备。"
#. Tag: term
-#: boot-installer.xml:2221
+#: boot-installer.xml:2190
+#, no-c-format
+msgid "log_host"
+msgstr ""
+
+#. Tag: term
+#: boot-installer.xml:2191
+#, no-c-format
+msgid "log_port"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2192
+#, no-c-format
+msgid ""
+"Causes the installer to send log messages to a remote syslog on the "
+"specified host and port as well as to a local file. If not specified, the "
+"port defaults to the standard syslog port 514."
+msgstr ""
+
+#. Tag: term
+#: boot-installer.xml:2203
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: boot-installer.xml:2222
+#: boot-installer.xml:2204
#, no-c-format
msgid ""
"Can be used to force the installer to a lowmem level higher than the one the "
@@ -2774,13 +2890,13 @@ msgstr ""
"和 2。参阅 <xref linkend=\"lowmem\"/>。"
#. Tag: term
-#: boot-installer.xml:2232
+#: boot-installer.xml:2214
#, no-c-format
msgid "noshell"
msgstr "noshell"
#. Tag: para
-#: boot-installer.xml:2233
+#: boot-installer.xml:2215
#, no-c-format
msgid ""
"Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2790,13 +2906,13 @@ msgstr ""
"处。"
#. Tag: term
-#: boot-installer.xml:2242
+#: boot-installer.xml:2224
#, no-c-format
msgid "debian-installer/framebuffer (fb)"
msgstr "debian-installer/framebuffer (fb)"
#. Tag: para
-#: boot-installer.xml:2243
+#: boot-installer.xml:2225
#, no-c-format
msgid ""
"Some architectures use the kernel framebuffer to offer installation in a "
@@ -2812,13 +2928,13 @@ msgstr ""
"bogl 的相关错误信息、一个空白的屏幕,或者在开始安装几分钟后停止。"
#. Tag: para
-#: boot-installer.xml:2252
+#: boot-installer.xml:2234
#, no-c-format
msgid "Such problems have been reported on hppa."
msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
-#: boot-installer.xml:2256
+#: boot-installer.xml:2238
#, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
@@ -2835,13 +2951,13 @@ msgstr ""
"<userinput>fb=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2270
+#: boot-installer.xml:2252
#, no-c-format
msgid "debian-installer/theme (theme)"
msgstr "debian-installer/theme (theme)"
#. Tag: para
-#: boot-installer.xml:2271
+#: boot-installer.xml:2253
#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
@@ -2856,13 +2972,13 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2283 boot-installer.xml:2516
+#: boot-installer.xml:2265 boot-installer.xml:2498
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
#. Tag: para
-#: boot-installer.xml:2284
+#: boot-installer.xml:2266
#, no-c-format
msgid ""
"By default, the &d-i; automatically probes for network configuration via "
@@ -2874,7 +2990,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:2291
+#: boot-installer.xml:2273
#, no-c-format
msgid ""
"If you have a DHCP server on your local network, but want to avoid it "
@@ -2887,13 +3003,13 @@ msgstr ""
"过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
-#: boot-installer.xml:2302
+#: boot-installer.xml:2284
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:2303
+#: boot-installer.xml:2285
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -2903,13 +3019,13 @@ msgstr ""
"携机会有这种现象。"
#. Tag: term
-#: boot-installer.xml:2313
+#: boot-installer.xml:2295
#, no-c-format
msgid "disk-detect/dmraid/enable (dmraid)"
msgstr "disk-detect/dmraid/enable (dmraid)"
#. Tag: para
-#: boot-installer.xml:2314
+#: boot-installer.xml:2296
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -2923,13 +3039,13 @@ msgstr ""
"ulink> 找到。"
#. Tag: term
-#: boot-installer.xml:2325
+#: boot-installer.xml:2307
#, no-c-format
msgid "preseed/url (url)"
msgstr "preseed/url (url)"
#. Tag: para
-#: boot-installer.xml:2326
+#: boot-installer.xml:2308
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use for "
@@ -2939,13 +3055,13 @@ msgstr ""
"install\"/>。"
#. Tag: term
-#: boot-installer.xml:2335
+#: boot-installer.xml:2317
#, no-c-format
msgid "preseed/file (file)"
msgstr "preseed/file (file)"
#. Tag: para
-#: boot-installer.xml:2336
+#: boot-installer.xml:2318
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load for automating the "
@@ -2955,13 +3071,13 @@ msgstr ""
">。"
#. Tag: term
-#: boot-installer.xml:2345
+#: boot-installer.xml:2327
#, no-c-format
msgid "preseed/interactive"
msgstr "preseed/interactive"
#. Tag: para
-#: boot-installer.xml:2346
+#: boot-installer.xml:2328
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to display questions even if they have "
@@ -2975,13 +3091,13 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
#. Tag: term
-#: boot-installer.xml:2358
+#: boot-installer.xml:2340
#, no-c-format
msgid "auto-install/enable (auto)"
msgstr "auto-install/enable (auto)"
#. Tag: para
-#: boot-installer.xml:2359
+#: boot-installer.xml:2341
#, no-c-format
msgid ""
"Delay questions that are normally asked before preseeding is possible until "
@@ -2992,13 +3108,13 @@ msgstr ""
"auto\"/> 了解自动安装的详细信息。"
#. Tag: term
-#: boot-installer.xml:2370
+#: boot-installer.xml:2352
#, no-c-format
msgid "finish-install/keep-consoles"
msgstr "finish-install/keep-consoles"
#. Tag: para
-#: boot-installer.xml:2371
+#: boot-installer.xml:2353
#, no-c-format
msgid ""
"During installations from serial or management console, the regular virtual "
@@ -3009,13 +3125,13 @@ msgstr ""
"inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
#. Tag: term
-#: boot-installer.xml:2382
+#: boot-installer.xml:2364
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:2383
+#: boot-installer.xml:2365
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3031,7 +3147,7 @@ msgstr ""
"新加载介质。"
#. Tag: para
-#: boot-installer.xml:2392
+#: boot-installer.xml:2374
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3042,13 +3158,13 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:2403
+#: boot-installer.xml:2385
#, no-c-format
msgid "base-installer/install-recommends (recommends)"
msgstr "base-installer/install-recommends (recommends)"
#. Tag: para
-#: boot-installer.xml:2404
+#: boot-installer.xml:2386
#, no-c-format
msgid ""
"By setting this option to <userinput>false</userinput>, the package "
@@ -3061,7 +3177,7 @@ msgstr ""
"<xref linkend=\"di-install-base\"/>。"
#. Tag: para
-#: boot-installer.xml:2411
+#: boot-installer.xml:2393
#, no-c-format
msgid ""
"Note that this option allows to have a leaner system, but can also result in "
@@ -3075,13 +3191,13 @@ msgstr ""
"非常有经验的用户来使用。"
#. Tag: term
-#: boot-installer.xml:2423
+#: boot-installer.xml:2405
#, no-c-format
msgid "debian-installer/allow_unauthenticated"
msgstr "debian-installer/allow_unauthenticated"
#. Tag: para
-#: boot-installer.xml:2424
+#: boot-installer.xml:2406
#, no-c-format
msgid ""
"By default the installer requires that repositories be authenticated using a "
@@ -3094,13 +3210,13 @@ msgstr ""
"emphasis>"
#. Tag: term
-#: boot-installer.xml:2435
+#: boot-installer.xml:2417
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:2436
+#: boot-installer.xml:2418
#, no-c-format
msgid ""
"This parameter should already be set to a correct value where needed; set it "
@@ -3111,13 +3227,13 @@ msgstr ""
"置。该值的单位是 kB。"
#. Tag: term
-#: boot-installer.xml:2446
+#: boot-installer.xml:2428
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:2447
+#: boot-installer.xml:2429
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3127,13 +3243,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2460
+#: boot-installer.xml:2442
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2461
+#: boot-installer.xml:2443
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3146,25 +3262,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2473
+#: boot-installer.xml:2455
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2474
+#: boot-installer.xml:2456
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2475
+#: boot-installer.xml:2457
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2476
+#: boot-installer.xml:2458
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3174,7 +3290,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2481
+#: boot-installer.xml:2463
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3192,7 +3308,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2490
+#: boot-installer.xml:2472
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3207,13 +3323,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2502
+#: boot-installer.xml:2484
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2503
+#: boot-installer.xml:2485
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3228,7 +3344,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2517
+#: boot-installer.xml:2499
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3237,13 +3353,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2526
+#: boot-installer.xml:2508
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2527
+#: boot-installer.xml:2509
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3258,13 +3374,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2540
+#: boot-installer.xml:2522
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2541
+#: boot-installer.xml:2523
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3275,13 +3391,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2555
+#: boot-installer.xml:2537
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2556
+#: boot-installer.xml:2538
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3301,7 +3417,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2569
+#: boot-installer.xml:2551
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3313,7 +3429,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2576
+#: boot-installer.xml:2558
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3333,19 +3449,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2586
+#: boot-installer.xml:2568
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2592
+#: boot-installer.xml:2574
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2593
+#: boot-installer.xml:2575
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3360,7 +3476,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2602
+#: boot-installer.xml:2584
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3374,7 +3490,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2610
+#: boot-installer.xml:2592
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3386,19 +3502,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2626
+#: boot-installer.xml:2608
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2631
+#: boot-installer.xml:2613
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2632
+#: boot-installer.xml:2614
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3410,7 +3526,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2639
+#: boot-installer.xml:2621
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3421,13 +3537,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2645
+#: boot-installer.xml:2627
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2650
+#: boot-installer.xml:2632
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3435,7 +3551,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2656
+#: boot-installer.xml:2638
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3448,7 +3564,7 @@ msgstr ""
"的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2666
+#: boot-installer.xml:2648
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3459,7 +3575,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2672
+#: boot-installer.xml:2654
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3467,13 +3583,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2680
+#: boot-installer.xml:2662
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2683
+#: boot-installer.xml:2665
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3481,7 +3597,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:2689
+#: boot-installer.xml:2671
#, no-c-format
msgid ""
"If your system boots correctly from the CD-ROM, it does not necessarily mean "
@@ -3492,7 +3608,7 @@ msgstr ""
"(或者,更准确一点,CD-ROM 驱动器所连接的控制器)。"
#. Tag: para
-#: boot-installer.xml:2696
+#: boot-installer.xml:2678
#, no-c-format
msgid ""
"Some older CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3502,19 +3618,19 @@ msgstr ""
"常工作。"
#. Tag: title
-#: boot-installer.xml:2707
+#: boot-installer.xml:2689
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2708
+#: boot-installer.xml:2690
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2713
+#: boot-installer.xml:2695
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (older systems "
@@ -3524,7 +3640,7 @@ msgstr ""
"持您所使用的介质。"
#. Tag: para
-#: boot-installer.xml:2719
+#: boot-installer.xml:2701
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3548,7 +3664,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2732
+#: boot-installer.xml:2714
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3570,7 +3686,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2737
+#: boot-installer.xml:2719
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3589,7 +3705,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:2749
+#: boot-installer.xml:2731
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3601,7 +3717,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2756
+#: boot-installer.xml:2738
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3629,7 +3745,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:2770
+#: boot-installer.xml:2752
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3641,7 +3757,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:2778
+#: boot-installer.xml:2760
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3656,7 +3772,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:2788
+#: boot-installer.xml:2770
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3681,7 +3797,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:2803
+#: boot-installer.xml:2785
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3693,13 +3809,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:2818
+#: boot-installer.xml:2800
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:2820
+#: boot-installer.xml:2802
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -3708,7 +3824,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:2825
+#: boot-installer.xml:2807
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3724,7 +3840,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:2834
+#: boot-installer.xml:2816
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3739,7 +3855,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:2843
+#: boot-installer.xml:2825
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3750,7 +3866,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:2849
+#: boot-installer.xml:2831
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -3761,7 +3877,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:2855
+#: boot-installer.xml:2837
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3772,13 +3888,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:2864
+#: boot-installer.xml:2846
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:2866
+#: boot-installer.xml:2848
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3791,7 +3907,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:2873
+#: boot-installer.xml:2855
#, no-c-format
msgid ""
"Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -3803,7 +3919,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: boot-installer.xml:2879
+#: boot-installer.xml:2861
#, no-c-format
msgid ""
"If you have a large amount of memory installed in your machine, more than "
@@ -3815,14 +3931,50 @@ msgstr ""
"可能需要加入一个引导参数,来限制内核能够看到的内存数量,比如 "
"<userinput>mem=512m</userinput>。"
+#. Tag: para
+#: boot-installer.xml:2874
+#, no-c-format
+msgid ""
+"If software speech synthesis does not work, there is most probably an issue "
+"with your sound board, usually because either the driver for it is not "
+"included in the installer, or because it has unusual mixer level names which "
+"are set to muted by default. You should thus submit a bug report which "
+"includes the output of the following commands, run on the same machine from "
+"a Linux system which is known to have sound working (e.g., a live CD)."
+msgstr ""
+
+#. Tag: userinput
+#: boot-installer.xml:2885
+#, no-c-format
+msgid "dmesg"
+msgstr ""
+
+#. Tag: userinput
+#: boot-installer.xml:2887
+#, no-c-format
+msgid "lspci"
+msgstr ""
+
+#. Tag: userinput
+#: boot-installer.xml:2889
+#, no-c-format
+msgid "lsmod"
+msgstr ""
+
+#. Tag: userinput
+#: boot-installer.xml:2891
+#, no-c-format
+msgid "amixer"
+msgstr ""
+
#. Tag: title
-#: boot-installer.xml:2890 boot-installer.xml:2992
+#: boot-installer.xml:2899 boot-installer.xml:3001
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:2891
+#: boot-installer.xml:2900
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3830,7 +3982,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:2896
+#: boot-installer.xml:2905
#, no-c-format
msgid ""
"Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -3841,7 +3993,7 @@ msgstr ""
"息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:2902
+#: boot-installer.xml:2911
#, no-c-format
msgid ""
"On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -3859,7 +4011,7 @@ msgstr ""
"replaceable>,<replaceable>sectors</replaceable></userinput>。"
#. Tag: para
-#: boot-installer.xml:2911
+#: boot-installer.xml:2920
#, no-c-format
msgid ""
"If you have a very old machine, and the kernel hangs after saying "
@@ -3872,7 +4024,7 @@ msgstr ""
"userinput> 参数来取消这个测试。"
#. Tag: para
-#: boot-installer.xml:2918
+#: boot-installer.xml:2927
#, no-c-format
msgid ""
"Some systems (especially laptops) that have a native resolution that is not "
@@ -3895,7 +4047,7 @@ msgstr ""
"boot 参数 <userinput>fb=false</userinput>。"
#. Tag: para
-#: boot-installer.xml:2936
+#: boot-installer.xml:2945
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3913,13 +4065,13 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:2950
+#: boot-installer.xml:2959
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:2951
+#: boot-installer.xml:2960
#, no-c-format
msgid ""
"Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -3937,7 +4089,7 @@ msgstr ""
"段。"
#. Tag: para
-#: boot-installer.xml:2961
+#: boot-installer.xml:2970
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3957,13 +4109,13 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: title
-#: boot-installer.xml:2978
+#: boot-installer.xml:2987
#, no-c-format
msgid "System Freeze while Loading USB Modules"
msgstr "在装入 USB 模块时系统停止"
#. Tag: para
-#: boot-installer.xml:2979
+#: boot-installer.xml:2988
#, no-c-format
msgid ""
"The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -3979,19 +4131,19 @@ msgstr ""
"<userinput>nousb</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:2993
+#: boot-installer.xml:3002
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:2999
+#: boot-installer.xml:3008
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3000
+#: boot-installer.xml:3009
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4015,7 +4167,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3014
+#: boot-installer.xml:3023
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4028,13 +4180,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3025
+#: boot-installer.xml:3034
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3026
+#: boot-installer.xml:3035
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4045,19 +4197,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3032
+#: boot-installer.xml:3041
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3041
+#: boot-installer.xml:3050
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3043
+#: boot-installer.xml:3052
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4091,13 +4243,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3068
+#: boot-installer.xml:3077
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3069
+#: boot-installer.xml:3078
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4114,7 +4266,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3080
+#: boot-installer.xml:3089
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4125,13 +4277,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3091
+#: boot-installer.xml:3100
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3092
+#: boot-installer.xml:3101
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4143,7 +4295,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3099
+#: boot-installer.xml:3108
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4154,7 +4306,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3105
+#: boot-installer.xml:3114
#, no-c-format
msgid ""
"If you have a working &debian; system, the easiest way to send an "
@@ -4173,7 +4325,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3115
+#: boot-installer.xml:3124
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
@@ -4258,3 +4410,94 @@ msgstr ""
" and ideas you had during the initial install.&gt;\n"
"</screen></informalexample> 在 bug 报告中,请说明问题所在,包括内核挂起时最后"
"见到的内核消息。描述进入问题状态所进行的步骤。"
+
+#~ msgid "Booting the NSLU2"
+#~ msgstr "引导 NSLU2"
+
+#~ msgid "There are three ways how to put the installer firmware into flash:"
+#~ msgstr "有三种方式可以将安装程序的固件放入闪存:"
+
+#~ msgid "Using the NSLU2 web interface"
+#~ msgstr "使用 NSLU2 的 web 界面"
+
+#~ msgid ""
+#~ "Go to the administration section and choose the menu item "
+#~ "<literal>Upgrade</literal>. You can then browse your disk for the "
+#~ "installer image you have previously downloaded. Then press the "
+#~ "<literal>Start Upgrade</literal> button, confirm, wait for a few minutes "
+#~ "and confirm again. The system will then boot straight into the installer."
+#~ msgstr ""
+#~ "进入管理部分然后选择菜单项 <literal>Upgrade</literal>。接着从您的磁盘上找"
+#~ "到前面下载安装程序映像。然后按下 <literal>Start Upgrade</literal> 按钮,确"
+#~ "认,等几分钟再次确认。系统将直接启动进入安装程序。"
+
+#~ msgid "Via the network using Linux/Unix"
+#~ msgstr "通过网络使用 Linux/Unix"
+
+#~ msgid ""
+#~ "You can use <command>upslug2</command> from any Linux or Unix machine to "
+#~ "upgrade the machine via the network. This software is packaged for "
+#~ "&debian;. First, you have to put your NSLU2 in upgrade mode: "
+#~ "<orderedlist> <listitem><para> Disconnect any disks and/or devices from "
+#~ "the USB ports. </para></listitem> <listitem><para> Power off the NSLU2 </"
+#~ "para></listitem> <listitem><para> Press and hold the reset button "
+#~ "(accessible through the small hole on the back just above the power "
+#~ "input). </para></listitem> <listitem><para> Press and release the power "
+#~ "button to power on the NSLU2. </para></listitem> <listitem><para> Wait "
+#~ "for 10 seconds watching the ready/status LED. After 10 seconds it will "
+#~ "change from amber to red. Immediately release the reset button. </para></"
+#~ "listitem> <listitem><para> The NSLU2 ready/status LED will flash "
+#~ "alternately red/green (there is a 1 second delay before the first green). "
+#~ "The NSLU2 is now in upgrade mode. </para></listitem> </orderedlist> See "
+#~ "the <ulink url=\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary"
+#~ "\">NSLU2-Linux pages</ulink> if you have problems with this. Once your "
+#~ "NSLU2 is in upgrade mode, you can flash the new image: "
+#~ "<informalexample><screen>\n"
+#~ "sudo upslug2 -i di-nslu2.bin\n"
+#~ "</screen></informalexample> Note that the tool also shows the MAC address "
+#~ "of your NSLU2, which may come in handy to configure your DHCP server. "
+#~ "After the whole image has been written and verified, the system will "
+#~ "automatically reboot. Make sure you connect your USB disk again now, "
+#~ "otherwise the installer won't be able to find it."
+#~ msgstr ""
+#~ "您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络"
+#~ "来升级机器。&debian; 下有该软件包。首先,您必须将 NSLU2 置于升级模式: "
+#~ "<orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</"
+#~ "para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> "
+#~ "<listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></"
+#~ "listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></"
+#~ "listitem> <listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥"
+#~ "珀色变成红色。立即松开复位按钮。 </para></listitem> <listitem><para> "
+#~ "NSLU2 就绪/状态 LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延"
+#~ "迟)。NSLU2 现在处于升级模式。</para></listitem> </orderedlist> 如果您遇到"
+#~ "问题,请参考 <ulink url=\"http://www.nslu2-linux.org/wiki/OpenSlug/"
+#~ "UsingTheBinary\">NSLU2-Linux pages</ulink>。一旦 NSLU2 处于升级模式,您就"
+#~ "可以刷人新的映像:<informalexample><screen>\n"
+#~ "sudo upslug2 -i di-nslu2.bin\n"
+#~ "</screen></informalexample> 注意,该工具还会显示 NSLU2 的 MAC 地址,它可以"
+#~ "用来配置 DHCP 服务器。整个映像写入和检验后,系统将自动重启。确保 USB 磁盘"
+#~ "再次连接,否则将无法找到安装程序。"
+
+#~ msgid "Via the network using Windows"
+#~ msgstr "通过网络使用 Windows"
+
+#~ msgid ""
+#~ "There is <ulink url=\"http://www.everbesthk.com/8-download/sercomm/"
+#~ "firmware/all_router_utility.zip\">a tool</ulink> for Windows to upgrade "
+#~ "the firmware via the network."
+#~ msgstr ""
+#~ "有一个 <ulink url=\"http://www.everbesthk.com/8-download/sercomm/firmware/"
+#~ "all_router_utility.zip\">工具</ulink> 用于 Windows 通过网络升级固件。"
+
+#~ msgid ""
+#~ "If your system doesn't boot directly from CD-ROM, you can still use the "
+#~ "CD-ROM to install the system. On NewWorlds, you can also use an "
+#~ "OpenFirmware command to boot from the CD-ROM manually. Follow the "
+#~ "instructions in <xref linkend=\"boot-newworld\"/> for booting from the "
+#~ "hard disk, except use the path to <command>yaboot</command> on the CD at "
+#~ "the OF prompt, such as"
+#~ msgstr ""
+#~ "如果您的系统不支持直接从 CD 光盘启动,仍然可以采用 CD 光盘来安装系统。在 "
+#~ "NewWorlds 上面,可以使用一个 OpenFirmware 命令来手工从 CD 光盘引导。按照 "
+#~ "<xref linkend=\"boot-newworld\"/> 的方法从硬盘来进行引导,只是在 OF 提示符"
+#~ "下使用 CD 上的 <command>yaboot</command> 路径,比如:"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 5a9e3e5fb..75f09e994 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: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2012-06-22 15:03+0000\n"
"PO-Revision-Date: 2010-11-04 16:56+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -339,8 +339,9 @@ msgstr "IBM/Motorola PowerPC"
#. Tag: entry
#: hardware.xml:140
-#, no-c-format
-msgid "<entry>powerpc</entry>"
+#, fuzzy, no-c-format
+#| msgid "<entry>powerpc</entry>"
+msgid "<entry morerows=\"1\">powerpc</entry>"
msgstr "<entry>powerpc</entry>"
#. Tag: entry
@@ -503,14 +504,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:239 hardware.xml:275 hardware.xml:381 hardware.xml:400
-#: hardware.xml:483 hardware.xml:541 hardware.xml:594
+#: hardware.xml:239 hardware.xml:275 hardware.xml:364 hardware.xml:383
+#: hardware.xml:466 hardware.xml:524 hardware.xml:577
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
#. Tag: para
-#: hardware.xml:240 hardware.xml:401
+#: hardware.xml:240 hardware.xml:384
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -522,7 +523,7 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:248 hardware.xml:409 hardware.xml:518
+#: hardware.xml:248 hardware.xml:392 hardware.xml:501
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
@@ -590,44 +591,28 @@ msgstr ""
#. Tag: term
#: hardware.xml:315
#, no-c-format
-msgid "IXP4xx"
-msgstr "IXP4xx"
-
-#. Tag: para
-#: hardware.xml:316
-#, no-c-format
-msgid ""
-"The IXP4xx platform is based on Intel's XScale ARM core. Currently, only one "
-"IXP4xx based system is supported, the Linksys NSLU2. The Linksys NSLU2 "
-"(Network Storage Link for USB 2.0 Disk Drives) is a small device which "
-"allows you to easily provide storage via the network. It comes with an "
-"Ethernet connection and two USB ports to which hard drives can be connected. "
-"There is an external site with <ulink url=\"&url-arm-cyrius-nslu2;"
-"\">installation instructions</ulink>."
-msgstr ""
-"IXP4xx 平台基于 Intel XScale ARM 核心。当前,只有一个基于 IXP4xx 的系统被支"
-"持,Linksys NSLU2。Linksys NSLU2 (Network Storage Link for USB 2.0 Disk "
-"Drives) 是一个通过网络提供易用存储的小型设备。它提供了一个以太网接口和两个 "
-"USB 端口来连接硬盘。这里有一个外部网站 <ulink url=\"&url-arm-cyrius-nslu2;"
-"\">installation instructions</ulink>。"
-
-#. Tag: term
-#: hardware.xml:330
-#, no-c-format
msgid "Kirkwood"
msgstr "Kirkwood"
#. Tag: para
-#: hardware.xml:331
-#, no-c-format
+#: hardware.xml:316
+#, 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: 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)."
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: 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)."
+"support the following Kirkwood based devices: OpenRD (OpenRD-Base, OpenRD-"
+"Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-sheevaplug;\">plug "
+"computers (SheevaPlug and GuruPlug)</ulink>, and <ulink url=\"&url-arm-"
+"cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x and "
+"TS-41x models)."
msgstr ""
"Kirkwood 是 Marvell 的 SoC (system on a chip) 产品,该芯片上集成了 ARM CPU、"
"Ethernet、SATA、USB,以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood "
@@ -637,22 +622,31 @@ msgstr ""
"TS-219P; TS-410 和 TS-419P 仍然不被支持)。"
#. Tag: term
-#: hardware.xml:346
+#: hardware.xml:330
#, no-c-format
msgid "Orion5x"
msgstr "Orion5x"
#. Tag: para
-#: hardware.xml:347
-#, no-c-format
+#: hardware.xml:331
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Orion is a system on a chip (SoC) from Marvell that integrates an ARM "
+#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. There are "
+#| "many Network Attached Storage (NAS) devices on the market that are based "
+#| "on an Orion chip. We currently support the following Orion based devices: "
+#| "<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, "
+#| "<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url="
+#| "\"&url-arm-cyrius-qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and "
+#| "TS-409)."
msgid ""
"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
"Ethernet, SATA, USB, and other functionality in one chip. There are many "
"Network Attached Storage (NAS) devices on the market that are based on an "
"Orion chip. We currently support the following Orion based devices: <ulink "
"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink url="
-"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url=\"&url-arm-cyrius-"
-"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)."
+"\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> and <ulink url=\"&url-arm-"
+"cyrius-mv2120;\">HP mv2120</ulink>."
msgstr ""
"Orion 是 Marvell 的 SoC (system on a chip) 产品,芯片上集成了 ARM CPU、以太"
"网、SATA、USB,以及一些其他的功能。现在市场上有很多 NAS (Network Attached "
@@ -662,13 +656,13 @@ msgstr ""
"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
#. Tag: term
-#: hardware.xml:362
+#: hardware.xml:345
#, no-c-format
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:363
+#: hardware.xml:346
#, no-c-format
msgid ""
"The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -678,7 +672,7 @@ msgstr ""
"&debian; 是一个不错的方法。"
#. Tag: para
-#: hardware.xml:382
+#: hardware.xml:365
#, no-c-format
msgid ""
"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -694,7 +688,7 @@ msgstr ""
"位的 userland。"
#. Tag: para
-#: hardware.xml:410
+#: hardware.xml:393
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -707,7 +701,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:417
+#: hardware.xml:400
#, no-c-format
msgid ""
"However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
@@ -742,7 +736,7 @@ msgstr ""
"了。</para> </footnote>。"
#. Tag: para
-#: hardware.xml:450
+#: hardware.xml:433
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel EM64T "
@@ -753,13 +747,13 @@ msgstr ""
"的安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:459
+#: hardware.xml:442
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:460
+#: hardware.xml:443
#, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
@@ -773,7 +767,7 @@ msgstr ""
"线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:484
+#: hardware.xml:467
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -803,7 +797,7 @@ msgstr ""
"\"> debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:519
+#: hardware.xml:502
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -816,7 +810,7 @@ msgstr ""
"持 R5000。"
#. Tag: para
-#: hardware.xml:525
+#: hardware.xml:508
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -827,7 +821,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:542
+#: hardware.xml:525
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -854,13 +848,13 @@ msgstr ""
"mailing list</ulink>。"
#. Tag: title
-#: hardware.xml:570
+#: hardware.xml:553
#, no-c-format
msgid "CPU/Machine types"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:572
+#: hardware.xml:555
#, no-c-format
msgid ""
"All MIPS based Cobalt machines are supported with the exception of the Qube "
@@ -868,19 +862,19 @@ msgid ""
msgstr "除了 Qube 2700 (Qube 1),其他所有基于 MIPS 的 Cobalt 机器都获得支持。"
#. Tag: title
-#: hardware.xml:580
+#: hardware.xml:563
#, no-c-format
msgid "Supported console options"
msgstr "支持的控制台选项"
#. Tag: para
-#: hardware.xml:581
+#: hardware.xml:564
#, no-c-format
msgid "Cobalt machines use 115200 bps."
msgstr "使用 115200 bps 的 Cobalt 机器。"
#. Tag: para
-#: hardware.xml:595
+#: hardware.xml:578
#, no-c-format
msgid ""
"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -890,13 +884,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:616
+#: hardware.xml:599
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:618
+#: hardware.xml:601
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -904,13 +898,13 @@ msgid ""
msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:625
+#: hardware.xml:608
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:626
+#: hardware.xml:609
#, no-c-format
msgid ""
"Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
@@ -921,19 +915,19 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:636
+#: hardware.xml:619
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:637
+#: hardware.xml:620
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:641
+#: hardware.xml:624
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -945,7 +939,7 @@ msgstr ""
"7044-270。"
#. Tag: para
-#: hardware.xml:647
+#: hardware.xml:630
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -955,7 +949,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:652
+#: hardware.xml:635
#, no-c-format
msgid ""
"Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
@@ -964,13 +958,13 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: title
-#: hardware.xml:686
+#: hardware.xml:669
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:688
+#: hardware.xml:671
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -983,7 +977,7 @@ msgstr ""
"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:695
+#: hardware.xml:678
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -996,7 +990,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:703
+#: hardware.xml:686
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1011,7 +1005,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:711
+#: hardware.xml:694
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1026,384 +1020,384 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:727 hardware.xml:862 hardware.xml:906 hardware.xml:935
+#: hardware.xml:710 hardware.xml:845 hardware.xml:889 hardware.xml:918
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:728
+#: hardware.xml:711
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:734
+#: hardware.xml:717
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:735
+#: hardware.xml:718
#, 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:736 hardware.xml:739 hardware.xml:742 hardware.xml:745
-#: hardware.xml:748 hardware.xml:751 hardware.xml:754 hardware.xml:757
-#: hardware.xml:760 hardware.xml:763 hardware.xml:766 hardware.xml:769
-#: hardware.xml:772 hardware.xml:775 hardware.xml:778 hardware.xml:781
+#: 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
+#: hardware.xml:755 hardware.xml:758 hardware.xml:761 hardware.xml:764
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:738
+#: hardware.xml:721
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:741
+#: hardware.xml:724
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:744
+#: hardware.xml:727
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:747
+#: hardware.xml:730
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:750
+#: hardware.xml:733
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:753
+#: hardware.xml:736
#, 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:756
+#: hardware.xml:739
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:759
+#: hardware.xml:742
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:762
+#: hardware.xml:745
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:765
+#: hardware.xml:748
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:768
+#: hardware.xml:751
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:771
+#: hardware.xml:754
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:774
+#: hardware.xml:757
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:777
+#: hardware.xml:760
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:780
+#: hardware.xml:763
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:783
+#: hardware.xml:766
#, 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:784 hardware.xml:787 hardware.xml:790 hardware.xml:793
-#: hardware.xml:796 hardware.xml:799 hardware.xml:802 hardware.xml:805
-#: hardware.xml:808 hardware.xml:811 hardware.xml:814 hardware.xml:817
-#: hardware.xml:823 hardware.xml:826 hardware.xml:832 hardware.xml:838
-#: hardware.xml:844
+#: 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:791 hardware.xml:794 hardware.xml:797 hardware.xml:800
+#: hardware.xml:806 hardware.xml:809 hardware.xml:815 hardware.xml:821
+#: hardware.xml:827
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:786
+#: hardware.xml:769
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:789
+#: hardware.xml:772
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:792
+#: hardware.xml:775
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:795
+#: hardware.xml:778
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:798
+#: hardware.xml:781
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:801
+#: hardware.xml:784
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:804
+#: hardware.xml:787
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:807
+#: hardware.xml:790
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:810
+#: hardware.xml:793
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:813
+#: hardware.xml:796
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:816
+#: hardware.xml:799
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:821
+#: hardware.xml:804
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:822
+#: hardware.xml:805
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:825
+#: hardware.xml:808
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:830
+#: hardware.xml:813
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:831
+#: hardware.xml:814
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:836
+#: hardware.xml:819
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:837
+#: hardware.xml:820
#, 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:842 hardware.xml:868
+#: hardware.xml:825 hardware.xml:851
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:843
+#: hardware.xml:826
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:852
+#: hardware.xml:835
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:869
+#: hardware.xml:852
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:871
+#: hardware.xml:854
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:873
+#: hardware.xml:856
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:875
+#: hardware.xml:858
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:877
+#: hardware.xml:860
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:881 hardware.xml:912
+#: hardware.xml:864 hardware.xml:895
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:882
+#: hardware.xml:865
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:884
+#: hardware.xml:867
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:886
+#: hardware.xml:869
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:888
+#: hardware.xml:871
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:896
+#: hardware.xml:879
#, no-c-format
msgid "CHRP subarchitecture (unsupported)"
msgstr "CHRP 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:913
+#: hardware.xml:896
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:916
+#: hardware.xml:899
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:917
+#: hardware.xml:900
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: title
-#: hardware.xml:925
+#: hardware.xml:908
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:941
+#: hardware.xml:924
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:942
+#: hardware.xml:925
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:950
+#: hardware.xml:933
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:952
+#: hardware.xml:935
#, no-c-format
msgid ""
"NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1427,13 +1421,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:989
+#: hardware.xml:972
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:991
+#: hardware.xml:974
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1449,7 +1443,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1000
+#: hardware.xml:983
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1464,7 +1458,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1008
+#: hardware.xml:991
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1475,24 +1469,35 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1024
-#, no-c-format
-msgid "S/390 and zSeries machine types"
+#: hardware.xml:1007
+#, fuzzy, no-c-format
+#| msgid "S/390 and zSeries machine types"
+msgid "zSeries and System z machine types"
msgstr "S/390 与 zSeries 机器类型"
#. Tag: para
-#: hardware.xml:1025
-#, no-c-format
+#: hardware.xml:1008
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+#| "Your machine needs to support for at least the z/Architecture, "
+#| "Architecture Level Set 2. The userland is still compiled for ESA/390, "
+#| "though. All zSeries hardware is fully supported. &arch-title; support "
+#| "software is included from the kernel 2.6.32 development stream. The most "
+#| "current information about IBM's Linux support can be found at the <ulink "
+#| "url=\"http://www.ibm.com/developerworks/linux/linux390/"
+#| "development_technical.html\"> Linux on <trademark class=\"registered"
+#| "\">System z</trademark> page on developerWorks</ulink>."
msgid ""
"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
-"Your machine needs to support for at least the z/Architecture, Architecture "
-"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
-"hardware is fully supported. &arch-title; support software is included from "
-"the kernel 2.6.32 development stream. The most current information about "
-"IBM's Linux support can be found at the <ulink url=\"http://www.ibm.com/"
-"developerworks/linux/linux390/development_technical.html\"> Linux on "
-"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
-"ulink>."
+"Your machine needs to support the z/Architecture, 64-bit support is "
+"mandatory. The userland of the s390 port is still compiled for ESA/390, "
+"though. All zSeries and System z hardware is fully supported. &arch-title; "
+"support software is included from the kernel 3.1 development stream. The "
+"most current information about IBM's Linux support can be found at the "
+"<ulink url=\"http://www.ibm.com/developerworks/linux/linux390/"
+"development_technical.html\"> Linux on <trademark class=\"registered"
+"\">System z</trademark> page on developerWorks</ulink>."
msgstr ""
"&debian; Squeeze 已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/"
"Architecture、Architecture Level Set 2。不过 userland 仍然为 ESA/390 编译。所"
@@ -1502,15 +1507,31 @@ msgstr ""
"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
"ulink> 找到。"
+#. Tag: title
+#: hardware.xml:1025
+#, no-c-format
+msgid "PAV and HyperPAV"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1026
+#, no-c-format
+msgid ""
+"PAV and HyperPAV are supported transparently, multipathing is not needed to "
+"take advantage of these storage system features. Be sure to configure the "
+"devices during DASD device selection. The alias devices will not be offered "
+"neither for formatting, partitioning nor direct use."
+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:1048
+#: hardware.xml:1042
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1049
+#: hardware.xml:1043
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1522,13 +1543,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1060
+#: hardware.xml:1054
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1062
+#: hardware.xml:1056
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1541,7 +1562,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1069
+#: hardware.xml:1063
#, no-c-format
msgid ""
"The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1552,13 +1573,13 @@ msgstr ""
"32 位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1079
+#: hardware.xml:1073
#, no-c-format
msgid "<term>sun4u</term>"
msgstr "<term>sun4u</term>"
#. Tag: para
-#: hardware.xml:1081
+#: hardware.xml:1075
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1574,13 +1595,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1094
+#: hardware.xml:1088
#, no-c-format
msgid "<term>sun4v</term>"
msgstr "<term>sun4v</term>"
#. Tag: para
-#: hardware.xml:1096
+#: hardware.xml:1090
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1593,7 +1614,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1107
+#: hardware.xml:1101
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1603,13 +1624,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1116
+#: hardware.xml:1110
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1117
+#: hardware.xml:1111
#, no-c-format
msgid ""
"Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1624,13 +1645,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
+#: hardware.xml:1123 hardware.xml:1146 hardware.xml:1166 hardware.xml:1189
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1130
+#: hardware.xml:1124
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1646,7 +1667,7 @@ msgstr ""
"了一些性能。在普通系统中使用时几乎不会察觉。"
#. Tag: para
-#: hardware.xml:1139
+#: hardware.xml:1133
#, no-c-format
msgid ""
"In order to optimize the kernel for single CPU systems, you'll have to "
@@ -1663,7 +1684,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: hardware.xml:1154
+#: hardware.xml:1148
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1679,7 +1700,7 @@ msgstr ""
"器的数量(或者处理器核心数),并在单处理器系统上自动关闭 SMP 的功能。"
#. Tag: para
-#: hardware.xml:1163
+#: hardware.xml:1157
#, no-c-format
msgid ""
"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1687,7 +1708,7 @@ msgid ""
msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1173
+#: hardware.xml:1167
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1702,7 +1723,7 @@ msgstr ""
"核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1182
+#: hardware.xml:1176
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -1718,7 +1739,7 @@ msgstr ""
"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
#. Tag: para
-#: hardware.xml:1196
+#: hardware.xml:1190
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1734,7 +1755,7 @@ msgstr ""
"装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1206
+#: hardware.xml:1200
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -1745,7 +1766,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1212
+#: hardware.xml:1206
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP.<phrase arch="
@@ -1760,13 +1781,13 @@ msgstr ""
"<quote>&smp-config-option;</quote>。</phrase>"
#. Tag: title
-#: hardware.xml:1223
+#: hardware.xml:1217
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1224
+#: hardware.xml:1218
#, no-c-format
msgid ""
"You should be using a VGA-compatible display interface for the console "
@@ -1781,7 +1802,7 @@ msgstr ""
"择使用图形安装程序,本文所述的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
-#: hardware.xml:1233
+#: hardware.xml:1227
#, no-c-format
msgid ""
"&debian;'s support for graphical interfaces is determined by the underlying "
@@ -1796,13 +1817,13 @@ msgstr ""
"&x11ver; 版。"
#. Tag: para
-#: hardware.xml:1242
+#: hardware.xml:1236
#, 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:1247
+#: hardware.xml:1241
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1821,7 +1842,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1257
+#: hardware.xml:1251
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1844,13 +1865,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1279
+#: hardware.xml:1273
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1280
+#: hardware.xml:1274
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1864,7 +1885,7 @@ msgstr ""
"phrase> <phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>"
#. Tag: para
-#: hardware.xml:1289
+#: hardware.xml:1283
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1872,91 +1893,81 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1295
+#: hardware.xml:1289
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1300
+#: hardware.xml:1294
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1305
+#: hardware.xml:1299
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1310
+#: hardware.xml:1304
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1315
+#: hardware.xml:1309
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1322
+#: hardware.xml:1316
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1327
+#: hardware.xml:1321
#, 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:1332
+#: hardware.xml:1326
#, 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:1337
+#: hardware.xml:1331
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1346
+#: hardware.xml:1340
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
-"for additional PCI and USB devices are provided. The major exception is the "
-"IXP4xx platform (featuring devices such as the Linksys NSLU2) which needs a "
-"proprietary microcode for the operation of its built-in Ethernet device. "
-"Unofficial images for Linksys NSLU2 with this proprietary microcode can be "
-"obtained from the <ulink url=\"&url-slug-firmware;\">Slug-Firmware site</"
-"ulink>."
+"for additional PCI and USB devices are provided."
msgstr ""
-"在 &arch-title; 上,多数内建的以太网设备都支持,并提供额外的 PCI 和 USB 设备"
-"模块。主要的例外是 IXP4xx 平台(典型的设备是 Linksys NSLU2),它需要专用的 "
-"microcode 来操作内建的以太网设备。包含该专有 microcode 的 Linksys NSLU2 非正"
-"式映像可以从 <ulink url=\"&url-slug-firmware;\">Slug-Firmware site</ulink> 地"
-"址获得。"
#. Tag: para
-#: hardware.xml:1356
+#: hardware.xml:1345
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1363
+#: hardware.xml:1352
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1364
+#: hardware.xml:1353
#, no-c-format
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -1971,7 +1982,7 @@ msgstr ""
"linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
-#: hardware.xml:1372
+#: hardware.xml:1361
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -1982,18 +1993,7 @@ msgstr ""
"作,但是却不能在安装过程中使用。"
#. Tag: para
-#: hardware.xml:1377
-#, no-c-format
-msgid ""
-"Support for encrypted wireless during installation is currently limited to "
-"WEP. If your access point uses stronger encryption, it cannot be used during "
-"the installation process."
-msgstr ""
-"加密无线网络在安装过程中还有所限制,现在仅可以使用 WEP。如果您的 AP 采用了更"
-"健壮的加密方法,在安装时就无法使用。"
-
-#. Tag: para
-#: hardware.xml:1383
+#: hardware.xml:1366
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
@@ -2009,7 +2009,7 @@ msgstr ""
"件,并手动配置网络。"
#. Tag: para
-#: hardware.xml:1393
+#: hardware.xml:1376
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a &debian; "
@@ -2025,13 +2025,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1407
+#: hardware.xml:1390
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1408
+#: hardware.xml:1391
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -2039,13 +2039,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1415
+#: hardware.xml:1398
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1417
+#: hardware.xml:1400
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2061,7 +2061,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1427
+#: hardware.xml:1410
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2074,7 +2074,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1435
+#: hardware.xml:1418
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2091,13 +2091,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1448
+#: hardware.xml:1431
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1450
+#: hardware.xml:1433
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2106,13 +2106,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1465
+#: hardware.xml:1448
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1466
+#: hardware.xml:1449
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2129,21 +2129,30 @@ msgstr ""
"的 <classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1480
+#: hardware.xml:1463
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1481
-#, no-c-format
+#: hardware.xml:1464
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Support for hardware speech synthesis devices is determined by the "
+#| "underlying support found in <classname>speakup</classname>. "
+#| "<classname>speakup</classname> only supports integrated boards and "
+#| "external devices connected to a serial port (no USB or serial-to-USB "
+#| "adapters are supported). Details on supported hardware speech synthesis "
+#| "devices can be found on the <ulink url=\"&url-speakup;"
+#| "\"><classname>speakup</classname> website</ulink>. &debian-gnu; &release; "
+#| "ships with <classname>speakup</classname> version &speakupver;."
msgid ""
"Support for hardware speech synthesis devices is determined by the "
"underlying support found in <classname>speakup</classname>. "
"<classname>speakup</classname> only supports integrated boards and external "
-"devices connected to a serial port (no USB or serial-to-USB adapters are "
-"supported). Details on supported hardware speech synthesis devices can be "
-"found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
+"devices connected to a serial port (no USB, serial-to-USB or PCI adapters "
+"are supported). Details on supported hardware speech synthesis devices can "
+"be found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
msgstr ""
@@ -2154,13 +2163,13 @@ msgstr ""
"gnu; &release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1501
+#: hardware.xml:1484
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1502
+#: hardware.xml:1485
#, no-c-format
msgid ""
"&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2171,7 +2180,7 @@ msgstr ""
"设备。然而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1508
+#: hardware.xml:1491
#, no-c-format
msgid ""
"USB hardware generally works fine, only some USB keyboards may require "
@@ -2181,7 +2190,7 @@ msgstr ""
"\"hardware-issues\"/>)。"
#. Tag: para
-#: hardware.xml:1514
+#: hardware.xml:1497
#, no-c-format
msgid ""
"Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2192,7 +2201,7 @@ msgstr ""
"Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
#. Tag: para
-#: hardware.xml:1520
+#: hardware.xml:1503
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -2203,7 +2212,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:1526
+#: hardware.xml:1509
#, no-c-format
msgid ""
"The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2211,13 +2220,13 @@ msgid ""
msgstr "Cobalt RaQ 不支持外加设备,但 Qube 有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:1538
+#: hardware.xml:1521
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1539
+#: hardware.xml:1522
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -2232,7 +2241,7 @@ msgstr ""
"说很常见,但有些 USB 设备甚至是硬盘控制器也需要加载固件(firmware)。"
#. Tag: para
-#: hardware.xml:1547
+#: hardware.xml:1530
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2247,7 +2256,7 @@ msgstr ""
"gnu; 可以合法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1556
+#: hardware.xml:1539
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -2263,13 +2272,13 @@ msgstr ""
"息。"
#. Tag: title
-#: hardware.xml:1572
+#: hardware.xml:1555
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
msgstr "特别为 GNU/&arch-kernel; 采购硬件"
#. Tag: para
-#: hardware.xml:1574
+#: hardware.xml:1557
#, no-c-format
msgid ""
"There are several vendors, who ship systems with &debian; or other "
@@ -2283,7 +2292,7 @@ msgstr ""
"心,因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1582
+#: hardware.xml:1565
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2297,7 +2306,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1590
+#: hardware.xml:1573
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2313,13 +2322,13 @@ msgstr ""
"&arch-kernel; 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1601
+#: hardware.xml:1584
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1602
+#: hardware.xml:1585
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2331,7 +2340,7 @@ msgstr ""
"不公开的契约才能接触文档,以阻止我们发布 &arch-kernel; 驱动程序源代码。"
#. Tag: para
-#: hardware.xml:1609
+#: hardware.xml:1592
#, no-c-format
msgid ""
"Since we haven't been granted access to the documentation on these devices, "
@@ -2345,13 +2354,13 @@ msgstr ""
"识到自由软件社区也是一个重要的市场。"
#. Tag: title
-#: hardware.xml:1621
+#: hardware.xml:1604
#, no-c-format
msgid "Windows-specific Hardware"
msgstr "Windows 专用硬件"
#. Tag: para
-#: hardware.xml:1622
+#: hardware.xml:1605
#, no-c-format
msgid ""
"A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2373,7 +2382,7 @@ msgstr ""
"等功能的保留内嵌处理器的设备昂贵。"
#. Tag: para
-#: hardware.xml:1635
+#: hardware.xml:1618
#, no-c-format
msgid ""
"You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2405,7 +2414,7 @@ msgstr ""
"能下降。"
#. Tag: para
-#: hardware.xml:1656
+#: hardware.xml:1639
#, no-c-format
msgid ""
"You can help improve this situation by encouraging these manufacturers to "
@@ -2421,21 +2430,27 @@ msgstr ""
"ulink></phrase>。"
#. Tag: title
-#: hardware.xml:1674
+#: hardware.xml:1657
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1676
-#, no-c-format
+#: hardware.xml:1659
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This section will help you determine which different media types you can "
+#| "use to install &debian;. For example, if you have a floppy disk drive on "
+#| "your machine, it can be used to install &debian;. There is a whole "
+#| "chapter devoted to media, <xref linkend=\"install-methods\"/>, which "
+#| "lists the advantages and disadvantages of each media type. You may want "
+#| "to refer back to this page once you reach that section."
msgid ""
"This section will help you determine which different media types you can use "
-"to install &debian;. For example, if you have a floppy disk drive on your "
-"machine, it can be used to install &debian;. There is a whole chapter "
-"devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
-"advantages and disadvantages of each media type. You may want to refer back "
-"to this page once you reach that section."
+"to install &debian;. There is a whole chapter devoted to media, <xref "
+"linkend=\"install-methods\"/>, which lists the advantages and disadvantages "
+"of each media type. You may want to refer back to this page once you reach "
+"that section."
msgstr ""
"本章将助您选则安装 &debian; 所采用的介质。例如,您的电脑上有一个软驱,它就可"
"以用来安装 &debian;。有一整章专门用于说明介质:<xref linkend=\"install-"
@@ -2443,13 +2458,13 @@ msgstr ""
"本页。"
#. Tag: title
-#: hardware.xml:1687
+#: hardware.xml:1669
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1688
+#: hardware.xml:1670
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2460,19 +2475,19 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1694
+#: hardware.xml:1676
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1701
+#: hardware.xml:1683
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1703
+#: hardware.xml:1685
#, no-c-format
msgid ""
"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2485,7 +2500,7 @@ msgstr ""
"IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
#. Tag: para
-#: hardware.xml:1710
+#: hardware.xml:1692
#, no-c-format
msgid ""
"CD-ROM based installation is supported for some architectures. On machines "
@@ -2503,7 +2518,7 @@ msgstr ""
"installer\"/>。"
#. Tag: para
-#: hardware.xml:1722
+#: hardware.xml:1704
#, no-c-format
msgid ""
"SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2514,7 +2529,7 @@ msgstr ""
"\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
#. Tag: para
-#: hardware.xml:1728
+#: hardware.xml:1710
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2524,13 +2539,13 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:1733
+#: hardware.xml:1715
#, no-c-format
msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:1737
+#: hardware.xml:1719
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2548,13 +2563,13 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:1751
+#: hardware.xml:1733
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:1753
+#: hardware.xml:1735
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -2565,7 +2580,7 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: hardware.xml:1759
+#: hardware.xml:1741
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2575,13 +2590,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:1767
+#: hardware.xml:1749
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1769
+#: hardware.xml:1751
#, no-c-format
msgid ""
"Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
@@ -2596,13 +2611,13 @@ msgstr ""
"复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
#. Tag: title
-#: hardware.xml:1781
+#: hardware.xml:1763
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1783
+#: hardware.xml:1765
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -2619,7 +2634,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:1793
+#: hardware.xml:1775
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2630,7 +2645,7 @@ msgstr ""
"\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:1799
+#: hardware.xml:1781
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -2640,13 +2655,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:1807
+#: hardware.xml:1789
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:1809
+#: hardware.xml:1791
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -2661,13 +2676,13 @@ msgstr ""
">。"
#. Tag: title
-#: hardware.xml:1821
+#: hardware.xml:1803
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:1823
+#: hardware.xml:1805
#, no-c-format
msgid ""
"The &debian; boot disks contain a kernel which is built to maximize the "
@@ -2685,7 +2700,7 @@ msgstr ""
"的硬件上安装。"
#. Tag: para
-#: hardware.xml:1833
+#: hardware.xml:1815
#, no-c-format
msgid ""
"Generally, the &debian; installation system includes support for floppies, "
@@ -2698,7 +2713,7 @@ msgstr ""
"Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:1840
+#: hardware.xml:1822
#, no-c-format
msgid ""
"Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2713,7 +2728,7 @@ msgstr ""
"HOWTO</ulink> 以获得更详细信息。"
#. Tag: para
-#: hardware.xml:1848
+#: hardware.xml:1830
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2735,7 +2750,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:1881
+#: hardware.xml:1863
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2746,7 +2761,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:1887
+#: hardware.xml:1869
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2757,7 +2772,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:1893
+#: hardware.xml:1875
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2765,7 +2780,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:1898
+#: hardware.xml:1880
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2777,13 +2792,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:1915
+#: hardware.xml:1897
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:1917
+#: hardware.xml:1899
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2796,7 +2811,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:1924
+#: hardware.xml:1906
#, no-c-format
msgid ""
"Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2811,3 +2826,44 @@ msgstr ""
"本界面需要更多的内存,并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
"形界面两种方式之间选择,应选择普通方式。</para> </footnote>或磁盘空间上安装系"
"统或许可行,但只针对有经验的用户。"
+
+#~ msgid "IXP4xx"
+#~ msgstr "IXP4xx"
+
+#~ msgid ""
+#~ "The IXP4xx platform is based on Intel's XScale ARM core. Currently, only "
+#~ "one IXP4xx based system is supported, the Linksys NSLU2. The Linksys "
+#~ "NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small device "
+#~ "which allows you to easily provide storage via the network. It comes with "
+#~ "an Ethernet connection and two USB ports to which hard drives can be "
+#~ "connected. There is an external site with <ulink url=\"&url-arm-cyrius-"
+#~ "nslu2;\">installation instructions</ulink>."
+#~ msgstr ""
+#~ "IXP4xx 平台基于 Intel XScale ARM 核心。当前,只有一个基于 IXP4xx 的系统被"
+#~ "支持,Linksys NSLU2。Linksys NSLU2 (Network Storage Link for USB 2.0 Disk "
+#~ "Drives) 是一个通过网络提供易用存储的小型设备。它提供了一个以太网接口和两"
+#~ "个 USB 端口来连接硬盘。这里有一个外部网站 <ulink url=\"&url-arm-cyrius-"
+#~ "nslu2;\">installation instructions</ulink>。"
+
+#~ msgid ""
+#~ "On &arch-title;, most built-in Ethernet devices are supported and modules "
+#~ "for additional PCI and USB devices are provided. The major exception is "
+#~ "the IXP4xx platform (featuring devices such as the Linksys NSLU2) which "
+#~ "needs a proprietary microcode for the operation of its built-in Ethernet "
+#~ "device. Unofficial images for Linksys NSLU2 with this proprietary "
+#~ "microcode can be obtained from the <ulink url=\"&url-slug-firmware;"
+#~ "\">Slug-Firmware site</ulink>."
+#~ msgstr ""
+#~ "在 &arch-title; 上,多数内建的以太网设备都支持,并提供额外的 PCI 和 USB 设"
+#~ "备模块。主要的例外是 IXP4xx 平台(典型的设备是 Linksys NSLU2),它需要专用"
+#~ "的 microcode 来操作内建的以太网设备。包含该专有 microcode 的 Linksys "
+#~ "NSLU2 非正式映像可以从 <ulink url=\"&url-slug-firmware;\">Slug-Firmware "
+#~ "site</ulink> 地址获得。"
+
+#~ msgid ""
+#~ "Support for encrypted wireless during installation is currently limited "
+#~ "to WEP. If your access point uses stronger encryption, it cannot be used "
+#~ "during the installation process."
+#~ msgstr ""
+#~ "加密无线网络在安装过程中还有所限制,现在仅可以使用 WEP。如果您的 AP 采用了"
+#~ "更健壮的加密方法,在安装时就无法使用。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index acce5d429..1a184bb57 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: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2010-11-04 16:56+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -151,30 +151,11 @@ msgstr ""
#. Tag: title
#: install-methods.xml:113
#, no-c-format
-msgid "NSLU2 Installation Files"
-msgstr "NSLU2 安装文件"
-
-#. Tag: para
-#: install-methods.xml:114
-#, no-c-format
-msgid ""
-"A firmware image is provided for the Linksys NSLU2 which will automatically "
-"boot <classname>debian-installer</classname>. This image can be uploaded via "
-"the Linksys web frontend or with upslug2. This firmware image can be "
-"obtained from &nslu2-firmware-img;."
-msgstr ""
-"用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
-"classname>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 "
-"&nslu2-firmware-img; 获得。"
-
-#. Tag: title
-#: install-methods.xml:126
-#, no-c-format
msgid "Thecus N2100 Installation Files"
msgstr "Thecus N2100 安装文件"
#. Tag: para
-#: install-methods.xml:127
+#: install-methods.xml:114
#, no-c-format
msgid ""
"A firmware image is provided for the Thecus N2100 which will automatically "
@@ -187,13 +168,13 @@ msgstr ""
"firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:138
+#: install-methods.xml:125
#, no-c-format
msgid "GLAN Tank Installation Files"
msgstr "GLAN Tank 安装文件"
#. Tag: para
-#: install-methods.xml:139
+#: install-methods.xml:126
#, no-c-format
msgid ""
"The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
@@ -204,13 +185,13 @@ msgstr ""
"些映象可以从 &glantank-firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:149
+#: install-methods.xml:136
#, no-c-format
msgid "Kurobox Pro Installation Files"
msgstr "Kurobox Pro 安装文件"
#. Tag: para
-#: install-methods.xml:150
+#: install-methods.xml:137
#, no-c-format
msgid ""
"The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
@@ -221,13 +202,13 @@ msgstr ""
"这些映象可以从 &kuroboxpro-firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:160
+#: install-methods.xml:147
#, no-c-format
msgid "HP mv2120 Installation Files"
msgstr "HP mv2120 安装文件"
#. Tag: para
-#: install-methods.xml:161
+#: install-methods.xml:148
#, no-c-format
msgid ""
"A firmware image is provided for the HP mv2120 which will automatically boot "
@@ -242,19 +223,24 @@ msgstr ""
"映象。"
#. Tag: title
-#: install-methods.xml:173
+#: install-methods.xml:160
#, no-c-format
msgid "QNAP Turbo Station Installation Files"
msgstr "QNAP Turbo Station 安装文件"
#. Tag: para
-#: install-methods.xml:174
-#, no-c-format
+#: install-methods.xml:161
+#, fuzzy, no-c-format
+#| msgid ""
+#| "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;."
msgid ""
"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-"
+"the installation files for QNAP TS-11x, TS-21x and TS-41x models from &qnap-"
"kirkwood-firmware-img;."
msgstr ""
"QNAP Turbo Station 安装文件包括内核和 ramdisk 以及将这些映象写入 flash 的脚"
@@ -263,30 +249,35 @@ msgstr ""
"TS-219, TS-219P 的。"
#. Tag: title
-#: install-methods.xml:186
-#, no-c-format
-msgid "SheevaPlug and OpenRD Installation Files"
+#: install-methods.xml:172
+#, fuzzy, no-c-format
+#| msgid "SheevaPlug and OpenRD Installation Files"
+msgid "Plug Computer and OpenRD Installation Files"
msgstr "SheevaPlug 和 OpenRD 安装文件"
#. Tag: para
-#: install-methods.xml:187
-#, no-c-format
+#: install-methods.xml:173
+#, fuzzy, 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;."
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;."
+"The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
+"OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
+"these files from &kirkwood-marvell-firmware-img;."
msgstr ""
"Marvell SheevaPlug 和 OpenRD 设备的安装文件包括内核和 initrd 用于 U-Boot。您"
"可以从 &kirkwood-marvell-firmware-img; 获得这些文件。"
#. Tag: title
-#: install-methods.xml:237
+#: install-methods.xml:223
#, no-c-format
msgid "Creating an IPL tape"
msgstr "创建一个 IPL 磁带"
#. Tag: para
-#: install-methods.xml:239
+#: install-methods.xml:225
#, no-c-format
msgid ""
"If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
@@ -307,13 +298,13 @@ msgstr ""
"linkend=\"where-files\"/>,"
#. Tag: title
-#: install-methods.xml:263
+#: install-methods.xml:249
#, no-c-format
msgid "Creating Floppies from Disk Images"
msgstr "从软盘映像创建引导软盘"
#. Tag: para
-#: install-methods.xml:264
+#: install-methods.xml:250
#, no-c-format
msgid ""
"Bootable floppy disks are generally used as a last resort to boot the "
@@ -323,7 +314,7 @@ msgstr ""
"最后一种方法。"
#. Tag: para
-#: install-methods.xml:269
+#: install-methods.xml:255
#, no-c-format
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -331,7 +322,7 @@ msgid ""
msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
#. Tag: para
-#: install-methods.xml:274
+#: install-methods.xml:260
#, no-c-format
msgid ""
"Disk images are files containing the complete contents of a floppy disk in "
@@ -349,7 +340,7 @@ msgstr ""
"按扇区复制</emphasis>到软盘中。"
#. Tag: para
-#: install-methods.xml:285
+#: install-methods.xml:271
#, no-c-format
msgid ""
"There are different techniques for creating floppies from disk images. This "
@@ -360,7 +351,7 @@ msgstr ""
"像创建引导软盘。"
#. Tag: para
-#: install-methods.xml:291
+#: install-methods.xml:277
#, no-c-format
msgid ""
"Before you can create the floppies, you will first need to download them "
@@ -374,7 +365,7 @@ msgstr ""
"DVD,软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
#. Tag: para
-#: install-methods.xml:299
+#: install-methods.xml:285
#, no-c-format
msgid ""
"No matter which method you use to create your floppies, you should remember "
@@ -385,13 +376,13 @@ msgstr ""
"保内容不会在无意被抹掉。"
#. Tag: title
-#: install-methods.xml:307
+#: install-methods.xml:293
#, no-c-format
msgid "Writing Disk Images From a Linux or Unix System"
msgstr "从 Linux 或者 Unix 系统写软盘映像"
#. Tag: para
-#: install-methods.xml:308
+#: install-methods.xml:294
#, no-c-format
msgid ""
"To write the floppy disk image files to the floppy disks, you will probably "
@@ -423,7 +414,7 @@ msgstr ""
"(Solaris 系统中使用 <command>eject</command> 命令,请参见其手册)</phrase>。"
#. Tag: para
-#: install-methods.xml:329
+#: install-methods.xml:315
#, no-c-format
msgid ""
"Some systems attempt to automatically mount a floppy disk when you place it "
@@ -453,7 +444,7 @@ msgstr ""
"统,请咨询您的系统管理员)。</phrase>"
#. Tag: para
-#: install-methods.xml:350
+#: install-methods.xml:336
#, no-c-format
msgid ""
"If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -464,13 +455,13 @@ msgstr ""
"command> 命令能够很好地对此进行控制,当然您可能需要先安装它。"
#. Tag: title
-#: install-methods.xml:368
+#: install-methods.xml:354
#, no-c-format
msgid "Writing Disk Images From DOS, Windows, or OS/2"
msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
#. Tag: para
-#: install-methods.xml:370
+#: install-methods.xml:356
#, no-c-format
msgid ""
"If you have access to an i386 or amd64 machine, you can use one of the "
@@ -479,7 +470,7 @@ msgstr ""
"如果您能操作一台 i386 或 amd64 机器,可以使用如下方法之一往软盘复制映像文件。"
#. Tag: para
-#: install-methods.xml:375
+#: install-methods.xml:361
#, no-c-format
msgid ""
"The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -493,7 +484,7 @@ msgstr ""
"或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
#. Tag: para
-#: install-methods.xml:383
+#: install-methods.xml:369
#, no-c-format
msgid ""
"The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -504,7 +495,7 @@ msgstr ""
"可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
#. Tag: para
-#: install-methods.xml:389
+#: install-methods.xml:375
#, no-c-format
msgid ""
"These tools can be found on the Official &debian; CD-ROMs under the "
@@ -514,13 +505,13 @@ msgstr ""
"下。"
#. Tag: title
-#: install-methods.xml:402
+#: install-methods.xml:388
#, no-c-format
msgid "Writing Disk Images From MacOS"
msgstr "在 MacOS 上写磁盘映像"
#. Tag: para
-#: install-methods.xml:403
+#: install-methods.xml:389
#, no-c-format
msgid ""
"An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -540,7 +531,7 @@ msgstr ""
"您确认的确想要清空磁盘并写入磁盘映像。"
#. Tag: para
-#: install-methods.xml:414
+#: install-methods.xml:400
#, no-c-format
msgid ""
"You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -553,13 +544,13 @@ msgstr ""
"您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
#. Tag: title
-#: install-methods.xml:425
+#: install-methods.xml:411
#, no-c-format
msgid "Writing Disk Images with <command>Disk Copy</command>"
msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#. Tag: para
-#: install-methods.xml:426
+#: install-methods.xml:412
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
@@ -572,7 +563,7 @@ msgstr ""
"下载映像文件的情况。"
#. Tag: para
-#: install-methods.xml:435
+#: install-methods.xml:421
#, no-c-format
msgid ""
"Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -582,7 +573,7 @@ msgstr ""
"且用它打开 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:442
+#: install-methods.xml:428
#, no-c-format
msgid ""
"Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -593,7 +584,7 @@ msgstr ""
"<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
#. Tag: para
-#: install-methods.xml:449
+#: install-methods.xml:435
#, no-c-format
msgid ""
"<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -608,7 +599,7 @@ msgstr ""
"会删除引导区。"
#. Tag: para
-#: install-methods.xml:458
+#: install-methods.xml:444
#, no-c-format
msgid ""
"Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -620,7 +611,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: install-methods.xml:465
+#: install-methods.xml:451
#, no-c-format
msgid ""
"Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -635,13 +626,13 @@ msgstr ""
"删除它。完成后它应该会弹出软盘。"
#. Tag: title
-#: install-methods.xml:480
+#: install-methods.xml:466
#, no-c-format
msgid "Writing Disk Images with <command>suntar</command>"
msgstr "写磁盘映像:使用<command>suntar</command>"
#. Tag: para
-#: install-methods.xml:484
+#: install-methods.xml:470
#, no-c-format
msgid ""
"Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -654,21 +645,21 @@ msgstr ""
"userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
#. Tag: para
-#: install-methods.xml:492
+#: install-methods.xml:478
#, 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:498
+#: install-methods.xml:484
#, 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:503
+#: install-methods.xml:489
#, no-c-format
msgid ""
"After the floppy has been created successfully, select <menuchoice> "
@@ -681,7 +672,7 @@ msgstr ""
"换别的软盘试试。"
#. Tag: para
-#: install-methods.xml:511
+#: install-methods.xml:497
#, no-c-format
msgid ""
"Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -692,26 +683,13 @@ msgstr ""
"然在 MacOS 中挂载了它,MacOS 将会将其毁坏。"
#. Tag: title
-#: install-methods.xml:530
+#: install-methods.xml:516
#, no-c-format
msgid "Preparing Files for USB Memory Stick Booting"
msgstr "为从 U 盘引导准备文件"
#. Tag: para
-#: install-methods.xml:532
-#, no-c-format
-msgid ""
-"There are two installation methods possible when booting from USB stick. The "
-"first is to only use the USB stick to boot the installer, and then install "
-"completely from the network. The second is to also copy a CD image onto the "
-"USB stick and use that as a source for packages, possibly in combination "
-"with a mirror."
-msgstr ""
-"从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序,然后完全通过网"
-"络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源,还可以结合其他镜像。"
-
-#. Tag: para
-#: install-methods.xml:540
+#: install-methods.xml:518
#, no-c-format
msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -732,7 +710,7 @@ msgstr ""
"护开关。"
#. Tag: para
-#: install-methods.xml:553
+#: install-methods.xml:531
#, no-c-format
msgid ""
"The procedures described in this section will destroy anything already on "
@@ -743,41 +721,59 @@ msgstr ""
"采用这种方法将销毁设备上已有的任何内容!请确认您使用了正确的 U 盘设备名。如果"
"搞错,比如写成硬盘,将造成该设备上的所有信息丢失。"
+#. Tag: title
+#: install-methods.xml:541
+#, no-c-format
+msgid "Preparing a USB stick using a hybrid CD or DVD image"
+msgstr ""
+
#. Tag: para
-#: install-methods.xml:560
+#: install-methods.xml:542
#, no-c-format
msgid ""
-"To prepare a USB stick that only boots the installer, which then proceeds to "
-"install entirely from the network, you'll need to download the "
-"<filename>mini.iso</filename> image from the <filename>netboot</filename> "
-"directory (at the location mentioned in <xref linkend=\"where-files\"/>), "
-"and write this file directly to the USB stick, overwriting its current "
-"contents. This method will work with very small USB sticks, only a few "
-"megabytes in size."
+"Debian CD and DVD images can now be written directly a USB stick, which is a "
+"very easy way to make a bootable USB stick. Simply choose a CD or DVD image "
+"that will fit on your USB stick. See <xref linkend=\"official-cdrom\"/> to "
+"get a CD or DVD image."
msgstr ""
-"要制作一个仅启动安装程序的 U 盘,之后完全从网络安装,您需要从 "
-"<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位"
-"于 <xref linkend=\"where-files\"/>),然后将该文件直接写入 U 盘,覆盖里面的内"
-"容。此方法适用于容量很小的 U 盘,它只需要几 M 的字节。"
#. Tag: para
-#: install-methods.xml:570
+#: install-methods.xml:549
#, no-c-format
msgid ""
-"For example, when using an existing GNU/Linux system, the <filename>mini."
-"iso</filename> file can be written to a USB stick as follows: "
-"<informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
-"<prompt>#</prompt> <userinput>sync</userinput>\n"
-"</screen></informalexample> To add firmware to a USB stick prepared in this "
-"way, obtain the necessary firmware files. See <xref linkend=\"loading-"
-"firmware\"/> for more information. Now unplug and replug the USB stick, and "
-"two partitions should now be visible on it. You should mount the second of "
-"the two partitions, and unpack the firmware onto it."
+"Alternatively, for very small USB sticks, only a few megabytes in size, you "
+"can download the <filename>mini.iso</filename> image from the "
+"<filename>netboot</filename> directory (at the location mentioned in <xref "
+"linkend=\"where-files\"/>)."
+msgstr ""
+
+#. Tag: para
+#: install-methods.xml:557
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For example, when using an existing GNU/Linux system, the <filename>mini."
+#| "iso</filename> file can be written to a USB stick as follows: "
+#| "<informalexample><screen>\n"
+#| "<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> "
+#| "of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+#| "<prompt>#</prompt> <userinput>sync</userinput>\n"
+#| "</screen></informalexample> To add firmware to a USB stick prepared in "
+#| "this way, obtain the necessary firmware files. See <xref linkend="
+#| "\"loading-firmware\"/> for more information. Now unplug and replug the "
+#| "USB stick, and two partitions should now be visible on it. You should "
+#| "mount the second of the two partitions, and unpack the firmware onto it."
+msgid ""
+"A special method can be used to add firmware to the <filename>mini.iso</"
+"filename>. First, write the <filename>mini.iso</filename> to the USB stick. "
+"Next obtain the necessary firmware files. See <xref linkend=\"loading-"
+"firmware\"/> for more information about firmware. Now unplug and replug the "
+"USB stick, and two partitions should now be visible on it. You should mount "
+"the second of the two partitions, and unpack the firmware onto it."
msgstr ""
"例如,当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
"可以写如到一个 U 盘里面: <informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> "
+"of=/dev/<replaceable>sdX</replaceable></userinput>\n"
"<prompt>#</prompt> <userinput>sync</userinput>\n"
"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘,需要先取得固件"
"文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
@@ -785,7 +781,7 @@ msgstr ""
"面。"
#. Tag: screen
-#: install-methods.xml:582
+#: install-methods.xml:567
#, no-c-format
msgid ""
"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -801,46 +797,57 @@ msgstr ""
"# umount"
#. Tag: para
-#: install-methods.xml:584
+#: install-methods.xml:573
+#, no-c-format
+msgid ""
+"The CD or DVD image you choose should be written directly to the USB stick, "
+"overwriting its current contents. For example, when using an existing GNU/"
+"Linux system, the CD or DVD image file can be written to a USB stick as "
+"follows, after having made sure that the stick is unmounted:"
+msgstr ""
+
+#. Tag: screen
+#: install-methods.xml:580
#, no-c-format
msgid ""
-"To prepare a USB stick that installs packages from a CD image included on "
-"the stick, use the installer images found in the <filename>hd-media</"
-"filename> directory. Either the <quote>easy way</quote> or the "
-"<quote>flexible way</quote> can be used to copy the image to the USB stick. "
-"For this installation method you will also need to download a CD image. The "
-"installation image and the CD image must be based on the same release of &d-"
-"i;. If they do not match you are likely to get errors<footnote> <para> The "
-"error message that is most likely to be displayed is that no kernel modules "
-"can be found. This means that the version of the kernel module udebs "
-"included on the CD image is different from the version of the running "
-"kernel. </para> </footnote> during the installation."
+"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
+"<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>"
msgstr ""
-"制作包含 CD 映象软件包的 U 盘,需要使用的安装映象放在 <filename>hd-media</"
-"filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它"
-"复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该"
-"是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息"
-"大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与"
-"正在运行的内核不符。</para> </footnote>。"
#. Tag: para
-#: install-methods.xml:604
+#: install-methods.xml:582
#, no-c-format
msgid ""
-"Note that the USB stick should be at least 256 MB in size (smaller setups "
-"are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
+"Simply writing the CD or DVD image to USB like this should work fine for "
+"most users. The other options below are more complex, mainly for people with "
+"specialised needs."
msgstr ""
-"注意,U 盘至少要有 256MB 的容量(更小的尺寸安装也是可能的,请参阅 <xref "
-"linkend=\"usb-copy-flexible\"/>)。"
#. Tag: title
-#: install-methods.xml:612
-#, no-c-format
-msgid "Copying the files &mdash; the easy way"
-msgstr "复制文件 &mdash; 轻松的途径"
+#: install-methods.xml:593
+#, fuzzy, no-c-format
+#| msgid "Booting the USB stick"
+msgid "Manually copying files to the USB stick"
+msgstr "从 U 盘启动"
+
+#. Tag: para
+#: install-methods.xml:594
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that the USB stick should be at least 256 MB in size (smaller setups "
+#| "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
+msgid ""
+"An alternative way to set up your USB stick is to manually copy the "
+"installer files, and also a CD image to it. Note that the USB stick should "
+"be at least 1 GB in size (smaller setups are possible if you follow <xref "
+"linkend=\"usb-copy-flexible\"/>)."
+msgstr ""
+"注意,U 盘至少要有 256MB 的容量(更小的尺寸安装也是可能的,请参阅 <xref "
+"linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
-#: install-methods.xml:613
+#: install-methods.xml:601
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -855,16 +862,22 @@ msgstr ""
"classname> 和对应的配置文件</phrase>。"
#. Tag: para
-#: install-methods.xml:622
-#, no-c-format
+#: install-methods.xml:610
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that, although convenient, this method does have one major "
+#| "disadvantage: the logical size of the device will be limited to 256 MB, "
+#| "even if the capacity of the USB stick is larger. You will need to "
+#| "repartition the USB stick and create new file systems to get its full "
+#| "capacity back if you ever want to use it for some different purpose. A "
+#| "second disadvantage is that you cannot copy a full CD image onto the USB "
+#| "stick, but only the smaller businesscard or netinst CD images."
msgid ""
"Note that, although convenient, this method does have one major "
-"disadvantage: the logical size of the device will be limited to 256 MB, even "
+"disadvantage: the logical size of the device will be limited to 1 GB, even "
"if the capacity of the USB stick is larger. You will need to repartition the "
"USB stick and create new file systems to get its full capacity back if you "
-"ever want to use it for some different purpose. A second disadvantage is "
-"that you cannot copy a full CD image onto the USB stick, but only the "
-"smaller businesscard or netinst CD images."
+"ever want to use it for some different purpose."
msgstr ""
"需要注意的是,虽然方便,但该方法有一个主要的缺点: 即使 U 盘很大,设备的逻辑"
"尺寸还是限制在 256 MB。如果您要将该 U 盘用作其他用途,需要为它重新分区,为其"
@@ -872,19 +885,19 @@ msgstr ""
"使用较小的 businesscard 或 netinst CD 映象。"
#. Tag: para
-#: install-methods.xml:632
+#: install-methods.xml:618
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:636
+#: install-methods.xml:622
#, 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:638
+#: install-methods.xml:624
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -895,23 +908,32 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:644
+#: install-methods.xml:630
#, 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:646
-#, no-c-format
+#: install-methods.xml:632
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
+#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
+#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
+#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
+#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
+#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a &debian; netinst "
+#| "or businesscard ISO image to it. Unmount the stick (<userinput>umount /"
+#| "mnt</userinput>) and you are done."
msgid ""
"After that, mount the USB memory stick <phrase arch=\"x86\">"
"(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
"phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
"replaceable> /mnt</userinput>),</phrase> which will now have <phrase arch="
"\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS "
-"filesystem</phrase> on it, and copy a &debian; netinst or businesscard ISO "
-"image to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
-"are done."
+"filesystem</phrase> on it, and copy a &debian; ISO image (netinst, "
+"businesscard, or full CD) to it. Unmount the stick (<userinput>umount /mnt</"
+"userinput>) and you are done."
msgstr ""
"然后,挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
"<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch="
@@ -922,13 +944,14 @@ msgstr ""
"userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:663
-#, no-c-format
-msgid "Copying the files &mdash; the flexible way"
+#: install-methods.xml:649
+#, fuzzy, no-c-format
+#| msgid "Copying the files &mdash; the flexible way"
+msgid "Manually copying files to the USB stick &mdash; the flexible way"
msgstr "复制文件 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:664
+#: install-methods.xml:650
#, no-c-format
msgid ""
"If you like more flexibility or just want to know what's going on, you "
@@ -941,13 +964,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:679 install-methods.xml:791
+#: install-methods.xml:665 install-methods.xml:777
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:680
+#: install-methods.xml:666
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -955,7 +978,7 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:685
+#: install-methods.xml:671
#, no-c-format
msgid ""
"Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -979,7 +1002,7 @@ msgstr ""
"classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:704
+#: install-methods.xml:690
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -996,7 +1019,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:714
+#: install-methods.xml:700
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1019,13 +1042,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:731 install-methods.xml:838
+#: install-methods.xml:717 install-methods.xml:824
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:732
+#: install-methods.xml:718
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
@@ -1049,7 +1072,7 @@ msgstr ""
"(8.3) 文件名。"
#. Tag: para
-#: install-methods.xml:756
+#: install-methods.xml:742
#, no-c-format
msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1071,16 +1094,24 @@ msgstr ""
"userinput> 到第二行尾部。"
#. Tag: para
-#: install-methods.xml:768
-#, no-c-format
-msgid ""
-"If you used an <filename>hd-media</filename> image, you should now copy a "
-"&debian; ISO image<footnote> <para> You can use either a businesscard, a "
-"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
-"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
-"filename></quote> image is not usable for this purpose. </para> </footnote> "
-"onto the stick. When you are done, unmount the USB memory stick "
-"(<userinput>umount /mnt</userinput>)."
+#: install-methods.xml:754 install-methods.xml:864
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you used an <filename>hd-media</filename> image, you should now copy a "
+#| "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
+#| "netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
+#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
+#| "iso</filename></quote> image is not usable for this purpose. </para> </"
+#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
+#| "(<userinput>umount /mnt</userinput>)."
+msgid ""
+"If you used an <filename>hd-media</filename> image, you should now copy the "
+"ISO file of a &debian; ISO image<footnote> <para> You can use either a "
+"businesscard, a netinst or a full CD image (see <xref linkend=\"official-"
+"cdrom\"/>). Be sure to select one that fits. Note that the <quote>netboot "
+"<filename>mini.iso</filename></quote> image is not usable for this purpose. "
+"</para> </footnote> onto the stick. When you are done, unmount the USB "
+"memory stick (<userinput>umount /mnt</userinput>)."
msgstr ""
"如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映象"
"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
@@ -1089,7 +1120,7 @@ msgstr ""
"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:792
+#: install-methods.xml:778
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1116,7 +1147,7 @@ msgstr ""
"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:809
+#: install-methods.xml:795
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1131,7 +1162,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:818
+#: install-methods.xml:804
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1165,7 +1196,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:839
+#: install-methods.xml:825
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1175,31 +1206,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:846
+#: install-methods.xml:832
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:851
+#: install-methods.xml:837
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:856
+#: install-methods.xml:842
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:861
+#: install-methods.xml:847
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:868
+#: install-methods.xml:854
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1234,51 +1265,14 @@ msgstr ""
"<userinput>initrd-size</userinput> 参数的数值,这完全取决于您所使用的内存映像"
"的大小。"
-#. Tag: para
-#: install-methods.xml:878
-#, no-c-format
-msgid ""
-"If you used an <filename>hd-media</filename> image, you should now copy a "
-"&debian; ISO image (businesscard, netinst or full CD image; be sure to "
-"select one that fits) onto the stick. When you are done, unmount the USB "
-"memory stick (<userinput>umount /mnt</userinput>)."
-msgstr ""
-"如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映象"
-"(businesscard、netinst 或者完整的 CD 映象;确认适合的一种)到 U 盘上。然后,卸"
-"载 U 盘 (<userinput>umount /mnt</userinput>)。"
-
#. Tag: title
-#: install-methods.xml:893
-#, no-c-format
-msgid "Booting the USB stick"
-msgstr "从 U 盘启动"
-
-#. Tag: para
-#: install-methods.xml:894
-#, no-c-format
-msgid ""
-"If your system refuses to boot from the memory stick, the stick may contain "
-"an invalid master boot record (MBR). To fix this, use the <command>install-"
-"mbr</command> command from the package <classname>mbr</classname>:"
-msgstr ""
-"如果您的系统拒绝从 U 盘引导,那么可能是因为它含有无效的主引导扇区记录(MBR)。"
-"您可以使用 <command>install-mbr</command> 命令来修复这个问题,该命令来自 "
-"<classname>mbr</classname> 软件包:"
-
-#. Tag: screen
-#: install-methods.xml:901
-#, no-c-format
-msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
-msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"
-
-#. Tag: title
-#: install-methods.xml:912
+#: install-methods.xml:892
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:913
+#: install-methods.xml:893
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1289,7 +1283,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:919
+#: install-methods.xml:899
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1302,7 +1296,7 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:926
+#: install-methods.xml:906
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1322,7 +1316,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:937
+#: install-methods.xml:917
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1333,7 +1327,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:946
+#: install-methods.xml:926
#, no-c-format
msgid ""
"Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1342,7 +1336,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:948
+#: install-methods.xml:928
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1352,7 +1346,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:954
+#: install-methods.xml:934
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1363,7 +1357,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:960
+#: install-methods.xml:940
#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
@@ -1374,19 +1368,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:968
+#: install-methods.xml:948
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:973
+#: install-methods.xml:953
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:980
+#: install-methods.xml:960
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1394,13 +1388,13 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:990
+#: install-methods.xml:970
#, no-c-format
msgid "Hard disk installer booting using <command>loadlin</command>"
msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
#. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:971
#, no-c-format
msgid ""
"This section explains how to prepare your hard drive for booting the "
@@ -1409,7 +1403,7 @@ msgstr ""
"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
#. Tag: para
-#: install-methods.xml:996
+#: install-methods.xml:976
#, no-c-format
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1417,26 +1411,26 @@ msgid ""
msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
-#: install-methods.xml:1001
+#: install-methods.xml:981
#, no-c-format
msgid ""
"<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
#. Tag: para
-#: install-methods.xml:1006
+#: install-methods.xml:986
#, no-c-format
msgid "<filename>/tools</filename> (loadlin tool)"
msgstr "<filename>/tools</filename> (loadlin 工具)"
#. Tag: title
-#: install-methods.xml:1019
+#: install-methods.xml:999
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1020
+#: install-methods.xml:1000
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1458,7 +1452,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1033
+#: install-methods.xml:1013
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1485,13 +1479,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1053
+#: install-methods.xml:1033
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1054
+#: install-methods.xml:1034
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1509,7 +1503,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1065
+#: install-methods.xml:1045
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1522,31 +1516,31 @@ msgstr ""
"硬盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1075 install-methods.xml:1401
+#: install-methods.xml:1055 install-methods.xml:1381
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1080 install-methods.xml:1406
+#: install-methods.xml:1060 install-methods.xml:1386
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1085 install-methods.xml:1411
+#: install-methods.xml:1065 install-methods.xml:1391
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1090 install-methods.xml:1416
+#: install-methods.xml:1070 install-methods.xml:1396
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1095
+#: install-methods.xml:1075
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1560,19 +1554,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1103
+#: install-methods.xml:1083
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1116
+#: install-methods.xml:1096
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1117
+#: install-methods.xml:1097
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1586,7 +1580,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1125
+#: install-methods.xml:1105
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1598,7 +1592,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1132
+#: install-methods.xml:1112
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1617,7 +1611,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1146
+#: install-methods.xml:1126
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1628,7 +1622,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1152
+#: install-methods.xml:1132
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1638,7 +1632,7 @@ msgstr ""
"个 <classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1157
+#: install-methods.xml:1137
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1652,7 +1646,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1165
+#: install-methods.xml:1145
#, no-c-format
msgid ""
"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1665,13 +1659,13 @@ msgstr ""
"多问题。另一个好的选择是 <classname>atftpd</classname>。"
#. Tag: title
-#: install-methods.xml:1181
+#: install-methods.xml:1161
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1182
+#: install-methods.xml:1162
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1689,7 +1683,7 @@ msgstr ""
"addr show dev eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1194
+#: install-methods.xml:1174
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1712,13 +1706,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1215
+#: install-methods.xml:1195
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1216
+#: install-methods.xml:1196
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1731,7 +1725,7 @@ msgstr ""
"示例文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1223
+#: install-methods.xml:1203
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1775,7 +1769,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1225
+#: install-methods.xml:1205
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1791,7 +1785,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1235
+#: install-methods.xml:1215
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1801,13 +1795,13 @@ msgstr ""
"<userinput>/etc/init.d/dhcp3-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1243
+#: install-methods.xml:1223
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1244
+#: install-methods.xml:1224
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1877,13 +1871,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1264
+#: install-methods.xml:1244
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1265
+#: install-methods.xml:1245
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1898,7 +1892,7 @@ msgstr ""
"<classname>dhcp3-server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1273
+#: install-methods.xml:1253
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1960,7 +1954,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1306
+#: install-methods.xml:1286
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1982,13 +1976,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1325
+#: install-methods.xml:1305
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1326
+#: install-methods.xml:1306
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -1997,7 +1991,7 @@ msgstr ""
"要准备好 TFTP 服务器,您首先需要确定 <command>tftpd</command> 已经启动。"
#. Tag: para
-#: install-methods.xml:1331
+#: install-methods.xml:1311
#, no-c-format
msgid ""
"In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2011,7 +2005,7 @@ msgstr ""
"以在安装软件包的时候选择,也可以用重新配置软件包方式修改。"
#. Tag: para
-#: install-methods.xml:1340
+#: install-methods.xml:1320
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2028,7 +2022,7 @@ msgstr ""
"置文件示例。"
#. Tag: para
-#: install-methods.xml:1350
+#: install-methods.xml:1330
#, no-c-format
msgid ""
"All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2042,7 +2036,7 @@ msgstr ""
"问题,建议先检查这些日志信息,这对于分析错误是一个好的起始点。"
#. Tag: para
-#: install-methods.xml:1358
+#: install-methods.xml:1338
#, no-c-format
msgid ""
"If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2070,13 +2064,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1380
+#: install-methods.xml:1360
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1381
+#: install-methods.xml:1361
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2091,7 +2085,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1390
+#: install-methods.xml:1370
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2106,13 +2100,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1421
+#: install-methods.xml:1401
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1426
+#: install-methods.xml:1406
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2123,11 +2117,11 @@ msgid ""
msgstr ""
"对于用 PXE 引导来说,您所需的只是建立 <filename>netboot/netboot.tar.gz</"
"filename> 压缩包。只须将此包解压到 <command>tftpd</command> 引导映像目录下。"
-"并确保您的 DHCP 服务器的配置将会把 <filename>pxelinux.0</filename> 作为启动"
-"所需的文件名传递给 <command>tftpd</command>。"
+"并确保您的 DHCP 服务器的配置将会把 <filename>pxelinux.0</filename> 作为启动所"
+"需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1434
+#: install-methods.xml:1414
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2142,13 +2136,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1446
+#: install-methods.xml:1426
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1447
+#: install-methods.xml:1427
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2176,7 +2170,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1463
+#: install-methods.xml:1443
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2188,7 +2182,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1470
+#: install-methods.xml:1450
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2201,13 +2195,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1481
+#: install-methods.xml:1461
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1482
+#: install-methods.xml:1462
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2221,13 +2215,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1590
+#: install-methods.xml:1570
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1591
+#: install-methods.xml:1571
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2242,13 +2236,13 @@ msgstr ""
"更多细节。"
#. Tag: title
-#: install-methods.xml:1603
+#: install-methods.xml:1583
#, no-c-format
msgid "Automatic Installation Using the &debian; Installer"
msgstr "使用 &debian; 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1604
+#: install-methods.xml:1584
#, no-c-format
msgid ""
"The &debian; Installer supports automating installs via preconfiguration "
@@ -2260,7 +2254,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1611
+#: install-methods.xml:1591
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2268,3 +2262,88 @@ msgid ""
msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
+
+#~ msgid "NSLU2 Installation Files"
+#~ msgstr "NSLU2 安装文件"
+
+#~ msgid ""
+#~ "A firmware image is provided for the Linksys NSLU2 which will "
+#~ "automatically boot <classname>debian-installer</classname>. This image "
+#~ "can be uploaded via the Linksys web frontend or with upslug2. This "
+#~ "firmware image can be obtained from &nslu2-firmware-img;."
+#~ msgstr ""
+#~ "用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
+#~ "classname>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 "
+#~ "&nslu2-firmware-img; 获得。"
+
+#~ msgid ""
+#~ "There are two installation methods possible when booting from USB stick. "
+#~ "The first is to only use the USB stick to boot the installer, and then "
+#~ "install completely from the network. The second is to also copy a CD "
+#~ "image onto the USB stick and use that as a source for packages, possibly "
+#~ "in combination with a mirror."
+#~ msgstr ""
+#~ "从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序,然后完全通过"
+#~ "网络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源,还可以结合其他镜"
+#~ "像。"
+
+#~ msgid ""
+#~ "To prepare a USB stick that only boots the installer, which then proceeds "
+#~ "to install entirely from the network, you'll need to download the "
+#~ "<filename>mini.iso</filename> image from the <filename>netboot</filename> "
+#~ "directory (at the location mentioned in <xref linkend=\"where-files\"/>), "
+#~ "and write this file directly to the USB stick, overwriting its current "
+#~ "contents. This method will work with very small USB sticks, only a few "
+#~ "megabytes in size."
+#~ msgstr ""
+#~ "要制作一个仅启动安装程序的 U 盘,之后完全从网络安装,您需要从 "
+#~ "<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象"
+#~ "(它位于 <xref linkend=\"where-files\"/>),然后将该文件直接写入 U 盘,覆盖"
+#~ "里面的内容。此方法适用于容量很小的 U 盘,它只需要几 M 的字节。"
+
+#~ msgid ""
+#~ "To prepare a USB stick that installs packages from a CD image included on "
+#~ "the stick, use the installer images found in the <filename>hd-media</"
+#~ "filename> directory. Either the <quote>easy way</quote> or the "
+#~ "<quote>flexible way</quote> can be used to copy the image to the USB "
+#~ "stick. For this installation method you will also need to download a CD "
+#~ "image. The installation image and the CD image must be based on the same "
+#~ "release of &d-i;. If they do not match you are likely to get "
+#~ "errors<footnote> <para> The error message that is most likely to be "
+#~ "displayed is that no kernel modules can be found. This means that the "
+#~ "version of the kernel module udebs included on the CD image is different "
+#~ "from the version of the running kernel. </para> </footnote> during the "
+#~ "installation."
+#~ msgstr ""
+#~ "制作包含 CD 映象软件包的 U 盘,需要使用的安装映象放在 <filename>hd-media</"
+#~ "filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将"
+#~ "它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映"
+#~ "象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> "
+#~ "<para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内"
+#~ "核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
+
+#~ msgid "Copying the files &mdash; the easy way"
+#~ msgstr "复制文件 &mdash; 轻松的途径"
+
+#~ msgid ""
+#~ "If you used an <filename>hd-media</filename> image, you should now copy a "
+#~ "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
+#~ "select one that fits) onto the stick. When you are done, unmount the USB "
+#~ "memory stick (<userinput>umount /mnt</userinput>)."
+#~ msgstr ""
+#~ "如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO "
+#~ "映象(businesscard、netinst 或者完整的 CD 映象;确认适合的一种)到 U 盘上。"
+#~ "然后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
+
+#~ msgid ""
+#~ "If your system refuses to boot from the memory stick, the stick may "
+#~ "contain an invalid master boot record (MBR). To fix this, use the "
+#~ "<command>install-mbr</command> command from the package <classname>mbr</"
+#~ "classname>:"
+#~ msgstr ""
+#~ "如果您的系统拒绝从 U 盘引导,那么可能是因为它含有无效的主引导扇区记录"
+#~ "(MBR)。您可以使用 <command>install-mbr</command> 命令来修复这个问题,该命"
+#~ "令来自 <classname>mbr</classname> 软件包:"
+
+#~ msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
+#~ msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 031ee201f..a4dcfaa11 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2011-01-16 23:32+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -236,11 +236,31 @@ msgstr ""
#: installation-howto.xml:138
#, no-c-format
msgid ""
+"The easiest way to prepare your USB memory stick is to download any Debian "
+"CD or DVD image that will fit on it, and write the CD image directly to the "
+"memory stick. Of course this will destroy anything already on the memory "
+"stick. This works because Debian CD images are \"isohybrid\" images that can "
+"boot both from CD and from USB drives."
+msgstr ""
+
+#. Tag: para
+#: installation-howto.xml:146
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The easiest way to prepare your USB memory stick is to download "
+#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
+#| "256 MB image from that file. Write this image directly to your memory "
+#| "stick, which must be at least 256 mb in size. Of course this will destroy "
+#| "anything already on the memory stick. Then mount the memory stick, which "
+#| "will now have a FAT filesystem on it. Next, download a &debian; netinst "
+#| "CD image, and copy that file to the memory stick; any filename is ok as "
+#| "long as it ends in <literal>.iso</literal>."
+msgid ""
"The easiest way to prepare your USB memory stick is to download <filename>hd-"
-"media/boot.img.gz</filename>, and use gunzip to extract the 256 MB image "
-"from that file. Write this image directly to your memory stick, which must "
-"be at least 256 mb in size. Of course this will destroy anything already on "
-"the memory stick. Then mount the memory stick, which will now have a FAT "
+"media/boot.img.gz</filename>, and use gunzip to extract the 1 GB image from "
+"that file. Write this image directly to your memory stick, which must be at "
+"least 1 GB in size. Of course this will destroy anything already on the "
+"memory stick. Then mount the memory stick, which will now have a FAT "
"filesystem on it. Next, download a &debian; netinst CD image, and copy that "
"file to the memory stick; any filename is ok as long as it ends in <literal>."
"iso</literal>."
@@ -254,7 +274,7 @@ msgstr ""
"iso</literal> 结尾的就行。"
#. Tag: para
-#: installation-howto.xml:149
+#: installation-howto.xml:157
#, no-c-format
msgid ""
"There are other, more flexible ways to set up a memory stick to use the "
@@ -266,7 +286,7 @@ msgstr ""
"files\"/>。"
#. Tag: para
-#: installation-howto.xml:155
+#: installation-howto.xml:163
#, no-c-format
msgid ""
"Some BIOSes can boot USB storage directly, and some cannot. You may need to "
@@ -280,7 +300,7 @@ msgstr ""
"提示和具体的细节说明。"
#. Tag: para
-#: installation-howto.xml:162
+#: installation-howto.xml:170
#, no-c-format
msgid ""
"Booting Macintosh systems from USB storage devices involves manual use of "
@@ -290,13 +310,13 @@ msgstr ""
"<xref linkend=\"usb-boot\"/>。"
#. Tag: title
-#: installation-howto.xml:171
+#: installation-howto.xml:179
#, no-c-format
msgid "Booting from network"
msgstr "从网络启动"
#. Tag: para
-#: installation-howto.xml:172
+#: installation-howto.xml:180
#, no-c-format
msgid ""
"It's also possible to boot &d-i; completely from the net. The various "
@@ -308,32 +328,30 @@ msgstr ""
"filename> 目录里的文件是用来从网络启动 &d-i; 的。"
#. Tag: para
-#: installation-howto.xml:178
+#: installation-howto.xml:186
#, no-c-format
-#| msgid ""
-#| "The easiest thing to set up is probably PXE netbooting. Untar the file "
-#| "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/var/lib/"
-#| "tftpboot</filename> or wherever is appropriate for your tftp server. Set "
-#| "up your DHCP server to pass filename <filename>pxelinux.0</filename> to "
-#| "clients, and with luck everything will just work. For detailed "
-#| "instructions, see <xref linkend=\"install-tftp\"/>."
msgid ""
"The easiest thing to set up is probably PXE netbooting. Untar the file "
"<filename>netboot/pxeboot.tar.gz</filename> into <filename>/srv/tftp</"
"filename> or wherever is appropriate for your tftp server. Set up your DHCP "
-"server to pass filename <filename>pxelinux.0</filename> to clients, and "
-"with luck everything will just work. For detailed instructions, see <xref "
-"linkend=\"install-tftp\"/>."
-msgstr "最简单的建立方式大概是使用 PXE 的网络启动。解压 <filename>netboot/pxeboot.tar.gz</filename> 文件,把它放到 <filename>/srv/tftp</filename>,或者您 tftp 服务器上合适的地方。然后再建立 DHCP 服务器,传送 <filename>pxelinux.0</filename> 这个文件名给客户端。老天保佑的话,就能顺利安装了。若要知道详细的操作步骤,请参阅 <xref linkend=\"install-tftp\"/>。"
+"server to pass filename <filename>pxelinux.0</filename> to clients, and with "
+"luck everything will just work. For detailed instructions, see <xref linkend="
+"\"install-tftp\"/>."
+msgstr ""
+"最简单的建立方式大概是使用 PXE 的网络启动。解压 <filename>netboot/pxeboot."
+"tar.gz</filename> 文件,把它放到 <filename>/srv/tftp</filename>,或者您 tftp "
+"服务器上合适的地方。然后再建立 DHCP 服务器,传送 <filename>pxelinux.0</"
+"filename> 这个文件名给客户端。老天保佑的话,就能顺利安装了。若要知道详细的操"
+"作步骤,请参阅 <xref linkend=\"install-tftp\"/>。"
#. Tag: title
-#: installation-howto.xml:192
+#: installation-howto.xml:200
#, no-c-format
msgid "Booting from hard disk"
msgstr "从硬盘启动"
#. Tag: para
-#: installation-howto.xml:193
+#: installation-howto.xml:201
#, no-c-format
msgid ""
"It's possible to boot the installer using no removable media, but just an "
@@ -353,13 +371,13 @@ msgstr ""
"\"/> 说明了如何做这件事。</phrase>"
#. Tag: title
-#: installation-howto.xml:210
+#: installation-howto.xml:218
#, no-c-format
msgid "Installation"
msgstr "安装"
#. Tag: para
-#: installation-howto.xml:211
+#: installation-howto.xml:219
#, no-c-format
msgid ""
"Once the installer starts, you will be greeted with an initial screen. Press "
@@ -370,7 +388,7 @@ msgstr ""
"一下其它的启动方式以及各种参数的说明(参阅 <xref linkend=\"boot-parms\"/>)。"
#. Tag: para
-#: installation-howto.xml:217
+#: installation-howto.xml:225
#, no-c-format
msgid ""
"After a while you will be asked to select your language. Use the arrow keys "
@@ -385,7 +403,7 @@ msgstr ""
"上所有国家的列表以备选择。"
#. Tag: para
-#: installation-howto.xml:225
+#: installation-howto.xml:233
#, no-c-format
msgid ""
"You may be asked to confirm your keyboard layout. Choose the default unless "
@@ -395,7 +413,7 @@ msgstr ""
"清楚更合适的布局。"
#. Tag: para
-#: installation-howto.xml:230
+#: installation-howto.xml:238
#, no-c-format
msgid ""
"Now sit back while debian-installer detects some of your hardware, and loads "
@@ -405,7 +423,7 @@ msgstr ""
"件,并从 CD、软驱、USB 或其它设备里把它的其余部分加载进系统。"
#. Tag: para
-#: installation-howto.xml:235
+#: installation-howto.xml:243
#, no-c-format
msgid ""
"Next the installer will try to detect your network hardware and set up "
@@ -416,7 +434,7 @@ msgstr ""
"果没有连接网络,或是没有用 DHCP,那么您也可以手动配置网络。"
#. Tag: para
-#: installation-howto.xml:241
+#: installation-howto.xml:249
#, no-c-format
msgid ""
"The next step is setting up your clock and time zone. The installer will try "
@@ -429,7 +447,7 @@ msgstr ""
"的一个。"
#. Tag: para
-#: installation-howto.xml:248
+#: installation-howto.xml:256
#, no-c-format
msgid ""
"Now it is time to partition your disks. First you will be given the "
@@ -444,7 +462,7 @@ msgstr ""
"guimenuitem>。"
#. Tag: para
-#: installation-howto.xml:256
+#: installation-howto.xml:264
#, no-c-format
msgid ""
"If you have an existing DOS or Windows partition that you want to preserve, "
@@ -458,7 +476,7 @@ msgstr ""
"装空间:只需选择该分区,并指定它的新尺寸。"
#. Tag: para
-#: installation-howto.xml:263
+#: installation-howto.xml:271
#, no-c-format
msgid ""
"On the next screen you will see your partition table, how the partitions "
@@ -480,7 +498,7 @@ msgstr ""
"\"partitioning\"/> 有更多关于分区方面的信息。"
#. Tag: para
-#: installation-howto.xml:276
+#: installation-howto.xml:284
#, no-c-format
msgid ""
"Now &d-i; formats your partitions and starts to install the base system, "
@@ -490,7 +508,7 @@ msgstr ""
"装内核。"
#. Tag: para
-#: installation-howto.xml:281
+#: installation-howto.xml:289
#, no-c-format
msgid ""
"The base system that was installed earlier is a working, but very minimal "
@@ -510,7 +528,7 @@ msgstr ""
"quote>任务。参阅 <xref linkend=\"pkgsel\"/> 了解本步骤的详细信息。"
#. Tag: para
-#: installation-howto.xml:293
+#: installation-howto.xml:301
#, no-c-format
msgid ""
"Installation of the base system is followed by setting up user accounts. By "
@@ -522,7 +540,7 @@ msgstr ""
"理员) 帐号设置密码,并建立一个普通用户帐号。"
#. Tag: para
-#: installation-howto.xml:300
+#: installation-howto.xml:308
#, no-c-format
msgid ""
"The last step is to install a boot loader. If the installer detects other "
@@ -538,7 +556,7 @@ msgstr ""
"它这样做,而是把 GRUB 装在其它什么地方。</phrase>"
#. Tag: para
-#: installation-howto.xml:310
+#: installation-howto.xml:318
#, no-c-format
msgid ""
"&d-i; will now tell you that the installation has finished. Remove the cdrom "
@@ -551,7 +569,7 @@ msgstr ""
"<xref linkend=\"boot-new\"/> 有对它的详尽说明。"
#. Tag: para
-#: installation-howto.xml:317
+#: installation-howto.xml:325
#, no-c-format
msgid ""
"If you need more information on the install process, see <xref linkend=\"d-i-"
@@ -559,13 +577,13 @@ msgid ""
msgstr "如果您想要更多的安装过程相关信息,请看 <xref linkend=\"d-i-intro\"/>。"
#. Tag: title
-#: installation-howto.xml:326
+#: installation-howto.xml:334
#, no-c-format
msgid "Send us an installation report"
msgstr "请给我们发一份安装报告"
#. Tag: para
-#: installation-howto.xml:327
+#: installation-howto.xml:335
#, no-c-format
msgid ""
"If you successfully managed an installation with &d-i;, please take time to "
@@ -580,7 +598,7 @@ msgstr ""
"然后执行 <command>reportbug installation-reports</command>。"
#. Tag: para
-#: installation-howto.xml:337
+#: installation-howto.xml:345
#, no-c-format
msgid ""
"If you did not complete the install, you probably found a bug in debian-"
@@ -595,13 +613,13 @@ msgstr ""
"\"problem-report\"/>。"
#. Tag: title
-#: installation-howto.xml:349
+#: installation-howto.xml:357
#, no-c-format
msgid "And finally&hellip;"
msgstr "末了&hellip;"
#. Tag: para
-#: installation-howto.xml:350
+#: installation-howto.xml:358
#, no-c-format
msgid ""
"We hope that your &debian; installation is pleasant and that you find "
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index c4ecf5cff..8de582f2c 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2011-01-16 23:40+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -527,14 +527,6 @@ msgstr ""
#. Tag: para
#: partitioning.xml:268
#, no-c-format
-#| msgid ""
-#| "On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the "
-#| "maximum size of a swap partition is 2GB. That should be enough for nearly "
-#| "any installation. However, if your swap requirements are this high, you "
-#| "should probably try to spread the swap across different disks (also "
-#| "called <quote>spindles</quote>) and, if possible, different SCSI or IDE "
-#| "channels. The kernel will balance swap usage between multiple swap "
-#| "partitions, giving better performance."
msgid ""
"On some 32-bit architectures (m68k and PowerPC), the maximum size of a swap "
"partition is 2GB. That should be enough for nearly any installation. "
@@ -542,7 +534,11 @@ msgid ""
"spread the swap across different disks (also called <quote>spindles</quote>) "
"and, if possible, different SCSI or IDE channels. The kernel will balance "
"swap usage between multiple swap partitions, giving better performance."
-msgstr "在 32 位体系结构(m68k 和 PowerPC)下,最大的交换分区尺寸是 2GB。这应该基本满足任何安装情况。但是如果您的交换分区需求非常大,您或许该将交换分区散布到不同磁盘中(也叫做 <quote>spindles</quote>),并且如果可能的话,使用不同的 SCSI 或者 IDE 通道。内核将平衡使用多个交换分区以达到更好的性能。"
+msgstr ""
+"在 32 位体系结构(m68k 和 PowerPC)下,最大的交换分区尺寸是 2GB。这应该基本满足"
+"任何安装情况。但是如果您的交换分区需求非常大,您或许该将交换分区散布到不同磁"
+"盘中(也叫做 <quote>spindles</quote>),并且如果可能的话,使用不同的 SCSI 或者 "
+"IDE 通道。内核将平衡使用多个交换分区以达到更好的性能。"
#. Tag: para
#: partitioning.xml:278
@@ -778,12 +774,6 @@ msgstr ""
"&debian; 开发人员选用了几种在不同硬盘和不同体系结构上的分区程序。下面是一个适"
"合您的体系的程序列表。"
-#. Tag: command
-#: partitioning.xml:448
-#, no-c-format
-msgid "partman"
-msgstr "partman"
-
#. Tag: para
#: partitioning.xml:449
#, no-c-format
@@ -797,12 +787,6 @@ msgstr ""
"arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分"
"区至挂接点。"
-#. Tag: command
-#: partitioning.xml:460
-#, no-c-format
-msgid "fdisk"
-msgstr "fdisk"
-
#. Tag: para
#: partitioning.xml:461
#, no-c-format
@@ -823,12 +807,6 @@ msgstr ""
"是 <command>fdisk</command> 表示他们的设备名称方式可能有所不同(也可能不是)。"
"参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
-#. Tag: command
-#: partitioning.xml:477
-#, no-c-format
-msgid "cfdisk"
-msgstr "cfdisk"
-
#. Tag: para
#: partitioning.xml:478
#, no-c-format
@@ -845,48 +823,24 @@ msgstr ""
"请注意 <command>cfdisk</command> 完全不了解 FreeBSD 的分区,因此,再说一次,"
"设备名称与结果可能不同。"
-#. Tag: command
-#: partitioning.xml:491
-#, no-c-format
-msgid "atari-fdisk"
-msgstr "atari-fdisk"
-
#. Tag: para
#: partitioning.xml:492
#, no-c-format
msgid "Atari-aware version of <command>fdisk</command>."
msgstr "Atari 版本的 <command>fdisk</command>。"
-#. Tag: command
-#: partitioning.xml:500
-#, no-c-format
-msgid "amiga-fdisk"
-msgstr "amiga-fdisk"
-
#. Tag: para
#: partitioning.xml:501
#, no-c-format
msgid "Amiga-aware version of <command>fdisk</command>."
msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
-#. Tag: command
-#: partitioning.xml:509
-#, no-c-format
-msgid "mac-fdisk"
-msgstr "mac-fdisk"
-
#. Tag: para
#: partitioning.xml:510
#, no-c-format
msgid "Mac-aware version of <command>fdisk</command>."
msgstr "Mac-aware 版本的 <command>fdisk</command>。"
-#. Tag: command
-#: partitioning.xml:518
-#, no-c-format
-msgid "pmac-fdisk"
-msgstr "pmac-fdisk"
-
#. Tag: para
#: partitioning.xml:519
#, no-c-format
@@ -897,12 +851,6 @@ msgstr ""
"PowerMac 的 <command>fdisk</command>版本,同时也用于 BVM 以及 Motorola "
"VMEbus 系统。"
-#. Tag: command
-#: partitioning.xml:528
-#, no-c-format
-msgid "fdasd"
-msgstr "fdasd"
-
#. Tag: para
#: partitioning.xml:529
#, no-c-format
@@ -955,8 +903,8 @@ msgstr ""
# index.docbook:612, index.docbook:672, index.docbook:696, index.docbook:793, index.docbook:912, index.docbook:989
#. Tag: title
-#: partitioning.xml:566 partitioning.xml:590 partitioning.xml:687
-#: partitioning.xml:801 partitioning.xml:878
+#: partitioning.xml:566 partitioning.xml:590 partitioning.xml:686
+#: partitioning.xml:800 partitioning.xml:877
#, no-c-format
msgid "Partitioning for &arch-title;"
msgstr "为 &arch-title; 准备分区"
@@ -1006,16 +954,24 @@ msgstr ""
#. Tag: para
#: partitioning.xml:601
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The PC BIOS generally adds additional constraints for disk partitioning. "
+#| "There is a limit to how many <quote>primary</quote> and <quote>logical</"
+#| "quote> partitions a drive can contain. Additionally, with pre "
+#| "1994&ndash;98 BIOSes, there are limits to where on the drive the BIOS can "
+#| "boot from. More information can be found in the <ulink url=\"&url-"
+#| "partition-howto;\">Linux Partition HOWTO</ulink> and the <ulink url="
+#| "\"&url-phoenix-bios-faq-large-disk;\">Phoenix BIOS FAQ</ulink>, but this "
+#| "section will include a brief overview to help you plan most situations."
msgid ""
"The PC BIOS generally adds additional constraints for disk partitioning. "
"There is a limit to how many <quote>primary</quote> and <quote>logical</"
"quote> partitions a drive can contain. Additionally, with pre 1994&ndash;98 "
"BIOSes, there are limits to where on the drive the BIOS can boot from. More "
"information can be found in the <ulink url=\"&url-partition-howto;\">Linux "
-"Partition HOWTO</ulink> and the <ulink url=\"&url-phoenix-bios-faq-large-"
-"disk;\">Phoenix BIOS FAQ</ulink>, but this section will include a brief "
-"overview to help you plan most situations."
+"Partition HOWTO</ulink>, but this section will include a brief overview to "
+"help you plan most situations."
msgstr ""
"PC BIOS 一般会对磁盘分区加入一些约束。比如一个磁盘驱动可以含有多少个<quote>主"
"</quote>分区和<quote>逻辑</quote>分区。在 1994$ndash;98 年的 BIOS 里,还有关"
@@ -1025,7 +981,7 @@ msgstr ""
"包含一个简单的介绍,帮助您在大多数情况下进行规划。"
#. Tag: para
-#: partitioning.xml:612
+#: partitioning.xml:611
#, no-c-format
msgid ""
"<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -1043,7 +999,7 @@ msgstr ""
"一个扩展分区。"
#. Tag: para
-#: partitioning.xml:623
+#: partitioning.xml:622
#, no-c-format
msgid ""
"Linux limits the partitions per drive to 255 partitions for SCSI disks (3 "
@@ -1053,13 +1009,13 @@ msgid ""
"may not install on partitions higher than 20 unless you first manually "
"create devices for those partitions."
msgstr ""
-"对于 SCSI 来说,Linux 限制每个驱动器最多有 255 个分区(3 个可用的主分区,252 个"
-"逻辑分区)。对于 IDE 来说可以有 63 个分区(3 个可用的主分区,60 个逻辑分区)。但"
-"是对于普通的 &debian-gnu; 版本,系统只支持 20 个分区设备,因此您不能安装超过 "
-"20 个的分区,除非您首先为这些分区手工创建了设备文件。"
+"对于 SCSI 来说,Linux 限制每个驱动器最多有 255 个分区(3 个可用的主分区,252 "
+"个逻辑分区)。对于 IDE 来说可以有 63 个分区(3 个可用的主分区,60 个逻辑分区)。"
+"但是对于普通的 &debian-gnu; 版本,系统只支持 20 个分区设备,因此您不能安装超"
+"过 20 个的分区,除非您首先为这些分区手工创建了设备文件。"
#. Tag: para
-#: partitioning.xml:633
+#: partitioning.xml:632
#, no-c-format
msgid ""
"If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1073,7 +1029,7 @@ msgstr ""
"盘第一个 1024 柱面内(在没有 BIOS 转换的情况下,大约有 524MB)。"
#. Tag: para
-#: partitioning.xml:641
+#: partitioning.xml:640
#, no-c-format
msgid ""
"This restriction doesn't apply if you have a BIOS newer than around "
@@ -1097,7 +1053,7 @@ msgstr ""
"&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
#. Tag: para
-#: partitioning.xml:655
+#: partitioning.xml:654
#, no-c-format
msgid ""
"If you have a large disk, you might have to use cylinder translation "
@@ -1117,7 +1073,7 @@ msgstr ""
"</emphasis>的 1024 柱面内。"
#. Tag: para
-#: partitioning.xml:667
+#: partitioning.xml:666
#, no-c-format
msgid ""
"The recommended way of accomplishing this is to create a small "
@@ -1137,7 +1093,7 @@ msgstr ""
"起作用,甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
#. Tag: para
-#: partitioning.xml:688
+#: partitioning.xml:687
#, no-c-format
msgid ""
"The <command>partman</command> disk partitioner is the default partitioning "
@@ -1151,13 +1107,13 @@ msgstr ""
"<command>parted</command> 来进行磁盘分区的。"
#. Tag: title
-#: partitioning.xml:700
+#: partitioning.xml:699
#, no-c-format
msgid "EFI Recognized Formats"
msgstr "EFI 能够识别的格式"
#. Tag: para
-#: partitioning.xml:701
+#: partitioning.xml:700
#, no-c-format
msgid ""
"The IA-64 EFI firmware supports two partition table (or disk label) formats, "
@@ -1174,7 +1130,7 @@ msgstr ""
"DOS 分区表。"
#. Tag: para
-#: partitioning.xml:713
+#: partitioning.xml:712
#, no-c-format
msgid ""
"The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1188,7 +1144,7 @@ msgstr ""
"配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
#. Tag: para
-#: partitioning.xml:721
+#: partitioning.xml:720
#, no-c-format
msgid ""
"The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1233,13 +1189,13 @@ msgstr ""
"它可能要扫描坏区。"
#. Tag: title
-#: partitioning.xml:746
+#: partitioning.xml:745
#, no-c-format
msgid "Boot Loader Partition Requirements"
msgstr "启动引导器分区要求"
#. Tag: para
-#: partitioning.xml:747
+#: partitioning.xml:746
#, no-c-format
msgid ""
"ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
@@ -1254,7 +1210,7 @@ msgstr ""
"个内核的话,128MB 也许更好。"
#. Tag: para
-#: partitioning.xml:756
+#: partitioning.xml:755
#, no-c-format
msgid ""
"The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1276,7 +1232,7 @@ msgstr ""
"入一个 EFI 分区。"
#. Tag: para
-#: partitioning.xml:771
+#: partitioning.xml:770
#, no-c-format
msgid ""
"It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1286,13 +1242,13 @@ msgstr ""
"盘上。"
#. Tag: title
-#: partitioning.xml:779
+#: partitioning.xml:778
#, no-c-format
msgid "EFI Diagnostic Partitions"
msgstr "EFI 诊断分区"
#. Tag: para
-#: partitioning.xml:780
+#: partitioning.xml:779
#, no-c-format
msgid ""
"The EFI firmware is significantly more sophisticated than the usual BIOS "
@@ -1311,7 +1267,7 @@ msgstr ""
"区的时候。"
#. Tag: para
-#: partitioning.xml:802
+#: partitioning.xml:801
#, no-c-format
msgid ""
"SGI machines require an SGI disk label in order to make the system bootable "
@@ -1327,13 +1283,13 @@ msgstr ""
"入。注意 volume header 必须从 0 号扇区开始。"
#. Tag: title
-#: partitioning.xml:819
+#: partitioning.xml:818
#, no-c-format
msgid "Partitioning Newer PowerMacs"
msgstr "为较新的 PowerMacs 分区"
#. Tag: para
-#: partitioning.xml:820
+#: partitioning.xml:819
#, no-c-format
msgid ""
"If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1355,7 +1311,7 @@ msgstr ""
"command> 里面使用 <userinput>b</userinput> 命令。"
#. Tag: para
-#: partitioning.xml:833
+#: partitioning.xml:832
#, no-c-format
msgid ""
"The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1366,7 +1322,7 @@ msgstr ""
"为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
#. Tag: para
-#: partitioning.xml:840
+#: partitioning.xml:839
#, no-c-format
msgid ""
"Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1383,7 +1339,7 @@ msgstr ""
"command> 工具可以用来维护这个分区。"
#. Tag: para
-#: partitioning.xml:850
+#: partitioning.xml:849
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
@@ -1403,7 +1359,7 @@ msgstr ""
"顺序。"
#. Tag: para
-#: partitioning.xml:862
+#: partitioning.xml:861
#, no-c-format
msgid ""
"Apple disks normally have several small driver partitions. If you intend to "
@@ -1417,7 +1373,7 @@ msgstr ""
"启动的时候,会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
#. Tag: para
-#: partitioning.xml:879
+#: partitioning.xml:878
#, no-c-format
msgid ""
"Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1430,7 +1386,7 @@ msgstr ""
"<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
#. Tag: para
-#: partitioning.xml:887
+#: partitioning.xml:886
#, no-c-format
msgid ""
"Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1449,7 +1405,7 @@ msgstr ""
"或者 UFS 分区在那里;它们将隔离分区表和引导块。"
#. Tag: para
-#: partitioning.xml:898
+#: partitioning.xml:897
#, no-c-format
msgid ""
"It is also advised that the third partition should be of type <quote>Whole "
@@ -1460,3 +1416,27 @@ msgstr ""
"这里建议第三个分区应该是 <quote>Whole disk</quote>(type 5),并且包含整个磁盘 "
"(从第一个柱面至最后一个),这是 Sun 磁盘格式的惯例,并且确保 <command>SILO</"
"command> 启动引导器工作良好。"
+
+#~ msgid "partman"
+#~ msgstr "partman"
+
+#~ msgid "fdisk"
+#~ msgstr "fdisk"
+
+#~ msgid "cfdisk"
+#~ msgstr "cfdisk"
+
+#~ msgid "atari-fdisk"
+#~ msgstr "atari-fdisk"
+
+#~ msgid "amiga-fdisk"
+#~ msgstr "amiga-fdisk"
+
+#~ msgid "mac-fdisk"
+#~ msgstr "mac-fdisk"
+
+#~ msgid "pmac-fdisk"
+#~ msgstr "pmac-fdisk"
+
+#~ msgid "fdasd"
+#~ msgstr "fdasd"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index dbf169f6d..e4d69101f 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2010-10-27 23:19+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -179,11 +179,28 @@ msgstr ""
#. Tag: title
#: post-install.xml:141
#, no-c-format
+msgid "Additional Software Available for &debian;"
+msgstr ""
+
+#. Tag: para
+#: post-install.xml:142
+#, no-c-format
+msgid ""
+"There are official and unofficial software repositories that are not enabled "
+"in the default &debian; install. These contain software which many find "
+"important and expect to have. Information on these additional repositories "
+"can be found on the &debian; Wiki page titled <ulink url=\"&url-debian-wiki-"
+"software;\">The Software Available for &debian;'s Stable Release</ulink>."
+msgstr ""
+
+#. Tag: title
+#: post-install.xml:154
+#, no-c-format
msgid "Application Version Management"
msgstr "应用程序版本管理"
#. Tag: para
-#: post-install.xml:142
+#: post-install.xml:155
#, no-c-format
msgid ""
"Alternative versions of applications are managed by update-alternatives. If "
@@ -194,13 +211,13 @@ msgstr ""
"多个版本,请阅读 update-alternatives 的 man 手册。"
#. Tag: title
-#: post-install.xml:152
+#: post-install.xml:165
#, no-c-format
msgid "Cron Job Management"
msgstr "定时任务管理"
#. Tag: para
-#: post-install.xml:153
+#: post-install.xml:166
#, no-c-format
msgid ""
"Any jobs under the purview of the system administrator should be in "
@@ -217,7 +234,7 @@ msgstr ""
"然后按照文件名的字典顺序依次运行。"
#. Tag: para
-#: post-install.xml:162
+#: post-install.xml:175
#, no-c-format
msgid ""
"On the other hand, if you have a cron job that (a) needs to run as a special "
@@ -232,7 +249,7 @@ msgstr ""
"件可以包含一个额外的域,允许您指定运行该定时任务的用户帐户。"
#. Tag: para
-#: post-install.xml:171
+#: post-install.xml:184
#, no-c-format
msgid ""
"In either case, you just edit the files and cron will notice them "
@@ -245,13 +262,13 @@ msgstr ""
"share/doc/cron/README.Debian</filename>。"
#. Tag: title
-#: post-install.xml:186
+#: post-install.xml:199
#, no-c-format
msgid "Further Reading and Information"
msgstr "更多信息"
#. Tag: para
-#: post-install.xml:187
+#: post-install.xml:200
#, no-c-format
msgid ""
"If you need information about a particular program, you should first try "
@@ -263,7 +280,7 @@ msgstr ""
"replaceable></userinput>。"
#. Tag: para
-#: post-install.xml:193
+#: post-install.xml:206
#, no-c-format
msgid ""
"There is lots of useful documentation in <filename>/usr/share/doc</filename> "
@@ -281,7 +298,7 @@ msgstr ""
"filename>。"
#. Tag: para
-#: post-install.xml:204
+#: post-install.xml:217
#, no-c-format
msgid ""
"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
@@ -309,7 +326,7 @@ msgstr ""
"&debian; 丰富的信息。"
#. Tag: para
-#: post-install.xml:222
+#: post-install.xml:235
#, no-c-format
msgid ""
"A general source of information on GNU/Linux is the <ulink url=\"http://www."
@@ -322,13 +339,13 @@ msgstr ""
"系统各个部分的非常有价值的 HOWTO 文档以及其他指导。"
#. Tag: title
-#: post-install.xml:238
+#: post-install.xml:251
#, no-c-format
msgid "Setting Up Your System To Use E-Mail"
msgstr "让您的系统使用 E-Mail"
#. Tag: para
-#: post-install.xml:239
+#: post-install.xml:252
#, no-c-format
msgid ""
"Today, email is an important part of many people's life. As there are many "
@@ -340,7 +357,7 @@ msgstr ""
"多 &debian; 工具如何设置正确非常重要,我们将在本节介绍一些基本的知识。"
#. Tag: para
-#: post-install.xml:246
+#: post-install.xml:259
#, no-c-format
msgid ""
"There are three main functions that make up an e-mail system. First there is "
@@ -358,7 +375,7 @@ msgstr ""
"的收件箱。"
#. Tag: para
-#: post-install.xml:256
+#: post-install.xml:269
#, no-c-format
msgid ""
"These three functions can be performed by separate programs, but they can "
@@ -369,7 +386,7 @@ msgstr ""
"程序处理不同类型的邮件。"
#. Tag: para
-#: post-install.xml:262
+#: post-install.xml:275
#, no-c-format
msgid ""
"On Linux and Unix systems <command>mutt</command> is historically a very "
@@ -383,7 +400,7 @@ msgstr ""
"command> 一起使用。"
#. Tag: para
-#: post-install.xml:269
+#: post-install.xml:282
#, no-c-format
msgid ""
"With the increasing popularity of graphical desktop systems, the use of "
@@ -406,13 +423,13 @@ msgstr ""
"能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
#. Tag: title
-#: post-install.xml:289
+#: post-install.xml:302
#, no-c-format
msgid "Default E-Mail Configuration"
msgstr "默认的 E-Mail 配置"
#. Tag: para
-#: post-install.xml:290
+#: post-install.xml:303
#, no-c-format
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
@@ -430,7 +447,7 @@ msgstr ""
"footnote> 会通过邮件发送重要的提示通知系统管理员潜在的问题或变化。"
#. Tag: para
-#: post-install.xml:305
+#: post-install.xml:318
#, no-c-format
msgid ""
"For this reason the packages <classname>exim4</classname> and "
@@ -454,7 +471,7 @@ msgstr ""
"会发送给 root 帐号。</para> </footnote>。"
#. Tag: para
-#: post-install.xml:324
+#: post-install.xml:337
#, no-c-format
msgid ""
"When system e-mails are delivered they are added to a file in <filename>/var/"
@@ -466,13 +483,13 @@ msgstr ""
"<command>mutt</command> 读取。"
#. Tag: title
-#: post-install.xml:334
+#: post-install.xml:347
#, no-c-format
msgid "Sending E-Mails Outside The System"
msgstr "发送邮件到系统之外"
#. Tag: para
-#: post-install.xml:335
+#: post-install.xml:348
#, no-c-format
msgid ""
"As mentioned earlier, the installed &debian; system is only set up to handle "
@@ -483,7 +500,7 @@ msgstr ""
"收其他系统的邮件。"
#. Tag: para
-#: post-install.xml:341
+#: post-install.xml:354
#, no-c-format
msgid ""
"If you would like <classname>exim4</classname> to handle external e-mail, "
@@ -494,7 +511,7 @@ msgstr ""
"可以使用的基本配置选项。确认邮件可以正确地发送和接收。"
#. Tag: para
-#: post-install.xml:347
+#: post-install.xml:360
#, no-c-format
msgid ""
"If you intend to use a graphical mail program and use a mail server of your "
@@ -509,7 +526,7 @@ msgstr ""
"(配置方法超出了本手册的范围)。"
#. Tag: para
-#: post-install.xml:356
+#: post-install.xml:369
#, no-c-format
msgid ""
"However, in that case you may need to configure individual utilities to "
@@ -523,7 +540,7 @@ msgstr ""
"应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
#. Tag: para
-#: post-install.xml:364
+#: post-install.xml:377
#, no-c-format
msgid ""
"To correctly set up <command>reportbug</command> to use an external mail "
@@ -536,13 +553,13 @@ msgstr ""
"<quote>no</quote>。您接着将会被问到使用哪个 SMTP 服务器来提交 bug 报告。"
#. Tag: title
-#: post-install.xml:375
+#: post-install.xml:388
#, no-c-format
msgid "Configuring the Exim4 Mail Transport Agent"
msgstr "配置 Exim4 MTA"
#. Tag: para
-#: post-install.xml:376
+#: post-install.xml:389
#, no-c-format
msgid ""
"If you would like your system to also handle external e-mail, you will need "
@@ -555,13 +572,13 @@ msgstr ""
"MTA/MDA。</para> </footnote>:"
#. Tag: screen
-#: post-install.xml:388
+#: post-install.xml:401
#, no-c-format
msgid "# dpkg-reconfigure exim4-config"
msgstr "# dpkg-reconfigure exim4-config"
#. Tag: para
-#: post-install.xml:390
+#: post-install.xml:403
#, no-c-format
msgid ""
"After entering that command (as root), you will be asked if you want split "
@@ -572,7 +589,7 @@ msgstr ""
"不准,就选择默认选项。"
#. Tag: para
-#: post-install.xml:396
+#: post-install.xml:409
#, no-c-format
msgid ""
"Next you will be presented with several common mail scenarios. Choose the "
@@ -580,13 +597,13 @@ msgid ""
msgstr "接着您将看到几个常见的邮件方案,请选择一个最近似您需求的那个。"
#. Tag: term
-#: post-install.xml:405
+#: post-install.xml:418
#, no-c-format
msgid "internet site"
msgstr "internet site"
#. Tag: para
-#: post-install.xml:406
+#: post-install.xml:419
#, no-c-format
msgid ""
"Your system is connected to a network and your mail is sent and received "
@@ -598,13 +615,13 @@ msgstr ""
"会询问您一些基本问题,如:您的机器的邮件名称、您接受或转发邮件的域等等。"
#. Tag: term
-#: post-install.xml:417
+#: post-install.xml:430
#, no-c-format
msgid "mail sent by smarthost"
msgstr "mail sent by smarthost"
#. Tag: para
-#: post-install.xml:418
+#: post-install.xml:431
#, no-c-format
msgid ""
"In this scenario your outgoing mail is forwarded to another machine, called "
@@ -620,7 +637,7 @@ msgstr ""
"载邮件。"
#. Tag: para
-#: post-install.xml:428
+#: post-install.xml:441
#, no-c-format
msgid ""
"In a lot of cases the smarthost will be your ISP's mail server, which makes "
@@ -631,13 +648,13 @@ msgstr ""
"司的邮件服务器,或是您自己网络中的另外一台机器。"
#. Tag: term
-#: post-install.xml:438
+#: post-install.xml:451
#, no-c-format
msgid "mail sent by smarthost; no local mail"
msgstr "mail sent by smarthost; no local mail"
#. Tag: para
-#: post-install.xml:439
+#: post-install.xml:452
#, no-c-format
msgid ""
"This option is basically the same as the previous one except that the system "
@@ -648,25 +665,25 @@ msgstr ""
"mail domain。在本系统上的邮件(比如,给系统管理员的)还是会被处理。"
#. Tag: term
-#: post-install.xml:450
+#: post-install.xml:463
#, no-c-format
msgid "local delivery only"
msgstr "local delivery only"
#. Tag: para
-#: post-install.xml:451
+#: post-install.xml:464
#, no-c-format
msgid "This is the option your system is configured for by default."
msgstr "本选项是系统默认的配置。"
#. Tag: term
-#: post-install.xml:459
+#: post-install.xml:472
#, no-c-format
msgid "no configuration at this time"
msgstr "no configuration at this time"
#. Tag: para
-#: post-install.xml:460
+#: post-install.xml:473
#, no-c-format
msgid ""
"Choose this if you are absolutely convinced you know what you are doing. "
@@ -679,7 +696,7 @@ msgstr ""
"工具发来的重要信息。"
#. Tag: para
-#: post-install.xml:471
+#: post-install.xml:484
#, no-c-format
msgid ""
"If none of these scenarios suits your needs, or if you need a finer grained "
@@ -697,7 +714,7 @@ msgstr ""
"classname> 配置方面的细节,并说明从哪里找到更多的文档。"
#. Tag: para
-#: post-install.xml:482
+#: post-install.xml:495
#, no-c-format
msgid ""
"Note that sending mail directly to the Internet when you don't have an "
@@ -715,13 +732,13 @@ msgstr ""
"filename>。"
#. Tag: title
-#: post-install.xml:500
+#: post-install.xml:513
#, no-c-format
msgid "Compiling a New Kernel"
msgstr "编译新内核"
#. Tag: para
-#: post-install.xml:501
+#: post-install.xml:514
#, no-c-format
msgid ""
"Why would someone want to compile a new kernel? It is often not necessary "
@@ -737,7 +754,7 @@ msgstr ""
"还是很有用的:"
#. Tag: para
-#: post-install.xml:511
+#: post-install.xml:524
#, no-c-format
msgid ""
"handle special hardware needs, or hardware conflicts with the pre-supplied "
@@ -745,7 +762,7 @@ msgid ""
msgstr "支持某些特殊的硬件,或者默认的内核配置和某些硬件冲突"
#. Tag: para
-#: post-install.xml:517
+#: post-install.xml:530
#, no-c-format
msgid ""
"use options of the kernel which are not supported in the pre-supplied "
@@ -753,43 +770,43 @@ msgid ""
msgstr "使用某些不为所提供的内核支持的选项 (例如,支持 high memory)"
#. Tag: para
-#: post-install.xml:523
+#: post-install.xml:536
#, no-c-format
msgid "optimize the kernel by removing useless drivers to speed up boot time"
msgstr "通过删除无用的驱动程序来优化内核,以减少启动时间"
#. Tag: para
-#: post-install.xml:528
+#: post-install.xml:541
#, no-c-format
msgid "create a monolithic instead of a modularized kernel"
msgstr "创建整体的而不是模块化的内核"
#. Tag: para
-#: post-install.xml:533
+#: post-install.xml:546
#, no-c-format
msgid "run an updated or development kernel"
msgstr "运行最新的内核或开发中的内核"
#. Tag: para
-#: post-install.xml:538
+#: post-install.xml:551
#, no-c-format
msgid "learn more about linux kernels"
msgstr "深入了解 linux 内核"
#. Tag: title
-#: post-install.xml:547
+#: post-install.xml:560
#, no-c-format
msgid "Kernel Image Management"
msgstr "内核映象管理"
#. Tag: para
-#: post-install.xml:548
+#: post-install.xml:561
#, no-c-format
msgid "Don't be afraid to try compiling the kernel. It's fun and profitable."
msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
#. Tag: para
-#: post-install.xml:552
+#: post-install.xml:565
#, no-c-format
msgid ""
"To compile a kernel the &debian; way, you need some packages: "
@@ -804,7 +821,7 @@ msgstr ""
"<filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
#. Tag: para
-#: post-install.xml:561
+#: post-install.xml:574
#, no-c-format
msgid ""
"This method will make a .deb of your kernel source, and, if you have non-"
@@ -817,7 +834,7 @@ msgstr ""
"filename> 目录将保存内核,System.map,以及当前编译的活动配置文件的日志。"
#. Tag: para
-#: post-install.xml:569
+#: post-install.xml:582
#, no-c-format
msgid ""
"Note that you don't <emphasis>have</emphasis> to compile your kernel the "
@@ -833,7 +850,7 @@ msgstr ""
"源码,并仍使用 <classname>kernel-package</classname> 的编译方法。"
#. Tag: para
-#: post-install.xml:578
+#: post-install.xml:591
#, no-c-format
msgid ""
"Note that you'll find complete documentation on using <classname>kernel-"
@@ -845,7 +862,7 @@ msgstr ""
"入门指南。"
#. Tag: para
-#: post-install.xml:585
+#: post-install.xml:598
#, no-c-format
msgid ""
"Hereafter, we'll assume you have free rein over your machine and will "
@@ -867,7 +884,7 @@ msgstr ""
"<filename>linux-source-&kernelversion;</filename> 刚才创建的目录。"
#. Tag: para
-#: post-install.xml:605
+#: post-install.xml:618
#, no-c-format
msgid ""
"Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
@@ -893,7 +910,7 @@ msgstr ""
"quote> (它们默认并没有被选择)。否则,您的 &debian; 安装将会遇到问题。"
#. Tag: para
-#: post-install.xml:620
+#: post-install.xml:633
#, no-c-format
msgid ""
"Clean the source tree and reset the <classname>kernel-package</classname> "
@@ -903,7 +920,7 @@ msgstr ""
"<userinput>make-kpkg clean</userinput>。"
#. Tag: para
-#: post-install.xml:625
+#: post-install.xml:638
#, no-c-format
msgid ""
"Now, compile the kernel: <userinput>fakeroot make-kpkg --initrd --"
@@ -920,7 +937,7 @@ msgstr ""
"长的时间,这取决于您的机器的性能。"
#. Tag: para
-#: post-install.xml:635
+#: post-install.xml:648
#, no-c-format
msgid ""
"Once the compilation is complete, you can install your custom kernel like "
@@ -950,7 +967,7 @@ msgstr ""
"如果您创建了一个模块软件包,也要同时安装该软件包。"
#. Tag: para
-#: post-install.xml:655
+#: post-install.xml:668
#, no-c-format
msgid ""
"It is time to reboot the system: read carefully any warning that the above "
@@ -960,7 +977,7 @@ msgstr ""
"<userinput>shutdown -r now</userinput>。"
#. Tag: para
-#: post-install.xml:660
+#: post-install.xml:673
#, no-c-format
msgid ""
"For more information on &debian; kernels and kernel compilation, see the "
@@ -974,13 +991,13 @@ msgstr ""
"<filename>/usr/share/doc/kernel-package</filename>。"
#. Tag: title
-#: post-install.xml:676
+#: post-install.xml:689
#, no-c-format
msgid "Recovering a Broken System"
msgstr "修复损坏的系统"
#. Tag: para
-#: post-install.xml:677
+#: post-install.xml:690
#, no-c-format
msgid ""
"Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -996,7 +1013,7 @@ msgstr ""
"一个可以工作的系统,rescue 模式正好用于此目的。"
#. Tag: para
-#: post-install.xml:687
+#: post-install.xml:700
#, no-c-format
msgid ""
"To access rescue mode, type <userinput>rescue</userinput> at the "
@@ -1017,7 +1034,7 @@ msgstr ""
"用。"
#. Tag: para
-#: post-install.xml:702
+#: post-install.xml:715
#, no-c-format
msgid ""
"Instead of the partitioning tool, you should now be presented with a list of "
@@ -1031,7 +1048,7 @@ msgstr ""
"创建一样。"
#. Tag: para
-#: post-install.xml:710
+#: post-install.xml:723
#, no-c-format
msgid ""
"If possible, the installer will now present you with a shell prompt in the "
@@ -1047,7 +1064,7 @@ msgstr ""
"userinput> 完成。</phrase>"
#. Tag: para
-#: post-install.xml:722
+#: post-install.xml:735
#, no-c-format
msgid ""
"If the installer cannot run a usable shell in the root file system you "
@@ -1063,13 +1080,13 @@ msgstr ""
"统将挂载到 <filename>/target</filename> 目录。"
#. Tag: para
-#: post-install.xml:731
+#: post-install.xml:744
#, no-c-format
msgid "In either case, after you exit the shell, the system will reboot."
msgstr "无论哪种情况,退出 shell 之后,系统将重启。"
#. Tag: para
-#: post-install.xml:735
+#: post-install.xml:748
#, no-c-format
msgid ""
"Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 256613b59..49fcd8e57 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2010-11-04 17:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -913,8 +913,9 @@ msgstr "您的无线网络的 ESSID。"
#. Tag: para
#: preparing.xml:620
-#, no-c-format
-msgid "WEP security key (if applicable)."
+#, fuzzy, no-c-format
+#| msgid "WEP security key (if applicable)."
+msgid "WEP or WPA/WPA2 security key (if applicable)."
msgstr "WEP 安全密钥(如果可用)。"
#. Tag: title
@@ -2557,15 +2558,24 @@ msgstr ""
#. Tag: para
#: preparing.xml:1710
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters. <filename>parmfile.debian</"
+#| "filename> can be in either ASCII or EBCDIC format. A sample "
+#| "<filename>debian.exec</filename> script, which will punch the files in "
+#| "the proper order, is included with the images."
msgid ""
"You need to copy all the files from the <filename>generic</filename> sub-"
"directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
"filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters. <filename>parmfile.debian</filename> can be "
-"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
-"script, which will punch the files in the proper order, is included with the "
-"images."
+"record length of 80 characters (by specifying <userinput>BINARY</userinput> "
+"and <userinput>LOCSITE FIX 80</userinput> in your FTP client). "
+"<filename>parmfile.debian</filename> can be in either ASCII or EBCDIC "
+"format. A sample <filename>debian.exec</filename> script, which will punch "
+"the files in the proper order, is included with the images."
msgstr ""
"您需要从 <filename>generic</filename> 子目录复制所有的文件到 CMS 磁盘。确保 "
"<filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> 是"
@@ -2574,13 +2584,13 @@ msgstr ""
"filename>,用来将文件按正确次序存放,也包含在映象里面。"
#. Tag: title
-#: preparing.xml:1726
+#: preparing.xml:1727
#, no-c-format
msgid "Setting up an installation server"
msgstr "建立安装服务器"
#. Tag: para
-#: preparing.xml:1728
+#: preparing.xml:1729
#, no-c-format
msgid ""
"If you don't have a connection to the Internet (either directly or via a web "
@@ -2593,7 +2603,7 @@ msgstr ""
"HTTP 或 FTP 访问。"
#. Tag: para
-#: preparing.xml:1736
+#: preparing.xml:1737
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
@@ -2605,25 +2615,25 @@ msgstr ""
"些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
#. Tag: emphasis
-#: preparing.xml:1745
+#: preparing.xml:1746
#, no-c-format
msgid "FIXME: more information needed &mdash; from a Redbook?"
msgstr "FIXME: more information needed &mdash; from a Redbook?"
#. Tag: title
-#: preparing.xml:1752
+#: preparing.xml:1753
#, no-c-format
msgid "Hardware Issues to Watch Out For"
msgstr "需要留心的硬件问题"
#. Tag: title
-#: preparing.xml:1755
+#: preparing.xml:1756
#, no-c-format
msgid "USB BIOS support and keyboards"
msgstr "USB BIOS 支持与键盘"
#. Tag: para
-#: preparing.xml:1756
+#: preparing.xml:1757
#, no-c-format
msgid ""
"If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2641,13 +2651,13 @@ msgstr ""
"keyboard support</quote>选项。"
#. Tag: title
-#: preparing.xml:1770
+#: preparing.xml:1771
#, no-c-format
msgid "Display-visibility on OldWorld Powermacs"
msgstr "在 OldWorld Powermac 上正常显示"
#. Tag: para
-#: preparing.xml:1772
+#: preparing.xml:1773
#, no-c-format
msgid ""
"Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 777e72953..2f8f1bedf 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: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-26 13:45+0000\n"
"PO-Revision-Date: 2011-01-16 23:42+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -27,7 +27,7 @@ msgid ""
msgstr "本附录说明如何预置 &d-i; 中提问的答案,让安装过程自动化。"
#. Tag: para
-#: preseed.xml:23 preseed.xml:676
+#: preseed.xml:23 preseed.xml:677
#, no-c-format
msgid ""
"The configuration fragments used in this appendix are also available as an "
@@ -107,7 +107,7 @@ msgid "initrd"
msgstr "initrd"
#. Tag: entry
-#: preseed.xml:70 preseed.xml:523
+#: preseed.xml:70 preseed.xml:524
#, no-c-format
msgid "file"
msgstr "file"
@@ -126,9 +126,8 @@ msgstr "CD/DVD"
#. Tag: entry
#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
-#: preseed.xml:94 preseed.xml:95 preseed.xml:96 preseed.xml:99 preseed.xml:100
-#: preseed.xml:101 preseed.xml:104 preseed.xml:106 preseed.xml:109
-#: preseed.xml:111
+#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100
+#: preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>yes</entry>"
@@ -161,6 +160,12 @@ msgid ""
msgstr "硬盘 <phrase condition=\"bootable-usb\">(包括 U 盘)</phrase>"
#. Tag: entry
+#: preseed.xml:96 preseed.xml:101
+#, no-c-format
+msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
+msgstr ""
+
+#. Tag: entry
#: preseed.xml:98
#, no-c-format
msgid "floppy based (cd-drivers)"
@@ -381,24 +386,30 @@ msgstr ""
#. Tag: para
#: preseed.xml:285
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that <filename>preseed/url</filename> can be shortened to just "
+#| "<filename>url</filename> and <filename>preseed/file</filename> to just "
+#| "<filename>file</filename> when they are passed as boot parameters."
msgid ""
"Note that <filename>preseed/url</filename> can be shortened to just "
-"<filename>url</filename> and <filename>preseed/file</filename> to just "
-"<filename>file</filename> when they are passed as boot parameters."
+"<filename>url</filename>, <filename>preseed/file</filename> to just "
+"<filename>file</filename> and <filename>preseed/file/checksum</filename> to "
+"just <filename>preseed-md5</filename> when they are passed as boot "
+"parameters."
msgstr ""
"注意,在作为引导参数的时候,<filename>preseed/url</filename> 可以简写为 "
"<filename>url</filename>,<filename>preseed/file</filename> 简写为 "
"<filename>file</filename>。"
#. Tag: title
-#: preseed.xml:295
+#: preseed.xml:296
#, no-c-format
msgid "Using boot parameters to preseed questions"
msgstr "使用引导参数预置问题的答案"
#. Tag: para
-#: preseed.xml:296
+#: preseed.xml:297
#, no-c-format
msgid ""
"If a preconfiguration file cannot be used to preseed some steps, the install "
@@ -409,7 +420,7 @@ msgstr ""
"装程序时,在命令行上为内核传递预置的值。"
#. Tag: para
-#: preseed.xml:302
+#: preseed.xml:303
#, no-c-format
msgid ""
"Boot parameters can also be used if you do not really want to use "
@@ -420,7 +431,7 @@ msgstr ""
"中有一些这样的示例。"
#. Tag: para
-#: preseed.xml:308
+#: preseed.xml:309
#, no-c-format
msgid ""
"To set a value to be used inside &d-i;, just pass "
@@ -453,7 +464,7 @@ msgstr ""
"用。"
#. Tag: para
-#: preseed.xml:331
+#: preseed.xml:332
#, no-c-format
msgid ""
"Normally, preseeding a question in this way will mean that the question will "
@@ -466,7 +477,7 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/>。"
#. Tag: para
-#: preseed.xml:338
+#: preseed.xml:339
#, no-c-format
msgid ""
"Note that some variables that are frequently set at the boot prompt have a "
@@ -482,7 +493,7 @@ msgstr ""
"<literal>tasksel:tasksel/first</literal>。"
#. Tag: para
-#: preseed.xml:347
+#: preseed.xml:348
#, no-c-format
msgid ""
"A <quote>--</quote> in the boot options has special meaning. Kernel "
@@ -496,7 +507,7 @@ msgstr ""
"程序可以自动发现它能识别的选项(就像预置选项)。"
#. Tag: para
-#: preseed.xml:356
+#: preseed.xml:357
#, no-c-format
msgid ""
"Current linux kernels (2.6.9 and later) accept a maximum of 32 command line "
@@ -509,7 +520,7 @@ msgstr ""
"数目更少。)"
#. Tag: para
-#: preseed.xml:364
+#: preseed.xml:365
#, no-c-format
msgid ""
"For most installations some of the default options in your bootloader "
@@ -520,7 +531,7 @@ msgstr ""
"literal>,可以放心地删除,这让您可以添加更多的预置选项。"
#. Tag: para
-#: preseed.xml:371
+#: preseed.xml:372
#, no-c-format
msgid ""
"It may not always be possible to specify values with spaces for boot "
@@ -528,13 +539,13 @@ msgid ""
msgstr "引导参数中即使使用引号,也可能无法夹杂空格。"
#. Tag: title
-#: preseed.xml:380
+#: preseed.xml:381
#, no-c-format
msgid "Auto mode"
msgstr "auto 模式"
#. Tag: para
-#: preseed.xml:381
+#: preseed.xml:382
#, no-c-format
msgid ""
"There are several features of &debian; Installer that combine to allow "
@@ -561,7 +572,7 @@ msgstr ""
"literal> 获得。"
#. Tag: para
-#: preseed.xml:398
+#: preseed.xml:399
#, no-c-format
msgid ""
"The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</"
@@ -593,7 +604,7 @@ msgstr ""
"late_command.sh</literal> 获得。"
#. Tag: para
-#: preseed.xml:418
+#: preseed.xml:419
#, no-c-format
msgid ""
"If there is no local DHCP or DNS infrastructure, or if you do not want to "
@@ -615,13 +626,13 @@ msgstr ""
"</screen></informalexample> 它会以下列方式运作:"
#. Tag: para
-#: preseed.xml:431
+#: preseed.xml:432
#, no-c-format
msgid "if the URL is missing a protocol, http is assumed,"
msgstr "如果 URL 不含协议,就使用 http"
#. Tag: para
-#: preseed.xml:434
+#: preseed.xml:435
#, no-c-format
msgid ""
"if the hostname section contains no periods, it has the domain derived from "
@@ -629,7 +640,7 @@ msgid ""
msgstr "如果主机名不含域名,将使用 DHCP 提供的,并且"
#. Tag: para
-#: preseed.xml:438
+#: preseed.xml:439
#, no-c-format
msgid ""
"if there's no <literal>/</literal>'s after the hostname, then the default "
@@ -637,7 +648,7 @@ msgid ""
msgstr "如果主机名后面没有 <literal>/</literal>,那么将加上默认路径。"
#. Tag: para
-#: preseed.xml:444
+#: preseed.xml:445
#, no-c-format
msgid ""
"In addition to specifying the url, you can also specify settings that do not "
@@ -660,7 +671,7 @@ msgstr ""
"</screen></informalexample> classes 可以指定系统的类型,或者本地化信息。"
#. Tag: para
-#: preseed.xml:458
+#: preseed.xml:459
#, no-c-format
msgid ""
"It is of course possible to extend this concept, and if you do, it is "
@@ -678,7 +689,7 @@ msgstr ""
"名。"
#. Tag: para
-#: preseed.xml:468
+#: preseed.xml:469
#, no-c-format
msgid ""
"The <literal>auto</literal> boot label is not yet defined everywhere. The "
@@ -700,7 +711,7 @@ msgstr ""
"低优先级下的问题提出。"
#. Tag: para
-#: preseed.xml:482
+#: preseed.xml:483
#, no-c-format
msgid ""
"Additional options that may be of interest while attempting to automate an "
@@ -713,7 +724,7 @@ msgstr ""
"询。"
#. Tag: para
-#: preseed.xml:491
+#: preseed.xml:492
#, no-c-format
msgid ""
"An extensive example of how to use this framework, including example scripts "
@@ -726,13 +737,13 @@ msgstr ""
"d-i/\">其开发者的网站</ulink>找到。那里的例子还显示出预置可以达到更多的效果。"
#. Tag: title
-#: preseed.xml:502
+#: preseed.xml:503
#, no-c-format
msgid "Aliases useful with preseeding"
msgstr "预置中有用的别名"
#. Tag: para
-#: preseed.xml:503
+#: preseed.xml:504
#, no-c-format
msgid ""
"The following aliases can be useful when using (auto mode) preseeding. Note "
@@ -745,175 +756,175 @@ msgstr ""
"<literal>interface=eth0</literal>。"
#. Tag: entry
-#: preseed.xml:516
+#: preseed.xml:517
#, no-c-format
msgid "auto"
msgstr "auto"
#. Tag: entry
-#: preseed.xml:516
+#: preseed.xml:517
#, no-c-format
msgid "auto-install/enable"
msgstr "auto-install/enable"
#. Tag: entry
-#: preseed.xml:517
+#: preseed.xml:518
#, no-c-format
msgid "classes"
msgstr "classes"
#. Tag: entry
-#: preseed.xml:517
+#: preseed.xml:518
#, no-c-format
msgid "auto-install/classes"
msgstr "auto-install/classes"
#. Tag: entry
-#: preseed.xml:518
+#: preseed.xml:519
#, no-c-format
msgid "<entry>fb</entry>"
msgstr "<entry>fb</entry>"
#. Tag: entry
-#: preseed.xml:518
+#: preseed.xml:519
#, no-c-format
msgid "debian-installer/framebuffer"
msgstr "debian-installer/framebuffer"
#. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:520
#, no-c-format
msgid "language"
msgstr "language"
#. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:520
#, no-c-format
msgid "debian-installer/language"
msgstr "debian-installer/language"
#. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:521
#, no-c-format
msgid "country"
msgstr "country"
#. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:521
#, no-c-format
msgid "debian-installer/country"
msgstr "debian-installer/country"
#. Tag: entry
-#: preseed.xml:521
+#: preseed.xml:522
#, no-c-format
msgid "locale"
msgstr "locale"
#. Tag: entry
-#: preseed.xml:521
+#: preseed.xml:522
#, no-c-format
msgid "debian-installer/locale"
msgstr "debian-installer/locale"
#. Tag: entry
-#: preseed.xml:522
+#: preseed.xml:523
#, no-c-format
msgid "priority"
msgstr "priority"
#. Tag: entry
-#: preseed.xml:522
+#: preseed.xml:523
#, no-c-format
msgid "debconf/priority"
msgstr "debconf/priority"
#. Tag: entry
-#: preseed.xml:523
+#: preseed.xml:524
#, no-c-format
msgid "preseed/file"
msgstr "preseed/file"
#. Tag: entry
-#: preseed.xml:524
+#: preseed.xml:525
#, no-c-format
msgid "<entry>url</entry>"
msgstr "<entry>url</entry>"
#. Tag: entry
-#: preseed.xml:524
+#: preseed.xml:525
#, no-c-format
msgid "preseed/url"
msgstr "preseed/url"
#. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:526
#, no-c-format
msgid "interface"
msgstr "interface"
#. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:526
#, no-c-format
msgid "netcfg/choose_interface"
msgstr "netcfg/choose_interface"
#. Tag: entry
-#: preseed.xml:526
+#: preseed.xml:527
#, no-c-format
msgid "hostname&nbsp;&nbsp;&nbsp;"
msgstr "hostname&nbsp;&nbsp;&nbsp;"
#. Tag: entry
-#: preseed.xml:526
+#: preseed.xml:527
#, no-c-format
msgid "netcfg/get_hostname"
msgstr "netcfg/get_hostname"
#. Tag: entry
-#: preseed.xml:527
+#: preseed.xml:528
#, no-c-format
msgid "domain"
msgstr "domain"
#. Tag: entry
-#: preseed.xml:527
+#: preseed.xml:528
#, no-c-format
msgid "netcfg/get_domain"
msgstr "netcfg/get_domain"
#. Tag: entry
-#: preseed.xml:528
+#: preseed.xml:529
#, no-c-format
msgid "protocol"
msgstr "protocol"
#. Tag: entry
-#: preseed.xml:528
+#: preseed.xml:529
#, no-c-format
msgid "mirror/protocol"
msgstr "mirror/protocol"
#. Tag: entry
-#: preseed.xml:529
+#: preseed.xml:530
#, no-c-format
msgid "suite"
msgstr "suite"
#. Tag: entry
-#: preseed.xml:529
+#: preseed.xml:530
#, no-c-format
msgid "mirror/suite"
msgstr "mirror/suite"
#. Tag: title
-#: preseed.xml:536
+#: preseed.xml:537
#, no-c-format
msgid "Using a DHCP server to specify preconfiguration files"
msgstr "使用 DHCP 服务器指定预置文件"
#. Tag: para
-#: preseed.xml:537
+#: preseed.xml:538
#, no-c-format
msgid ""
"It's also possible to use DHCP to specify a preconfiguration file to "
@@ -930,7 +941,7 @@ msgstr ""
"务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
#. Tag: screen
-#: preseed.xml:548
+#: preseed.xml:549
#, no-c-format
msgid ""
"if substring (option vendor-class-identifier, 0, 3) = \"d-i\" {\n"
@@ -942,7 +953,7 @@ msgstr ""
"}"
#. Tag: para
-#: preseed.xml:550
+#: preseed.xml:551
#, no-c-format
msgid ""
"Note that the above example limits this filename to DHCP clients that "
@@ -955,7 +966,7 @@ msgstr ""
"段,以避免预置网络中的其他安装。"
#. Tag: para
-#: preseed.xml:557
+#: preseed.xml:558
#, no-c-format
msgid ""
"A good way to use the DHCP preseeding is to only preseed values specific to "
@@ -969,13 +980,13 @@ msgstr ""
"进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
#. Tag: title
-#: preseed.xml:571
+#: preseed.xml:572
#, no-c-format
msgid "Creating a preconfiguration file"
msgstr "创建预置文件"
#. Tag: para
-#: preseed.xml:572
+#: preseed.xml:573
#, no-c-format
msgid ""
"The preconfiguration file is in the format used by the <command>debconf-set-"
@@ -986,21 +997,21 @@ msgstr ""
"文件中每一行的格式为:"
#. Tag: screen
-#: preseed.xml:578
+#: preseed.xml:579
#, 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:580
+#: preseed.xml:581
#, no-c-format
msgid ""
"There are a few rules to keep in mind when writing a preconfiguration file."
msgstr "编写预置文件的时候要留意几条规则。"
#. Tag: para
-#: preseed.xml:587
+#: preseed.xml:588
#, no-c-format
msgid ""
"Put only a single space or tab between type and value: any additional "
@@ -1009,7 +1020,7 @@ msgstr ""
"在类型和值之间只有一个空格或者 tab:任何额外的空格将被解释为值的一部分。"
#. Tag: para
-#: preseed.xml:591
+#: preseed.xml:592
#, no-c-format
msgid ""
"A line can be split into multiple lines by appending a backslash "
@@ -1023,11 +1034,18 @@ msgstr ""
"割的行连接时会把行首和行尾的空格缩减为一个空格,再组成单独一行。"
#. Tag: para
-#: preseed.xml:598
-#, no-c-format
-msgid ""
-"For debconf variables (templates) used in the installer itself, the owner "
-"should be set to <quote>d-i</quote>; to preseed variables used in the "
+#: preseed.xml:599
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For debconf variables (templates) used in the installer itself, the owner "
+#| "should be set to <quote>d-i</quote>; to preseed variables used in the "
+#| "installed system, the name of the package that contains the corresponding "
+#| "debconf template should be used. Only variables that have their owner set "
+#| "to something other than <quote>d-i</quote> will be propagated to the "
+#| "debconf database for the installed system."
+msgid ""
+"For debconf variables (templates) used only in the installer itself, the "
+"owner should be set to <quote>d-i</quote>; to preseed variables used in the "
"installed system, the name of the package that contains the corresponding "
"debconf template should be used. Only variables that have their owner set to "
"something other than <quote>d-i</quote> will be propagated to the debconf "
@@ -1039,7 +1057,7 @@ msgstr ""
"debconf 数据库里面。"
#. Tag: para
-#: preseed.xml:606
+#: preseed.xml:607
#, no-c-format
msgid ""
"Most questions need to be preseeded using the values valid in English and "
@@ -1050,7 +1068,7 @@ msgstr ""
"<classname>partman</classname>),需要使用翻译过的值。"
#. Tag: para
-#: preseed.xml:612
+#: preseed.xml:613
#, no-c-format
msgid ""
"Some questions take a code as value instead of the English text that is "
@@ -1058,7 +1076,7 @@ msgid ""
msgstr "有些问题在安装过程中显示值的代码而不是英文文本。"
#. Tag: para
-#: preseed.xml:618
+#: preseed.xml:619
#, no-c-format
msgid ""
"The easiest way to create a preconfiguration file is to use the example file "
@@ -1068,7 +1086,7 @@ msgstr ""
"\"preseed-contents\"/>。"
#. Tag: para
-#: preseed.xml:623
+#: preseed.xml:624
#, no-c-format
msgid ""
"An alternative method is to do a manual installation and then, after "
@@ -1081,7 +1099,7 @@ msgstr ""
"程序的 cdebconf 数据库到一个文件:"
#. Tag: screen
-#: preseed.xml:630
+#: preseed.xml:631
#, no-c-format
msgid ""
"$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -1091,7 +1109,7 @@ msgstr ""
"$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
#. Tag: para
-#: preseed.xml:632
+#: preseed.xml:633
#, no-c-format
msgid ""
"However, a file generated in this manner will have some items that should "
@@ -1102,7 +1120,7 @@ msgstr ""
"始。"
#. Tag: para
-#: preseed.xml:640
+#: preseed.xml:641
#, no-c-format
msgid ""
"This method relies on the fact that, at the end of the installation, the "
@@ -1116,7 +1134,7 @@ msgstr ""
"感的信息,默认只为 root 可读。"
#. Tag: para
-#: preseed.xml:648
+#: preseed.xml:649
#, no-c-format
msgid ""
"The directory <filename>/var/log/installer</filename> and all files in it "
@@ -1127,7 +1145,7 @@ msgstr ""
"log/installer</filename> 目录及其中的文件将从您的系统中删除。"
#. Tag: para
-#: preseed.xml:656
+#: preseed.xml:657
#, no-c-format
msgid ""
"To check possible values for questions, you can use <command>nano</command> "
@@ -1142,7 +1160,7 @@ msgstr ""
"值。"
#. Tag: para
-#: preseed.xml:664
+#: preseed.xml:665
#, no-c-format
msgid ""
"To check if the format of your preconfiguration file is valid before "
@@ -1153,13 +1171,13 @@ msgstr ""
"selections -c <replaceable>preseed.cfg</replaceable></command> 命令。"
#. Tag: title
-#: preseed.xml:675
+#: preseed.xml:676
#, no-c-format
msgid "Contents of the preconfiguration file (for &releasename;)"
msgstr "预置文件的内容(&releasename;)"
#. Tag: para
-#: preseed.xml:681
+#: preseed.xml:682
#, no-c-format
msgid ""
"Note that this example is based on an installation for the Intel x86 "
@@ -1173,21 +1191,23 @@ msgstr ""
"debconf 设置替换。"
#. Tag: para
-#: preseed.xml:689
+#: preseed.xml:690
#, no-c-format
msgid ""
"Details on how the different Debian Installer components actually work can "
"be found in <xref linkend=\"module-details\"/>."
-msgstr "有关不同 Debian 安装程序模块的工作细节,请参阅 <xref linkend=\"module-details\"/>。"
+msgstr ""
+"有关不同 Debian 安装程序模块的工作细节,请参阅 <xref linkend=\"module-details"
+"\"/>。"
#. Tag: title
-#: preseed.xml:697
+#: preseed.xml:698
#, no-c-format
msgid "Localization"
msgstr "本地化"
#. Tag: para
-#: preseed.xml:698
+#: preseed.xml:699
#, no-c-format
msgid ""
"Setting localization values will only work if you are using initrd "
@@ -1197,7 +1217,7 @@ msgstr ""
"设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
#. Tag: para
-#: preseed.xml:704
+#: preseed.xml:705
#, no-c-format
msgid ""
"The locale can be used to specify both language and country and can be any "
@@ -1213,7 +1233,7 @@ msgstr ""
"userinput>。"
#. Tag: para
-#: preseed.xml:713
+#: preseed.xml:714
#, no-c-format
msgid ""
"Although this method is very easy to use, it does not allow preseeding of "
@@ -1232,8 +1252,18 @@ msgstr ""
"因此另一种方法是单独预置各值。语言和国家可以在引导参数里面指定。"
#. Tag: screen
-#: preseed.xml:728
-#, no-c-format
+#: preseed.xml:729
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# 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"
msgid ""
"# Preseeding only locale sets language, country and locale.\n"
"d-i debian-installer/locale string en_US\n"
@@ -1243,7 +1273,7 @@ msgid ""
"#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"
+"#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8"
msgstr ""
"# Preseeding only locale sets language, country and locale.\n"
"d-i debian-installer/locale string en_US\n"
@@ -1256,22 +1286,25 @@ msgstr ""
"#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
#. Tag: para
-#: preseed.xml:730
-#, no-c-format
+#: preseed.xml:731
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Keyboard configuration consists of selecting a keyboard architecture and "
+#| "a keymap."
msgid ""
-"Keyboard configuration consists of selecting a keyboard architecture and a "
+"Keyboard configuration consists of selecting a keymap and (for non-latin "
+"keymaps) a toggle key to switch between the non-latin keymap and the US "
"keymap."
-msgstr ""
-"键盘设置由键盘体系和 keymap 组成。"
+msgstr "键盘设置由键盘体系和 keymap 组成。"
#. Tag: screen
-#: preseed.xml:737
+#: preseed.xml:736
#, fuzzy, no-c-format
msgid ""
"# Keyboard selection.\n"
"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
"d-i keymap select us\n"
-"# d-i keyboard-configuration/toggle select No toggling\n"
+"# d-i keyboard-configuration/toggle select No toggling"
msgstr ""
"# Keyboard selection.\n"
"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
@@ -1279,24 +1312,24 @@ msgstr ""
"# d-i keyboard-configuration/toggle select No toggling\n"
#. Tag: para
-#: preseed.xml:739
+#: preseed.xml:738
#, no-c-format
msgid ""
-"To skip keyboard configuration, preseed <classname>keymap</"
-"classname> with <userinput>skip-config</userinput>. This will result in the "
-"kernel keymap remaining active."
+"To skip keyboard configuration, preseed <classname>keymap</classname> with "
+"<userinput>skip-config</userinput>. This will result in the kernel keymap "
+"remaining active."
msgstr ""
-"使用 <userinput>skip-config</userinput> 可以跳过键盘预置 <classname>keymap"
-"</classname>。这将导致内核 keymap 保持活动。"
+"使用 <userinput>skip-config</userinput> 可以跳过键盘预置 <classname>keymap</"
+"classname>。这将导致内核 keymap 保持活动。"
#. Tag: title
-#: preseed.xml:758
+#: preseed.xml:750
#, no-c-format
msgid "Network configuration"
msgstr "网络设置"
#. Tag: para
-#: preseed.xml:759
+#: preseed.xml:751
#, no-c-format
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
@@ -1309,7 +1342,7 @@ msgstr ""
"助。如果您计划从网络加载预置文件,应该使用传递网络设置给内核引导参数的方式。"
#. Tag: para
-#: preseed.xml:767
+#: preseed.xml:759
#, no-c-format
msgid ""
"If you need to pick a particular interface when netbooting before loading a "
@@ -1320,7 +1353,7 @@ msgstr ""
"<userinput>interface=<replaceable>eth1</replaceable></userinput>。"
#. Tag: para
-#: preseed.xml:773
+#: preseed.xml:765
#, no-c-format
msgid ""
"Although preseeding the network configuration is normally not possible when "
@@ -1336,20 +1369,74 @@ msgstr ""
"再运行一次,这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面:"
#. Tag: screen
-#: preseed.xml:783
+#: preseed.xml:775
#, no-c-format
msgid "killall.sh; netcfg"
msgstr "killall.sh; netcfg"
#. Tag: para
-#: preseed.xml:785
+#: preseed.xml:777
#, no-c-format
msgid "The following debconf variables are relevant for network configuration."
msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
-#: preseed.xml:791
-#, no-c-format
+#: preseed.xml:783
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Disable network configuration entirely. This is useful for cdrom\n"
+#| "# installations on non-networked devices where the network questions,\n"
+#| "# warning and long timeouts are a nuisance.\n"
+#| "#d-i netcfg/enable boolean false\n"
+#| "\n"
+#| "# netcfg will choose an interface that has link if possible. This makes "
+#| "it\n"
+#| "# skip displaying a list if there is more than one interface.\n"
+#| "d-i netcfg/choose_interface select auto\n"
+#| "\n"
+#| "# To pick a particular interface instead:\n"
+#| "#d-i netcfg/choose_interface select eth1\n"
+#| "\n"
+#| "# If you have a slow dhcp server and the installer times out waiting for\n"
+#| "# it, this might be useful.\n"
+#| "#d-i netcfg/dhcp_timeout string 60\n"
+#| "\n"
+#| "# If you prefer to configure the network manually, uncomment this line "
+#| "and\n"
+#| "# the static network configuration below.\n"
+#| "#d-i netcfg/disable_dhcp boolean true\n"
+#| "\n"
+#| "# If you want the preconfiguration file to work on systems both with and\n"
+#| "# without a dhcp server, uncomment these lines and the static network\n"
+#| "# configuration below.\n"
+#| "#d-i netcfg/dhcp_failed note\n"
+#| "#d-i netcfg/dhcp_options select Configure network manually\n"
+#| "\n"
+#| "# Static network configuration.\n"
+#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
+#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
+#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
+#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
+#| "#d-i netcfg/confirm_static boolean true\n"
+#| "\n"
+#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
+#| "# values set here. However, setting the values still prevents the "
+#| "questions\n"
+#| "# from being shown, even if values come from dhcp.\n"
+#| "d-i netcfg/get_hostname string unassigned-hostname\n"
+#| "d-i netcfg/get_domain string unassigned-domain\n"
+#| "\n"
+#| "# Disable that annoying WEP key dialog.\n"
+#| "d-i netcfg/wireless_wep string\n"
+#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
+#| "#d-i netcfg/dhcp_hostname string radish\n"
+#| "\n"
+#| "# If non-free firmware is needed for the network or other hardware, you "
+#| "can\n"
+#| "# configure the installer to always try to load it, without prompting. "
+#| "Or\n"
+#| "# change to false to disable asking.\n"
+#| "#d-i hw-detect/load_firmware boolean true"
msgid ""
"# Disable network configuration entirely. This is useful for cdrom\n"
"# installations on non-networked devices where the network questions,\n"
@@ -1363,6 +1450,10 @@ msgid ""
"# To pick a particular interface instead:\n"
"#d-i netcfg/choose_interface select eth1\n"
"\n"
+"# To set a different link detection timeout (default is 3 seconds).\n"
+"# Values are interpreted as seconds.\n"
+"#di netcfg/link_detection_timeout string 10\n"
+"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
"#d-i netcfg/dhcp_timeout string 60\n"
@@ -1450,7 +1541,7 @@ msgstr ""
"#d-i hw-detect/load_firmware boolean true"
#. Tag: para
-#: preseed.xml:793
+#: preseed.xml:785
#, no-c-format
msgid ""
"Please note that <command>netcfg</command> will automatically determine the "
@@ -1469,13 +1560,13 @@ msgstr ""
"quote> 确定不使用网关。"
#. Tag: title
-#: preseed.xml:809
+#: preseed.xml:801
#, no-c-format
msgid "Network console"
msgstr "网络控制台"
#. Tag: screen
-#: preseed.xml:811
+#: preseed.xml:803
#, no-c-format
msgid ""
"# Use the following settings if you wish to make use of the network-console\n"
@@ -1493,13 +1584,13 @@ msgstr ""
"#d-i network-console/password-again password r00tme"
#. Tag: title
-#: preseed.xml:816
+#: preseed.xml:808
#, no-c-format
msgid "Mirror settings"
msgstr "镜像设置"
#. Tag: para
-#: preseed.xml:817
+#: preseed.xml:809
#, no-c-format
msgid ""
"Depending on the installation method you use, a mirror may be used to "
@@ -1511,7 +1602,7 @@ msgstr ""
"安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
#. Tag: para
-#: preseed.xml:824
+#: preseed.xml:816
#, no-c-format
msgid ""
"The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1520,7 +1611,7 @@ msgstr ""
"参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
#. Tag: para
-#: preseed.xml:829
+#: preseed.xml:821
#, no-c-format
msgid ""
"The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1535,7 +1626,7 @@ msgstr ""
"常安装程序会自动安装并使用正确的值而毋需手动设置。"
#. Tag: screen
-#: preseed.xml:840
+#: preseed.xml:832
#, no-c-format
msgid ""
"# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1563,13 +1654,13 @@ msgstr ""
"#d-i mirror/udeb/suite string testing"
#. Tag: title
-#: preseed.xml:845
+#: preseed.xml:837
#, no-c-format
msgid "Account setup"
msgstr "帐号设置"
#. Tag: para
-#: preseed.xml:846
+#: preseed.xml:838
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -1580,7 +1671,7 @@ msgstr ""
"或 MD5 <emphasis>哈希</emphasis> 值。"
#. Tag: para
-#: preseed.xml:853
+#: preseed.xml:845
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1593,7 +1684,7 @@ msgstr ""
"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
#. Tag: screen
-#: preseed.xml:863
+#: preseed.xml:855
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -1651,7 +1742,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:865
+#: preseed.xml:857
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -1668,26 +1759,26 @@ msgstr ""
"root 登录(例如使用 SSH key 认证或 sudo)。"
#. Tag: para
-#: preseed.xml:875
+#: preseed.xml:867
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "下面的命令可用于生成密码的 MD5 值。"
#. Tag: screen
-#: preseed.xml:879
+#: preseed.xml:871
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:885
+#: preseed.xml:877
#, no-c-format
msgid "Clock and time zone setup"
msgstr "时钟与时区设置"
#. Tag: screen
-#: preseed.xml:887
+#: preseed.xml:879
#, no-c-format
msgid ""
"# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1715,13 +1806,13 @@ msgstr ""
"#d-i clock-setup/ntp-server string ntp.example.com"
#. Tag: title
-#: preseed.xml:892
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning"
msgstr "分区"
#. Tag: para
-#: preseed.xml:893
+#: preseed.xml:885
#, no-c-format
msgid ""
"Using preseeding to partition the harddisk is limited to what is supported "
@@ -1735,7 +1826,7 @@ msgstr ""
"义方案,用户自定义的方案文件或预置文件包含的方案。"
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:893
#, no-c-format
msgid ""
"Preseeding of advanced partition setups using RAID, LVM and encryption is "
@@ -1746,16 +1837,24 @@ msgstr ""
"性不足。"
#. Tag: para
-#: preseed.xml:907
-#, no-c-format
+#: preseed.xml:899
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The examples below only provide basic information on the use of recipes. "
+#| "For detailed information see the files <filename>partman-auto-recipe.txt</"
+#| "filename> and <filename>partman-auto-raid-recipe.txt</filename> included "
+#| "in the <classname>debian-installer</classname> package. Both files are "
+#| "also available from the <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/"
+#| "devel/\">&d-i; source repository</ulink>. Note that the supported "
+#| "functionality may change between releases."
msgid ""
"The examples below only provide basic information on the use of recipes. For "
"detailed information see the files <filename>partman-auto-recipe.txt</"
"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
"the <classname>debian-installer</classname> package. Both files are also "
-"available from the <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/"
-"\">&d-i; source repository</ulink>. Note that the supported functionality "
-"may change between releases."
+"available from the <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source "
+"repository</ulink>. Note that the supported functionality may change between "
+"releases."
msgstr ""
"下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 "
"<filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-"
@@ -1765,7 +1864,7 @@ msgstr ""
"改变。"
#. Tag: para
-#: preseed.xml:921
+#: preseed.xml:913
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1776,13 +1875,13 @@ msgstr ""
"确的那一个。"
#. Tag: title
-#: preseed.xml:930
+#: preseed.xml:922
#, no-c-format
msgid "Partitioning example"
msgstr "分区示例"
#. Tag: screen
-#: preseed.xml:932
+#: preseed.xml:924
#, no-c-format
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
@@ -1932,13 +2031,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:928
#, no-c-format
msgid "Partitioning using RAID"
msgstr "使用 RAID 分区"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:929
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1949,7 +2048,7 @@ msgstr ""
"列(degraded arrays)和指定额外设备。"
#. Tag: para
-#: preseed.xml:943
+#: preseed.xml:935
#, no-c-format
msgid ""
"If you are using RAID 1, you can preseed grub to install to all devices used "
@@ -1959,7 +2058,7 @@ msgstr ""
"linkend=\"preseed-bootloader\"/>。"
#. Tag: para
-#: preseed.xml:950
+#: preseed.xml:942
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1973,7 +2072,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: screen
-#: preseed.xml:960
+#: preseed.xml:952
#, no-c-format
msgid ""
"# The method should be set to \"raid\".\n"
@@ -2077,13 +2176,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:965
+#: preseed.xml:957
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "分区挂载控制"
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:958
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2099,7 +2198,7 @@ msgstr ""
"系统仍然使用 UUID 方式挂载。"
#. Tag: para
-#: preseed.xml:975
+#: preseed.xml:967
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2109,7 +2208,7 @@ msgstr ""
"挂载。"
#. Tag: para
-#: preseed.xml:982
+#: preseed.xml:974
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2123,7 +2222,7 @@ msgstr ""
"后会出现一些随机的情况。"
#. Tag: screen
-#: preseed.xml:992
+#: preseed.xml:984
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2141,13 +2240,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:998
+#: preseed.xml:990
#, no-c-format
msgid "Base system installation"
msgstr "基本系统安装"
#. Tag: para
-#: preseed.xml:999
+#: preseed.xml:991
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2156,19 +2255,31 @@ msgid ""
msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
#. Tag: screen
-#: preseed.xml:1006
-#, no-c-format
+#: preseed.xml:998
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Configure APT to not install recommended packages by default. Use of "
+#| "this\n"
+#| "# option can result in an incomplete system and should only be used by "
+#| "very\n"
+#| "# experienced users.\n"
+#| "#d-i base-installer/install-recommends boolean false\n"
+#| "\n"
+#| "# Select the initramfs generator used to generate the initrd for 2.6 "
+#| "kernels.\n"
+#| "#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
+#| "tools\n"
+#| "\n"
+#| "# The kernel image (meta) package to be installed; \"none\" can be used "
+#| "if no\n"
+#| "# kernel is to be installed.\n"
+#| "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
"# option can result in an incomplete system and should only be used by very\n"
"# experienced users.\n"
"#d-i base-installer/install-recommends boolean false\n"
"\n"
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
-"tools\n"
-"\n"
"# The kernel image (meta) package to be installed; \"none\" can be used if "
"no\n"
"# kernel is to be installed.\n"
@@ -2190,13 +2301,13 @@ msgstr ""
"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
#. Tag: title
-#: preseed.xml:1011
+#: preseed.xml:1003
#, no-c-format
msgid "Apt setup"
msgstr "设置 apt"
#. Tag: para
-#: preseed.xml:1012
+#: preseed.xml:1004
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2209,7 +2320,7 @@ msgstr ""
"仓库。"
#. Tag: screen
-#: preseed.xml:1020
+#: preseed.xml:1012
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2267,13 +2378,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:1025
+#: preseed.xml:1017
#, no-c-format
msgid "Package selection"
msgstr "选择软件包"
#. Tag: para
-#: preseed.xml:1026
+#: preseed.xml:1018
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2281,73 +2392,73 @@ msgid ""
msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括:"
#. Tag: userinput
-#: preseed.xml:1035
+#: preseed.xml:1027
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1038
+#: preseed.xml:1030
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1041
+#: preseed.xml:1033
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1044
+#: preseed.xml:1036
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1047
+#: preseed.xml:1039
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1050
+#: preseed.xml:1042
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1053
+#: preseed.xml:1045
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1056
+#: preseed.xml:1048
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1059
+#: preseed.xml:1051
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1062
+#: preseed.xml:1054
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1065
+#: preseed.xml:1057
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1069
+#: preseed.xml:1061
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2358,7 +2469,7 @@ msgstr ""
"<userinput>standard</userinput> 任务。"
#. Tag: para
-#: preseed.xml:1075
+#: preseed.xml:1067
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2372,7 +2483,7 @@ msgstr ""
"命令行上使用。"
#. Tag: screen
-#: preseed.xml:1085
+#: preseed.xml:1077
#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2410,14 +2521,64 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1090
+#: preseed.xml:1082
#, no-c-format
msgid "Boot loader installation"
msgstr "安装 bootloader"
#. Tag: screen
-#: preseed.xml:1092
-#, no-c-format
+#: preseed.xml:1084
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
+#| "\n"
+#| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
+#| "the\n"
+#| "# default. If you need GRUB Legacy for some particular reason, then\n"
+#| "# uncomment this:\n"
+#| "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)\n"
+#| "# To install to a particular device:\n"
+#| "#d-i grub-installer/bootdev string /dev/sda\n"
+#| "\n"
+#| "# Optional password for grub, either in clear text\n"
+#| "#d-i grub-installer/password password r00tme\n"
+#| "#d-i grub-installer/password-again password r00tme\n"
+#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
+#| "\n"
+#| "# Use the following option to add additional boot parameters for the\n"
+#| "# installed system (if supported by the bootloader installer).\n"
+#| "# Note: options passed to the installer will be added automatically.\n"
+#| "#d-i debian-installer/add-kernel-opts string nousb"
msgid ""
"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
"you want lilo installed\n"
@@ -2430,11 +2591,6 @@ msgid ""
"this\n"
"#d-i grub-installer/skip boolean true</phrase>\n"
"\n"
-"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
-"# default. If you need GRUB Legacy for some particular reason, then\n"
-"# uncomment this:\n"
-"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
-"\n"
"# This is fairly safe to set, it makes grub install automatically to the "
"MBR\n"
"# if no other operating system is detected on the machine.\n"
@@ -2514,7 +2670,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1094
+#: preseed.xml:1086
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2526,13 +2682,13 @@ msgstr ""
"令。"
#. Tag: title
-#: preseed.xml:1104
+#: preseed.xml:1096
#, no-c-format
msgid "Finishing up the installation"
msgstr "完成安装"
#. Tag: screen
-#: preseed.xml:1106
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2572,13 +2728,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1111
+#: preseed.xml:1103
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:1113
+#: preseed.xml:1105
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2598,19 +2754,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1120
+#: preseed.xml:1112
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:1123
+#: preseed.xml:1115
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "安装过程中运行用户命令"
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1116
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2620,7 +2776,7 @@ msgstr ""
"本。"
#. Tag: screen
-#: preseed.xml:1132
+#: preseed.xml:1124
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2668,13 +2824,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1137
+#: preseed.xml:1129
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "使用预置修改默认值"
#. Tag: para
-#: preseed.xml:1138
+#: preseed.xml:1130
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2698,7 +2854,7 @@ msgstr ""
"这对于测试和调试您的预置文件很有帮助。"
#. Tag: para
-#: preseed.xml:1152
+#: preseed.xml:1144
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2711,7 +2867,7 @@ msgstr ""
"\"preseed-bootparms\"/> 的脚注。"
#. Tag: para
-#: preseed.xml:1159
+#: preseed.xml:1151
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2731,6 +2887,16 @@ msgstr ""
"replaceable>?=<replaceable>value</replaceable></userinput>)。当然,这只会影响"
"在安装时显示出来的问题对应的参数,而不是<quote>内部的</quote>参数。"
+#. Tag: para
+#: preseed.xml:1161
+#, no-c-format
+msgid ""
+"For more debugging information, use the boot parameter "
+"<classname>DEBCONF_DEBUG=5</classname>. This will cause <classname>debconf</"
+"classname> to print much more detail about the current settings of each "
+"variable and about its progress through each package's installation scripts."
+msgstr ""
+
#. Tag: title
#: preseed.xml:1173
#, no-c-format
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 1d33fd120..fc74bdd05 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2010-11-04 18:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1167,14 +1167,21 @@ msgstr "可以使用的选项有:"
#. Tag: para
#: random-bits.xml:573
-#, no-c-format
-msgid "create a default set of static device files using"
+#, fuzzy, no-c-format
+#| msgid "create a default set of static device files using"
+msgid ""
+"install the makedev package, and create a default set of static device files "
+"using (after chrooting)"
msgstr "创建默认的静态设备文件,使用"
#. Tag: screen
-#: random-bits.xml:576
-#, no-c-format
+#: random-bits.xml:577
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# cd /dev\n"
+#| "# MAKEDEV generic"
msgid ""
+"# apt-get install makedev\n"
"# cd /dev\n"
"# MAKEDEV generic"
msgstr ""
@@ -1182,14 +1189,14 @@ msgstr ""
"# MAKEDEV generic"
#. Tag: para
-#: random-bits.xml:579
+#: random-bits.xml:580
#, no-c-format
msgid ""
"manually create only specific device files using <command>MAKEDEV</command>"
msgstr "手动创建指定的设备文件,使用 <command>MAKEDEV</command>"
#. Tag: para
-#: random-bits.xml:584
+#: random-bits.xml:585
#, no-c-format
msgid ""
"bind mount /dev from your host system on top of /dev in the target system; "
@@ -1200,13 +1207,13 @@ msgstr ""
"postinst 脚本会创建设备文件,所以要小心使用改选项。"
#. Tag: title
-#: random-bits.xml:597
+#: random-bits.xml:598
#, no-c-format
msgid "Mount Partitions"
msgstr "分区的挂载"
#. Tag: para
-#: random-bits.xml:598
+#: random-bits.xml:599
#, no-c-format
msgid ""
"You need to create <filename>/etc/fstab</filename>. "
@@ -1286,13 +1293,13 @@ msgstr ""
"<userinput>mount -a</userinput>,请在进入下一步前先将 proc 挂载:"
#. Tag: screen
-#: random-bits.xml:624
+#: random-bits.xml:625
#, no-c-format
msgid "# mount -t proc proc /proc"
msgstr "# mount -t proc proc /proc"
#. Tag: para
-#: random-bits.xml:626
+#: random-bits.xml:627
#, no-c-format
msgid ""
"The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1303,19 +1310,19 @@ msgstr ""
"chroot: 以外加载 proc。"
#. Tag: screen
-#: random-bits.xml:632
+#: random-bits.xml:633
#, no-c-format
msgid "# mount -t proc proc /mnt/debinst/proc"
msgstr "# mount -t proc proc /mnt/debinst/proc"
#. Tag: title
-#: random-bits.xml:638
+#: random-bits.xml:639
#, no-c-format
msgid "Setting Timezone"
msgstr "设置时区"
#. Tag: para
-#: random-bits.xml:639
+#: random-bits.xml:640
#, no-c-format
msgid ""
"An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1327,7 +1334,7 @@ msgstr ""
"间解释硬件时钟。下面命令可以让您设定和选择时区。"
#. Tag: screen
-#: random-bits.xml:646
+#: random-bits.xml:647
#, no-c-format
msgid ""
"# editor /etc/default/rcS\n"
@@ -1337,13 +1344,13 @@ msgstr ""
"# dpkg-reconfigure tzdata"
#. Tag: title
-#: random-bits.xml:652
+#: random-bits.xml:653
#, no-c-format
msgid "Configure Networking"
msgstr "网络的配置"
#. Tag: para
-#: random-bits.xml:653
+#: random-bits.xml:654
#, no-c-format
msgid ""
"To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1465,13 +1472,13 @@ msgstr ""
"with the interface name (eth0, eth1, etc.) that you expect."
#. Tag: title
-#: random-bits.xml:694
+#: random-bits.xml:695
#, no-c-format
msgid "Configure Apt"
msgstr "配置 Apt"
#. Tag: para
-#: random-bits.xml:695
+#: random-bits.xml:696
#, no-c-format
msgid ""
"Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1496,13 +1503,13 @@ msgstr ""
"update</userinput>。"
#. Tag: title
-#: random-bits.xml:711
+#: random-bits.xml:712
#, no-c-format
msgid "Configure Locales and Keyboard"
msgstr "本地化和键盘的配置"
#. Tag: para
-#: random-bits.xml:712
+#: random-bits.xml:713
#, no-c-format
msgid ""
"To configure your locale settings to use a language other than English, "
@@ -1520,7 +1527,7 @@ msgstr ""
"</screen></informalexample> 配置您的键盘(如果需要):"
#. Tag: screen
-#: random-bits.xml:722
+#: random-bits.xml:723
#, no-c-format
msgid ""
"# aptitude install console-setup\n"
@@ -1530,7 +1537,7 @@ msgstr ""
"# dpkg-reconfigure keyboard-configuration"
#. Tag: para
-#: random-bits.xml:724
+#: random-bits.xml:725
#, no-c-format
msgid ""
"Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1538,13 +1545,13 @@ msgid ""
msgstr "注意,在 chroot 里面不能设置键盘,但重新启动以后可以。"
#. Tag: title
-#: random-bits.xml:734
+#: random-bits.xml:735
#, no-c-format
msgid "Install a Kernel"
msgstr "内核的安装"
#. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:736
#, no-c-format
msgid ""
"If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1554,19 +1561,19 @@ msgstr ""
"以用下面指令找到那些预先打包的内核:"
#. Tag: screen
-#: random-bits.xml:740
+#: random-bits.xml:741
#, no-c-format
msgid "# apt-cache search &kernelpackage;"
msgstr "# apt-cache search &kernelpackage;"
#. Tag: para
-#: random-bits.xml:742
+#: random-bits.xml:743
#, no-c-format
msgid "Then install the kernel package of your choice using its package name."
msgstr "然后根据所选取的软件包名称安装内核软件包。"
#. Tag: screen
-#: random-bits.xml:746
+#: random-bits.xml:747
#, no-c-format
msgid ""
"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
@@ -1576,13 +1583,13 @@ msgstr ""
"replaceable>"
#. Tag: title
-#: random-bits.xml:752
+#: random-bits.xml:753
#, no-c-format
msgid "Set up the Boot Loader"
msgstr "Boot Loader 的设置"
#. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:754
#, no-c-format
msgid ""
"To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1596,14 +1603,24 @@ msgstr ""
"成。"
#. Tag: para
-#: random-bits.xml:760
-#, no-c-format
+#: random-bits.xml:761
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
+#| "<userinput>man lilo.conf</userinput></phrase> for instructions on setting "
+#| "up the bootloader. If you are keeping the system you used to install "
+#| "&debian;, just add an entry for the &debian; install to your existing "
+#| "grub <filename>menu.lst</filename><phrase arch=\"x86\">or <filename>lilo."
+#| "conf</filename>. For <filename>lilo.conf</filename>, you could also copy "
+#| "it to the new system and edit it there. After you are done editing, call "
+#| "<command>lilo</command> (remember it will use <filename>lilo.conf</"
+#| "filename> relative to the system you call it from)</phrase>."
msgid ""
"Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
"<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
"the bootloader. If you are keeping the system you used to install &debian;, "
-"just add an entry for the &debian; install to your existing grub "
-"<filename>menu.lst</filename><phrase arch=\"x86\">or <filename>lilo.conf</"
+"just add an entry for the &debian; install to your existing grub2 "
+"<filename>grub.cfg</filename><phrase arch=\"x86\">or <filename>lilo.conf</"
"filename>. For <filename>lilo.conf</filename>, you could also copy it to the "
"new system and edit it there. After you are done editing, call "
"<command>lilo</command> (remember it will use <filename>lilo.conf</filename> "
@@ -1619,17 +1636,27 @@ msgstr ""
"<filename>lilo.conf</filename>)</phrase>。"
#. Tag: para
-#: random-bits.xml:772
-#, no-c-format
-msgid ""
-"Installing and setting up <classname>grub</classname> is as easy as: "
+#: random-bits.xml:773
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Installing and setting up <classname>grub</classname> is as easy as: "
+#| "<informalexample><screen>\n"
+#| "# aptitude install grub\n"
+#| "# grub-install /dev/<replaceable>hda</replaceable>\n"
+#| "# update-grub\n"
+#| "</screen></informalexample> The second command will install "
+#| "<command>grub</command> (in this case in the MBR of <literal>hda</"
+#| "literal>). The last command will create a sane and working <filename>/"
+#| "boot/grub/menu.lst</filename>."
+msgid ""
+"Installing and setting up <classname>grub2</classname> is as easy as: "
"<informalexample><screen>\n"
-"# aptitude install grub\n"
+"# aptitude install grub-pc\n"
"# grub-install /dev/<replaceable>hda</replaceable>\n"
"# update-grub\n"
-"</screen></informalexample> The second command will install <command>grub</"
+"</screen></informalexample> The second command will install <command>grub2</"
"command> (in this case in the MBR of <literal>hda</literal>). The last "
-"command will create a sane and working <filename>/boot/grub/menu.lst</"
+"command will create a sane and working <filename>/boot/grub/grub.cfg</"
"filename>."
msgstr ""
"安装和建立 <classname>grub</classname> 非常容易:<informalexample><screen>\n"
@@ -1641,24 +1668,28 @@ msgstr ""
"boot/grub/menu.lst</filename>。"
#. Tag: para
-#: random-bits.xml:782
-#, no-c-format
+#: random-bits.xml:783
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that this assumes that a <filename>/dev/hda</filename> device file "
+#| "has been created. There are alternative methods to install <command>grub</"
+#| "command>, but those are outside the scope of this appendix."
msgid ""
"Note that this assumes that a <filename>/dev/hda</filename> device file has "
-"been created. There are alternative methods to install <command>grub</"
+"been created. There are alternative methods to install <command>grub2</"
"command>, but those are outside the scope of this appendix."
msgstr ""
"注意,这里假设已经创建了 <filename>/dev/hda</filename> 设备文件。另外一种方法"
"是安装 <command>grub</command>,但本附录中不讨论。"
#. Tag: para
-#: random-bits.xml:788
+#: random-bits.xml:789
#, no-c-format
msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子:"
#. Tag: screen
-#: random-bits.xml:792
+#: random-bits.xml:793
#, no-c-format
msgid ""
"boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1680,7 +1711,7 @@ msgstr ""
"label=Debian"
#. Tag: para
-#: random-bits.xml:794
+#: random-bits.xml:795
#, no-c-format
msgid ""
"Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1697,7 +1728,7 @@ msgstr ""
"行 ybin (请记住,您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
#. Tag: para
-#: random-bits.xml:804
+#: random-bits.xml:805
#, no-c-format
msgid ""
"Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1727,13 +1758,13 @@ msgstr ""
"userinput> 换成 <userinput>hd:</userinput>。"
#. Tag: title
-#: random-bits.xml:817
+#: random-bits.xml:818
#, no-c-format
msgid "Finishing touches"
msgstr "最后一笔"
#. Tag: para
-#: random-bits.xml:818
+#: random-bits.xml:819
#, no-c-format
msgid ""
"As mentioned earlier, the installed system will be very basic. If you would "
@@ -1752,7 +1783,7 @@ msgstr ""
"装单独的软件包。"
#. Tag: para
-#: random-bits.xml:829
+#: random-bits.xml:830
#, no-c-format
msgid ""
"After the installation there will be a lot of downloaded packages in "
@@ -1763,19 +1794,19 @@ msgstr ""
"件包。您可以运行下面命令释放空间:"
#. Tag: screen
-#: random-bits.xml:835
+#: random-bits.xml:836
#, no-c-format
msgid "# aptitude clean"
msgstr "# aptitude clean"
#. Tag: title
-#: random-bits.xml:846
+#: random-bits.xml:847
#, no-c-format
msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
#. Tag: para
-#: random-bits.xml:848
+#: random-bits.xml:849
#, no-c-format
msgid ""
"This section explains how to install &debian-gnu; on a computer without an "
@@ -1789,7 +1820,7 @@ msgstr ""
"接到具有 &debian; 镜像的网络(比如,互联网)。"
#. Tag: para
-#: random-bits.xml:856
+#: random-bits.xml:857
#, no-c-format
msgid ""
"In the example in this appendix we will set up a PLIP connection using a "
@@ -1803,7 +1834,7 @@ msgstr ""
"IP 地址(这些地址在您的网络地址空间里面未被占用)。"
#. Tag: para
-#: random-bits.xml:864
+#: random-bits.xml:865
#, no-c-format
msgid ""
"The PLIP connection set up during the installation will also be available "
@@ -1814,7 +1845,7 @@ msgstr ""
"linkend=\"boot-new\"/>)。"
#. Tag: para
-#: random-bits.xml:869
+#: random-bits.xml:870
#, no-c-format
msgid ""
"Before you start, you will need to check the BIOS configuration (IO base "
@@ -1826,13 +1857,13 @@ msgstr ""
"为 <literal>io=0x378</literal>,<literal>irq=7</literal>。"
#. Tag: title
-#: random-bits.xml:879
+#: random-bits.xml:880
#, no-c-format
msgid "Requirements"
msgstr "需求"
#. Tag: para
-#: random-bits.xml:882
+#: random-bits.xml:883
#, no-c-format
msgid ""
"A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1840,13 +1871,13 @@ msgid ""
msgstr "目标计算机,称为 <emphasis>target</emphasis>,将要安装 &debian;。"
#. Tag: para
-#: random-bits.xml:888
+#: random-bits.xml:889
#, no-c-format
msgid "System installation media; see <xref linkend=\"installation-media\"/>."
msgstr "系统安装介质;参阅 <xref linkend=\"installation-media\"/>。"
#. Tag: para
-#: random-bits.xml:893
+#: random-bits.xml:894
#, no-c-format
msgid ""
"Another computer connected to the Internet, called <emphasis>source</"
@@ -1855,7 +1886,7 @@ msgstr ""
"另外一台连接到互联网的计算机,称为 <emphasis>source</emphasis>,功能是网关。"
#. Tag: para
-#: random-bits.xml:899
+#: random-bits.xml:900
#, no-c-format
msgid ""
"A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1866,13 +1897,13 @@ msgstr ""
"Install-HOWTO</ulink> 了解这种线的更多信息,以及如何自己制作。"
#. Tag: title
-#: random-bits.xml:911
+#: random-bits.xml:912
#, no-c-format
msgid "Setting up source"
msgstr "建立源"
#. Tag: para
-#: random-bits.xml:912
+#: random-bits.xml:913
#, no-c-format
msgid ""
"The following shell script is a simple example of how to configure the "
@@ -1882,7 +1913,7 @@ msgstr ""
"算机。"
#. Tag: screen
-#: random-bits.xml:917
+#: random-bits.xml:918
#, no-c-format
msgid ""
"#!/bin/sh\n"
@@ -1924,13 +1955,13 @@ msgstr ""
"echo 1 > /proc/sys/net/ipv4/ip_forward"
#. Tag: title
-#: random-bits.xml:923
+#: random-bits.xml:924
#, no-c-format
msgid "Installing target"
msgstr "安装目标"
#. Tag: para
-#: random-bits.xml:924
+#: random-bits.xml:925
#, no-c-format
msgid ""
"Boot the installation media. The installation needs to be run in expert "
@@ -1954,13 +1985,13 @@ msgstr ""
"</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
#. Tag: guimenuitem
-#: random-bits.xml:943
+#: random-bits.xml:944
#, no-c-format
msgid "Load installer components from CD"
msgstr "从光盘加载安装组件"
#. Tag: para
-#: random-bits.xml:945
+#: random-bits.xml:946
#, no-c-format
msgid ""
"Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1970,13 +2001,13 @@ msgstr ""
"用 PLIP 驱动。"
#. Tag: guimenuitem
-#: random-bits.xml:953
+#: random-bits.xml:954
#, no-c-format
msgid "Detect network hardware"
msgstr "侦测网络硬件"
#. Tag: para
-#: random-bits.xml:958
+#: random-bits.xml:959
#, no-c-format
msgid ""
"If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1989,7 +2020,7 @@ msgstr ""
"系统没有网卡,安装程序不会显示该列表。"
#. Tag: para
-#: random-bits.xml:967
+#: random-bits.xml:968
#, no-c-format
msgid ""
"Because no network card was detected/selected earlier, the installer will "
@@ -2000,19 +2031,19 @@ msgstr ""
"<userinput>plip</userinput> 模块。"
#. Tag: guimenuitem
-#: random-bits.xml:979
+#: random-bits.xml:980
#, no-c-format
msgid "Configure the network"
msgstr "配置网络"
#. Tag: para
-#: random-bits.xml:982
+#: random-bits.xml:983
#, no-c-format
msgid "Auto-configure network with DHCP: No"
msgstr "Auto-configure network with DHCP: No"
#. Tag: para
-#: random-bits.xml:987
+#: random-bits.xml:988
#, no-c-format
msgid ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2020,7 +2051,7 @@ msgstr ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
#. Tag: para
-#: random-bits.xml:992
+#: random-bits.xml:993
#, no-c-format
msgid ""
"Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2030,7 +2061,7 @@ msgstr ""
"userinput>"
#. Tag: para
-#: random-bits.xml:998
+#: random-bits.xml:999
#, no-c-format
msgid ""
"Name server addresses: you can enter the same addresses used on source (see "
@@ -2040,13 +2071,13 @@ msgstr ""
"resolv.conf</filename>)"
#. Tag: title
-#: random-bits.xml:1017
+#: random-bits.xml:1018
#, no-c-format
msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
#. Tag: para
-#: random-bits.xml:1019
+#: random-bits.xml:1020
#, no-c-format
msgid ""
"In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2060,7 +2091,7 @@ msgstr ""
"本节将说明操作方法。"
#. Tag: para
-#: random-bits.xml:1027
+#: random-bits.xml:1028
#, no-c-format
msgid ""
"The PPPoE connection set up during the installation will also be available "
@@ -2071,7 +2102,7 @@ msgstr ""
"linkend=\"boot-new\"/>)。"
#. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1033
#, no-c-format
msgid ""
"To have the option of setting up and using PPPoE during the installation, "
@@ -2084,7 +2115,7 @@ msgstr ""
"phrase>)。"
#. Tag: para
-#: random-bits.xml:1039
+#: random-bits.xml:1040
#, no-c-format
msgid ""
"Installing over PPPoE is mostly the same as any other installation. The "
@@ -2092,7 +2123,7 @@ msgid ""
msgstr "通过 PPPoE 进行安装,绝大部分与其他方式相同。下面步骤说明不同之处。"
#. Tag: para
-#: random-bits.xml:1047
+#: random-bits.xml:1048
#, no-c-format
msgid ""
"Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2107,7 +2138,7 @@ msgstr ""
"udeb</classname>) 会被加载并自动运行。"
#. Tag: para
-#: random-bits.xml:1062
+#: random-bits.xml:1063
#, no-c-format
msgid ""
"Follow the regular initial steps of the installation (language, country and "
@@ -2125,7 +2156,7 @@ msgstr ""
"footnote>)。"
#. Tag: para
-#: random-bits.xml:1081
+#: random-bits.xml:1082
#, no-c-format
msgid ""
"The next step is the detection of network hardware, in order to identify any "
@@ -2133,7 +2164,7 @@ msgid ""
msgstr "下一步是侦测网络硬件,目的是识别当前系统中的网卡。"
#. Tag: para
-#: random-bits.xml:1087
+#: random-bits.xml:1088
#, no-c-format
msgid ""
"After this the actual setup of PPPoE is started. The installer will probe "
@@ -2144,7 +2175,7 @@ msgstr ""
"处理 PPPoE 连接的服务器)。"
#. Tag: para
-#: random-bits.xml:1093
+#: random-bits.xml:1094
#, no-c-format
msgid ""
"It is possible that the concentrator will not to be found at the first "
@@ -2158,7 +2189,7 @@ msgstr ""
"<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
#. Tag: para
-#: random-bits.xml:1102
+#: random-bits.xml:1103
#, no-c-format
msgid ""
"After a concentrator is found, the user will be prompted to type the login "
@@ -2166,7 +2197,7 @@ msgid ""
msgstr "连接找到之后,用户需要提供登录信息(PPPoE 用户名和密码)。"
#. Tag: para
-#: random-bits.xml:1108
+#: random-bits.xml:1109
#, no-c-format
msgid ""
"At this point the installer will use the provided information to establish "
@@ -2183,13 +2214,13 @@ msgstr ""
"and start PPPoE connection</guimenuitem> 菜单项重新配置。"
#. Tag: title
-#: random-bits.xml:1128
+#: random-bits.xml:1129
#, no-c-format
msgid "The Graphical Installer"
msgstr "图形安装程序"
#. Tag: para
-#: random-bits.xml:1129
+#: random-bits.xml:1130
#, no-c-format
msgid ""
"The graphical version of the installer is only available for a limited "
@@ -2202,7 +2233,7 @@ msgstr ""
"前端。"
#. Tag: para
-#: random-bits.xml:1137
+#: random-bits.xml:1138
#, no-c-format
msgid ""
"Although the functionality is identical, the graphical installer still has a "
@@ -2217,7 +2248,7 @@ msgstr ""
"有一些优点,比如可以使用鼠标,以及在一个屏幕下显示多个问题。"
#. Tag: para
-#: random-bits.xml:1146
+#: random-bits.xml:1147
#, no-c-format
msgid ""
"The graphical installer is available with all CD images and with the hd-"
@@ -2237,7 +2268,7 @@ msgstr ""
"<quote>Help</quote> 选项选取后看到。"
#. Tag: para
-#: random-bits.xml:1157
+#: random-bits.xml:1158
#, no-c-format
msgid ""
"There is also a graphical installer image that can be netbooted. And there "
@@ -2253,7 +2284,7 @@ msgstr ""
"mini.iso</filename>。</para> </footnote>,主要用于测试。"
#. Tag: para
-#: random-bits.xml:1170
+#: random-bits.xml:1171
#, no-c-format
msgid ""
"For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -2270,7 +2301,7 @@ msgstr ""
"的 PowerPC 系统上,但其它的不行。"
#. Tag: para
-#: random-bits.xml:1184
+#: random-bits.xml:1185
#, no-c-format
msgid ""
"Just as with the regular installer it is possible to add boot parameters "
@@ -2278,7 +2309,7 @@ msgid ""
msgstr "如同一般安装程序,它也可以在启动图形安装界面时添加引导参数。"
#. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1191
#, no-c-format
msgid ""
"The graphical installer requires significantly more memory to run than the "
@@ -2290,7 +2321,7 @@ msgstr ""
"内存条件,它将自动回到普通的 <quote>newt</quote> 前端。"
#. Tag: para
-#: random-bits.xml:1197
+#: random-bits.xml:1198
#, no-c-format
msgid ""
"If the amount of memory in your system is below &minimum-memory;, the "
@@ -2302,13 +2333,13 @@ msgstr ""
"程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
#. Tag: title
-#: random-bits.xml:1207
+#: random-bits.xml:1208
#, no-c-format
msgid "Using the graphical installer"
msgstr "使用图形安装程序"
#. Tag: para
-#: random-bits.xml:1208
+#: random-bits.xml:1209
#, no-c-format
msgid ""
"As already mentioned, the graphical installer basically works the same as "
@@ -2319,7 +2350,7 @@ msgstr ""
"用来给您的安装过程进行指导。"
#. Tag: para
-#: random-bits.xml:1214
+#: random-bits.xml:1215
#, no-c-format
msgid ""
"If you prefer using the keyboard over the mouse, there are two things you "
@@ -2336,7 +2367,7 @@ msgstr ""
"换选择,而不是激活 &BTN-CONT; 。"
#. Tag: para
-#: random-bits.xml:1224
+#: random-bits.xml:1225
#, no-c-format
msgid ""
"If a dialog offers additional help information, a <guibutton>Help</"
@@ -2347,7 +2378,7 @@ msgstr ""
"帮助信息可以通过该按钮或者按下 <keycap>F1</keycap> 键。"
#. Tag: para
-#: random-bits.xml:1230
+#: random-bits.xml:1231
#, no-c-format
msgid ""
"To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 0d45c14cc..0b77e4b9b 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2011-01-08 16:52+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
"PO-Revision-Date: 2011-01-17 00:39+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1131,7 +1131,17 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:753
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The manual network setup in turn asks you a number of questions about "
+#| "your network, notably <computeroutput>IP address</computeroutput>, "
+#| "<computeroutput>Netmask</computeroutput>, <computeroutput>Gateway</"
+#| "computeroutput>, <computeroutput>Name server addresses</computeroutput>, "
+#| "and a <computeroutput>Hostname</computeroutput>. Moreover, if you have a "
+#| "wireless network interface, you will be asked to provide your "
+#| "<computeroutput>Wireless ESSID</computeroutput> and a <computeroutput>WEP "
+#| "key</computeroutput>. Fill in the answers from <xref linkend=\"needed-info"
+#| "\"/>."
msgid ""
"The manual network setup in turn asks you a number of questions about your "
"network, notably <computeroutput>IP address</computeroutput>, "
@@ -1140,8 +1150,8 @@ msgid ""
"a <computeroutput>Hostname</computeroutput>. Moreover, if you have a "
"wireless network interface, you will be asked to provide your "
"<computeroutput>Wireless ESSID</computeroutput> and a <computeroutput>WEP "
-"key</computeroutput>. Fill in the answers from <xref linkend=\"needed-info\"/"
-">."
+"key</computeroutput> or <computeroutput>WPA/WPA2 passphrase</"
+"computeroutput>. Fill in the answers from <xref linkend=\"needed-info\"/>."
msgstr ""
"手动配置网络会依次询问一些您网络的问题,值得注意的是 <computeroutput>IP 地址"
"</computeroutput>、<computeroutput>网络掩码</computeroutput>、"
@@ -1152,7 +1162,7 @@ msgstr ""
"\"needed-info\"/>。"
#. Tag: para
-#: using-d-i.xml:767
+#: using-d-i.xml:769
#, no-c-format
msgid ""
"Some technical details you might, or might not, find handy: the program "
@@ -1171,13 +1181,13 @@ msgstr ""
"filename> 文件进行修改。"
#. Tag: title
-#: using-d-i.xml:812
+#: using-d-i.xml:815
#, no-c-format
msgid "Configuring the Clock and Time Zone"
msgstr "配置时钟和时区"
#. Tag: para
-#: using-d-i.xml:814
+#: using-d-i.xml:817
#, no-c-format
msgid ""
"The installer will first attempt to connect to a time server on the Internet "
@@ -1192,13 +1202,13 @@ msgstr ""
"的。在安装过程中没法手动对系统时间进行设置。"
#. Tag: para
-#: using-d-i.xml:823
+#: using-d-i.xml:826
#, no-c-format
msgid "The installer does not modify the system clock on the s390 platform."
msgstr "在 s390 平台,安装程序不会修改系统时钟。"
#. Tag: para
-#: using-d-i.xml:836
+#: using-d-i.xml:839
#, no-c-format
msgid ""
"Depending on the location selected earlier in the installation process, you "
@@ -1210,7 +1220,7 @@ msgstr ""
"如果该地只对应一个时区并且是默认安装,那么系统就不会询问而直接使用该时区。"
#. Tag: para
-#: using-d-i.xml:844
+#: using-d-i.xml:847
#, no-c-format
msgid ""
"In expert mode or when installing at medium priority, you will have the "
@@ -1221,7 +1231,7 @@ msgstr ""
"<quote>Coordinated Universal Time</quote> (UTC) 作为时区。"
#. Tag: para
-#: using-d-i.xml:850
+#: using-d-i.xml:853
#, no-c-format
msgid ""
"If for some reason you wish to set a time zone for the installed system that "
@@ -1232,7 +1242,7 @@ msgstr ""
"选项。"
#. Tag: para
-#: using-d-i.xml:861
+#: using-d-i.xml:864
#, no-c-format
msgid ""
"The simplest option is to just select a different time zone after the "
@@ -1243,13 +1253,13 @@ msgstr ""
"为:"
#. Tag: screen
-#: using-d-i.xml:867
+#: using-d-i.xml:870
#, no-c-format
msgid "# dpkg-reconfigure tzdata"
msgstr "# dpkg-reconfigure tzdata"
#. Tag: para
-#: using-d-i.xml:873
+#: using-d-i.xml:876
#, no-c-format
msgid ""
"Alternatively, the time zone can be set at the very start of the "
@@ -1264,7 +1274,7 @@ msgstr ""
"userinput> 或 <userinput>UTC</userinput>。"
#. Tag: para
-#: using-d-i.xml:887
+#: using-d-i.xml:890
#, no-c-format
msgid ""
"For automated installations the time zone can be set to any desired value "
@@ -1272,13 +1282,13 @@ msgid ""
msgstr "自动安装可以通过预置设置任何所需的时区。"
#. Tag: title
-#: using-d-i.xml:901
+#: using-d-i.xml:904
#, no-c-format
msgid "Setting Up Users And Passwords"
msgstr "设置用户和密码"
#. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:905
#, no-c-format
msgid ""
"Just before configuring the clock, the installer will allow you to set up "
@@ -1289,13 +1299,13 @@ msgstr ""
"号。其他的用户帐号可以在安装完成之后创建。"
#. Tag: title
-#: using-d-i.xml:916
+#: using-d-i.xml:919
#, no-c-format
msgid "Set the Root Password"
msgstr "设置 root 密码"
#. Tag: para
-#: using-d-i.xml:920
+#: using-d-i.xml:923
#, no-c-format
msgid ""
"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
@@ -1308,7 +1318,7 @@ msgstr ""
"理,而且使用时间应该尽可能短。"
#. Tag: para
-#: using-d-i.xml:928
+#: using-d-i.xml:931
#, no-c-format
msgid ""
"Any password you create should contain at least 6 characters, and should "
@@ -1322,7 +1332,7 @@ msgstr ""
"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
#. Tag: para
-#: using-d-i.xml:936
+#: using-d-i.xml:939
#, no-c-format
msgid ""
"If anyone ever tells you they need your root password, be extremely wary. "
@@ -1333,13 +1343,13 @@ msgstr ""
"员,否则通常不应该将超级用户密码交给别人。"
#. Tag: title
-#: using-d-i.xml:946
+#: using-d-i.xml:949
#, no-c-format
msgid "Create an Ordinary User"
msgstr "创建一个普通用户"
#. Tag: para
-#: using-d-i.xml:948
+#: using-d-i.xml:951
#, no-c-format
msgid ""
"The system will ask you whether you wish to create an ordinary user account "
@@ -1351,7 +1361,7 @@ msgstr ""
"记,平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
#. Tag: para
-#: using-d-i.xml:957
+#: using-d-i.xml:960
#, no-c-format
msgid ""
"Why not? Well, one reason to avoid using root's privileges is that it is "
@@ -1369,7 +1379,7 @@ msgstr ""
"容,建议找一本进行学习。"
#. Tag: para
-#: using-d-i.xml:967
+#: using-d-i.xml:970
#, no-c-format
msgid ""
"You will first be prompted for the user's full name. Then you'll be asked "
@@ -1381,7 +1391,7 @@ msgstr ""
"便满足要求,并为缺省值。最后,您将要求输入该帐号的密码。"
#. Tag: para
-#: using-d-i.xml:974
+#: using-d-i.xml:977
#, no-c-format
msgid ""
"If at any point after installation you would like to create another account, "
@@ -1391,13 +1401,13 @@ msgstr ""
"令。"
#. Tag: title
-#: using-d-i.xml:985
+#: using-d-i.xml:988
#, no-c-format
msgid "Partitioning and Mount Point Selection"
msgstr "分区与选择挂载点"
#. Tag: para
-#: using-d-i.xml:986
+#: using-d-i.xml:989
#, no-c-format
msgid ""
"At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1412,7 +1422,7 @@ msgstr ""
"排挂载点,还可以选择为 RAID、LVM 或加密设备这组选项进行配置。"
#. Tag: para
-#: using-d-i.xml:1007
+#: using-d-i.xml:1010
#, no-c-format
msgid ""
"If you are uncomfortable with partitioning, or just want to know more "
@@ -1422,7 +1432,7 @@ msgstr ""
"\"partitioning\"/>。"
#. Tag: para
-#: using-d-i.xml:1013
+#: using-d-i.xml:1016
#, no-c-format
msgid ""
"If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1442,7 +1452,7 @@ msgstr ""
"</screen></informalexample> 注意,这会是磁盘上已有的数据无法访问。"
#. Tag: para
-#: using-d-i.xml:1026
+#: using-d-i.xml:1029
#, no-c-format
msgid ""
"First you will be given the opportunity to automatically partition either an "
@@ -1455,13 +1465,13 @@ msgstr ""
"<guimenuitem>Manual</guimenuitem> 手动分区。"
#. Tag: title
-#: using-d-i.xml:1036
+#: using-d-i.xml:1039
#, no-c-format
msgid "Supported partitioning options"
msgstr "支持的分区选项"
#. Tag: para
-#: using-d-i.xml:1037
+#: using-d-i.xml:1040
#, no-c-format
msgid ""
"The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1472,7 +1482,7 @@ msgstr ""
"块设备创建多种分区方案。"
#. Tag: para
-#: using-d-i.xml:1043
+#: using-d-i.xml:1046
#, no-c-format
msgid ""
"Exactly which options are available depends mainly on the architecture, but "
@@ -1489,7 +1499,7 @@ msgstr ""
"装下改变;高优先级下会采用默认值。"
#. Tag: para
-#: using-d-i.xml:1054
+#: using-d-i.xml:1057
#, no-c-format
msgid ""
"The installer supports various forms of advanced partitioning and use of "
@@ -1497,31 +1507,31 @@ msgid ""
msgstr "安装程序支持多种高级分区和存储设备,很多情况下可以组合使用。"
#. Tag: emphasis
-#: using-d-i.xml:1061
+#: using-d-i.xml:1064
#, no-c-format
msgid "Logical Volume Management (LVM)"
msgstr "逻辑卷管理(LVM)"
#. Tag: emphasis
-#: using-d-i.xml:1064
+#: using-d-i.xml:1067
#, no-c-format
msgid "Software RAID"
msgstr "Software RAID"
#. Tag: para
-#: using-d-i.xml:1065
+#: using-d-i.xml:1068
#, no-c-format
msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
msgstr "支持 RAID levels 0, 1, 4, 5, 6 和 10。"
#. Tag: emphasis
-#: using-d-i.xml:1069
+#: using-d-i.xml:1072
#, no-c-format
msgid "Encryption"
msgstr "加密"
#. Tag: para
-#: using-d-i.xml:1071
+#: using-d-i.xml:1074
#, no-c-format
msgid ""
"<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1529,7 +1539,7 @@ msgstr ""
"<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
#. Tag: para
-#: using-d-i.xml:1073
+#: using-d-i.xml:1076
#, no-c-format
msgid ""
"Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1542,13 +1552,13 @@ msgstr ""
"sataraid;\">我们的 Wiki</ulink>。"
#. Tag: para
-#: using-d-i.xml:1079
+#: using-d-i.xml:1082
#, no-c-format
msgid "<emphasis>Multipath</emphasis> (experimental)"
msgstr "<emphasis>Multipath</emphasis> (experimental)"
#. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1084
#, no-c-format
msgid ""
"See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1559,27 +1569,27 @@ msgstr ""
"于 multipath 只在安装程序启动时打开才支持。"
#. Tag: para
-#: using-d-i.xml:1088
+#: using-d-i.xml:1091
#, no-c-format
msgid "The following file systems are supported."
msgstr "支持下列的文件系统。"
#. Tag: para
-#: using-d-i.xml:1093
+#: using-d-i.xml:1096
#, no-c-format
-#| msgid ""
-#| "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
-#| "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
-#| "emphasis>"
msgid ""
"<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
"<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
"emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></"
"phrase>"
-msgstr "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> <emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></phrase>"
+msgstr ""
+"<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
+"<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
+"emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></"
+"phrase>"
#. Tag: para
-#: using-d-i.xml:1098
+#: using-d-i.xml:1101
#, no-c-format
msgid ""
"The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1590,57 +1600,59 @@ msgstr ""
"filename> 分区选择 ext2 作为默认值。"
#. Tag: para
-#: using-d-i.xml:1103
+#: using-d-i.xml:1106
#, no-c-format
msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
msgstr "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
#. Tag: emphasis
-#: using-d-i.xml:1107
+#: using-d-i.xml:1110
#, no-c-format
-#| msgid "<emphasis>NTFS</emphasis> (read-only)"
msgid "<emphasis>ufs</emphasis>"
msgstr "<emphasis>ufs</emphasis>"
#. Tag: para
-#: using-d-i.xml:1108
+#: using-d-i.xml:1111
#, no-c-format
msgid "The default file system is UFS."
msgstr "默认文件系统是 UFS。"
#. Tag: para
-#: using-d-i.xml:1111
+#: using-d-i.xml:1114
#, no-c-format
msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
msgstr "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
#. Tag: emphasis
-#: using-d-i.xml:1115
+#: using-d-i.xml:1118
#, no-c-format
-#| msgid "<emphasis>NTFS</emphasis> (read-only)"
msgid "<emphasis>zfs</emphasis>"
msgstr "<emphasis>zfs</emphasis>"
#. Tag: para
-#: using-d-i.xml:1116
+#: using-d-i.xml:1119
#, no-c-format
msgid ""
"As ZFS support in the installer is still in development, only a basic subset "
"of ZFS features are supported. Some of them can be enabled manually after "
"the initial install, but there are some caveats:"
-msgstr "安装程序对 ZFS 的支持仍然在开发之中,仅有基本的 ZFS 特性被支持。其中一些可以通过手动方式在初始安装之后打开,但仍有一些地方需要注意:"
+msgstr ""
+"安装程序对 ZFS 的支持仍然在开发之中,仅有基本的 ZFS 特性被支持。其中一些可以"
+"通过手动方式在初始安装之后打开,但仍有一些地方需要注意:"
#. Tag: para
-#: using-d-i.xml:1121
+#: using-d-i.xml:1124
#, no-c-format
msgid ""
"Each ZFS pool will host only one filesystem. After install is finished, more "
"filesystems can be created on this pool by using the <quote>zfs create</"
"quote> command."
-msgstr "每个 ZFS pool 仅能容纳一个文件系统。安装完成之后,可以使用 <quote>zfs create</quote> 命令在这个 pool 中创建更多的文件系统。"
+msgstr ""
+"每个 ZFS pool 仅能容纳一个文件系统。安装完成之后,可以使用 <quote>zfs "
+"create</quote> 命令在这个 pool 中创建更多的文件系统。"
#. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1129
#, no-c-format
msgid ""
"Each ZFS pool will be composed of exactly one partition. After install is "
@@ -1649,10 +1661,14 @@ msgid ""
"using the <quote>zpool attach</quote> command. However, you shouldn't do "
"this on the pool that hosts root filesystem, as it would prevent GRUB from "
"booting your system."
-msgstr "每个 ZFS pool 正好由一个分区组成。安装完成之后,可以使用 <quote>zpool add</quote> 命令将 single-device ZFS pool 可以转换成 multi-device pool,或者用 <quote>zpool attach</quote> 命令转换成 mirrored pool。然而,不应该对容纳根文件系统的 pool 执行这种操作,那样 GRUB 将无法引导您的系统。"
+msgstr ""
+"每个 ZFS pool 正好由一个分区组成。安装完成之后,可以使用 <quote>zpool add</"
+"quote> 命令将 single-device ZFS pool 可以转换成 multi-device pool,或者用 "
+"<quote>zpool attach</quote> 命令转换成 mirrored pool。然而,不应该对容纳根文"
+"件系统的 pool 执行这种操作,那样 GRUB 将无法引导您的系统。"
#. Tag: para
-#: using-d-i.xml:1134
+#: using-d-i.xml:1137
#, no-c-format
msgid ""
"Compression is not currently supported. After the install is finished, "
@@ -1660,17 +1676,20 @@ msgid ""
"property via the <quote>zfs set</quote> command. However, if a compression "
"algorithm other than the default (lzjb) is used on the pool that hosts your "
"root filesystem, this may prevent GRUB from booting your system."
-msgstr "当前还不支持压缩。安装完成之后,可以通过 <quote>zfs set</quote> 命令设置 <quote>compression</quote> 属性打开压缩功能。然而,如果在容纳您的根文件系统 pool 上,使用异于默认的压缩算法(lzjb)将导致 GRUB 无法引导您的系统。"
+msgstr ""
+"当前还不支持压缩。安装完成之后,可以通过 <quote>zfs set</quote> 命令设置 "
+"<quote>compression</quote> 属性打开压缩功能。然而,如果在容纳您的根文件系统 "
+"pool 上,使用异于默认的压缩算法(lzjb)将导致 GRUB 无法引导您的系统。"
#. Tag: para
-#: using-d-i.xml:1143
+#: using-d-i.xml:1146
#, no-c-format
msgid ""
"<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
msgstr "<emphasis>reiserfs</emphasis> (选项;并不是所有架构都支持)"
#. Tag: para
-#: using-d-i.xml:1145
+#: using-d-i.xml:1148
#, no-c-format
msgid ""
"Support for the Reiser file system is no longer available by default. When "
@@ -1683,13 +1702,13 @@ msgstr ""
"版本 3。"
#. Tag: emphasis
-#: using-d-i.xml:1152
+#: using-d-i.xml:1155
#, no-c-format
msgid "jffs2"
msgstr "jffs2"
#. Tag: para
-#: using-d-i.xml:1153
+#: using-d-i.xml:1156
#, no-c-format
msgid ""
"Used on some systems to read flash memory. It is not possible to create new "
@@ -1697,13 +1716,13 @@ msgid ""
msgstr "在一些系统上用于读取闪存。不可以创建新的 jffs2 分区。"
#. Tag: emphasis
-#: using-d-i.xml:1158
+#: using-d-i.xml:1161
#, no-c-format
msgid "qnx4"
msgstr "qnx4"
#. Tag: para
-#: using-d-i.xml:1159
+#: using-d-i.xml:1162
#, no-c-format
msgid ""
"Existing partitions will be recognized and it is possible to assign mount "
@@ -1711,19 +1730,19 @@ msgid ""
msgstr "识别已存在的分区并挂载它们。不可以创建新的 qnx4 分区。"
#. Tag: para
-#: using-d-i.xml:1163
+#: using-d-i.xml:1166
#, no-c-format
msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
#. Tag: para
-#: using-d-i.xml:1166
+#: using-d-i.xml:1169
#, no-c-format
msgid "<emphasis>NTFS</emphasis> (read-only)"
msgstr "<emphasis>NTFS</emphasis> (只读)"
#. Tag: para
-#: using-d-i.xml:1168
+#: using-d-i.xml:1171
#, no-c-format
msgid ""
"Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1731,13 +1750,13 @@ msgid ""
msgstr "已存在的 NTFS 分区可以调整大小,并挂载它们。不能创建新的 NTFS 分区。"
#. Tag: title
-#: using-d-i.xml:1178
+#: using-d-i.xml:1181
#, no-c-format
msgid "Guided Partitioning"
msgstr "导引式分区"
#. Tag: para
-#: using-d-i.xml:1179
+#: using-d-i.xml:1182
#, no-c-format
msgid ""
"If you choose guided partitioning, you may have three options: to create "
@@ -1753,14 +1772,14 @@ msgstr ""
"footnote>"
#. Tag: para
-#: using-d-i.xml:1194
+#: using-d-i.xml:1197
#, no-c-format
msgid ""
"The option to use (encrypted) LVM may not be available on all architectures."
msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
#. Tag: para
-#: using-d-i.xml:1199
+#: using-d-i.xml:1202
#, no-c-format
msgid ""
"When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1774,7 +1793,7 @@ msgstr ""
"大分区将无法读取,对您的(私有)数据提供了额外的安全性。"
#. Tag: para
-#: using-d-i.xml:1208
+#: using-d-i.xml:1211
#, no-c-format
msgid ""
"When using encrypted LVM, the installer will also automatically erase the "
@@ -1788,7 +1807,7 @@ msgstr ""
"时间。"
#. Tag: para
-#: using-d-i.xml:1217
+#: using-d-i.xml:1220
#, no-c-format
msgid ""
"If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1803,15 +1822,8 @@ msgstr ""
"安装程序会在写入磁盘之前让您确认。"
#. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1230
#, no-c-format
-#| msgid ""
-#| "If you choose guided partitioning (either classic or using (encrypted) "
-#| "LVM) for a whole disk, you will first be asked to select the disk you "
-#| "want to use. Check that all your disks are listed and, if you have "
-#| "several disks, make sure you select the correct one. The order they are "
-#| "listed in may differ from what you are used to. The size of the disks may "
-#| "help to identify them."
msgid ""
"If you choose guided partitioning<phrase arch=\"linux-any\"> (either classic "
"or using (encrypted) LVM)</phrase> for a whole disk, you will first be asked "
@@ -1819,27 +1831,28 @@ msgid ""
"and, if you have several disks, make sure you select the correct one. The "
"order they are listed in may differ from what you are used to. The size of "
"the disks may help to identify them."
-msgstr "假如用导引式分区<phrase arch=\"linux-any\">(经典方式或(加密)LVM)</phrase>选择整个磁盘,您会首先被要求选取将要使用的磁盘。检查一下是否所有的磁盘都被列出,如果有多个磁盘,并确认所选的是真正要使用的那块。排列的次序可能与以前的不同,但磁盘的尺寸将会协助您辨别它们。"
+msgstr ""
+"假如用导引式分区<phrase arch=\"linux-any\">(经典方式或(加密)LVM)</phrase>选择"
+"整个磁盘,您会首先被要求选取将要使用的磁盘。检查一下是否所有的磁盘都被列出,"
+"如果有多个磁盘,并确认所选的是真正要使用的那块。排列的次序可能与以前的不同,"
+"但磁盘的尺寸将会协助您辨别它们。"
#. Tag: para
-#: using-d-i.xml:1236
+#: using-d-i.xml:1239
#, no-c-format
-#| msgid ""
-#| "Any data on the disk you select will eventually be lost, but you will "
-#| "always be asked to confirm any changes before they are written to the "
-#| "disk. If you have selected the classic method of partitioning, you will "
-#| "be able to undo any changes right until the end; when using (encrypted) "
-#| "LVM this is not possible."
msgid ""
"Any data on the disk you select will eventually be lost, but you will always "
"be asked to confirm any changes before they are written to the disk. <phrase "
"arch=\"linux-any\"> If you have selected the classic method of partitioning, "
"you will be able to undo any changes right until the end; when using "
"(encrypted) LVM this is not possible. </phrase>"
-msgstr "所选磁盘上的所有数据将会丢失,但总会在写入磁盘前提示您进行确认。<phrase arch=\"linux-any\">如果选择的是经典分区方式,您可以在整个过程中撤销任何修改;但使用(加密) LVM 方式则不能撤销。</phrase>"
+msgstr ""
+"所选磁盘上的所有数据将会丢失,但总会在写入磁盘前提示您进行确认。<phrase arch="
+"\"linux-any\">如果选择的是经典分区方式,您可以在整个过程中撤销任何修改;但使"
+"用(加密) LVM 方式则不能撤销。</phrase>"
#. Tag: para
-#: using-d-i.xml:1246
+#: using-d-i.xml:1249
#, no-c-format
msgid ""
"Next, you will be able to choose from the schemes listed in the table below. "
@@ -1855,73 +1868,73 @@ msgstr ""
"1GB 以上的空间(具体大小视所选的方式而不同),那么导引式分区将以失败告终。"
#. Tag: entry
-#: using-d-i.xml:1262
+#: using-d-i.xml:1265
#, no-c-format
msgid "Partitioning scheme"
msgstr "分区方式"
#. Tag: entry
-#: using-d-i.xml:1263
+#: using-d-i.xml:1266
#, no-c-format
msgid "Minimum space"
msgstr "所需最小空间"
#. Tag: entry
-#: using-d-i.xml:1264
+#: using-d-i.xml:1267
#, no-c-format
msgid "Created partitions"
msgstr "所新建的分区"
#. Tag: entry
-#: using-d-i.xml:1270
+#: using-d-i.xml:1273
#, no-c-format
msgid "All files in one partition"
msgstr "所有文件在同一分区"
#. Tag: entry
-#: using-d-i.xml:1271
+#: using-d-i.xml:1274
#, no-c-format
msgid "600MB"
msgstr "600MB"
#. Tag: entry
-#: using-d-i.xml:1272
+#: using-d-i.xml:1275
#, no-c-format
msgid "<filename>/</filename>, swap"
msgstr "<filename>/</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1274
+#: using-d-i.xml:1277
#, no-c-format
msgid "Separate /home partition"
msgstr "建立 /home 分区"
#. Tag: entry
-#: using-d-i.xml:1275
+#: using-d-i.xml:1278
#, no-c-format
msgid "500MB"
msgstr "500MB"
#. Tag: entry
-#: using-d-i.xml:1276
+#: using-d-i.xml:1279
#, no-c-format
msgid "<filename>/</filename>, <filename>/home</filename>, swap"
msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1280
+#: using-d-i.xml:1283
#, no-c-format
msgid "Separate /home, /usr, /var and /tmp partitions"
msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
#. Tag: entry
-#: using-d-i.xml:1281
+#: using-d-i.xml:1284
#, no-c-format
msgid "<entry>1GB</entry>"
msgstr "<entry>1GB</entry>"
#. Tag: entry
-#: using-d-i.xml:1282
+#: using-d-i.xml:1285
#, no-c-format
msgid ""
"<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1931,7 +1944,7 @@ msgstr ""
"filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
#. Tag: para
-#: using-d-i.xml:1291
+#: using-d-i.xml:1294
#, no-c-format
msgid ""
"If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1943,7 +1956,7 @@ msgstr ""
"boot</filename> 分区。其他的分区,除了交换分区,都会建在 LVM 分区之内。"
#. Tag: para
-#: using-d-i.xml:1297
+#: using-d-i.xml:1300
#, no-c-format
msgid ""
"If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1956,7 +1969,7 @@ msgstr ""
"手动把某个分区作为 EFI 引导分区。"
#. Tag: para
-#: using-d-i.xml:1305
+#: using-d-i.xml:1308
#, no-c-format
msgid ""
"After selecting a scheme, the next screen will show your new partition "
@@ -1967,7 +1980,7 @@ msgstr ""
"区是否将被格式化,将以何种方式格式化,以及它们将被挂载到哪里的相关信息。"
#. Tag: para
-#: using-d-i.xml:1311
+#: using-d-i.xml:1314
#, no-c-format
msgid ""
"The list of partitions might look like this: <informalexample><screen>\n"
@@ -2015,7 +2028,7 @@ msgstr ""
"置,但使用手动方式分区的结果会有所不同。"
#. Tag: para
-#: using-d-i.xml:1324
+#: using-d-i.xml:1327
#, no-c-format
msgid ""
"This concludes the guided partitioning. If you are satisfied with the "
@@ -2033,13 +2046,13 @@ msgstr ""
"后再次运行导引式分区,或者按照下面的介绍进行手动分区。"
#. Tag: title
-#: using-d-i.xml:1338
+#: using-d-i.xml:1341
#, no-c-format
msgid "Manual Partitioning"
msgstr "手动分区"
#. Tag: para
-#: using-d-i.xml:1339
+#: using-d-i.xml:1342
#, no-c-format
msgid ""
"A similar screen to the one shown just above will be displayed if you choose "
@@ -2054,7 +2067,7 @@ msgstr ""
"面谈到。"
#. Tag: para
-#: using-d-i.xml:1347
+#: using-d-i.xml:1350
#, no-c-format
msgid ""
"If you select a pristine disk which has neither partitions nor free space on "
@@ -2067,27 +2080,8 @@ msgstr ""
"的磁盘条目下出现一个新行,上面写着 <quote>FREE SPACE</quote>。"
#. Tag: para
-#: using-d-i.xml:1355
+#: using-d-i.xml:1358
#, no-c-format
-#| msgid ""
-#| "If you select some free space, you will have the opportunity to create a "
-#| "new partition. You will have to answer a quick series of questions about "
-#| "its size, type (primary or logical), and location (beginning or end of "
-#| "the free space). After this, you will be presented with a detailed "
-#| "overview of your new partition. The main setting is <guimenuitem>Use as:</"
-#| "guimenuitem>, which determines if the partition will have a file system "
-#| "on it, or be used for swap, software RAID, LVM, an encrypted file system, "
-#| "or not be used at all. Other settings include mountpoint, mount options, "
-#| "and bootable flag; which settings are shown depends on how the partition "
-#| "is to be used. If you don't like the preselected defaults, feel free to "
-#| "change them to your liking. E.g. by selecting the option <guimenuitem>Use "
-#| "as:</guimenuitem>, you can choose a different filesystem for this "
-#| "partition, including options to use the partition for swap, software "
-#| "RAID, LVM, or not use it at all. Another nice feature is the ability to "
-#| "copy data from an existing partition onto this one. When you are "
-#| "satisfied with your new partition, select <guimenuitem>Done setting up "
-#| "the partition</guimenuitem> and you will return to <command>partman</"
-#| "command>'s main screen."
msgid ""
"If you select some free space, you will have the opportunity to create a new "
"partition. You will have to answer a quick series of questions about its "
@@ -2107,10 +2101,23 @@ msgid ""
"onto this one. When you are satisfied with your new partition, select "
"<guimenuitem>Done setting up the partition</guimenuitem> and you will return "
"to <command>partman</command>'s main screen."
-msgstr "如果您选中了某块空闲空间,那么就可以在上面建新分区了。接下来需要回答一系列简短的问题,它们会就分区大小、类型(主分区还是逻辑分区)、以及分区的位置(在空闲空间的开始部分还是在结束部分)向您询问。回答完毕,您会看到一个新分区的小结。主要设置是 <guimenuitem>Use as:</guimenuitem>,它决定一个分区上是否会有文件系统,或被用作交换分区<phrase arch=\"linux-any\">、软 RAID、LVM 和加密文件系统</phrase>,或者根本就放着不用。其他的设置包括挂载点、挂载选项和启动标识;这些是否显示由分区的使用方式决定。如果您不喜欢预选的缺省设置的话,尽可按照自己的喜好更改。比如说,选中 <guimenuitem>Use as:</guimenuitem> 选项,然后您可以让这个分区改用其他的文件系统,把它用作交换分区<phrase arch=\"linux-any\">、软 RAID、LVM</phrase>,或者根本就放着不用。另外还有个不错的功能,就是可以把现有分区的数据复制到新分区上。一旦您对新分区的设置感到满意了,就可以选择 <guimenuitem>Done setting up the partition</guimenuitem>,然后退回到 <command>partman</command> 的主界面。"
+msgstr ""
+"如果您选中了某块空闲空间,那么就可以在上面建新分区了。接下来需要回答一系列简"
+"短的问题,它们会就分区大小、类型(主分区还是逻辑分区)、以及分区的位置(在空闲空"
+"间的开始部分还是在结束部分)向您询问。回答完毕,您会看到一个新分区的小结。主要"
+"设置是 <guimenuitem>Use as:</guimenuitem>,它决定一个分区上是否会有文件系统,"
+"或被用作交换分区<phrase arch=\"linux-any\">、软 RAID、LVM 和加密文件系统</"
+"phrase>,或者根本就放着不用。其他的设置包括挂载点、挂载选项和启动标识;这些是"
+"否显示由分区的使用方式决定。如果您不喜欢预选的缺省设置的话,尽可按照自己的喜"
+"好更改。比如说,选中 <guimenuitem>Use as:</guimenuitem> 选项,然后您可以让这"
+"个分区改用其他的文件系统,把它用作交换分区<phrase arch=\"linux-any\">、软 "
+"RAID、LVM</phrase>,或者根本就放着不用。另外还有个不错的功能,就是可以把现有"
+"分区的数据复制到新分区上。一旦您对新分区的设置感到满意了,就可以选择 "
+"<guimenuitem>Done setting up the partition</guimenuitem>,然后退回到 "
+"<command>partman</command> 的主界面。"
#. Tag: para
-#: using-d-i.xml:1377
+#: using-d-i.xml:1380
#, no-c-format
msgid ""
"If you decide you want to change something about your partition, simply "
@@ -2129,7 +2136,7 @@ msgstr ""
"这个菜单中,您还可以删除分区。"
#. Tag: para
-#: using-d-i.xml:1388
+#: using-d-i.xml:1391
#, no-c-format
msgid ""
"Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2144,7 +2151,7 @@ msgstr ""
"面的步骤,直到您纠正了这个错误。"
#. Tag: para
-#: using-d-i.xml:1396
+#: using-d-i.xml:1399
#, no-c-format
msgid ""
"If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2155,7 +2162,7 @@ msgstr ""
"点,不让您继续操作,直到您划分出这样一个分区。"
#. Tag: para
-#: using-d-i.xml:1402
+#: using-d-i.xml:1405
#, no-c-format
msgid ""
"Capabilities of <command>partman</command> can be extended with installer "
@@ -2171,7 +2178,7 @@ msgstr ""
"filename> 或者 <filename>partman-lvm</filename>)。"
#. Tag: para
-#: using-d-i.xml:1410
+#: using-d-i.xml:1413
#, no-c-format
msgid ""
"After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2185,13 +2192,13 @@ msgstr ""
"此分区。"
#. Tag: title
-#: using-d-i.xml:1438
+#: using-d-i.xml:1441
#, no-c-format
msgid "Configuring Multidisk Devices (Software RAID)"
msgstr "配置多磁盘设备(软 RAID)"
#. Tag: para
-#: using-d-i.xml:1439
+#: using-d-i.xml:1442
#, no-c-format
msgid ""
"If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2209,7 +2216,7 @@ msgstr ""
"<firstterm>软 RAID</firstterm>)。"
#. Tag: para
-#: using-d-i.xml:1452
+#: using-d-i.xml:1455
#, no-c-format
msgid ""
"MD is basically a bunch of partitions located on different disks and "
@@ -2222,7 +2229,7 @@ msgstr ""
"command> 格式化,分配挂载点,等等)。"
#. Tag: para
-#: using-d-i.xml:1460
+#: using-d-i.xml:1463
#, no-c-format
msgid ""
"What benefits this brings depends on the type of MD device you are creating. "
@@ -2314,101 +2321,101 @@ msgstr ""
"listitem> </varlistentry></variablelist> 总结:"
#. Tag: entry
-#: using-d-i.xml:1574
+#: using-d-i.xml:1577
#, no-c-format
msgid "Type"
msgstr "类型"
#. Tag: entry
-#: using-d-i.xml:1575
+#: using-d-i.xml:1578
#, no-c-format
msgid "Minimum Devices"
msgstr "最少设备"
#. Tag: entry
-#: using-d-i.xml:1576
+#: using-d-i.xml:1579
#, no-c-format
msgid "Spare Device"
msgstr "备用设备"
#. Tag: entry
-#: using-d-i.xml:1577
+#: using-d-i.xml:1580
#, no-c-format
msgid "Survives disk failure?"
msgstr "幸免于磁盘损坏?"
#. Tag: entry
-#: using-d-i.xml:1578
+#: using-d-i.xml:1581
#, no-c-format
msgid "Available Space"
msgstr "可用空间"
#. Tag: entry
-#: using-d-i.xml:1584
+#: using-d-i.xml:1587
#, no-c-format
msgid "RAID0"
msgstr "RAID0"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1585 using-d-i.xml:1593 using-d-i.xml:1623
+#: using-d-i.xml:1588 using-d-i.xml:1596 using-d-i.xml:1626
#, no-c-format
msgid "<entry>2</entry>"
msgstr "<entry>2</entry>"
# index.docbook:1106, index.docbook:1107
#. Tag: entry
-#: using-d-i.xml:1586 using-d-i.xml:1587
+#: using-d-i.xml:1589 using-d-i.xml:1590
#, no-c-format
msgid "<entry>no</entry>"
msgstr "<entry>否</entry>"
#. Tag: entry
-#: using-d-i.xml:1588
+#: using-d-i.xml:1591
#, no-c-format
msgid "Size of the smallest partition multiplied by number of devices in RAID"
msgstr "容量为最小分区乘以 RAID 设备数"
#. Tag: entry
-#: using-d-i.xml:1592
+#: using-d-i.xml:1595
#, no-c-format
msgid "RAID1"
msgstr "RAID1"
# index.docbook:1114, index.docbook:1122
#. Tag: entry
-#: using-d-i.xml:1594 using-d-i.xml:1602 using-d-i.xml:1613 using-d-i.xml:1624
+#: using-d-i.xml:1597 using-d-i.xml:1605 using-d-i.xml:1616 using-d-i.xml:1627
#, no-c-format
msgid "optional"
msgstr "可选"
# index.docbook:1115, index.docbook:1123
#. Tag: entry
-#: using-d-i.xml:1595 using-d-i.xml:1603 using-d-i.xml:1614 using-d-i.xml:1625
+#: using-d-i.xml:1598 using-d-i.xml:1606 using-d-i.xml:1617 using-d-i.xml:1628
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>是</entry>"
#. Tag: entry
-#: using-d-i.xml:1596
+#: using-d-i.xml:1599
#, no-c-format
msgid "Size of the smallest partition in RAID"
msgstr "容量为 RAID 最小分区"
#. Tag: entry
-#: using-d-i.xml:1600
+#: using-d-i.xml:1603
#, no-c-format
msgid "RAID5"
msgstr "RAID5"
#. Tag: entry
-#: using-d-i.xml:1601
+#: using-d-i.xml:1604
#, no-c-format
msgid "<entry>3</entry>"
msgstr "<entry>3</entry>"
#. Tag: entry
-#: using-d-i.xml:1604
+#: using-d-i.xml:1607
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2416,20 +2423,20 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减一)"
#. Tag: entry
-#: using-d-i.xml:1611
+#: using-d-i.xml:1614
#, no-c-format
msgid "RAID6"
msgstr "RAID6"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1612
+#: using-d-i.xml:1615
#, no-c-format
msgid "<entry>4</entry>"
msgstr "<entry>4</entry>"
#. Tag: entry
-#: using-d-i.xml:1615
+#: using-d-i.xml:1618
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2437,13 +2444,13 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减二)"
#. Tag: entry
-#: using-d-i.xml:1622
+#: using-d-i.xml:1625
#, no-c-format
msgid "RAID10"
msgstr "RAID10"
#. Tag: entry
-#: using-d-i.xml:1626
+#: using-d-i.xml:1629
#, no-c-format
msgid ""
"Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2451,7 +2458,7 @@ msgid ""
msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
#. Tag: para
-#: using-d-i.xml:1633
+#: using-d-i.xml:1636
#, no-c-format
msgid ""
"If you want to know more about Software RAID, have a look at <ulink url="
@@ -2461,7 +2468,7 @@ msgstr ""
"\">Software RAID HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1638
+#: using-d-i.xml:1641
#, no-c-format
msgid ""
"To create an MD device, you need to have the desired partitions it should "
@@ -2476,7 +2483,7 @@ msgstr ""
"volume for RAID</guimenuitem> </menuchoice>。)"
#. Tag: para
-#: using-d-i.xml:1647
+#: using-d-i.xml:1650
#, no-c-format
msgid ""
"Make sure that the system can be booted with the partitioning scheme you are "
@@ -2494,7 +2501,7 @@ msgstr ""
"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
#. Tag: para
-#: using-d-i.xml:1659
+#: using-d-i.xml:1662
#, no-c-format
msgid ""
"Support for MD is a relatively new addition to the installer. You may "
@@ -2509,7 +2516,7 @@ msgstr ""
"验的用户,从 shell 手动地处理一些配置和安装步骤,也许会绕开这些问题。"
#. Tag: para
-#: using-d-i.xml:1668
+#: using-d-i.xml:1671
#, no-c-format
msgid ""
"Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2529,7 +2536,7 @@ msgstr ""
"RAID1)。后续操作会根据您选择的 MD 类型而定。"
#. Tag: para
-#: using-d-i.xml:1681
+#: using-d-i.xml:1684
#, no-c-format
msgid ""
"RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2540,7 +2547,7 @@ msgstr ""
"组成 MD 的分区。"
#. Tag: para
-#: using-d-i.xml:1688
+#: using-d-i.xml:1691
#, no-c-format
msgid ""
"RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2557,7 +2564,7 @@ msgstr ""
"将不会允许您继续下去,直到纠正错误。"
#. Tag: para
-#: using-d-i.xml:1700
+#: using-d-i.xml:1703
#, no-c-format
msgid ""
"RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2567,7 +2574,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1706
+#: using-d-i.xml:1709
#, no-c-format
msgid ""
"RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2577,7 +2584,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1712
+#: using-d-i.xml:1715
#, no-c-format
msgid ""
"RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2595,7 +2602,7 @@ msgstr ""
"贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
#. Tag: para
-#: using-d-i.xml:1726
+#: using-d-i.xml:1729
#, no-c-format
msgid ""
"It is perfectly possible to have several types of MD at once. For example, "
@@ -2611,7 +2618,7 @@ msgstr ""
"RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
#. Tag: para
-#: using-d-i.xml:1735
+#: using-d-i.xml:1738
#, no-c-format
msgid ""
"After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2624,13 +2631,13 @@ msgstr ""
"您的新 MD 设备,并分配挂载点这样的属性。"
#. Tag: title
-#: using-d-i.xml:1750
+#: using-d-i.xml:1753
#, no-c-format
msgid "Configuring the Logical Volume Manager (LVM)"
msgstr "配置逻辑卷管理(LVM)"
#. Tag: para
-#: using-d-i.xml:1751
+#: using-d-i.xml:1754
#, no-c-format
msgid ""
"If you are working with computers at the level of system administrator or "
@@ -2644,7 +2651,7 @@ msgstr ""
"或符号链接等方法来折腾。"
#. Tag: para
-#: using-d-i.xml:1759
+#: using-d-i.xml:1762
#, no-c-format
msgid ""
"To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2662,7 +2669,7 @@ msgstr ""
"点在于它可以跨越多个物理磁盘。"
#. Tag: para
-#: using-d-i.xml:1769
+#: using-d-i.xml:1772
#, no-c-format
msgid ""
"Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2680,7 +2687,7 @@ msgstr ""
"阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1780
+#: using-d-i.xml:1783
#, no-c-format
msgid ""
"LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2695,7 +2702,7 @@ msgstr ""
"<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
#. Tag: para
-#: using-d-i.xml:1789
+#: using-d-i.xml:1792
#, no-c-format
msgid ""
"When you return to the main <command>partman</command> screen, you will see "
@@ -2712,7 +2719,7 @@ msgstr ""
"了 LVM 配置的小结。菜单项本身是与内容相关,只显示可用的操作。可能的操作有:"
#. Tag: para
-#: using-d-i.xml:1800
+#: using-d-i.xml:1803
#, no-c-format
msgid ""
"<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2722,43 +2729,43 @@ msgstr ""
"名称和逻辑卷尺寸等"
#. Tag: guimenuitem
-#: using-d-i.xml:1805
+#: using-d-i.xml:1808
#, no-c-format
msgid "Create volume group"
msgstr "Create volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1808
+#: using-d-i.xml:1811
#, no-c-format
msgid "Create logical volume"
msgstr "Create logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1811
+#: using-d-i.xml:1814
#, no-c-format
msgid "Delete volume group"
msgstr "Delete volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1814
+#: using-d-i.xml:1817
#, no-c-format
msgid "Delete logical volume"
msgstr "Delete logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1817
+#: using-d-i.xml:1820
#, no-c-format
msgid "Extend volume group"
msgstr "Extend volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1820
+#: using-d-i.xml:1823
#, no-c-format
msgid "Reduce volume group"
msgstr "Reduce volume group"
#. Tag: para
-#: using-d-i.xml:1822
+#: using-d-i.xml:1825
#, no-c-format
msgid ""
"<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2767,7 +2774,7 @@ msgstr ""
"<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
#. Tag: para
-#: using-d-i.xml:1828
+#: using-d-i.xml:1831
#, no-c-format
msgid ""
"Use the options in that menu to first create a volume group and then create "
@@ -2775,7 +2782,7 @@ msgid ""
msgstr "使用该菜单内的选项首先创建卷组,然后在里面创建逻辑卷。"
#. Tag: para
-#: using-d-i.xml:1833
+#: using-d-i.xml:1836
#, no-c-format
msgid ""
"After you return to the main <command>partman</command> screen, any created "
@@ -2786,13 +2793,13 @@ msgstr ""
"通的分区一样(您也应该这样对待它们)。"
#. Tag: title
-#: using-d-i.xml:1847
+#: using-d-i.xml:1850
#, no-c-format
msgid "Configuring Encrypted Volumes"
msgstr "配置加密卷"
#. Tag: para
-#: using-d-i.xml:1848
+#: using-d-i.xml:1851
#, no-c-format
msgid ""
"&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2810,7 +2817,7 @@ msgstr ""
"许可以访问硬盘,但是没有正确的口令,硬盘上的数据看起来就像是随机的字符。"
#. Tag: para
-#: using-d-i.xml:1860
+#: using-d-i.xml:1863
#, no-c-format
msgid ""
"The two most important partitions to encrypt are: the home partition, where "
@@ -2833,7 +2840,7 @@ msgstr ""
"加载内核。"
#. Tag: para
-#: using-d-i.xml:1875
+#: using-d-i.xml:1878
#, no-c-format
msgid ""
"Please note that the performance of encrypted partitions will be less than "
@@ -2845,7 +2852,7 @@ msgstr ""
"密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
#. Tag: para
-#: using-d-i.xml:1882
+#: using-d-i.xml:1885
#, no-c-format
msgid ""
"To use encryption, you have to create a new partition by selecting some free "
@@ -2863,7 +2870,7 @@ msgstr ""
"guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
#. Tag: para
-#: using-d-i.xml:1893
+#: using-d-i.xml:1896
#, no-c-format
msgid ""
"&d-i; supports several encryption methods. The default method is "
@@ -2878,7 +2885,7 @@ msgstr ""
"使用默认的方法。"
#. Tag: para
-#: using-d-i.xml:1905
+#: using-d-i.xml:1908
#, no-c-format
msgid ""
"First, let's have a look at the options available when you select "
@@ -2891,13 +2898,13 @@ msgstr ""
"的安全考虑的选择。"
#. Tag: term
-#: using-d-i.xml:1915
+#: using-d-i.xml:1918
#, no-c-format
msgid "Encryption: <userinput>aes</userinput>"
msgstr "Encryption: <userinput>aes</userinput>"
#. Tag: para
-#: using-d-i.xml:1917
+#: using-d-i.xml:1920
#, no-c-format
msgid ""
"This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2920,13 +2927,13 @@ msgstr ""
"纪的敏感信息。"
#. Tag: term
-#: using-d-i.xml:1935
+#: using-d-i.xml:1938
#, no-c-format
msgid "Key size: <userinput>256</userinput>"
msgstr "Key size: <userinput>256</userinput>"
#. Tag: para
-#: using-d-i.xml:1937
+#: using-d-i.xml:1940
#, no-c-format
msgid ""
"Here you can specify the length of the encryption key. With a larger key "
@@ -2938,13 +2945,13 @@ msgstr ""
"加长度自然会降低性能。cipher 决定可用的密钥长度。"
#. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:1952
#, no-c-format
msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
#. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:1954
#, no-c-format
msgid ""
"The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2960,7 +2967,7 @@ msgstr ""
"复模板推断信息。"
#. Tag: para
-#: using-d-i.xml:1961
+#: using-d-i.xml:1964
#, no-c-format
msgid ""
"From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2973,25 +2980,25 @@ msgstr ""
"法时,才使用其他的算法。"
#. Tag: term
-#: using-d-i.xml:1973
+#: using-d-i.xml:1976
#, no-c-format
msgid "Encryption key: <userinput>Passphrase</userinput>"
msgstr "Encryption key: <userinput>Passphrase</userinput>"
#. Tag: para
-#: using-d-i.xml:1975
+#: using-d-i.xml:1978
#, no-c-format
msgid "Here you can choose the type of the encryption key for this partition."
msgstr "这里您可以为分区选择所使用的加密密钥类型。"
#. Tag: term
-#: using-d-i.xml:1981
+#: using-d-i.xml:1984
#, no-c-format
msgid "Passphrase"
msgstr "Passphrase"
#. Tag: para
-#: using-d-i.xml:1982
+#: using-d-i.xml:1985
#, no-c-format
msgid ""
"The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3004,13 +3011,13 @@ msgstr ""
"使用时要求输入。"
#. Tag: term
-#: using-d-i.xml:1997 using-d-i.xml:2090
+#: using-d-i.xml:2000 using-d-i.xml:2093
#, no-c-format
msgid "Random key"
msgstr "Random key"
#. Tag: para
-#: using-d-i.xml:1998
+#: using-d-i.xml:2001
#, no-c-format
msgid ""
"A new encryption key will be generated from random data each time you try to "
@@ -3025,7 +3032,7 @@ msgstr ""
"面临暴力破解,但是除非加密算法中有未知的弱点,这辈子也不会被攻破。)"
#. Tag: para
-#: using-d-i.xml:2007
+#: using-d-i.xml:2010
#, no-c-format
msgid ""
"Random keys are useful for swap partitions because you do not need to bother "
@@ -3042,13 +3049,13 @@ msgstr ""
"写入到交换分区的数据。"
#. Tag: term
-#: using-d-i.xml:2026 using-d-i.xml:2103
+#: using-d-i.xml:2029 using-d-i.xml:2106
#, no-c-format
msgid "Erase data: <userinput>yes</userinput>"
msgstr "Erase data: <userinput>yes</userinput>"
#. Tag: para
-#: using-d-i.xml:2028
+#: using-d-i.xml:2031
#, no-c-format
msgid ""
"Determines whether the content of this partition should be overwritten with "
@@ -3066,7 +3073,7 @@ msgstr ""
"备上的数据。</para></footnote>。"
#. Tag: para
-#: using-d-i.xml:2048
+#: using-d-i.xml:2051
#, no-c-format
msgid ""
"If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3078,13 +3085,13 @@ msgstr ""
"下面内容:"
#. Tag: term
-#: using-d-i.xml:2057
+#: using-d-i.xml:2060
#, no-c-format
msgid "Encryption: <userinput>AES256</userinput>"
msgstr "Encryption: <userinput>AES256</userinput>"
#. Tag: para
-#: using-d-i.xml:2059
+#: using-d-i.xml:2062
#, no-c-format
msgid ""
"For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3095,25 +3102,25 @@ msgstr ""
"时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
#. Tag: term
-#: using-d-i.xml:2069
+#: using-d-i.xml:2072
#, no-c-format
msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
#. Tag: para
-#: using-d-i.xml:2071
+#: using-d-i.xml:2074
#, no-c-format
msgid "Here you can select the type of the encryption key for this partition."
msgstr "这里您可以为分区选择加密密钥的类型。"
#. Tag: term
-#: using-d-i.xml:2077
+#: using-d-i.xml:2080
#, no-c-format
msgid "Keyfile (GnuPG)"
msgstr "Keyfile (GnuPG)"
#. Tag: para
-#: using-d-i.xml:2078
+#: using-d-i.xml:2081
#, no-c-format
msgid ""
"The encryption key will be generated from random data during the "
@@ -3125,19 +3132,19 @@ msgstr ""
"application> 加密。要使用它,您需要输入正确的 passphrase (在以后会要求提供)。"
#. Tag: para
-#: using-d-i.xml:2091
+#: using-d-i.xml:2094
#, no-c-format
msgid "Please see the section on random keys above."
msgstr "请查阅前面有关随机密钥的章节。"
#. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2108
#, no-c-format
msgid "Please see the the section on erasing data above."
msgstr "请查阅前面有关删除数据的章节。"
#. Tag: para
-#: using-d-i.xml:2114
+#: using-d-i.xml:2117
#, no-c-format
msgid ""
"After you have selected the desired parameters for your encrypted "
@@ -3152,7 +3159,7 @@ msgstr ""
"标记分区上的数据,以及写新分区表等动作。对于大的分区,这会花一些时间。"
#. Tag: para
-#: using-d-i.xml:2124
+#: using-d-i.xml:2127
#, no-c-format
msgid ""
"Next you will be asked to enter a passphrase for partitions configured to "
@@ -3166,7 +3173,7 @@ msgstr ""
"(比如生日、爱好、宠物的名字、以及家里其他成员的名字,等等)。"
#. Tag: para
-#: using-d-i.xml:2133
+#: using-d-i.xml:2136
#, no-c-format
msgid ""
"Before you input any passphrases, you should have made sure that your "
@@ -3186,7 +3193,7 @@ msgstr ""
"所选择的键盘布局未能正确建立,而且是在为根文件系统输入 passphrase 的时候。"
#. Tag: para
-#: using-d-i.xml:2146
+#: using-d-i.xml:2149
#, no-c-format
msgid ""
"If you selected to use methods other than a passphrase to create encryption "
@@ -3205,7 +3212,7 @@ msgstr ""
"程在每个要加密的分区重复进行。"
#. Tag: para
-#: using-d-i.xml:2162
+#: using-d-i.xml:2165
#, no-c-format
msgid ""
"After returning to the main partitioning menu, you will see all encrypted "
@@ -3236,7 +3243,7 @@ msgstr ""
"您不合适,可以进行修改。"
#. Tag: para
-#: using-d-i.xml:2175
+#: using-d-i.xml:2178
#, no-c-format
msgid ""
"Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3252,7 +3259,7 @@ msgstr ""
"面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
#. Tag: para
-#: using-d-i.xml:2185
+#: using-d-i.xml:2188
#, no-c-format
msgid ""
"Once you are satisfied with the partitioning scheme, continue with the "
@@ -3260,13 +3267,13 @@ msgid ""
msgstr "当您满意分区之后,可以继续安装过程。"
#. Tag: title
-#: using-d-i.xml:2196
+#: using-d-i.xml:2199
#, no-c-format
msgid "Installing the Base System"
msgstr "安装基本系统"
#. Tag: para
-#: using-d-i.xml:2197
+#: using-d-i.xml:2200
#, no-c-format
msgid ""
"Although this stage is the least problematic, it consumes a significant "
@@ -3278,7 +3285,7 @@ msgstr ""
"果您用较慢的计算机或网络,这要花费好一会儿时间。"
#. Tag: para
-#: using-d-i.xml:2210
+#: using-d-i.xml:2213
#, no-c-format
msgid ""
"During installation of the base system, package unpacking and setup messages "
@@ -3293,7 +3300,7 @@ msgstr ""
"Alt</keycap><keycap>F1</keycap></keycombo>。"
#. Tag: para
-#: using-d-i.xml:2219
+#: using-d-i.xml:2222
#, no-c-format
msgid ""
"The unpack/setup messages generated during this phase are also saved in "
@@ -3304,7 +3311,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: para
-#: using-d-i.xml:2225
+#: using-d-i.xml:2228
#, no-c-format
msgid ""
"As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3317,7 +3324,7 @@ msgstr ""
"核。"
#. Tag: para
-#: using-d-i.xml:2232
+#: using-d-i.xml:2235
#, no-c-format
msgid ""
"When packages are installed using the package management system, it will by "
@@ -3332,7 +3339,7 @@ msgstr ""
"看,正常情况下应该安装这些软件。"
#. Tag: para
-#: using-d-i.xml:2242
+#: using-d-i.xml:2245
#, no-c-format
msgid ""
"For technical reasons packages installed during the installation of the base "
@@ -3344,13 +3351,13 @@ msgstr ""
"</quote>。上面提到的原则只适用于之后的安装过程。"
#. Tag: title
-#: using-d-i.xml:2254
+#: using-d-i.xml:2257
#, no-c-format
msgid "Installing Additional Software"
msgstr "安装额外的软件"
#. Tag: para
-#: using-d-i.xml:2255
+#: using-d-i.xml:2258
#, no-c-format
msgid ""
"At this point you have a usable but limited system. Most users will want to "
@@ -3363,13 +3370,13 @@ msgstr ""
"装基本系统还要花时间。"
#. Tag: title
-#: using-d-i.xml:2270
+#: using-d-i.xml:2273
#, no-c-format
msgid "Configuring apt"
msgstr "配置 apt"
#. Tag: para
-#: using-d-i.xml:2272
+#: using-d-i.xml:2275
#, no-c-format
msgid ""
"One of the tools used to install packages on a &debian-gnu; system is a "
@@ -3400,7 +3407,7 @@ msgstr ""
"软件包管理工具使用。"
#. Tag: para
-#: using-d-i.xml:2296
+#: using-d-i.xml:2299
#, no-c-format
msgid ""
"<command>apt</command> must be configured so that it knows from where to "
@@ -3413,7 +3420,7 @@ msgstr ""
"并编辑成自己喜欢的地方。"
#. Tag: para
-#: using-d-i.xml:2303
+#: using-d-i.xml:2306
#, no-c-format
msgid ""
"If you are installing at default priority, the installer will largely take "
@@ -3428,7 +3435,7 @@ msgstr ""
"序程序会自动加上安全镜像,它是 <quote>volatile</quote> 更新服务的镜像。"
#. Tag: para
-#: using-d-i.xml:2312
+#: using-d-i.xml:2315
#, no-c-format
msgid ""
"If you are installing at a lower priority (e.g. in expert mode), you will be "
@@ -3442,13 +3449,13 @@ msgstr ""
"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title
-#: using-d-i.xml:2323
+#: using-d-i.xml:2326
#, no-c-format
msgid "Installing from more than one CD or DVD"
msgstr "从多个 CD 或 DVD 安装"
#. Tag: para
-#: using-d-i.xml:2325
+#: using-d-i.xml:2328
#, no-c-format
msgid ""
"If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -3461,7 +3468,7 @@ msgstr ""
"们里面的软件包了。"
#. Tag: para
-#: using-d-i.xml:2332
+#: using-d-i.xml:2335
#, no-c-format
msgid ""
"If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -3473,7 +3480,7 @@ msgstr ""
"节说明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
#. Tag: para
-#: using-d-i.xml:2340
+#: using-d-i.xml:2343
#, no-c-format
msgid ""
"Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -3485,7 +3492,7 @@ msgstr ""
"常用的软件,而最后一张光盘里面包含的是很少有人用到的软件。"
#. Tag: para
-#: using-d-i.xml:2347
+#: using-d-i.xml:2350
#, no-c-format
msgid ""
"It also means that buying or downloading and burning a full CD set is just a "
@@ -3499,7 +3506,7 @@ msgstr ""
"DVD 的情况类似:只要一张,或者前两张 DVD 就能满足您大部分要求。"
#. Tag: para
-#: using-d-i.xml:2356
+#: using-d-i.xml:2359
#, no-c-format
msgid ""
"A good rule of thumb is that for a regular desktop installation (using the "
@@ -3512,7 +3519,7 @@ msgstr ""
"境。"
#. Tag: para
-#: using-d-i.xml:2364
+#: using-d-i.xml:2367
#, no-c-format
msgid ""
"If you do scan multiple CDs or DVDs, the installer will prompt you to "
@@ -3527,13 +3534,13 @@ msgstr ""
"照次序来可以降低出错的几率。"
#. Tag: title
-#: using-d-i.xml:2377
+#: using-d-i.xml:2380
#, no-c-format
msgid "Using a network mirror"
msgstr "使用网络镜像"
#. Tag: para
-#: using-d-i.xml:2379
+#: using-d-i.xml:2382
#, no-c-format
msgid ""
"One question that will be asked during most installs is whether or not to "
@@ -3544,7 +3551,7 @@ msgstr ""
"默认答案会很好,但还是有一些例外。"
#. Tag: para
-#: using-d-i.xml:2385
+#: using-d-i.xml:2388
#, no-c-format
msgid ""
"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -3560,7 +3567,7 @@ msgstr ""
"<literal>desktop</literal> 任务。"
#. Tag: para
-#: using-d-i.xml:2394
+#: using-d-i.xml:2397
#, no-c-format
msgid ""
"If you are installing from a single full CD or using a full CD image, using "
@@ -3577,7 +3584,7 @@ msgstr ""
"装,以后(比如,重新启动到新系统)再安装额外的软件包。"
#. Tag: para
-#: using-d-i.xml:2405
+#: using-d-i.xml:2408
#, no-c-format
msgid ""
"If you are installing from a DVD or using a DVD image, any packages needed "
@@ -3590,7 +3597,7 @@ msgstr ""
"项。"
#. Tag: para
-#: using-d-i.xml:2412
+#: using-d-i.xml:2415
#, no-c-format
msgid ""
"One advantage of adding a network mirror is that updates that have occurred "
@@ -3603,7 +3610,7 @@ msgstr ""
"可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
#. Tag: para
-#: using-d-i.xml:2419
+#: using-d-i.xml:2422
#, no-c-format
msgid ""
"In summary: selecting a network mirror is generally a good idea, except if "
@@ -3617,26 +3624,26 @@ msgstr ""
"的数据量取决于"
#. Tag: para
-#: using-d-i.xml:2428
+#: using-d-i.xml:2431
#, no-c-format
msgid "the tasks you select in the next step of the installation,"
msgstr "安装下一步选择的任务,"
#. Tag: para
-#: using-d-i.xml:2433
+#: using-d-i.xml:2436
#, no-c-format
msgid "which packages are needed for those tasks,"
msgstr "这些任务所需的软件包,"
#. Tag: para
-#: using-d-i.xml:2438
+#: using-d-i.xml:2441
#, no-c-format
msgid ""
"which of those packages are present on the CDs or DVDs you have scanned, and"
msgstr "已检测的 CD 或 DVD 上的软件包,并且"
#. Tag: para
-#: using-d-i.xml:2443
+#: using-d-i.xml:2446
#, no-c-format
msgid ""
"whether any updated versions of packages included on the CDs or DVDs are "
@@ -3647,7 +3654,7 @@ msgstr ""
"安全更新的镜像)。"
#. Tag: para
-#: using-d-i.xml:2452
+#: using-d-i.xml:2455
#, no-c-format
msgid ""
"Note that the last point means that, even if you choose not to use a network "
@@ -3659,13 +3666,13 @@ msgstr ""
"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"
#. Tag: title
-#: using-d-i.xml:2468
+#: using-d-i.xml:2471
#, no-c-format
msgid "Selecting and Installing Software"
msgstr "选择和安装软件"
#. Tag: para
-#: using-d-i.xml:2470
+#: using-d-i.xml:2473
#, no-c-format
msgid ""
"During the installation process, you are given the opportunity to select "
@@ -3680,7 +3687,7 @@ msgstr ""
"来快速建立您的计算机应对各种任务。"
#. Tag: para
-#: using-d-i.xml:2479
+#: using-d-i.xml:2482
#, no-c-format
msgid ""
"So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3710,7 +3717,7 @@ msgstr ""
"空间。"
#. Tag: para
-#: using-d-i.xml:2506
+#: using-d-i.xml:2509
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3721,7 +3728,7 @@ msgstr ""
"些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2513
+#: using-d-i.xml:2516
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -3729,7 +3736,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2519
+#: using-d-i.xml:2522
#, no-c-format
msgid ""
"Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
@@ -3739,7 +3746,7 @@ msgstr ""
"GNOME 桌面环境。"
#. Tag: para
-#: using-d-i.xml:2524
+#: using-d-i.xml:2527
#, no-c-format
msgid ""
"It is not possible to interactively select a different desktop during the "
@@ -3758,7 +3765,7 @@ msgstr ""
"literal> 或 <literal>desktop=lxde</literal> 进行选择。"
#. Tag: para
-#: using-d-i.xml:2535
+#: using-d-i.xml:2538
#, no-c-format
msgid ""
"Some CD images (businesscard, netinst and DVD) also allow selection of the "
@@ -3771,7 +3778,7 @@ msgstr ""
"<quote>Alternative desktop environments</quote>。"
#. Tag: para
-#: using-d-i.xml:2542
+#: using-d-i.xml:2545
#, no-c-format
msgid ""
"Note that this will only work if the packages needed for the desired desktop "
@@ -3786,7 +3793,7 @@ msgstr ""
"Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
#. Tag: para
-#: using-d-i.xml:2552
+#: using-d-i.xml:2555
#, no-c-format
msgid ""
"The various server tasks will install software roughly as follows. DNS "
@@ -3805,7 +3812,7 @@ msgstr ""
"classname>。"
#. Tag: para
-#: using-d-i.xml:2563
+#: using-d-i.xml:2566
#, no-c-format
msgid ""
"The <quote>Standard system</quote> task will install any package that has a "
@@ -3819,7 +3826,7 @@ msgstr ""
"并需要一个最小化的系统,您应该让该任务选中。"
#. Tag: para
-#: using-d-i.xml:2571
+#: using-d-i.xml:2574
#, no-c-format
msgid ""
"If during language selection a default locale other than the <quote>C</"
@@ -3836,7 +3843,7 @@ msgstr ""
"(如果存在)还会安装该桌面对应的本地化软件包。"
#. Tag: para
-#: using-d-i.xml:2581
+#: using-d-i.xml:2584
#, no-c-format
msgid ""
"Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3848,7 +3855,7 @@ msgstr ""
"选中任务的软件包。假如某个程序需要用户输入信息,它将提示您指定。"
#. Tag: para
-#: using-d-i.xml:2588
+#: using-d-i.xml:2591
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -3863,7 +3870,7 @@ msgstr ""
"间。一旦启动,安装软件包过程将无法取消。"
#. Tag: para
-#: using-d-i.xml:2597
+#: using-d-i.xml:2600
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -3878,13 +3885,13 @@ msgstr ""
"新);如果您安装的是测试版本,这会出现在使用旧映像安装时。"
#. Tag: title
-#: using-d-i.xml:2612
+#: using-d-i.xml:2615
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2614
+#: using-d-i.xml:2617
#, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -3897,13 +3904,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2629
+#: using-d-i.xml:2632
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2631
+#: using-d-i.xml:2634
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -3917,7 +3924,7 @@ msgstr ""
"&debian; 一起,计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2639
+#: using-d-i.xml:2642
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -3931,13 +3938,13 @@ msgstr ""
"管理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2657
+#: using-d-i.xml:2660
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2658
+#: using-d-i.xml:2661
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3952,19 +3959,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2667
+#: using-d-i.xml:2670
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2679
+#: using-d-i.xml:2682
#, no-c-format
msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2681
+#: using-d-i.xml:2684
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3975,7 +3982,7 @@ msgstr ""
"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
-#: using-d-i.xml:2687
+#: using-d-i.xml:2690
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3987,7 +3994,7 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2693
+#: using-d-i.xml:2696
#, no-c-format
msgid ""
"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3998,13 +4005,13 @@ msgstr ""
"用的任何 bootloader。"
#. Tag: title
-#: using-d-i.xml:2706
+#: using-d-i.xml:2709
#, no-c-format
msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2708
+#: using-d-i.xml:2711
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -4020,7 +4027,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2718
+#: using-d-i.xml:2721
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -4033,7 +4040,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2726
+#: using-d-i.xml:2729
#, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -4041,13 +4048,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader:"
#. Tag: term
-#: using-d-i.xml:2733
+#: using-d-i.xml:2736
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2733
+#: using-d-i.xml:2736
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -4055,13 +4062,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2740
+#: using-d-i.xml:2743
#, no-c-format
msgid "new &debian; partition"
msgstr "新 &debian; 分区"
#. Tag: para
-#: using-d-i.xml:2740
+#: using-d-i.xml:2743
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -4072,13 +4079,13 @@ msgstr ""
"新 &debian; 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2749
+#: using-d-i.xml:2752
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2749
+#: using-d-i.xml:2752
#, no-c-format
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
@@ -4091,7 +4098,7 @@ msgstr ""
"filename> 或 <filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2759
+#: using-d-i.xml:2762
#, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4105,13 +4112,13 @@ msgstr ""
"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;!"
#. Tag: title
-#: using-d-i.xml:2775
+#: using-d-i.xml:2778
#, no-c-format
msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2777
+#: using-d-i.xml:2780
#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4136,7 +4143,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2793
+#: using-d-i.xml:2796
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4151,13 +4158,13 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2805
+#: using-d-i.xml:2808
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2807
+#: using-d-i.xml:2810
#, no-c-format
msgid ""
"The criterion for selecting a partition is that it must be a FAT format "
@@ -4173,13 +4180,13 @@ msgstr ""
"容!"
#. Tag: title
-#: using-d-i.xml:2822
+#: using-d-i.xml:2825
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2824
+#: using-d-i.xml:2827
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4205,13 +4212,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2846
+#: using-d-i.xml:2849
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2847
+#: using-d-i.xml:2850
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -4222,13 +4229,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2856
+#: using-d-i.xml:2859
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2857
+#: using-d-i.xml:2860
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4241,13 +4248,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2867
+#: using-d-i.xml:2870
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2868
+#: using-d-i.xml:2871
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4260,13 +4267,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2880
+#: using-d-i.xml:2883
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2881
+#: using-d-i.xml:2884
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -4277,13 +4284,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2891
+#: using-d-i.xml:2894
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2892
+#: using-d-i.xml:2895
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4296,13 +4303,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2912
+#: using-d-i.xml:2915
#, no-c-format
msgid "<command>arcboot</command>-installer"
msgstr "<command>arcboot</command>-installer"
#. Tag: para
-#: using-d-i.xml:2913
+#: using-d-i.xml:2916
#, no-c-format
msgid ""
"The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -4342,13 +4349,13 @@ msgstr ""
"</screen></informalexample> ,然后键入 <command>boot</command>。"
#. Tag: replaceable
-#: using-d-i.xml:2932
+#: using-d-i.xml:2935
#, no-c-format
msgid "scsi"
msgstr "scsi"
#. Tag: para
-#: using-d-i.xml:2933
+#: using-d-i.xml:2936
#, no-c-format
msgid ""
"is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -4356,13 +4363,13 @@ msgid ""
msgstr "是启动的 SCSI 总线,<userinput>0</userinput> 为板载控制器"
#. Tag: replaceable
-#: using-d-i.xml:2941
+#: using-d-i.xml:2944
#, no-c-format
msgid "disk"
msgstr "disk"
#. Tag: para
-#: using-d-i.xml:2942
+#: using-d-i.xml:2945
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -4371,13 +4378,13 @@ msgstr "硬盘的 SCSI ID,<command>arcboot</command> 安装在其上"
# index.docbook:1643, index.docbook:1712
#. Tag: replaceable
-#: using-d-i.xml:2950
+#: using-d-i.xml:2953
#, no-c-format
msgid "partnr"
msgstr "partnr"
#. Tag: para
-#: using-d-i.xml:2951
+#: using-d-i.xml:2954
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4385,13 +4392,13 @@ msgid ""
msgstr "分区号,<filename>/etc/arcboot.conf</filename> 处于该分区"
#. Tag: replaceable
-#: using-d-i.xml:2959
+#: using-d-i.xml:2962
#, no-c-format
msgid "config"
msgstr "config"
#. Tag: para
-#: using-d-i.xml:2960
+#: using-d-i.xml:2963
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4401,13 +4408,13 @@ msgstr ""
"quote> 。"
#. Tag: title
-#: using-d-i.xml:2981
+#: using-d-i.xml:2984
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2982
+#: using-d-i.xml:2985
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4425,13 +4432,13 @@ msgstr ""
"设为启动 &debian-gnu;。"
#. Tag: title
-#: using-d-i.xml:3000
+#: using-d-i.xml:3003
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:3001
+#: using-d-i.xml:3004
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4444,13 +4451,13 @@ msgstr ""
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
#. Tag: title
-#: using-d-i.xml:3017
+#: using-d-i.xml:3020
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:3018
+#: using-d-i.xml:3021
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4465,13 +4472,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:3035
+#: using-d-i.xml:3038
#, no-c-format
msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:3037
+#: using-d-i.xml:3040
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4498,13 +4505,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:3062
+#: using-d-i.xml:3065
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用 boot loader 继续进行"
#. Tag: para
-#: using-d-i.xml:3064
+#: using-d-i.xml:3067
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -4515,7 +4522,7 @@ msgstr ""
"是因为不想要(比如,您想使用已经存在的 boot loader)"
#. Tag: para
-#: using-d-i.xml:3071
+#: using-d-i.xml:3074
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -4534,13 +4541,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:3088
+#: using-d-i.xml:3091
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:3089
+#: using-d-i.xml:3092
#, no-c-format
msgid ""
"This is the last step in the &debian; installation process during which the "
@@ -4551,13 +4558,13 @@ msgstr ""
"&d-i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:3102
+#: using-d-i.xml:3105
#, no-c-format
msgid "Setting the System Clock"
msgstr "设置系统时钟"
#. Tag: para
-#: using-d-i.xml:3104
+#: using-d-i.xml:3107
#, no-c-format
msgid ""
"The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4569,7 +4576,7 @@ msgstr ""
"装程序依据是否有其他系统已经安装这类事情,来决定时钟要不要设为 UTC。"
#. Tag: para
-#: using-d-i.xml:3111
+#: using-d-i.xml:3114
#, no-c-format
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
@@ -4585,7 +4592,7 @@ msgstr ""
"常设为本地时间。如果您需要多重引导,请选择本地时间而不是 GMT。</phrase>"
#. Tag: para
-#: using-d-i.xml:3122
+#: using-d-i.xml:3125
#, no-c-format
msgid ""
"At this point &d-i; will also attempt to save the current time to the "
@@ -4596,13 +4603,13 @@ msgstr ""
"决于刚才的选择。"
#. Tag: title
-#: using-d-i.xml:3137
+#: using-d-i.xml:3140
#, no-c-format
msgid "Reboot the System"
msgstr "重新启动系统"
#. Tag: para
-#: using-d-i.xml:3139
+#: using-d-i.xml:3142
#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4613,7 +4620,7 @@ msgstr ""
"&debian; 系统。"
#. Tag: para
-#: using-d-i.xml:3145
+#: using-d-i.xml:3148
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
@@ -4625,13 +4632,13 @@ msgstr ""
"上的 IPL &debian-gnu;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:3158
+#: using-d-i.xml:3161
#, no-c-format
msgid "Troubleshooting"
msgstr "排除故障"
#. Tag: para
-#: using-d-i.xml:3159
+#: using-d-i.xml:3162
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -4642,13 +4649,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:3172
+#: using-d-i.xml:3175
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:3174
+#: using-d-i.xml:3177
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -4659,7 +4666,7 @@ msgstr ""
"的 <filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:3181
+#: using-d-i.xml:3184
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4673,13 +4680,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:3201
+#: using-d-i.xml:3204
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:3203
+#: using-d-i.xml:3206
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -4703,13 +4710,13 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: using-d-i.xml:3221
+#: using-d-i.xml:3224
#, no-c-format
msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
msgstr "对于图形安装程序,请参阅 <xref linkend=\"gtk-using\"/>。"
#. Tag: para
-#: using-d-i.xml:3225
+#: using-d-i.xml:3228
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4724,7 +4731,7 @@ msgstr ""
"到安装程序。"
#. Tag: para
-#: using-d-i.xml:3233
+#: using-d-i.xml:3236
#, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -4740,7 +4747,7 @@ msgstr ""
"Bourne shell 的克隆,有一些如自动完成与历史纪录这样的好特性。"
#. Tag: para
-#: using-d-i.xml:3242
+#: using-d-i.xml:3245
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4751,7 +4758,7 @@ msgstr ""
"以在 <filename>/var/log</filename> 目录找到。"
#. Tag: para
-#: using-d-i.xml:3249
+#: using-d-i.xml:3252
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -4762,7 +4769,7 @@ msgstr ""
"题时进行调试。"
#. Tag: para
-#: using-d-i.xml:3255
+#: using-d-i.xml:3258
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -4774,13 +4781,13 @@ msgstr ""
"该让安装程序激活交换分区,而不是在 shell 里面自己动手。"
#. Tag: title
-#: using-d-i.xml:3271
+#: using-d-i.xml:3274
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:3273
+#: using-d-i.xml:3276
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -4795,7 +4802,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:3283
+#: using-d-i.xml:3286
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -4815,7 +4822,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:3296
+#: using-d-i.xml:3299
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -4823,7 +4830,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:3301
+#: using-d-i.xml:3304
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4842,7 +4849,7 @@ msgstr ""
"fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
#. Tag: para
-#: using-d-i.xml:3313
+#: using-d-i.xml:3316
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -4853,7 +4860,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:3319
+#: using-d-i.xml:3322
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4881,7 +4888,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:3336
+#: using-d-i.xml:3339
#, no-c-format
msgid ""
"The <command>ssh</command> server in the installer uses a default "
@@ -4902,7 +4909,7 @@ msgstr ""
"接在安装过程中的哪一点断开,您在连接之后可能继续,也可能无法继续安装过程。"
#. Tag: para
-#: using-d-i.xml:3349
+#: using-d-i.xml:3352
#, no-c-format
msgid ""
"You may be able to avoid the connection being dropped by adding the option "
@@ -4922,7 +4929,7 @@ msgstr ""
"需要的时候采用。"
#. Tag: para
-#: using-d-i.xml:3362
+#: using-d-i.xml:3365
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -4944,7 +4951,7 @@ msgstr ""
"footnote>,再重新来过。"
#. Tag: para
-#: using-d-i.xml:3378
+#: using-d-i.xml:3381
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -4961,7 +4968,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:3388
+#: using-d-i.xml:3391
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -4974,13 +4981,13 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: title
-#: using-d-i.xml:3407
+#: using-d-i.xml:3410
#, no-c-format
msgid "Loading Missing Firmware"
msgstr "加载缺失的固件"
#. Tag: para
-#: using-d-i.xml:3408
+#: using-d-i.xml:3411
#, no-c-format
msgid ""
"As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4993,7 +5000,7 @@ msgstr ""
"强功能就无法使用。"
#. Tag: para
-#: using-d-i.xml:3416
+#: using-d-i.xml:3419
#, no-c-format
msgid ""
"If a device driver requests firmware that is not available, &d-i; will "
@@ -5009,7 +5016,7 @@ msgstr ""
"序模块。"
#. Tag: para
-#: using-d-i.xml:3426
+#: using-d-i.xml:3429
#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
@@ -5025,7 +5032,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: using-d-i.xml:3436
+#: using-d-i.xml:3439
#, no-c-format
msgid ""
"Note that it is possible to skip loading the firmware if you know the device "
@@ -5035,35 +5042,31 @@ msgstr ""
"假如了解设备毋需固件也可以工作,或者设备在安装时并不需要使用,您可以跳过加载"
"固件。"
-#. Tag: para
-#: using-d-i.xml:3443
-#, no-c-format
-msgid ""
-"Support for loading firmware is still relatively basic and is likely to be "
-"improved in future releases of the installer. Currently &d-i; will for "
-"example not display any warning if you choose to load missing firmware, but "
-"the requested firmware is not found. Please report any issues you encounter "
-"by filing an installation report (see <xref linkend=\"submit-bug\"/>)."
-msgstr ""
-"加载固件的支持相对简单,在以后的安装程序版本中会得到加强。例如,当前 &d-i; 中"
-"如果选择加载缺失的固件,但固件却无法找到,不会显示任何警告。请您填写安装报告"
-"反应遇到的任何问题(参阅 <xref linkend=\"submit-bug\"/>)。"
-
#. Tag: title
-#: using-d-i.xml:3454
+#: using-d-i.xml:3447
#, no-c-format
msgid "Preparing a medium"
msgstr "准备介质"
#. Tag: para
-#: using-d-i.xml:3455
-#, no-c-format
-msgid ""
-"Although in some cases the firmware can also be loaded from a partition on a "
-"hard disk, the most common method to load firmware will be from some "
-"removable medium such as a floppy disk or a USB stick. The firmware files or "
-"packages must be placed in either the root directory or a directory named "
-"<filename>/firmware</filename> of the file system on the medium. The "
+#: using-d-i.xml:3448
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Although in some cases the firmware can also be loaded from a partition "
+#| "on a hard disk, the most common method to load firmware will be from some "
+#| "removable medium such as a floppy disk or a USB stick. The firmware files "
+#| "or packages must be placed in either the root directory or a directory "
+#| "named <filename>/firmware</filename> of the file system on the medium. "
+#| "The recommended file system to use is FAT as that is most certain to be "
+#| "supported during the early stages of the installation."
+msgid ""
+"Official CD images do not include non-free firmware. The most common method "
+"to load such firmware is from some removable medium such as a USB stick. "
+"Alternatively, unofficial CD builds containing non-free firmware can be "
+"found at <ulink url=\"&url-firmware-cds;\"></ulink>. To prepare a USB stick "
+"(or other medium like a hard drive partition, or floppy disk), the firmware "
+"files or packages must be placed in either the root directory or a directory "
+"named <filename>/firmware</filename> of the file system on the medium. The "
"recommended file system to use is FAT as that is most certain to be "
"supported during the early stages of the installation."
msgstr ""
@@ -5073,7 +5076,7 @@ msgstr ""
"程最初阶段最可能支持的文件系统。"
#. Tag: para
-#: using-d-i.xml:3465
+#: using-d-i.xml:3461
#, no-c-format
msgid ""
"Tarballs and zip files containing current packages for the most common "
@@ -5088,7 +5091,7 @@ msgstr ""
"件系统里面。"
#. Tag: para
-#: using-d-i.xml:3479
+#: using-d-i.xml:3475
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -5101,7 +5104,7 @@ msgstr ""
"件。以下概要列出大多数固件软件包,但不保证完整,有些还是非固件软件包:"
#. Tag: para
-#: using-d-i.xml:3493
+#: using-d-i.xml:3489
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -5112,13 +5115,13 @@ msgstr ""
"造商那里获得。"
#. Tag: title
-#: using-d-i.xml:3502
+#: using-d-i.xml:3498
#, no-c-format
msgid "Firmware and the Installed System"
msgstr "固件和安装好的系统"
#. Tag: para
-#: using-d-i.xml:3503
+#: using-d-i.xml:3499
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -5133,7 +5136,7 @@ msgstr ""
"序不同的内核版本,有可能由于版本的偏差造成固件不能加载。"
#. Tag: para
-#: using-d-i.xml:3512
+#: using-d-i.xml:3508
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5147,7 +5150,7 @@ msgstr ""
"做的优点在于如果有固件的新版本存在会自动更新。"
#. Tag: para
-#: using-d-i.xml:3520
+#: using-d-i.xml:3516
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -5158,7 +5161,7 @@ msgstr ""
"安装好固件或软件包。"
#. Tag: para
-#: using-d-i.xml:3527
+#: using-d-i.xml:3523
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5168,3 +5171,15 @@ msgid ""
msgstr ""
"如果固件从不严格的固件文件加载,复制到安装好的系统的固件将<emphasis>不会</"
"emphasis>自动更新,除非对应的固件软件包(如果有的话)在系统安装之后安装。"
+
+#~ msgid ""
+#~ "Support for loading firmware is still relatively basic and is likely to "
+#~ "be improved in future releases of the installer. Currently &d-i; will for "
+#~ "example not display any warning if you choose to load missing firmware, "
+#~ "but the requested firmware is not found. Please report any issues you "
+#~ "encounter by filing an installation report (see <xref linkend=\"submit-bug"
+#~ "\"/>)."
+#~ msgstr ""
+#~ "加载固件的支持相对简单,在以后的安装程序版本中会得到加强。例如,当前 &d-"
+#~ "i; 中如果选择加载缺失的固件,但固件却无法找到,不会显示任何警告。请您填写"
+#~ "安装报告反应遇到的任何问题(参阅 <xref linkend=\"submit-bug\"/>)。"