summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2013-05-22 19:11:22 +0000
committerHolger Wansing <linux@wansing-online.de>2013-05-22 19:11:22 +0000
commitc25fe94a10a40f50fe164480faf915e804bfdc55 (patch)
tree9bf2af7402e07180066aec7b882788c7ae53ef6a /po/zh_CN
parent68c1afee09b4ea6d0d93229443e07fbabe1632db (diff)
downloadinstallation-guide-c25fe94a10a40f50fe164480faf915e804bfdc55.zip
d-i manual: update po|pot files after changings in en
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po469
-rw-r--r--po/zh_CN/boot-new.po40
-rw-r--r--po/zh_CN/hardware.po588
-rw-r--r--po/zh_CN/install-methods.po410
-rw-r--r--po/zh_CN/partitioning.po218
-rw-r--r--po/zh_CN/preparing.po51
-rw-r--r--po/zh_CN/preseed.po44
-rw-r--r--po/zh_CN/using-d-i.po44
8 files changed, 1015 insertions, 849 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index c7b10dba0..168c0d12b 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: 2013-04-16 19:15+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-25 16:26+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -57,7 +57,7 @@ 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:586 boot-installer.xml:1127
-#: boot-installer.xml:1650 boot-installer.xml:1759
+#: boot-installer.xml:1657 boot-installer.xml:1766
#, no-c-format
msgid ""
"Booting from the network requires that you have a network connection and a "
@@ -69,7 +69,7 @@ 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:591 boot-installer.xml:1132
-#: boot-installer.xml:1655 boot-installer.xml:1764
+#: boot-installer.xml:1662 boot-installer.xml:1771
#, no-c-format
msgid ""
"Older systems such as the 715 might require the use of an RBOOT server "
@@ -79,7 +79,7 @@ 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:596 boot-installer.xml:1137
-#: boot-installer.xml:1660 boot-installer.xml:1769
+#: boot-installer.xml:1667 boot-installer.xml:1776
#, no-c-format
msgid ""
"The installation method to support network booting is described in <xref "
@@ -95,7 +95,7 @@ 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:248 boot-installer.xml:746
-#: boot-installer.xml:1426 boot-installer.xml:1798
+#: boot-installer.xml:1426 boot-installer.xml:1805
#, no-c-format
msgid ""
"The easiest route for most people will be to use a set of &debian; CDs. If "
@@ -112,7 +112,7 @@ 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:259 boot-installer.xml:757
-#: boot-installer.xml:1437 boot-installer.xml:1809
+#: boot-installer.xml:1437 boot-installer.xml:1816
#, no-c-format
msgid ""
"Note that certain CD drives may require special drivers, and thus be "
@@ -128,7 +128,7 @@ 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:267 boot-installer.xml:765
-#: boot-installer.xml:1445 boot-installer.xml:1817
+#: boot-installer.xml:1445 boot-installer.xml:1824
#, no-c-format
msgid ""
"Even if you cannot boot from CD-ROM, you can probably install the &debian; "
@@ -144,7 +144,7 @@ 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:275 boot-installer.xml:773
-#: boot-installer.xml:1453 boot-installer.xml:1825
+#: boot-installer.xml:1453 boot-installer.xml:1832
#, no-c-format
msgid ""
"If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -371,7 +371,7 @@ msgstr "安装程序将正常启动。"
# index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
#. Tag: title
#: boot-installer.xml:242 boot-installer.xml:740 boot-installer.xml:1420
-#: boot-installer.xml:1792
+#: boot-installer.xml:1799
#, no-c-format
msgid "Booting from a CD-ROM"
msgstr "从 CD-ROM 启动"
@@ -681,14 +681,14 @@ msgstr ""
# index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
#. Tag: title
-#: boot-installer.xml:522 boot-installer.xml:1699
+#: boot-installer.xml:522 boot-installer.xml:1706
#, no-c-format
msgid "Booting from Floppies"
msgstr "从软盘引导"
# index.docbook:724, index.docbook:2286
#. Tag: para
-#: boot-installer.xml:523 boot-installer.xml:1707
+#: boot-installer.xml:523 boot-installer.xml:1714
#, no-c-format
msgid ""
"You will have already downloaded the floppy images you needed and created "
@@ -779,7 +779,7 @@ 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:580 boot-installer.xml:1109 boot-installer.xml:1250
-#: boot-installer.xml:1304 boot-installer.xml:1644 boot-installer.xml:1753
+#: boot-installer.xml:1304 boot-installer.xml:1651 boot-installer.xml:1760
#, no-c-format
msgid "Booting with TFTP"
msgstr "用 TFTP 引导"
@@ -1670,7 +1670,7 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:1274 boot-installer.xml:1341 boot-installer.xml:2031
+#: boot-installer.xml:1274 boot-installer.xml:1341 boot-installer.xml:2038
#, no-c-format
msgid "Boot Parameters"
msgstr "引导参数"
@@ -1914,15 +1914,36 @@ msgstr ""
msgid "boot cd install/pegasos"
msgstr "boot cd install/pegasos"
+#. Tag: para
+#: boot-installer.xml:1499
+#, fuzzy, no-c-format
+#| msgid ""
+#| "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"
+msgid ""
+"On YDL Powerstation machine, pres <keycap>s</keycap> immediately after "
+"<quote>Press 's' to enter Open Firmware</quote> message, when SLOF prompt "
+"appears type"
+msgstr ""
+"要在 Pegasos II 机器上引导 &debian; CD/DVD,按下电源按钮同时按住 "
+"<keycap>Esc</keycap> 键,出现 SmartFirmware 提示符后,键入"
+
+#. Tag: screen
+#: boot-installer.xml:1504
+#, no-c-format
+msgid "0 > boot cdrom"
+msgstr ""
+
#. Tag: title
-#: boot-installer.xml:1503
+#: boot-installer.xml:1510
#, no-c-format
msgid "Booting from Hard Disk"
msgstr "从硬盘引导"
# index.docbook:1591, index.docbook:2097
#. Tag: para
-#: boot-installer.xml:1509
+#: boot-installer.xml:1516
#, no-c-format
msgid ""
"Booting from an existing operating system is often a convenient option; for "
@@ -1933,7 +1954,7 @@ msgstr ""
# index.docbook:1597, index.docbook:2103
#. Tag: para
-#: boot-installer.xml:1515
+#: boot-installer.xml:1522
#, no-c-format
msgid ""
"To boot the installer from hard disk, you will have already completed "
@@ -1944,13 +1965,13 @@ msgstr ""
"下载并且安置所需文件。"
#. Tag: title
-#: boot-installer.xml:1535
+#: boot-installer.xml:1542
#, no-c-format
msgid "Booting OldWorld PowerMacs from MacOS"
msgstr "从 OldWorld PowerMacs 的 MacOS 上引导"
#. Tag: para
-#: boot-installer.xml:1536
+#: boot-installer.xml:1543
#, no-c-format
msgid ""
"If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
@@ -1971,13 +1992,13 @@ msgstr ""
"序。"
#. Tag: title
-#: boot-installer.xml:1554
+#: boot-installer.xml:1561
#, no-c-format
msgid "Booting NewWorld Macs from OpenFirmware"
msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
#. Tag: para
-#: boot-installer.xml:1555
+#: boot-installer.xml:1562
#, no-c-format
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
@@ -2018,19 +2039,19 @@ msgstr ""
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:1587
+#: boot-installer.xml:1594
#, no-c-format
msgid "Booting from USB memory stick"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:1588
+#: boot-installer.xml:1595
#, no-c-format
msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
msgstr "当前,New World PowerMac 系统支持从 USB 引导。"
#. Tag: para
-#: boot-installer.xml:1594
+#: boot-installer.xml:1601
#, no-c-format
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
@@ -2043,7 +2064,7 @@ msgstr ""
"Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
#. Tag: para
-#: boot-installer.xml:1603
+#: boot-installer.xml:1610
#, no-c-format
msgid ""
"You will need to work out where the USB storage device appears in the device "
@@ -2064,7 +2085,7 @@ msgstr ""
"disk@1</filename> 。"
#. Tag: para
-#: boot-installer.xml:1615
+#: boot-installer.xml:1622
#, no-c-format
msgid ""
"Having worked out the device path, use a command like this to boot the "
@@ -2088,7 +2109,7 @@ msgstr ""
"command>。"
#. Tag: para
-#: boot-installer.xml:1629
+#: boot-installer.xml:1636
#, no-c-format
msgid ""
"The system should now boot up, and you should be presented with the "
@@ -2099,7 +2120,7 @@ msgstr ""
"动参数,或者只按下 &enterkey;。"
#. Tag: para
-#: boot-installer.xml:1635
+#: boot-installer.xml:1642
#, no-c-format
msgid ""
"This boot method is new, and may be difficult to get to work on some "
@@ -2110,13 +2131,13 @@ msgstr ""
"下安装报告,参阅 <xref linkend=\"submit-bug\"/>。"
#. Tag: para
-#: boot-installer.xml:1668
+#: boot-installer.xml:1675
#, no-c-format
msgid "Currently, PReP and New World PowerMac systems support netbooting."
msgstr "目前来说,PReP 以及 New World PowerMac 系统支持网络引导。"
#. Tag: para
-#: boot-installer.xml:1672
+#: boot-installer.xml:1679
#, no-c-format
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
@@ -2149,7 +2170,7 @@ msgstr ""
"<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
#. Tag: para
-#: boot-installer.xml:1700
+#: boot-installer.xml:1707
#, no-c-format
msgid ""
"Booting from floppies is supported for &arch-title;, although it is "
@@ -2161,7 +2182,7 @@ msgstr ""
"没有安装 软盘驱动器,并且附带的 USB 软盘并不支持引导。"
#. Tag: para
-#: boot-installer.xml:1712
+#: boot-installer.xml:1719
#, no-c-format
msgid ""
"To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
@@ -2172,7 +2193,7 @@ msgstr ""
"按下电源开关前把它放到软盘驱动器内。"
#. Tag: para
-#: boot-installer.xml:1718
+#: boot-installer.xml:1725
#, no-c-format
msgid ""
"For those not familiar with Macintosh floppy operations: a floppy placed in "
@@ -2184,7 +2205,7 @@ msgstr ""
"序。一个 没有有效引导系统的软盘将回被弹出,并且机器将检查硬盘分区。"
#. Tag: para
-#: boot-installer.xml:1725
+#: boot-installer.xml:1732
#, no-c-format
msgid ""
"After booting, the <filename>root.bin</filename> floppy is requested. Insert "
@@ -2195,13 +2216,13 @@ msgstr ""
"&enterkey;。安装程序将在根系统被装入内存后自动启动。"
#. Tag: title
-#: boot-installer.xml:1736
+#: boot-installer.xml:1743
#, no-c-format
msgid "PowerPC Boot Parameters"
msgstr "PowerPC 引导参数"
#. Tag: para
-#: boot-installer.xml:1737
+#: boot-installer.xml:1744
#, no-c-format
msgid ""
"Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
@@ -2216,7 +2237,7 @@ msgstr ""
"128 来说,请改变其值为 <userinput>video=aty128fb:vmode:6</userinput> 。"
#. Tag: para
-#: boot-installer.xml:1777
+#: boot-installer.xml:1784
#, no-c-format
msgid ""
"On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -2235,7 +2256,7 @@ msgstr ""
"i; 。"
#. Tag: para
-#: boot-installer.xml:1832
+#: boot-installer.xml:1839
#, no-c-format
msgid ""
"Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -2247,13 +2268,13 @@ msgstr ""
"盘)。"
#. Tag: title
-#: boot-installer.xml:1841
+#: boot-installer.xml:1848
#, no-c-format
msgid "IDPROM Messages"
msgstr "IDPROM 消息"
#. Tag: para
-#: boot-installer.xml:1842
+#: boot-installer.xml:1849
#, no-c-format
msgid ""
"If you cannot boot because you get messages about a problem with "
@@ -2267,13 +2288,13 @@ msgstr ""
"nvram-faq;\">Sun NVRAM FAQ</ulink> 以获得更多信息。"
#. Tag: title
-#: boot-installer.xml:1861
+#: boot-installer.xml:1868
#, no-c-format
msgid "Accessibility"
msgstr "辅助功能"
#. Tag: para
-#: boot-installer.xml:1862
+#: boot-installer.xml:1869
#, no-c-format
msgid ""
"Some users may need specific support because of e.g. some visual impairment. "
@@ -2298,13 +2319,13 @@ msgstr ""
"要注意在大多数架构下 boot loader 将视您的键盘为 QWERTY 布局。"
#. Tag: title
-#: boot-installer.xml:1882
+#: boot-installer.xml:1889
#, no-c-format
msgid "USB Braille Displays"
msgstr "USB 盲文点显器"
#. Tag: para
-#: boot-installer.xml:1883
+#: boot-installer.xml:1890
#, no-c-format
msgid ""
"USB braille displays should be automatically detected. A textual version of "
@@ -2323,13 +2344,13 @@ msgstr ""
"website</ulink> 可以找到盲文点显器的键绑定文档。"
#. Tag: title
-#: boot-installer.xml:1898
+#: boot-installer.xml:1905
#, no-c-format
msgid "Serial Braille Displays"
msgstr "串口盲文点显器"
#. Tag: para
-#: boot-installer.xml:1899
+#: boot-installer.xml:1906
#, no-c-format
msgid ""
"Serial braille displays cannot safely be automatically detected (since that "
@@ -2364,13 +2385,13 @@ msgstr ""
"\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
-#: boot-installer.xml:1922 boot-installer.xml:2929
+#: boot-installer.xml:1929 boot-installer.xml:2936
#, no-c-format
msgid "Software Speech Synthesis"
msgstr "软件语音合成(Software Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1923
+#: boot-installer.xml:1930
#, fuzzy, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
@@ -2388,7 +2409,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:1932
+#: boot-installer.xml:1939
#, fuzzy, no-c-format
#| msgid ""
#| "Support for software speech synthesis can be activated by selecting it in "
@@ -2406,7 +2427,7 @@ msgstr ""
"<classname>espeak</classname>)。"
#. Tag: para
-#: boot-installer.xml:1938
+#: boot-installer.xml:1945
#, no-c-format
msgid ""
"The default speech rate is quite slow. To make it faster, press "
@@ -2420,13 +2441,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:1957
+#: boot-installer.xml:1964
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1958
+#: boot-installer.xml:1965
#, fuzzy, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
@@ -2442,7 +2463,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:1965
+#: boot-installer.xml:1972
#, no-c-format
msgid ""
"Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2462,13 +2483,13 @@ msgstr ""
"音合成设备的支持也会被自动安装到最终系统里面。"
#. Tag: title
-#: boot-installer.xml:1980
+#: boot-installer.xml:1987
#, no-c-format
msgid "Board Devices"
msgstr "板卡设备"
#. Tag: para
-#: boot-installer.xml:1981
+#: boot-installer.xml:1988
#, no-c-format
msgid ""
"Some accessibility devices are actual boards that are plugged inside the "
@@ -2483,7 +2504,7 @@ msgstr ""
"数量。"
#. Tag: para
-#: boot-installer.xml:1989
+#: boot-installer.xml:1996
#, no-c-format
msgid ""
"If desired a textual version of the bootloader can be activated before "
@@ -2493,30 +2514,34 @@ msgstr ""
"userinput> &enterkey;。"
#. Tag: title
-#: boot-installer.xml:1997
+#: boot-installer.xml:2004
#, no-c-format
msgid "High-Contrast Theme"
msgstr "高亮主题"
#. Tag: para
-#: boot-installer.xml:1998
-#, no-c-format
+#: boot-installer.xml:2005
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For users with low vision, the installer can use a high-contrast theme "
+#| "that makes it more readable. To enable it, append the "
+#| "<userinput>theme=dark</userinput> boot parameter."
msgid ""
-"For users with low vision, the installer can use a high-contrast theme that "
-"makes it more readable. To enable it, append the <userinput>theme=dark</"
+"For users with low vision, the installer can use a high-contrast color theme "
+"that makes it more readable. To enable it, append the <userinput>theme=dark</"
"userinput> boot parameter."
msgstr ""
"对于视力弱的用户,安装程序可以使用高亮主题增加可读性。打开它,设置 "
"<userinput>theme=dark</userinput> 引导参数即可。"
#. Tag: title
-#: boot-installer.xml:2007
+#: boot-installer.xml:2014
#, no-c-format
msgid "Preseeding"
msgstr "预置"
#. Tag: para
-#: boot-installer.xml:2008
+#: boot-installer.xml:2015
#, no-c-format
msgid ""
"Alternatively, &debian; can be installed completely automatically by using "
@@ -2526,13 +2551,13 @@ msgstr ""
"\"appendix-preseed\"/>。"
#. Tag: title
-#: boot-installer.xml:2016
+#: boot-installer.xml:2023
#, no-c-format
msgid "Accessibility of the installed system"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2017
+#: boot-installer.xml:2024
#, no-c-format
msgid ""
"Documentation on accessibility of the installed system is available on the "
@@ -2541,7 +2566,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:2032
+#: boot-installer.xml:2039
#, no-c-format
msgid ""
"Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2554,7 +2579,7 @@ msgstr ""
"要给内核一点小小的帮助。"
#. Tag: para
-#: boot-installer.xml:2039
+#: boot-installer.xml:2046
#, no-c-format
msgid ""
"If this is the first time you're booting the system, try the default boot "
@@ -2567,7 +2592,7 @@ msgstr ""
"的硬件特定参数。"
#. Tag: para
-#: boot-installer.xml:2046
+#: boot-installer.xml:2053
#, no-c-format
msgid ""
"Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2582,13 +2607,13 @@ msgstr ""
"linkend=\"boot-troubleshooting\"/>。"
#. Tag: title
-#: boot-installer.xml:2058
+#: boot-installer.xml:2065
#, no-c-format
msgid "Boot console"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2060
+#: boot-installer.xml:2067
#, no-c-format
msgid ""
"If you are booting with a serial console, generally the kernel will "
@@ -2605,7 +2630,7 @@ msgstr ""
"是串口设备,通常是 <filename>ttyS0</filename> 形式。"
#. Tag: para
-#: boot-installer.xml:2072
+#: boot-installer.xml:2079
#, no-c-format
msgid ""
"You may need to specify parameters for the serial port, such as speed and "
@@ -2614,7 +2639,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:2078
+#: boot-installer.xml:2085
#, no-c-format
msgid ""
"In order to ensure the terminal type used by the installer matches your "
@@ -2639,7 +2664,7 @@ msgstr ""
"literal> 终端类型,而它又非常接近于 <literal>vt102</literal> 类型。"
#. Tag: para
-#: boot-installer.xml:2094
+#: boot-installer.xml:2101
#, no-c-format
msgid ""
"For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2652,13 +2677,13 @@ msgstr ""
"<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
#. Tag: title
-#: boot-installer.xml:2106
+#: boot-installer.xml:2113
#, no-c-format
msgid "&debian; Installer Parameters"
msgstr "&debian; 安装程序的参数"
#. Tag: para
-#: boot-installer.xml:2107
+#: boot-installer.xml:2114
#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
@@ -2671,7 +2696,7 @@ msgstr ""
"para> </footnote>,它们很有用。"
#. Tag: para
-#: boot-installer.xml:2120
+#: boot-installer.xml:2127
#, no-c-format
msgid ""
"A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2685,19 +2710,19 @@ msgstr ""
"用简写。"
#. Tag: term
-#: boot-installer.xml:2132
+#: boot-installer.xml:2139
#, no-c-format
msgid "debconf/priority (priority)"
msgstr "debconf/priority (priority)"
#. Tag: para
-#: boot-installer.xml:2133
+#: boot-installer.xml:2140
#, no-c-format
msgid "This parameter sets the lowest priority of messages to be displayed."
msgstr "这些参数设置将设置显示的信息为最低的级别。"
#. Tag: para
-#: boot-installer.xml:2137
+#: boot-installer.xml:2144
#, no-c-format
msgid ""
"The default installation uses <userinput>priority=high</userinput>. This "
@@ -2710,7 +2735,7 @@ msgstr ""
"将按照要求调整优先级别。"
#. Tag: para
-#: boot-installer.xml:2144
+#: boot-installer.xml:2151
#, no-c-format
msgid ""
"If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2728,13 +2753,13 @@ msgstr ""
"且尝试正确无误地执行各项事宜。"
#. Tag: term
-#: boot-installer.xml:2158
+#: boot-installer.xml:2165
#, no-c-format
msgid "DEBIAN_FRONTEND"
msgstr "DEBIAN_FRONTEND"
#. Tag: para
-#: boot-installer.xml:2159
+#: boot-installer.xml:2166
#, no-c-format
msgid ""
"This boot parameter controls the type of user interface used for the "
@@ -2767,13 +2792,13 @@ msgstr ""
"所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
-#: boot-installer.xml:2190
+#: boot-installer.xml:2197
#, no-c-format
msgid "BOOT_DEBUG"
msgstr "BOOT_DEBUG"
#. Tag: para
-#: boot-installer.xml:2191
+#: boot-installer.xml:2198
#, no-c-format
msgid ""
"Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2785,49 +2810,49 @@ msgstr ""
"debug shell。(退出 shell 以后会继续引导过程。)"
#. Tag: userinput
-#: boot-installer.xml:2200
+#: boot-installer.xml:2207
#, no-c-format
msgid "BOOT_DEBUG=0"
msgstr "BOOT_DEBUG=0"
#. Tag: para
-#: boot-installer.xml:2201
+#: boot-installer.xml:2208
#, no-c-format
msgid "This is the default."
msgstr "此为默认。"
#. Tag: userinput
-#: boot-installer.xml:2205
+#: boot-installer.xml:2212
#, no-c-format
msgid "BOOT_DEBUG=1"
msgstr "BOOT_DEBUG=1"
#. Tag: para
-#: boot-installer.xml:2206
+#: boot-installer.xml:2213
#, no-c-format
msgid "More verbose than usual."
msgstr "更多的信息。"
#. Tag: userinput
-#: boot-installer.xml:2210
+#: boot-installer.xml:2217
#, no-c-format
msgid "BOOT_DEBUG=2"
msgstr "BOOT_DEBUG=2"
#. Tag: para
-#: boot-installer.xml:2211
+#: boot-installer.xml:2218
#, no-c-format
msgid "Lots of debugging information."
msgstr "大量的调试信息。"
#. Tag: userinput
-#: boot-installer.xml:2215
+#: boot-installer.xml:2222
#, no-c-format
msgid "BOOT_DEBUG=3"
msgstr "BOOT_DEBUG=3"
#. Tag: para
-#: boot-installer.xml:2216
+#: boot-installer.xml:2223
#, no-c-format
msgid ""
"Shells are run at various points in the boot process to allow detailed "
@@ -2837,13 +2862,13 @@ msgstr ""
"Shell 将继续引导过程。"
#. Tag: term
-#: boot-installer.xml:2230
+#: boot-installer.xml:2237
#, no-c-format
msgid "INSTALL_MEDIA_DEV"
msgstr "INSTALL_MEDIA_DEV"
#. Tag: para
-#: boot-installer.xml:2231
+#: boot-installer.xml:2238
#, no-c-format
msgid ""
"The value of the parameter is the path to the device to load the &debian; "
@@ -2854,7 +2879,7 @@ msgstr ""
"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
#. Tag: para
-#: boot-installer.xml:2237
+#: boot-installer.xml:2244
#, no-c-format
msgid ""
"The boot floppy, which normally scans all floppies it can to find the root "
@@ -2863,19 +2888,19 @@ msgstr ""
"引导软盘通常会扫描所有的软盘来找到根软盘,可以通过此参数设置只查找一个设备。"
#. Tag: term
-#: boot-installer.xml:2248
+#: boot-installer.xml:2255
#, no-c-format
msgid "log_host"
msgstr "log_host"
#. Tag: term
-#: boot-installer.xml:2249
+#: boot-installer.xml:2256
#, no-c-format
msgid "log_port"
msgstr "log_port"
#. Tag: para
-#: boot-installer.xml:2250
+#: boot-installer.xml:2257
#, no-c-format
msgid ""
"Causes the installer to send log messages to a remote syslog on the "
@@ -2886,13 +2911,13 @@ msgstr ""
"定,默认端口是 syslog 标准端口 514。"
#. Tag: term
-#: boot-installer.xml:2261
+#: boot-installer.xml:2268
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: boot-installer.xml:2262
+#: boot-installer.xml:2269
#, no-c-format
msgid ""
"Can be used to force the installer to a lowmem level higher than the one the "
@@ -2903,13 +2928,13 @@ msgstr ""
"和 2。参阅 <xref linkend=\"lowmem\"/>。"
#. Tag: term
-#: boot-installer.xml:2272
+#: boot-installer.xml:2279
#, no-c-format
msgid "noshell"
msgstr "noshell"
#. Tag: para
-#: boot-installer.xml:2273
+#: boot-installer.xml:2280
#, no-c-format
msgid ""
"Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2919,13 +2944,13 @@ msgstr ""
"处。"
#. Tag: term
-#: boot-installer.xml:2282
+#: boot-installer.xml:2289
#, no-c-format
msgid "debian-installer/framebuffer (fb)"
msgstr "debian-installer/framebuffer (fb)"
#. Tag: para
-#: boot-installer.xml:2283
+#: boot-installer.xml:2290
#, no-c-format
msgid ""
"Some architectures use the kernel framebuffer to offer installation in a "
@@ -2941,13 +2966,13 @@ msgstr ""
"bogl 的相关错误信息、一个空白的屏幕,或者在开始安装几分钟后停止。"
#. Tag: para
-#: boot-installer.xml:2292
+#: boot-installer.xml:2299
#, no-c-format
msgid "Such problems have been reported on hppa."
msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
-#: boot-installer.xml:2296
+#: boot-installer.xml:2303
#, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
@@ -2964,13 +2989,13 @@ msgstr ""
"<userinput>fb=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2310
+#: boot-installer.xml:2317
#, no-c-format
msgid "debian-installer/theme (theme)"
msgstr "debian-installer/theme (theme)"
#. Tag: para
-#: boot-installer.xml:2311
+#: boot-installer.xml:2318
#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
@@ -2985,13 +3010,13 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2323 boot-installer.xml:2556
+#: boot-installer.xml:2330 boot-installer.xml:2563
#, no-c-format
msgid "netcfg/disable_autoconfig"
msgstr "netcfg/disable_autoconfig"
#. Tag: para
-#: boot-installer.xml:2324
+#: boot-installer.xml:2331
#, fuzzy, no-c-format
#| msgid ""
#| "By default, the &d-i; automatically probes for network configuration via "
@@ -3008,7 +3033,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:2331
+#: boot-installer.xml:2338
#, fuzzy, no-c-format
#| msgid ""
#| "If you have a DHCP server on your local network, but want to avoid it "
@@ -3027,13 +3052,13 @@ msgstr ""
"阻止通过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
-#: boot-installer.xml:2342
+#: boot-installer.xml:2349
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:2343
+#: boot-installer.xml:2350
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -3043,13 +3068,13 @@ msgstr ""
"携机会有这种现象。"
#. Tag: term
-#: boot-installer.xml:2353
+#: boot-installer.xml:2360
#, no-c-format
msgid "disk-detect/dmraid/enable (dmraid)"
msgstr "disk-detect/dmraid/enable (dmraid)"
#. Tag: para
-#: boot-installer.xml:2354
+#: boot-installer.xml:2361
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -3063,13 +3088,13 @@ msgstr ""
"ulink> 找到。"
#. Tag: term
-#: boot-installer.xml:2365
+#: boot-installer.xml:2372
#, no-c-format
msgid "preseed/url (url)"
msgstr "preseed/url (url)"
#. Tag: para
-#: boot-installer.xml:2366
+#: boot-installer.xml:2373
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use for "
@@ -3079,13 +3104,13 @@ msgstr ""
"install\"/>。"
#. Tag: term
-#: boot-installer.xml:2375
+#: boot-installer.xml:2382
#, no-c-format
msgid "preseed/file (file)"
msgstr "preseed/file (file)"
#. Tag: para
-#: boot-installer.xml:2376
+#: boot-installer.xml:2383
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load for automating the "
@@ -3095,13 +3120,13 @@ msgstr ""
">。"
#. Tag: term
-#: boot-installer.xml:2385
+#: boot-installer.xml:2392
#, no-c-format
msgid "preseed/interactive"
msgstr "preseed/interactive"
#. Tag: para
-#: boot-installer.xml:2386
+#: boot-installer.xml:2393
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to display questions even if they have "
@@ -3115,13 +3140,13 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
#. Tag: term
-#: boot-installer.xml:2398
+#: boot-installer.xml:2405
#, no-c-format
msgid "auto-install/enable (auto)"
msgstr "auto-install/enable (auto)"
#. Tag: para
-#: boot-installer.xml:2399
+#: boot-installer.xml:2406
#, no-c-format
msgid ""
"Delay questions that are normally asked before preseeding is possible until "
@@ -3132,13 +3157,13 @@ msgstr ""
"auto\"/> 了解自动安装的详细信息。"
#. Tag: term
-#: boot-installer.xml:2410
+#: boot-installer.xml:2417
#, no-c-format
msgid "finish-install/keep-consoles"
msgstr "finish-install/keep-consoles"
#. Tag: para
-#: boot-installer.xml:2411
+#: boot-installer.xml:2418
#, no-c-format
msgid ""
"During installations from serial or management console, the regular virtual "
@@ -3149,13 +3174,13 @@ msgstr ""
"inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
#. Tag: term
-#: boot-installer.xml:2422
+#: boot-installer.xml:2429
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:2423
+#: boot-installer.xml:2430
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3171,7 +3196,7 @@ msgstr ""
"新加载介质。"
#. Tag: para
-#: boot-installer.xml:2432
+#: boot-installer.xml:2439
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3182,13 +3207,13 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:2443
+#: boot-installer.xml:2450
#, no-c-format
msgid "base-installer/install-recommends (recommends)"
msgstr "base-installer/install-recommends (recommends)"
#. Tag: para
-#: boot-installer.xml:2444
+#: boot-installer.xml:2451
#, no-c-format
msgid ""
"By setting this option to <userinput>false</userinput>, the package "
@@ -3201,7 +3226,7 @@ msgstr ""
"<xref linkend=\"di-install-base\"/>。"
#. Tag: para
-#: boot-installer.xml:2451
+#: boot-installer.xml:2458
#, no-c-format
msgid ""
"Note that this option allows to have a leaner system, but can also result in "
@@ -3215,13 +3240,13 @@ msgstr ""
"非常有经验的用户来使用。"
#. Tag: term
-#: boot-installer.xml:2463
+#: boot-installer.xml:2470
#, no-c-format
msgid "debian-installer/allow_unauthenticated"
msgstr "debian-installer/allow_unauthenticated"
#. Tag: para
-#: boot-installer.xml:2464
+#: boot-installer.xml:2471
#, no-c-format
msgid ""
"By default the installer requires that repositories be authenticated using a "
@@ -3234,13 +3259,13 @@ msgstr ""
"emphasis>"
#. Tag: term
-#: boot-installer.xml:2475
+#: boot-installer.xml:2482
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:2476
+#: boot-installer.xml:2483
#, no-c-format
msgid ""
"This parameter should already be set to a correct value where needed; set it "
@@ -3251,13 +3276,13 @@ msgstr ""
"置。该值的单位是 kB。"
#. Tag: term
-#: boot-installer.xml:2486
+#: boot-installer.xml:2493
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:2487
+#: boot-installer.xml:2494
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3267,13 +3292,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2500
+#: boot-installer.xml:2507
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2501
+#: boot-installer.xml:2508
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3286,25 +3311,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2513
+#: boot-installer.xml:2520
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2514
+#: boot-installer.xml:2521
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2515
+#: boot-installer.xml:2522
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2516
+#: boot-installer.xml:2523
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3314,7 +3339,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2521
+#: boot-installer.xml:2528
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3332,7 +3357,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2530
+#: boot-installer.xml:2537
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3347,13 +3372,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2542
+#: boot-installer.xml:2549
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2543
+#: boot-installer.xml:2550
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3368,7 +3393,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2557
+#: boot-installer.xml:2564
#, fuzzy, no-c-format
#| msgid ""
#| "Set to <userinput>true</userinput> if you want to disable DHCP and "
@@ -3380,13 +3405,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2566
+#: boot-installer.xml:2573
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2567
+#: boot-installer.xml:2574
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3401,13 +3426,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2580
+#: boot-installer.xml:2587
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2581
+#: boot-installer.xml:2588
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3418,13 +3443,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2595
+#: boot-installer.xml:2602
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2596
+#: boot-installer.xml:2603
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3444,7 +3469,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2609
+#: boot-installer.xml:2616
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3456,7 +3481,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2616
+#: boot-installer.xml:2623
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3476,19 +3501,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2626
+#: boot-installer.xml:2633
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2632
+#: boot-installer.xml:2639
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2633
+#: boot-installer.xml:2640
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3503,7 +3528,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2642
+#: boot-installer.xml:2649
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3517,7 +3542,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2650
+#: boot-installer.xml:2657
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3529,19 +3554,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2666
+#: boot-installer.xml:2673
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2671
+#: boot-installer.xml:2678
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2672
+#: boot-installer.xml:2679
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3553,7 +3578,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2679
+#: boot-installer.xml:2686
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3564,13 +3589,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2685
+#: boot-installer.xml:2692
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2690
+#: boot-installer.xml:2697
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3578,7 +3603,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2696
+#: boot-installer.xml:2703
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3591,7 +3616,7 @@ msgstr ""
"DMA 相关的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2706
+#: boot-installer.xml:2713
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3602,7 +3627,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2712
+#: boot-installer.xml:2719
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3610,13 +3635,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2720
+#: boot-installer.xml:2727
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2723
+#: boot-installer.xml:2730
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3624,7 +3649,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:2740
+#: boot-installer.xml:2747
#, no-c-format
msgid ""
"Some very old CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3634,19 +3659,19 @@ msgstr ""
"正常工作。"
#. Tag: title
-#: boot-installer.xml:2751
+#: boot-installer.xml:2758
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2752
+#: boot-installer.xml:2759
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2757
+#: boot-installer.xml:2764
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (only an issue "
@@ -3656,7 +3681,7 @@ msgstr ""
"开支持从 CD 引导。"
#. Tag: para
-#: boot-installer.xml:2764
+#: boot-installer.xml:2771
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3680,7 +3705,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2777
+#: boot-installer.xml:2784
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3702,7 +3727,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2782
+#: boot-installer.xml:2789
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3721,7 +3746,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:2794
+#: boot-installer.xml:2801
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3733,7 +3758,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2801
+#: boot-installer.xml:2808
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3761,7 +3786,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:2815
+#: boot-installer.xml:2822
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3773,7 +3798,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:2823
+#: boot-installer.xml:2830
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3788,7 +3813,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:2833
+#: boot-installer.xml:2840
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3813,7 +3838,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:2848
+#: boot-installer.xml:2855
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3825,13 +3850,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:2863
+#: boot-installer.xml:2870
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:2865
+#: boot-installer.xml:2872
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -3840,7 +3865,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:2870
+#: boot-installer.xml:2877
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3856,7 +3881,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:2879
+#: boot-installer.xml:2886
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3871,7 +3896,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:2888
+#: boot-installer.xml:2895
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3882,7 +3907,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:2894
+#: boot-installer.xml:2901
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -3893,7 +3918,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:2900
+#: boot-installer.xml:2907
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3904,13 +3929,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:2909
+#: boot-installer.xml:2916
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:2911
+#: boot-installer.xml:2918
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3923,7 +3948,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:2920
+#: boot-installer.xml:2927
#, no-c-format
msgid ""
"In some cases, malfunctions can be caused by missing device firmware (see "
@@ -3934,7 +3959,7 @@ msgstr ""
"firmware\"/> 和 <xref linkend=\"loading-firmware\"/>)。"
#. Tag: para
-#: boot-installer.xml:2931
+#: boot-installer.xml:2938
#, no-c-format
msgid ""
"If software speech synthesis does not work, there is most probably an issue "
@@ -3949,37 +3974,37 @@ msgstr ""
"台机器上声音可以正常工作的 Linux 系统上(比如,live CD),运行下面命令的输出。"
#. Tag: userinput
-#: boot-installer.xml:2942
+#: boot-installer.xml:2949
#, no-c-format
msgid "dmesg"
msgstr "dmesg"
#. Tag: userinput
-#: boot-installer.xml:2944
+#: boot-installer.xml:2951
#, no-c-format
msgid "lspci"
msgstr "lspci"
#. Tag: userinput
-#: boot-installer.xml:2946
+#: boot-installer.xml:2953
#, no-c-format
msgid "lsmod"
msgstr "lsmod"
#. Tag: userinput
-#: boot-installer.xml:2948
+#: boot-installer.xml:2955
#, no-c-format
msgid "amixer"
msgstr "amixer"
#. Tag: title
-#: boot-installer.xml:2956 boot-installer.xml:3067
+#: boot-installer.xml:2963 boot-installer.xml:3074
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:2957
+#: boot-installer.xml:2964
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3987,7 +4012,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:3008
+#: boot-installer.xml:3015
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4005,13 +4030,13 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:3022
+#: boot-installer.xml:3029
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:3023
+#: boot-installer.xml:3030
#, no-c-format
msgid ""
"Some very old laptop models produced by Dell are known to crash when PCMCIA "
@@ -4029,7 +4054,7 @@ msgstr ""
"题的资源区段。"
#. Tag: para
-#: boot-installer.xml:3033
+#: boot-installer.xml:3040
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4049,19 +4074,19 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: para
-#: boot-installer.xml:3068
+#: boot-installer.xml:3075
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:3074
+#: boot-installer.xml:3081
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3075
+#: boot-installer.xml:3082
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4085,7 +4110,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3089
+#: boot-installer.xml:3096
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4098,13 +4123,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3100
+#: boot-installer.xml:3107
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3101
+#: boot-installer.xml:3108
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4115,19 +4140,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3107
+#: boot-installer.xml:3114
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3116
+#: boot-installer.xml:3123
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3118
+#: boot-installer.xml:3125
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4161,13 +4186,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3143
+#: boot-installer.xml:3150
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3144
+#: boot-installer.xml:3151
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4184,7 +4209,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3155
+#: boot-installer.xml:3162
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4195,13 +4220,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3166
+#: boot-installer.xml:3173
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3167
+#: boot-installer.xml:3174
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4213,7 +4238,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3174
+#: boot-installer.xml:3181
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4224,7 +4249,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3180
+#: boot-installer.xml:3187
#, no-c-format
msgid ""
"If you have a working &debian; system, the easiest way to send an "
@@ -4243,7 +4268,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3190
+#: boot-installer.xml:3197
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 6a29d91cf..c0dfec81e 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2010-10-26 21:00+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -463,19 +463,27 @@ msgstr ""
#. Tag: para
#: boot-new.xml:282
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If any volume holding noncritical system files could not be mounted "
+#| "(<filename>/usr</filename> or <filename>/var</filename>), the system "
+#| "should still boot and you should be able to mount the volumes manually "
+#| "like in the previous case. However, you will also need to (re)start any "
+#| "services usually running in your default runlevel because it is very "
+#| "likely that they were not started. The easiest way to achieve this is by "
+#| "switching to the first runlevel and back by entering "
+#| "<informalexample><screen>\n"
+#| "<prompt>#</prompt> <userinput>init 1</userinput>\n"
+#| "</screen></informalexample> at the shell prompt and pressing <keycombo> "
+#| "<keycap>Control</keycap> <keycap>D</keycap> </keycombo> when asked for "
+#| "the root password."
msgid ""
"If any volume holding noncritical system files could not be mounted "
"(<filename>/usr</filename> or <filename>/var</filename>), the system should "
"still boot and you should be able to mount the volumes manually like in the "
"previous case. However, you will also need to (re)start any services usually "
"running in your default runlevel because it is very likely that they were "
-"not started. The easiest way to achieve this is by switching to the first "
-"runlevel and back by entering <informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>init 1</userinput>\n"
-"</screen></informalexample> at the shell prompt and pressing <keycombo> "
-"<keycap>Control</keycap> <keycap>D</keycap> </keycombo> when asked for the "
-"root password."
+"not started. The easiest way is to just reboot the computer."
msgstr ""
"如果保存着非临界系统文件(<filename>/usr</filename> 或 <filename>/var</"
"filename>)的卷不能加载,系统仍然可以启动,并且您仍然可以按前一种情况手动加"
@@ -486,13 +494,13 @@ msgstr ""
"令时按下 <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo>。"
#. Tag: title
-#: boot-new.xml:305
+#: boot-new.xml:300
#, no-c-format
msgid "Log In"
msgstr "登录"
#. Tag: para
-#: boot-new.xml:307
+#: boot-new.xml:302
#, no-c-format
msgid ""
"Once your system boots, you'll be presented with the login prompt. Log in "
@@ -503,7 +511,7 @@ msgstr ""
"在您的系统就能使用了。"
#. Tag: para
-#: boot-new.xml:313
+#: boot-new.xml:308
#, no-c-format
msgid ""
"If you are a new user, you may want to explore the documentation which is "
@@ -515,7 +523,7 @@ msgstr ""
"个文档系统,由不同类型的文档组成。这里是一些出发点。"
#. Tag: para
-#: boot-new.xml:321
+#: boot-new.xml:316
#, no-c-format
msgid ""
"Documentation accompanying programs you have installed can be found in "
@@ -534,7 +542,7 @@ msgstr ""
"<classname>apt-howto</classname> 软件包内。"
#. Tag: para
-#: boot-new.xml:332
+#: boot-new.xml:327
#, no-c-format
msgid ""
"In addition, there are some special folders within the <filename>/usr/share/"
@@ -550,7 +558,7 @@ msgstr ""
"<filename>/usr/share/doc/HTML/index.html</filename> 文档索引。"
#. Tag: para
-#: boot-new.xml:341
+#: boot-new.xml:336
#, no-c-format
msgid ""
"One easy way to view these documents using a text based browser is to enter "
@@ -568,7 +576,7 @@ msgstr ""
"录下的内容。"
#. Tag: para
-#: boot-new.xml:351
+#: boot-new.xml:346
#, no-c-format
msgid ""
"If you have a graphical desktop environment installed, you can also use its "
@@ -579,7 +587,7 @@ msgstr ""
"览器,然后在地址栏内键入 <userinput>/usr/share/doc/</userinput>。"
#. Tag: para
-#: boot-new.xml:357
+#: boot-new.xml:352
#, no-c-format
msgid ""
"You can also type <userinput>info <replaceable>command</replaceable></"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index c8b4c5532..4a48efcb0 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: 2012-11-01 19:41+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-25 23:22+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -80,13 +80,13 @@ msgstr ""
"quote> 的衍生品种。"
#. Tag: entry
-#: hardware.xml:53 hardware.xml:186
+#: hardware.xml:53 hardware.xml:180
#, no-c-format
msgid "Architecture"
msgstr "体系"
#. Tag: entry
-#: hardware.xml:53 hardware.xml:186
+#: hardware.xml:53 hardware.xml:180
#, no-c-format
msgid "&debian; Designation"
msgstr "&debian; 命名"
@@ -104,7 +104,7 @@ msgid "Flavor"
msgstr "Flavor"
#. Tag: entry
-#: hardware.xml:60 hardware.xml:192
+#: hardware.xml:60 hardware.xml:186
#, no-c-format
msgid "Intel x86-based"
msgstr "Intel x86-based"
@@ -116,7 +116,7 @@ msgid "i386"
msgstr "i386"
#. Tag: entry
-#: hardware.xml:67 hardware.xml:197
+#: hardware.xml:67 hardware.xml:191
#, no-c-format
msgid "AMD64 &amp; Intel 64"
msgstr "AMD64 &amp; Intel 64"
@@ -398,61 +398,49 @@ msgid "s390"
msgstr "s390"
#. Tag: entry
-#: hardware.xml:157 hardware.xml:167
+#: hardware.xml:157 hardware.xml:164
#, no-c-format
msgid "IPL from VM-reader and DASD"
msgstr "来自 VM-reader 和 DASD 的 IPL"
#. Tag: entry
-#: hardware.xml:158 hardware.xml:168
+#: hardware.xml:158 hardware.xml:165
#, no-c-format
msgid "generic"
msgstr "generic"
#. Tag: entry
-#: hardware.xml:160 hardware.xml:170
-#, no-c-format
-msgid "IPL from tape"
-msgstr "来自 tape 的 IPL"
-
-#. Tag: entry
-#: hardware.xml:161 hardware.xml:171
-#, no-c-format
-msgid "tape"
-msgstr "type"
-
-#. Tag: entry
-#: hardware.xml:165
+#: hardware.xml:162
#, no-c-format
msgid "64bit IBM S/390"
msgstr "64bit IBM S/390"
#. Tag: entry
-#: hardware.xml:166
+#: hardware.xml:163
#, no-c-format
msgid "s390x"
msgstr "s390x"
#. Tag: para
-#: hardware.xml:176
+#: hardware.xml:170
#, no-c-format
msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
msgstr "&debian; GNU/kFreeBSD &release; 支持两种架构。"
#. Tag: entry
-#: hardware.xml:193
+#: hardware.xml:187
#, no-c-format
msgid "kfreebsd-i386"
msgstr "kfreebsd-i386"
#. Tag: entry
-#: hardware.xml:198
+#: hardware.xml:192
#, no-c-format
msgid "kfreebsd-amd64"
msgstr "kfreebsd-amd64"
#. Tag: para
-#: hardware.xml:203
+#: hardware.xml:197
#, no-c-format
msgid ""
"This document covers installation for the <emphasis>&arch-title;</emphasis> "
@@ -466,7 +454,7 @@ msgstr ""
"org/ports/\">&debian;-Ports</ulink> 网页。"
#. Tag: para
-#: hardware.xml:213
+#: hardware.xml:207
#, no-c-format
msgid ""
"The &arch-title; architecture only supports Intel Itanium processors and not "
@@ -481,7 +469,7 @@ msgstr ""
"<emphasis>i386</emphasis> 体系。"
#. Tag: para
-#: hardware.xml:223
+#: hardware.xml:217
#, no-c-format
msgid ""
"This is the first official release of &debian-gnu; for the &arch-title; "
@@ -502,27 +490,27 @@ msgstr ""
"\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
#. Tag: title
-#: hardware.xml:245
+#: hardware.xml:239
#, no-c-format
msgid "CPU Support"
msgstr "CPU 支持"
#. Tag: para
-#: hardware.xml:246
+#: hardware.xml:240
#, no-c-format
msgid "Both AMD64 and Intel 64 processors are supported."
msgstr "AMD64 和 Intel 64 处理器都获得支持。"
# 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:271 hardware.xml:362 hardware.xml:381 hardware.xml:464
-#: hardware.xml:522 hardware.xml:575
+#: hardware.xml:265 hardware.xml:356 hardware.xml:375 hardware.xml:458
+#: hardware.xml:516 hardware.xml:569
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
#. Tag: para
-#: hardware.xml:273
+#: hardware.xml:267
#, no-c-format
msgid ""
"Each distinct ARM architecture requires its own kernel. Because of this the "
@@ -535,7 +523,7 @@ msgstr ""
"emphasis> ARM CPU 上。"
#. Tag: para
-#: hardware.xml:282
+#: hardware.xml:276
#, no-c-format
msgid ""
"Most ARM CPUs may be run in either endian mode (big or little). However, the "
@@ -547,19 +535,19 @@ msgstr ""
"ARM 系统。"
#. Tag: para
-#: hardware.xml:290
+#: hardware.xml:284
#, no-c-format
msgid "The supported platforms are:"
msgstr "获得支持的平台有:"
#. Tag: term
-#: hardware.xml:297
+#: hardware.xml:291
#, no-c-format
msgid "IOP32x"
msgstr "IOP32x"
#. Tag: para
-#: hardware.xml:298
+#: hardware.xml:292
#, no-c-format
msgid ""
"Intel's I/O Processor (IOP) line is found in a number of products related to "
@@ -576,13 +564,13 @@ msgstr ""
"cyrius-n2100;\">Thecus N2100</ulink>。"
#. Tag: term
-#: hardware.xml:311
+#: hardware.xml:305
#, no-c-format
msgid "Kirkwood"
msgstr "Kirkwood"
#. Tag: para
-#: hardware.xml:312
+#: hardware.xml:306
#, no-c-format
msgid ""
"Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
@@ -604,13 +592,13 @@ msgstr ""
"v2)。"
#. Tag: term
-#: hardware.xml:328
+#: hardware.xml:322
#, no-c-format
msgid "Orion5x"
msgstr "Orion5x"
#. Tag: para
-#: hardware.xml:329
+#: hardware.xml:323
#, no-c-format
msgid ""
"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
@@ -628,13 +616,13 @@ msgstr ""
"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
#. Tag: term
-#: hardware.xml:343
+#: hardware.xml:337
#, no-c-format
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:344
+#: hardware.xml:338
#, no-c-format
msgid ""
"The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -644,7 +632,7 @@ msgstr ""
"&debian; 是一个不错的方法。"
#. Tag: para
-#: hardware.xml:363
+#: hardware.xml:357
#, no-c-format
msgid ""
"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -660,7 +648,7 @@ msgstr ""
"位的 userland。"
#. Tag: para
-#: hardware.xml:382
+#: hardware.xml:376
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -672,13 +660,13 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:390 hardware.xml:499
+#: hardware.xml:384 hardware.xml:493
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
#. Tag: para
-#: hardware.xml:391
+#: hardware.xml:385
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -691,7 +679,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:398
+#: hardware.xml:392
#, no-c-format
msgid ""
"However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
@@ -726,7 +714,7 @@ msgstr ""
"了。</para> </footnote>。"
#. Tag: para
-#: hardware.xml:431
+#: hardware.xml:425
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
@@ -737,13 +725,13 @@ msgstr ""
"安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:440
+#: hardware.xml:434
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:441
+#: hardware.xml:435
#, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
@@ -757,7 +745,7 @@ msgstr ""
"线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:465
+#: hardware.xml:459
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -787,7 +775,7 @@ msgstr ""
"\"> debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:500
+#: hardware.xml:494
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -800,7 +788,7 @@ msgstr ""
"持 R5000。"
#. Tag: para
-#: hardware.xml:506
+#: hardware.xml:500
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -811,7 +799,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:523
+#: hardware.xml:517
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -838,13 +826,13 @@ msgstr ""
"mailing list</ulink>。"
#. Tag: title
-#: hardware.xml:551
+#: hardware.xml:545
#, no-c-format
msgid "CPU/Machine types"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:553
+#: hardware.xml:547
#, no-c-format
msgid ""
"All MIPS based Cobalt machines are supported with the exception of the Qube "
@@ -852,19 +840,19 @@ msgid ""
msgstr "除了 Qube 2700 (Qube 1),其他所有基于 MIPS 的 Cobalt 机器都获得支持。"
#. Tag: title
-#: hardware.xml:561
+#: hardware.xml:555
#, no-c-format
msgid "Supported console options"
msgstr "支持的控制台选项"
#. Tag: para
-#: hardware.xml:562
+#: hardware.xml:556
#, no-c-format
msgid "Cobalt machines use 115200 bps."
msgstr "使用 115200 bps 的 Cobalt 机器。"
#. Tag: para
-#: hardware.xml:576
+#: hardware.xml:570
#, no-c-format
msgid ""
"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -874,13 +862,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:597
+#: hardware.xml:591
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:599
+#: hardware.xml:593
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -888,36 +876,52 @@ msgid ""
msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:606
+#: hardware.xml:600
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:607
-#, no-c-format
+#: hardware.xml:601
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Most systems use this kernel flavour, which supports the PowerPC 601, "
+#| "603, 604, 740, 750, and 7400 processors. All Apple PowerMac machines up "
+#| "to and including the one marketed as G4 use one of these processors."
msgid ""
-"Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
-"604, 740, 750, and 7400 processors. All Apple PowerMac machines up to and "
-"including the one marketed as G4 use one of these processors."
+"This kernel flavour supports the PowerPC 601, 603, 604, 740, 750, and 7400 "
+"processors. All Apple PowerMac machines up to and including the one marketed "
+"as G4 use one of these processors."
msgstr ""
"绝大多数系统使用这种内核,它支持 PowerPC 601、603、604、740、750 与 7400 处理"
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:617
+#: hardware.xml:611
+#, no-c-format
+msgid "powerpc-smp"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:612
+#, no-c-format
+msgid "All Apple PowerMac G4 SMP machines."
+msgstr ""
+
+#. Tag: term
+#: hardware.xml:620
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:618
+#: hardware.xml:621
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:622
+#: hardware.xml:625
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -929,7 +933,7 @@ msgstr ""
"7044-270。"
#. Tag: para
-#: hardware.xml:628
+#: hardware.xml:631
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -939,22 +943,32 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:633
-#, no-c-format
+#: hardware.xml:636
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
+#| "POWER4 architecture, and use this kernel flavour."
msgid ""
-"Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
-"architecture, and use this kernel flavour."
+"Systems using the PPC970 processor (Apple G5, YDL PowerStation, IBM "
+"Intellistation POWER 185) are also based on the POWER4 architecture, and use "
+"this kernel flavour."
msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
+#. Tag: para
+#: hardware.xml:642
+#, no-c-format
+msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
+msgstr ""
+
#. Tag: title
-#: hardware.xml:667
+#: hardware.xml:675
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:669
+#: hardware.xml:677
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -967,7 +981,7 @@ msgstr ""
"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:676
+#: hardware.xml:684
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -980,7 +994,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:684
+#: hardware.xml:692
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -995,7 +1009,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:692
+#: hardware.xml:700
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1010,384 +1024,397 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:708 hardware.xml:843 hardware.xml:887 hardware.xml:916
+#: hardware.xml:716 hardware.xml:851 hardware.xml:895 hardware.xml:928
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:709
+#: hardware.xml:717
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:715
+#: hardware.xml:723
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:716
+#: hardware.xml:724
#, 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:717 hardware.xml:720 hardware.xml:723 hardware.xml:726
-#: hardware.xml:729 hardware.xml:732 hardware.xml:735 hardware.xml:738
-#: hardware.xml:741 hardware.xml:744 hardware.xml:747 hardware.xml:750
-#: hardware.xml:753 hardware.xml:756 hardware.xml:759 hardware.xml:762
+#: 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 hardware.xml:767 hardware.xml:770
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:719
+#: hardware.xml:727
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:722
+#: hardware.xml:730
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:725
+#: hardware.xml:733
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:728
+#: hardware.xml:736
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:731
+#: hardware.xml:739
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:734
+#: hardware.xml:742
#, 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:737
+#: hardware.xml:745
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:740
+#: hardware.xml:748
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:743
+#: hardware.xml:751
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:746
+#: hardware.xml:754
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:749
+#: hardware.xml:757
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:752
+#: hardware.xml:760
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:755
+#: hardware.xml:763
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:758
+#: hardware.xml:766
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:761
+#: hardware.xml:769
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:764
+#: hardware.xml:772
#, 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:765 hardware.xml:768 hardware.xml:771 hardware.xml:774
-#: hardware.xml:777 hardware.xml:780 hardware.xml:783 hardware.xml:786
-#: hardware.xml:789 hardware.xml:792 hardware.xml:795 hardware.xml:798
-#: hardware.xml:804 hardware.xml:807 hardware.xml:813 hardware.xml:819
-#: hardware.xml:825
+#: 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:803 hardware.xml:806
+#: hardware.xml:812 hardware.xml:815 hardware.xml:821 hardware.xml:827
+#: hardware.xml:833
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:767
+#: hardware.xml:775
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:770
+#: hardware.xml:778
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:773
+#: hardware.xml:781
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:776
+#: hardware.xml:784
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:779
+#: hardware.xml:787
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:782
+#: hardware.xml:790
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:785
+#: hardware.xml:793
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:788
+#: hardware.xml:796
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:791
+#: hardware.xml:799
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:794
+#: hardware.xml:802
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:797
+#: hardware.xml:805
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:802
+#: hardware.xml:810
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:803
+#: hardware.xml:811
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:806
+#: hardware.xml:814
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:811
+#: hardware.xml:819
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:812
+#: hardware.xml:820
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:817
+#: hardware.xml:825
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:818
+#: hardware.xml:826
#, 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:823 hardware.xml:849
+#: hardware.xml:831 hardware.xml:857
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:824
+#: hardware.xml:832
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:833
+#: hardware.xml:841
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:850
+#: hardware.xml:858
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:852
+#: hardware.xml:860
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:854
+#: hardware.xml:862
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:856
+#: hardware.xml:864
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:858
+#: hardware.xml:866
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:862 hardware.xml:893
+#: hardware.xml:870 hardware.xml:901
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:863
+#: hardware.xml:871
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:865
+#: hardware.xml:873
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:867
+#: hardware.xml:875
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:869
+#: hardware.xml:877
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:877
-#, no-c-format
-msgid "CHRP subarchitecture (unsupported)"
-msgstr "CHRP 子体系 (不支持)"
+#: hardware.xml:885
+#, fuzzy, no-c-format
+#| msgid "PReP subarchitecture"
+msgid "CHRP subarchitecture"
+msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:894
+#: hardware.xml:902
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:897
+#: hardware.xml:905
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:898
+#: hardware.xml:906
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
+#. Tag: entry
+#: hardware.xml:909
+#, no-c-format
+msgid "Fixstars"
+msgstr ""
+
+#. Tag: entry
+#: hardware.xml:910
+#, no-c-format
+msgid "YDL PowerStation"
+msgstr ""
+
#. Tag: title
-#: hardware.xml:906
+#: hardware.xml:918
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:922
+#: hardware.xml:934
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:923
+#: hardware.xml:935
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:931
+#: hardware.xml:943
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:933
+#: hardware.xml:945
#, no-c-format
msgid ""
"NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1411,13 +1438,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:970
+#: hardware.xml:982
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:972
+#: hardware.xml:984
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1433,7 +1460,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:981
+#: hardware.xml:993
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1448,7 +1475,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:989
+#: hardware.xml:1001
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1459,13 +1486,13 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1005
+#: hardware.xml:1017
#, no-c-format
msgid "zSeries and System z machine types"
msgstr "zSeries 和 System z 机器类型"
#. Tag: para
-#: hardware.xml:1006
+#: hardware.xml:1018
#, no-c-format
msgid ""
"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
@@ -1487,13 +1514,13 @@ msgstr ""
"ulink>。"
#. Tag: title
-#: hardware.xml:1023
+#: hardware.xml:1035
#, no-c-format
msgid "PAV and HyperPAV"
msgstr "PAV 和 HyperPAV"
#. Tag: para
-#: hardware.xml:1024
+#: hardware.xml:1036
#, no-c-format
msgid ""
"PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1506,13 +1533,13 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:1040
+#: hardware.xml:1052
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1041
+#: hardware.xml:1053
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1524,13 +1551,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1052
+#: hardware.xml:1064
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1054
+#: hardware.xml:1066
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1543,7 +1570,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1073
#, no-c-format
msgid ""
"The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1554,13 +1581,13 @@ msgstr ""
"32 位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1071
+#: hardware.xml:1083
#, no-c-format
msgid "<term>sun4u</term>"
msgstr "<term>sun4u</term>"
#. Tag: para
-#: hardware.xml:1073
+#: hardware.xml:1085
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1576,13 +1603,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1086
+#: hardware.xml:1098
#, no-c-format
msgid "<term>sun4v</term>"
msgstr "<term>sun4v</term>"
#. Tag: para
-#: hardware.xml:1088
+#: hardware.xml:1100
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1595,7 +1622,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1099
+#: hardware.xml:1111
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1605,13 +1632,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1108
+#: hardware.xml:1120
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1109
+#: hardware.xml:1121
#, no-c-format
msgid ""
"From a technical point of view, laptops are normal PCs, so all information "
@@ -1633,13 +1660,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1126 hardware.xml:1146 hardware.xml:1174 hardware.xml:1197
+#: hardware.xml:1138 hardware.xml:1158 hardware.xml:1186 hardware.xml:1209
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1127
+#: hardware.xml:1139
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1657,7 +1684,7 @@ msgstr ""
"集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1137
+#: hardware.xml:1149
#, no-c-format
msgid ""
"The standard &debian; &release; kernel image has been compiled with SMP "
@@ -1667,7 +1694,7 @@ msgstr ""
"使用也没有问题。"
#. Tag: para
-#: hardware.xml:1148
+#: hardware.xml:1160
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1683,7 +1710,7 @@ msgstr ""
"者核心)数量,并可以在单处理器系统上关闭 SMP 功能。"
#. Tag: para
-#: hardware.xml:1157
+#: hardware.xml:1169
#, no-c-format
msgid ""
"Having multiple processors in a computer was originally only an issue for "
@@ -1697,7 +1724,7 @@ msgstr ""
"两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1165
+#: hardware.xml:1177
#, no-c-format
msgid ""
"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1705,7 +1732,7 @@ msgid ""
msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1175
+#: hardware.xml:1187
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1720,7 +1747,7 @@ msgstr ""
"核仅使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1184
+#: hardware.xml:1196
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -1736,7 +1763,7 @@ msgstr ""
"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
#. Tag: para
-#: hardware.xml:1198
+#: hardware.xml:1210
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1752,7 +1779,7 @@ msgstr ""
"装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1208
+#: hardware.xml:1220
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -1763,7 +1790,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1214
+#: hardware.xml:1226
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP.<phrase arch="
@@ -1778,13 +1805,13 @@ msgstr ""
"<quote>&smp-config-option;</quote>。</phrase>"
#. Tag: title
-#: hardware.xml:1225
+#: hardware.xml:1237
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1226
+#: hardware.xml:1238
#, no-c-format
msgid ""
"&debian;'s support for graphical interfaces is determined by the underlying "
@@ -1805,7 +1832,7 @@ msgstr ""
"功能也需要安装额外的固件,但这是罕有的例子。"
#. Tag: para
-#: hardware.xml:1239
+#: hardware.xml:1251
#, no-c-format
msgid ""
"Details on supported graphics cards and pointing devices can be found at "
@@ -1816,13 +1843,13 @@ msgstr ""
"&debian; &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1244
+#: hardware.xml:1256
#, 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:1249
+#: hardware.xml:1261
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1841,7 +1868,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1259
+#: hardware.xml:1271
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1864,13 +1891,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1281
+#: hardware.xml:1293
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1282
+#: hardware.xml:1294
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1885,7 +1912,7 @@ msgstr ""
"很好。</phrase>"
#. Tag: para
-#: hardware.xml:1292
+#: hardware.xml:1304
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1893,61 +1920,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1310
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1315
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1320
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1325
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1318
+#: hardware.xml:1330
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1337
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1342
#, 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:1335
+#: hardware.xml:1347
#, 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:1340
+#: hardware.xml:1352
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1349
+#: hardware.xml:1361
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -1957,19 +1984,19 @@ msgstr ""
"块。"
#. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1366
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1373
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1374
#, no-c-format
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -1980,7 +2007,7 @@ msgstr ""
"核能支持的无线网卡也越来越多。"
#. Tag: para
-#: hardware.xml:1369
+#: hardware.xml:1381
#, no-c-format
msgid ""
"If firmware is needed, the installer will prompt you to load firmware. See "
@@ -1991,7 +2018,7 @@ msgstr ""
"> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
-#: hardware.xml:1374
+#: hardware.xml:1386
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2002,7 +2029,7 @@ msgstr ""
"作,但是却不能在安装过程中使用。"
#. Tag: para
-#: hardware.xml:1379
+#: hardware.xml:1391
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
@@ -2018,7 +2045,7 @@ msgstr ""
"件,并手动配置网络。"
#. Tag: para
-#: hardware.xml:1389
+#: hardware.xml:1401
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a &debian; "
@@ -2034,13 +2061,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1403
+#: hardware.xml:1415
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1404
+#: hardware.xml:1416
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -2048,13 +2075,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1411
+#: hardware.xml:1423
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1413
+#: hardware.xml:1425
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2070,7 +2097,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1423
+#: hardware.xml:1435
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2083,7 +2110,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1431
+#: hardware.xml:1443
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2100,13 +2127,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1444
+#: hardware.xml:1456
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1446
+#: hardware.xml:1458
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2115,13 +2142,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1461
+#: hardware.xml:1473
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1462
+#: hardware.xml:1474
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2138,13 +2165,13 @@ msgstr ""
"的 <classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1476
+#: hardware.xml:1488
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1477
+#: hardware.xml:1489
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is determined by the "
@@ -2163,13 +2190,13 @@ msgstr ""
"gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1497
+#: hardware.xml:1509
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1498
+#: hardware.xml:1510
#, no-c-format
msgid ""
"&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2180,7 +2207,7 @@ msgstr ""
"设备。然而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1504
+#: hardware.xml:1516
#, no-c-format
msgid ""
"USB hardware generally works fine. On some very old PC systems some USB "
@@ -2193,7 +2220,7 @@ msgstr ""
"要任何额外的配置就能工作。"
#. Tag: para
-#: hardware.xml:1513
+#: hardware.xml:1525
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -2204,7 +2231,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:1519
+#: hardware.xml:1531
#, no-c-format
msgid ""
"The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2212,13 +2239,13 @@ msgid ""
msgstr "Cobalt RaQ 不支持外加设备,但 Qube 有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:1531
+#: hardware.xml:1543
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1532
+#: hardware.xml:1544
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -2237,7 +2264,7 @@ msgstr ""
"系统中。"
#. Tag: para
-#: hardware.xml:1543
+#: hardware.xml:1555
#, no-c-format
msgid ""
"On many older devices which require firmware to work, the firmware file was "
@@ -2251,7 +2278,7 @@ msgstr ""
"主系统上传到设备中。"
#. Tag: para
-#: hardware.xml:1551
+#: hardware.xml:1563
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2266,7 +2293,7 @@ msgstr ""
"gnu; 可以合法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1560
+#: hardware.xml:1572
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -2281,7 +2308,7 @@ msgstr ""
"\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
#. Tag: para
-#: hardware.xml:1569
+#: hardware.xml:1581
#, no-c-format
msgid ""
"If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -2298,13 +2325,13 @@ msgstr ""
"卡上)。"
#. Tag: title
-#: hardware.xml:1586
+#: hardware.xml:1598
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
msgstr "特别为 GNU/&arch-kernel; 采购硬件"
#. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1600
#, no-c-format
msgid ""
"There are several vendors, who ship systems with &debian; or other "
@@ -2318,7 +2345,7 @@ msgstr ""
"心,因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1596
+#: hardware.xml:1608
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2332,7 +2359,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1604
+#: hardware.xml:1616
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2348,13 +2375,13 @@ msgstr ""
"&arch-kernel; 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1615
+#: hardware.xml:1627
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1616
+#: hardware.xml:1628
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2369,7 +2396,7 @@ msgstr ""
"于我们未被授权使用这些文档,造成它们无法在 &arch-kernel; 下工作。"
#. Tag: para
-#: hardware.xml:1626
+#: hardware.xml:1638
#, no-c-format
msgid ""
"In many cases there are standards (or at least some de-facto standards) "
@@ -2389,7 +2416,7 @@ msgstr ""
"所有设备都是符合标准的。"
#. Tag: para
-#: hardware.xml:1638
+#: hardware.xml:1650
#, no-c-format
msgid ""
"In other fields, among them e.g. printers, this is unfortunately not the "
@@ -2407,7 +2434,7 @@ msgstr ""
"于厂商提供的闭源驱动程序。"
#. Tag: para
-#: hardware.xml:1649
+#: hardware.xml:1661
#, no-c-format
msgid ""
"Even if there is a vendor-provided closed-source driver for such hardware "
@@ -2428,7 +2455,7 @@ msgstr ""
"统升级造成的不便。"
#. Tag: para
-#: hardware.xml:1662
+#: hardware.xml:1674
#, no-c-format
msgid ""
"You can help improve this situation by encouraging manufacturers of closed "
@@ -2439,13 +2466,13 @@ msgstr ""
"来改变这种状况。"
#. Tag: title
-#: hardware.xml:1677
+#: hardware.xml:1689
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1679
+#: hardware.xml:1691
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -2459,13 +2486,13 @@ msgstr ""
"读那一章的时候,可能需要回过头来参考本页。"
#. Tag: title
-#: hardware.xml:1689
+#: hardware.xml:1701
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1690
+#: hardware.xml:1702
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2476,19 +2503,19 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1696
+#: hardware.xml:1708
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1703
+#: hardware.xml:1715
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1705
+#: hardware.xml:1717
#, no-c-format
msgid ""
"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2499,19 +2526,19 @@ msgstr ""
"作系统的角度看,它们所用的技术是相同的。"
#. Tag: para
-#: hardware.xml:1711
+#: hardware.xml:1723
#, no-c-format
msgid "CD-ROM based installation is supported for most architectures."
msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
#. Tag: para
-#: hardware.xml:1715
+#: hardware.xml:1727
#, no-c-format
msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
msgstr "PC 上的 SATA、IDE/ATAPI 和 SCSI CD-ROM 都获得支持。"
#. Tag: para
-#: hardware.xml:1719
+#: hardware.xml:1731
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2521,13 +2548,13 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:1724
+#: hardware.xml:1736
#, no-c-format
msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:1728
+#: hardware.xml:1740
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2545,13 +2572,13 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:1742
+#: hardware.xml:1754
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1744
+#: hardware.xml:1756
#, no-c-format
msgid ""
"USB flash disks a.k.a. USB memory sticks have become a commonly used and "
@@ -2566,13 +2593,13 @@ msgstr ""
"CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
#. Tag: title
-#: hardware.xml:1756
+#: hardware.xml:1768
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1758
+#: hardware.xml:1770
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -2589,7 +2616,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:1768
+#: hardware.xml:1780
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2608,7 +2635,7 @@ msgstr ""
"安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1793
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -2618,13 +2645,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:1790
+#: hardware.xml:1802
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:1792
+#: hardware.xml:1804
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -2636,7 +2663,7 @@ msgstr ""
"安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
#. Tag: para
-#: hardware.xml:1799
+#: hardware.xml:1811
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2646,13 +2673,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:1808
+#: hardware.xml:1820
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:1810
+#: hardware.xml:1822
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -2669,13 +2696,13 @@ msgstr ""
">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
#. Tag: title
-#: hardware.xml:1823
+#: hardware.xml:1835
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:1825
+#: hardware.xml:1837
#, no-c-format
msgid ""
"The &debian; installer contains a kernel which is built to maximize the "
@@ -2683,7 +2710,7 @@ msgid ""
msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
#. Tag: para
-#: hardware.xml:1829
+#: hardware.xml:1841
#, no-c-format
msgid ""
"Generally, the &debian; installation system includes support for IDE (also "
@@ -2695,7 +2722,7 @@ msgstr ""
"动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1858
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2717,7 +2744,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1891
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2728,7 +2755,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1897
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2739,7 +2766,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1903
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2747,7 +2774,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1908
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2759,13 +2786,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1925
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1927
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2778,7 +2805,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1934
#, no-c-format
msgid ""
"Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2793,3 +2820,12 @@ msgstr ""
"本界面需要更多的内存,并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
"形界面两种方式之间选择,应选择普通方式。</para> </footnote>或磁盘空间上安装系"
"统或许可行,但只针对有经验的用户。"
+
+#~ msgid "IPL from tape"
+#~ msgstr "来自 tape 的 IPL"
+
+#~ msgid "tape"
+#~ msgstr "type"
+
+#~ msgid "CHRP subarchitecture (unsupported)"
+#~ msgstr "CHRP 子体系 (不支持)"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 8a84951d1..c24bc1b49 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: 2013-01-06 16:36+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-26 00:19+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -68,17 +68,30 @@ msgstr ""
#. Tag: para
#: install-methods.xml:38
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
+#| "relevant on very old PC systems)</phrase>, but you do have a CD set, you "
+#| "can use an alternative strategy such as <phrase condition=\"supports-"
+#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
+#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
+#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
+#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
+#| "the CD to initially boot the system installer. The files you need for "
+#| "booting by another means are also on the CD; the &debian; network archive "
+#| "and CD folder organization are identical. So when archive file paths are "
+#| "given below for particular files you need for booting, look for those "
+#| "files in the same directories and subdirectories on your CD."
msgid ""
"If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
"relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
"use an alternative strategy such as <phrase condition=\"supports-floppy-boot"
-"\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated tape,</phrase> "
-"<phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase condition="
-"\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-tftp\">net "
-"boot,</phrase> or manually loading the kernel from the CD to initially boot "
-"the system installer. The files you need for booting by another means are "
-"also on the CD; the &debian; network archive and CD folder organization are "
+"\">floppy disk,</phrase> <phrase arch=\"s390\">VM reader,</phrase> <phrase "
+"condition=\"bootable-disk\">hard disk,</phrase> <phrase condition=\"bootable-"
+"usb\">usb stick,</phrase> <phrase condition=\"supports-tftp\">net boot,</"
+"phrase> or manually loading the kernel from the CD to initially boot the "
+"system installer. The files you need for booting by another means are also "
+"on the CD; the &debian; network archive and CD folder organization are "
"identical. So when archive file paths are given below for particular files "
"you need for booting, look for those files in the same directories and "
"subdirectories on your CD."
@@ -102,10 +115,18 @@ msgstr "一旦安装程序被引导,它将能够获得 CD 中其他所有必
#. Tag: para
#: install-methods.xml:66
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you don't have a CD set, then you will need to download the installer "
+#| "system files and place them on the <phrase arch=\"s390\">installation "
+#| "tape</phrase> <phrase condition=\"supports-floppy-boot\">floppy disk or</"
+#| "phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase "
+#| "condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
+#| "\"supports-tftp\">a connected computer</phrase> so they can be used to "
+#| "boot the installer."
msgid ""
"If you don't have a CD set, then you will need to download the installer "
-"system files and place them on the <phrase arch=\"s390\">installation tape</"
+"system files and place them on the <phrase arch=\"s390\">VM minidisk</"
"phrase> <phrase condition=\"supports-floppy-boot\">floppy disk or</phrase> "
"<phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase condition="
"\"bootable-usb\">usb stick or</phrase> <phrase condition=\"supports-tftp\">a "
@@ -297,38 +318,11 @@ msgstr ""
#. Tag: title
#: install-methods.xml:244
#, no-c-format
-msgid "Creating an IPL tape"
-msgstr "创建一个 IPL 磁带"
-
-#. Tag: para
-#: install-methods.xml:246
-#, no-c-format
-msgid ""
-"If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
-"create an IPL tape first. This is described in section 3.4.3 in the <ulink "
-"url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux "
-"for IBM eServer zSeries and S/390: Distributions</ulink> Redbook. The files "
-"you need to write to the tape are (in this order): <filename>kernel.debian</"
-"filename>, <filename>parmfile.debian</filename> and <filename>initrd.debian</"
-"filename>. The files can be downloaded from the <filename>tape</filename> "
-"sub-directory, see <xref linkend=\"where-files\"/>."
-msgstr ""
-"如果不能从光盘引导(IPL)并且没有使用 VM,您首先就需要创建一个 IPL 磁带。在 "
-"<ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> "
-"Linux for IBM eServer zSeries and S/390: Distributions</ulink> Redbook 的第 "
-"3.4.3 节中有描述。您需要写到磁带上的文件是(按顺序): <filename>kernel.debian</"
-"filename>、<filename>parmfile.debian</filename> 和 <filename>initrd.debian</"
-"filename>。这些文件可以从 <filename>tape</filename> 子目录下载,请参见 <xref "
-"linkend=\"where-files\"/>,"
-
-#. Tag: title
-#: install-methods.xml:270
-#, no-c-format
msgid "Creating Floppies from Disk Images"
msgstr "从软盘映像创建引导软盘"
#. Tag: para
-#: install-methods.xml:271
+#: install-methods.xml:245
#, no-c-format
msgid ""
"Bootable floppy disks are generally used as a last resort to boot the "
@@ -338,7 +332,7 @@ msgstr ""
"最后一种方法。"
#. Tag: para
-#: install-methods.xml:276
+#: install-methods.xml:250
#, no-c-format
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -346,7 +340,7 @@ msgid ""
msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
#. Tag: para
-#: install-methods.xml:281
+#: install-methods.xml:255
#, no-c-format
msgid ""
"Disk images are files containing the complete contents of a floppy disk in "
@@ -364,7 +358,7 @@ msgstr ""
"按扇区复制</emphasis>到软盘中。"
#. Tag: para
-#: install-methods.xml:292
+#: install-methods.xml:266
#, no-c-format
msgid ""
"There are different techniques for creating floppies from disk images. This "
@@ -375,7 +369,7 @@ msgstr ""
"像创建引导软盘。"
#. Tag: para
-#: install-methods.xml:298
+#: install-methods.xml:272
#, no-c-format
msgid ""
"Before you can create the floppies, you will first need to download them "
@@ -389,7 +383,7 @@ msgstr ""
"DVD,软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
#. Tag: para
-#: install-methods.xml:306
+#: install-methods.xml:280
#, no-c-format
msgid ""
"No matter which method you use to create your floppies, you should remember "
@@ -400,13 +394,13 @@ msgstr ""
"保内容不会在无意被抹掉。"
#. Tag: title
-#: install-methods.xml:314
+#: install-methods.xml:288
#, no-c-format
msgid "Writing Disk Images From a Linux or Unix System"
msgstr "从 Linux 或者 Unix 系统写软盘映像"
#. Tag: para
-#: install-methods.xml:315
+#: install-methods.xml:289
#, no-c-format
msgid ""
"To write the floppy disk image files to the floppy disks, you will probably "
@@ -438,7 +432,7 @@ msgstr ""
"(Solaris 系统中使用 <command>eject</command> 命令,请参见其手册)</phrase>。"
#. Tag: para
-#: install-methods.xml:336
+#: install-methods.xml:310
#, no-c-format
msgid ""
"Some systems attempt to automatically mount a floppy disk when you place it "
@@ -468,7 +462,7 @@ msgstr ""
"统,请咨询您的系统管理员)。</phrase>"
#. Tag: para
-#: install-methods.xml:357
+#: install-methods.xml:331
#, no-c-format
msgid ""
"If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -479,13 +473,13 @@ msgstr ""
"command> 命令能够很好地对此进行控制,当然您可能需要先安装它。"
#. Tag: title
-#: install-methods.xml:375
+#: install-methods.xml:349
#, no-c-format
msgid "Writing Disk Images From DOS, Windows, or OS/2"
msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
#. Tag: para
-#: install-methods.xml:377
+#: install-methods.xml:351
#, no-c-format
msgid ""
"If you have access to an i386 or amd64 machine, you can use one of the "
@@ -494,7 +488,7 @@ msgstr ""
"如果您能操作一台 i386 或 amd64 机器,可以使用如下方法之一往软盘复制映像文件。"
#. Tag: para
-#: install-methods.xml:382
+#: install-methods.xml:356
#, no-c-format
msgid ""
"The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -508,7 +502,7 @@ msgstr ""
"或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
#. Tag: para
-#: install-methods.xml:390
+#: install-methods.xml:364
#, no-c-format
msgid ""
"The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -519,7 +513,7 @@ msgstr ""
"可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
#. Tag: para
-#: install-methods.xml:396
+#: install-methods.xml:370
#, no-c-format
msgid ""
"These tools can be found on the Official &debian; CD-ROMs under the "
@@ -529,13 +523,13 @@ msgstr ""
"下。"
#. Tag: title
-#: install-methods.xml:409
+#: install-methods.xml:383
#, no-c-format
msgid "Writing Disk Images From MacOS"
msgstr "在 MacOS 上写磁盘映像"
#. Tag: para
-#: install-methods.xml:410
+#: install-methods.xml:384
#, no-c-format
msgid ""
"An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -555,7 +549,7 @@ msgstr ""
"您确认的确想要清空磁盘并写入磁盘映像。"
#. Tag: para
-#: install-methods.xml:421
+#: install-methods.xml:395
#, no-c-format
msgid ""
"You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -568,13 +562,13 @@ msgstr ""
"您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
#. Tag: title
-#: install-methods.xml:432
+#: install-methods.xml:406
#, no-c-format
msgid "Writing Disk Images with <command>Disk Copy</command>"
msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#. Tag: para
-#: install-methods.xml:433
+#: install-methods.xml:407
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
@@ -587,7 +581,7 @@ msgstr ""
"下载映像文件的情况。"
#. Tag: para
-#: install-methods.xml:442
+#: install-methods.xml:416
#, no-c-format
msgid ""
"Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -597,7 +591,7 @@ msgstr ""
"且用它打开 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:449
+#: install-methods.xml:423
#, no-c-format
msgid ""
"Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -608,7 +602,7 @@ msgstr ""
"<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
#. Tag: para
-#: install-methods.xml:456
+#: install-methods.xml:430
#, no-c-format
msgid ""
"<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -623,7 +617,7 @@ msgstr ""
"会删除引导区。"
#. Tag: para
-#: install-methods.xml:465
+#: install-methods.xml:439
#, no-c-format
msgid ""
"Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -635,7 +629,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: install-methods.xml:472
+#: install-methods.xml:446
#, no-c-format
msgid ""
"Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -650,13 +644,13 @@ msgstr ""
"删除它。完成后它应该会弹出软盘。"
#. Tag: title
-#: install-methods.xml:487
+#: install-methods.xml:461
#, no-c-format
msgid "Writing Disk Images with <command>suntar</command>"
msgstr "写磁盘映像:使用<command>suntar</command>"
#. Tag: para
-#: install-methods.xml:491
+#: install-methods.xml:465
#, no-c-format
msgid ""
"Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -669,21 +663,21 @@ msgstr ""
"userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
#. Tag: para
-#: install-methods.xml:499
+#: install-methods.xml:473
#, 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:505
+#: install-methods.xml:479
#, 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:510
+#: install-methods.xml:484
#, no-c-format
msgid ""
"After the floppy has been created successfully, select <menuchoice> "
@@ -696,7 +690,7 @@ msgstr ""
"换别的软盘试试。"
#. Tag: para
-#: install-methods.xml:518
+#: install-methods.xml:492
#, no-c-format
msgid ""
"Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -707,13 +701,13 @@ msgstr ""
"然在 MacOS 中挂载了它,MacOS 将会将其毁坏。"
#. Tag: title
-#: install-methods.xml:537
+#: install-methods.xml:511
#, no-c-format
msgid "Preparing Files for USB Memory Stick Booting"
msgstr "为从 U 盘引导准备文件"
#. Tag: para
-#: install-methods.xml:539
+#: install-methods.xml:513
#, no-c-format
msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -734,7 +728,7 @@ msgstr ""
"护开关。"
#. Tag: para
-#: install-methods.xml:552
+#: install-methods.xml:526
#, no-c-format
msgid ""
"The procedures described in this section will destroy anything already on "
@@ -746,13 +740,13 @@ msgstr ""
"搞错,比如写成硬盘,将造成该设备上的所有信息丢失。"
#. Tag: title
-#: install-methods.xml:562
+#: install-methods.xml:536
#, no-c-format
msgid "Preparing a USB stick using a hybrid CD or DVD image"
msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
#. Tag: para
-#: install-methods.xml:563
+#: install-methods.xml:537
#, no-c-format
msgid ""
"Debian CD and DVD images can now be written directly a USB stick, which is a "
@@ -765,7 +759,7 @@ msgstr ""
"cdrom\"/> 获取 CD 或 DVD 映像。"
#. Tag: para
-#: install-methods.xml:570
+#: install-methods.xml:544
#, no-c-format
msgid ""
"Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -778,7 +772,7 @@ msgstr ""
">)。"
#. Tag: para
-#: install-methods.xml:577
+#: install-methods.xml:551
#, no-c-format
msgid ""
"The CD or DVD image you choose should be written directly to the USB stick, "
@@ -791,7 +785,7 @@ msgstr ""
"U 盘已经卸载:"
#. Tag: screen
-#: install-methods.xml:584
+#: install-methods.xml:558
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
@@ -803,7 +797,7 @@ msgstr ""
"<prompt>#</prompt> <userinput>sync</userinput>"
#. Tag: para
-#: install-methods.xml:586
+#: install-methods.xml:560
#, no-c-format
msgid ""
"Simply writing the CD or DVD image to USB like this should work fine for "
@@ -814,7 +808,7 @@ msgstr ""
"项主要提供给有特殊需要的用户。"
#. Tag: para
-#: install-methods.xml:594
+#: install-methods.xml:568
#, no-c-format
msgid ""
"The hybrid image on the stick does not occupy all the storage space, so it "
@@ -824,7 +818,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:602
+#: install-methods.xml:576
#, no-c-format
msgid ""
"Create a second, FAT partition on the stick, mount the partition and copy or "
@@ -832,7 +826,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: install-methods.xml:607
+#: install-methods.xml:581
#, fuzzy, no-c-format
#| msgid ""
#| "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -854,7 +848,7 @@ msgstr ""
"# umount"
#. Tag: para
-#: install-methods.xml:609
+#: install-methods.xml:583
#, no-c-format
msgid ""
"You might have written the <filename>mini.iso</filename> to the USB stick. "
@@ -864,13 +858,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: install-methods.xml:623
+#: install-methods.xml:597
#, no-c-format
msgid "Manually copying files to the USB stick"
msgstr "手动复制文件到 U 盘。"
#. Tag: para
-#: install-methods.xml:624
+#: install-methods.xml:598
#, no-c-format
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
@@ -882,7 +876,7 @@ msgstr ""
"可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
-#: install-methods.xml:631
+#: install-methods.xml:605
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -897,7 +891,7 @@ msgstr ""
"classname> 和对应的配置文件</phrase>。"
#. Tag: para
-#: install-methods.xml:640
+#: install-methods.xml:614
#, no-c-format
msgid ""
"Note that, although convenient, this method does have one major "
@@ -911,19 +905,19 @@ msgstr ""
"量创建一个新的文件系统。"
#. Tag: para
-#: install-methods.xml:648
+#: install-methods.xml:622
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:652
+#: install-methods.xml:626
#, 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:654
+#: install-methods.xml:628
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -934,13 +928,13 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:660
+#: install-methods.xml:634
#, 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:662
+#: install-methods.xml:636
#, no-c-format
msgid ""
"After that, mount the USB memory stick <phrase arch=\"x86\">"
@@ -961,13 +955,13 @@ msgstr ""
"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:679
+#: install-methods.xml:653
#, no-c-format
msgid "Manually copying files to the USB stick &mdash; the flexible way"
msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:680
+#: install-methods.xml:654
#, no-c-format
msgid ""
"If you like more flexibility or just want to know what's going on, you "
@@ -980,13 +974,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:695 install-methods.xml:817
+#: install-methods.xml:669 install-methods.xml:791
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:696
+#: install-methods.xml:670
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -994,7 +988,7 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:701
+#: install-methods.xml:675
#, no-c-format
msgid ""
"Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -1026,7 +1020,7 @@ msgstr ""
"&debian; 软件包内。"
#. Tag: para
-#: install-methods.xml:725
+#: install-methods.xml:699
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1043,7 +1037,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:735
+#: install-methods.xml:709
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1066,13 +1060,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:752 install-methods.xml:864
+#: install-methods.xml:726 install-methods.xml:838
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:753
+#: install-methods.xml:727
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
@@ -1096,7 +1090,7 @@ msgstr ""
"(8.3) 文件名。"
#. Tag: para
-#: install-methods.xml:777
+#: install-methods.xml:751
#, no-c-format
msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1119,7 +1113,7 @@ msgstr ""
"userinput> 到第二行尾部。还可以添加其他的参数。"
#. Tag: para
-#: install-methods.xml:789
+#: install-methods.xml:763
#, no-c-format
msgid ""
"To enable the boot prompt to permit further parameter appending, add a "
@@ -1128,7 +1122,7 @@ msgstr ""
"添加 <userinput>prompt 1</userinput> 一行,使得引导提示符可以允许附加参数。"
#. Tag: para
-#: install-methods.xml:794 install-methods.xml:904
+#: install-methods.xml:768 install-methods.xml:878
#, no-c-format
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
@@ -1146,7 +1140,7 @@ msgstr ""
"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:818
+#: install-methods.xml:792
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1173,7 +1167,7 @@ msgstr ""
"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:835
+#: install-methods.xml:809
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1188,7 +1182,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:844
+#: install-methods.xml:818
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1222,7 +1216,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:865
+#: install-methods.xml:839
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1232,31 +1226,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:872
+#: install-methods.xml:846
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:877
+#: install-methods.xml:851
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:882
+#: install-methods.xml:856
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:887
+#: install-methods.xml:861
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:894
+#: install-methods.xml:868
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1292,13 +1286,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:932
+#: install-methods.xml:906
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:933
+#: install-methods.xml:907
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1309,7 +1303,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:939
+#: install-methods.xml:913
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1322,7 +1316,7 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:946
+#: install-methods.xml:920
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1342,7 +1336,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:957
+#: install-methods.xml:931
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1353,7 +1347,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:966
+#: install-methods.xml:940
#, fuzzy, no-c-format
#| msgid ""
#| "Hard disk installer booting using <command>LILO</command> or "
@@ -1365,7 +1359,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:968
+#: install-methods.xml:942
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1375,7 +1369,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:974
+#: install-methods.xml:948
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1386,7 +1380,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:980
+#: install-methods.xml:954
#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
@@ -1397,19 +1391,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:988
+#: install-methods.xml:962
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:993
+#: install-methods.xml:967
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:1000
+#: install-methods.xml:974
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1417,14 +1411,14 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:1010
+#: install-methods.xml:984
#, fuzzy, no-c-format
#| msgid "Hard disk installer booting using <command>loadlin</command>"
msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
#. Tag: para
-#: install-methods.xml:1011
+#: install-methods.xml:985
#, no-c-format
msgid ""
"This section explains how to prepare your hard drive for booting the "
@@ -1433,7 +1427,7 @@ msgstr ""
"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
#. Tag: para
-#: install-methods.xml:1016
+#: install-methods.xml:990
#, no-c-format
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1441,26 +1435,26 @@ msgid ""
msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
-#: install-methods.xml:1021
+#: install-methods.xml:995
#, 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:1026
+#: install-methods.xml:1000
#, no-c-format
msgid "<filename>/tools</filename> (loadlin tool)"
msgstr "<filename>/tools</filename> (loadlin 工具)"
#. Tag: title
-#: install-methods.xml:1039
+#: install-methods.xml:1013
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1040
+#: install-methods.xml:1014
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1482,7 +1476,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1053
+#: install-methods.xml:1027
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1509,13 +1503,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1073
+#: install-methods.xml:1047
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1074
+#: install-methods.xml:1048
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1533,7 +1527,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1085
+#: install-methods.xml:1059
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1546,31 +1540,31 @@ msgstr ""
"硬盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1095 install-methods.xml:1421
+#: install-methods.xml:1069 install-methods.xml:1395
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1100 install-methods.xml:1426
+#: install-methods.xml:1074 install-methods.xml:1400
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1105 install-methods.xml:1431
+#: install-methods.xml:1079 install-methods.xml:1405
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1110 install-methods.xml:1436
+#: install-methods.xml:1084 install-methods.xml:1410
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1115
+#: install-methods.xml:1089
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1584,19 +1578,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1123
+#: install-methods.xml:1097
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1136
+#: install-methods.xml:1110
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1137
+#: install-methods.xml:1111
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1610,7 +1604,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1145
+#: install-methods.xml:1119
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1622,7 +1616,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1152
+#: install-methods.xml:1126
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1641,7 +1635,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1166
+#: install-methods.xml:1140
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1652,7 +1646,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1172
+#: install-methods.xml:1146
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1662,7 +1656,7 @@ msgstr ""
"个 <classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1177
+#: install-methods.xml:1151
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1676,7 +1670,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1185
+#: install-methods.xml:1159
#, no-c-format
msgid ""
"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1689,13 +1683,13 @@ msgstr ""
"多问题。另一个好的选择是 <classname>atftpd</classname>。"
#. Tag: title
-#: install-methods.xml:1201
+#: install-methods.xml:1175
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1202
+#: install-methods.xml:1176
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1713,7 +1707,7 @@ msgstr ""
"addr show dev eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1214
+#: install-methods.xml:1188
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1736,26 +1730,26 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1235
+#: install-methods.xml:1209
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1236
+#: install-methods.xml:1210
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
-"gnu;, the <classname>isc-dhcp-server</classname> package is recommended. Here "
-"is a sample configuration file for it (see <filename>/etc/dhcp/dhcpd.conf</"
-"filename>):"
+"gnu;, the <classname>isc-dhcp-server</classname> package is recommended. "
+"Here is a sample configuration file for it (see <filename>/etc/dhcp/dhcpd."
+"conf</filename>):"
msgstr ""
"一个 DHCP 服务器自由软件是 ISC <command>dhcpd</command>。对于 &debian-gnu;,"
-"推荐使用 <classname>isc-dhcp-server</classname> 软件包。这里是它的一个简单的配置"
-"示例文件(参阅 <filename>/etc/dhcp/dhcpd.conf</filename>):"
+"推荐使用 <classname>isc-dhcp-server</classname> 软件包。这里是它的一个简单的"
+"配置示例文件(参阅 <filename>/etc/dhcp/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1243
+#: install-methods.xml:1217
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1799,7 +1793,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1245
+#: install-methods.xml:1219
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1815,7 +1809,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1255
+#: install-methods.xml:1229
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1825,13 +1819,13 @@ msgstr ""
"<userinput>/etc/init.d/isc-dhcp-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1263
+#: install-methods.xml:1237
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1264
+#: install-methods.xml:1238
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1901,13 +1895,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1284
+#: install-methods.xml:1258
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1285
+#: install-methods.xml:1259
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1922,7 +1916,7 @@ msgstr ""
"<classname>isc-dhcp-server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1293
+#: install-methods.xml:1267
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1984,8 +1978,18 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1326
-#, no-c-format
+#: install-methods.xml:1300
+#, fuzzy, no-c-format
+#| msgid ""
+#| "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
+#| "easy, because it treats BOOTP clients as a moderately special case of "
+#| "DHCP clients. Some architectures require a complex configuration for "
+#| "booting clients via BOOTP. If yours is one of those, read the section "
+#| "<xref linkend=\"dhcpd\"/>. Otherwise you will probably be able to get "
+#| "away with simply adding the <userinput>allow bootp</userinput> directive "
+#| "to the configuration block for the subnet containing the client in "
+#| "<filename>/etc/dhcp3/dhcpd.conf</filename>, and restart <command>dhcpd</"
+#| "command> with <userinput>/etc/init.d/isc-dhcp-server restart</userinput>."
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
"easy, because it treats BOOTP clients as a moderately special case of DHCP "
@@ -1993,7 +1997,7 @@ msgid ""
"clients via BOOTP. If yours is one of those, read the section <xref linkend="
"\"dhcpd\"/>. Otherwise you will probably be able to get away with simply "
"adding the <userinput>allow bootp</userinput> directive to the configuration "
-"block for the subnet containing the client in <filename>/etc/dhcp3/dhcpd."
+"block for the subnet containing the client in <filename>/etc/dhcp/dhcpd."
"conf</filename>, and restart <command>dhcpd</command> with <userinput>/etc/"
"init.d/isc-dhcp-server restart</userinput>."
msgstr ""
@@ -2006,13 +2010,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1345
+#: install-methods.xml:1319
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1346
+#: install-methods.xml:1320
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -2021,7 +2025,7 @@ msgstr ""
"要准备好 TFTP 服务器,您首先需要确定 <command>tftpd</command> 已经启动。"
#. Tag: para
-#: install-methods.xml:1351
+#: install-methods.xml:1325
#, no-c-format
msgid ""
"In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2035,7 +2039,7 @@ msgstr ""
"以在安装软件包的时候选择,也可以用重新配置软件包方式修改。"
#. Tag: para
-#: install-methods.xml:1360
+#: install-methods.xml:1334
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2052,7 +2056,7 @@ msgstr ""
"置文件示例。"
#. Tag: para
-#: install-methods.xml:1370
+#: install-methods.xml:1344
#, no-c-format
msgid ""
"All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2066,7 +2070,7 @@ msgstr ""
"问题,建议先检查这些日志信息,这对于分析错误是一个好的起始点。"
#. Tag: para
-#: install-methods.xml:1378
+#: install-methods.xml:1352
#, no-c-format
msgid ""
"If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2094,13 +2098,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1400
+#: install-methods.xml:1374
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1401
+#: install-methods.xml:1375
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2115,7 +2119,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1410
+#: install-methods.xml:1384
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2130,13 +2134,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1441
+#: install-methods.xml:1415
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1446
+#: install-methods.xml:1420
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2151,7 +2155,7 @@ msgstr ""
"需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1454
+#: install-methods.xml:1428
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2166,13 +2170,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1466
+#: install-methods.xml:1440
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1467
+#: install-methods.xml:1441
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2200,7 +2204,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1483
+#: install-methods.xml:1457
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2212,7 +2216,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1490
+#: install-methods.xml:1464
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2225,13 +2229,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1501
+#: install-methods.xml:1475
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1502
+#: install-methods.xml:1476
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2245,13 +2249,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1610
+#: install-methods.xml:1584
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1611
+#: install-methods.xml:1585
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2266,13 +2270,13 @@ msgstr ""
"更多细节。"
#. Tag: title
-#: install-methods.xml:1623
+#: install-methods.xml:1597
#, no-c-format
msgid "Automatic Installation Using the &debian; Installer"
msgstr "使用 &debian; 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1624
+#: install-methods.xml:1598
#, no-c-format
msgid ""
"The &debian; Installer supports automating installs via preconfiguration "
@@ -2284,7 +2288,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1631
+#: install-methods.xml:1605
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2293,6 +2297,28 @@ msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
+#~ msgid "Creating an IPL tape"
+#~ msgstr "创建一个 IPL 磁带"
+
+#~ msgid ""
+#~ "If you can't boot (IPL) from the CD-ROM and you are not using VM you need "
+#~ "to create an IPL tape first. This is described in section 3.4.3 in the "
+#~ "<ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf"
+#~ "\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> "
+#~ "Redbook. The files you need to write to the tape are (in this order): "
+#~ "<filename>kernel.debian</filename>, <filename>parmfile.debian</filename> "
+#~ "and <filename>initrd.debian</filename>. The files can be downloaded from "
+#~ "the <filename>tape</filename> sub-directory, see <xref linkend=\"where-"
+#~ "files\"/>."
+#~ msgstr ""
+#~ "如果不能从光盘引导(IPL)并且没有使用 VM,您首先就需要创建一个 IPL 磁带。在 "
+#~ "<ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf"
+#~ "\"> Linux for IBM eServer zSeries and S/390: Distributions</ulink> "
+#~ "Redbook 的第 3.4.3 节中有描述。您需要写到磁带上的文件是(按顺序): "
+#~ "<filename>kernel.debian</filename>、<filename>parmfile.debian</filename> "
+#~ "和 <filename>initrd.debian</filename>。这些文件可以从 <filename>tape</"
+#~ "filename> 子目录下载,请参见 <xref linkend=\"where-files\"/>,"
+
#~ 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 "
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index c8d235c4b..0bd742e9c 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: 2012-10-24 19:53+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-26 00:20+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -256,90 +256,104 @@ msgstr "root 用户的目录"
#. Tag: filename
#: partitioning.xml:118
+#, fuzzy, no-c-format
+#| msgid "<filename>bin</filename>"
+msgid "<filename>run</filename>"
+msgstr "<filename>bin</filename>"
+
+#. Tag: entry
+#: partitioning.xml:119
+#, fuzzy, no-c-format
+#| msgid "Variable data"
+msgid "Run-time variable data"
+msgstr "不断变化的数据"
+
+#. Tag: filename
+#: partitioning.xml:121
#, no-c-format
msgid "sbin"
msgstr "sbin"
#. Tag: entry
-#: partitioning.xml:119
+#: partitioning.xml:122
#, no-c-format
msgid "Essential system binaries"
msgstr "基本系统命令执行文件"
#. Tag: filename
-#: partitioning.xml:121
+#: partitioning.xml:124
#, no-c-format
msgid "<filename>sys</filename>"
msgstr "<filename>sys</filename>"
#. Tag: entry
-#: partitioning.xml:122
+#: partitioning.xml:125
#, no-c-format
msgid "Virtual directory for system information (2.6 kernels)"
msgstr "系统信息的虚拟目录(2.6 内核)"
#. Tag: filename
-#: partitioning.xml:124
+#: partitioning.xml:127
#, no-c-format
msgid "<filename>tmp</filename>"
msgstr "<filename>tmp</filename>"
#. Tag: entry
-#: partitioning.xml:125
+#: partitioning.xml:128
#, no-c-format
msgid "Temporary files"
msgstr "临时文件"
#. Tag: filename
-#: partitioning.xml:127
+#: partitioning.xml:130
#, no-c-format
msgid "<filename>usr</filename>"
msgstr "<filename>usr</filename>"
#. Tag: entry
-#: partitioning.xml:128
+#: partitioning.xml:131
#, no-c-format
msgid "Secondary hierarchy"
msgstr "第二级目录"
#. Tag: filename
-#: partitioning.xml:130
+#: partitioning.xml:133
#, no-c-format
msgid "<filename>var</filename>"
msgstr "<filename>var</filename>"
#. Tag: entry
-#: partitioning.xml:131
+#: partitioning.xml:134
#, no-c-format
msgid "Variable data"
msgstr "不断变化的数据"
#. Tag: filename
-#: partitioning.xml:133
+#: partitioning.xml:136
#, no-c-format
msgid "<filename>srv</filename>"
msgstr "<filename>srv</filename>"
#. Tag: entry
-#: partitioning.xml:134
+#: partitioning.xml:137
#, no-c-format
msgid "Data for services provided by the system"
msgstr "系统提供的用于 service 的数据"
#. Tag: filename
-#: partitioning.xml:136
+#: partitioning.xml:139
#, no-c-format
msgid "<filename>opt</filename>"
msgstr "<filename>opt</filename>"
#. Tag: entry
-#: partitioning.xml:137
+#: partitioning.xml:140
#, no-c-format
msgid "Add-on application software packages"
msgstr "附加的应用程序软件包"
#. Tag: para
-#: partitioning.xml:142
+#: partitioning.xml:145
#, no-c-format
msgid ""
"The following is a list of important considerations regarding directories "
@@ -351,7 +365,7 @@ msgstr ""
"变化。这里所推荐的是通用指引,提供如何分区的起点。"
#. Tag: para
-#: partitioning.xml:152
+#: partitioning.xml:155
#, no-c-format
msgid ""
"The root partition <filename>/</filename> must always physically contain "
@@ -366,7 +380,7 @@ msgstr ""
"要 150&ndash;250MB 大小空间。"
#. Tag: para
-#: partitioning.xml:161
+#: partitioning.xml:164
#, no-c-format
msgid ""
"<filename>/usr</filename>: contains all user programs (<filename>/usr/bin</"
@@ -384,7 +398,7 @@ msgstr ""
"务器安装应该需要 4&ndash;6GB。"
#. Tag: para
-#: partitioning.xml:174
+#: partitioning.xml:177
#, no-c-format
msgid ""
"<filename>/var</filename>: variable data like news articles, e-mails, web "
@@ -408,7 +422,7 @@ msgstr ""
"很紧张,并且不准备做主版本的系统升级,可以为其准备 30 或 40MB 大小。"
#. Tag: para
-#: partitioning.xml:190
+#: partitioning.xml:193
#, no-c-format
msgid ""
"<filename>/tmp</filename>: temporary data created by programs will most "
@@ -424,7 +438,7 @@ msgstr ""
"件。如果要使用这些程序,应该相应地调整 <filename>/tmp</filename> 目录的大小。"
#. Tag: para
-#: partitioning.xml:201
+#: partitioning.xml:204
#, no-c-format
msgid ""
"<filename>/home</filename>: every user will put his personal data into a "
@@ -441,13 +455,13 @@ msgstr ""
"目录下计划保存大量的多媒体文件(图片、MP3、电影),该预备更多的空间。"
#. Tag: title
-#: partitioning.xml:222
+#: partitioning.xml:225
#, no-c-format
msgid "Recommended Partitioning Scheme"
msgstr "推荐的分区方案"
#. Tag: para
-#: partitioning.xml:223
+#: partitioning.xml:226
#, no-c-format
msgid ""
"For new users, personal &debian; boxes, home systems, and other single-user "
@@ -463,7 +477,7 @@ msgstr ""
"分区很大的时候,这将导致引导期间的延迟。"
#. Tag: para
-#: partitioning.xml:232
+#: partitioning.xml:235
#, no-c-format
msgid ""
"For multi-user systems or systems with lots of disk space, it's best to put "
@@ -476,7 +490,7 @@ msgstr ""
"filename> 分配到他们各自的分区,与 <filename>/</filename> 分区分离开来。"
#. Tag: para
-#: partitioning.xml:240
+#: partitioning.xml:243
#, no-c-format
msgid ""
"You might need a separate <filename>/usr/local</filename> partition if you "
@@ -497,7 +511,7 @@ msgstr ""
"好。一般来说,分区状况在每台计算机都不同,这取决于它们的用途。"
#. Tag: para
-#: partitioning.xml:252
+#: partitioning.xml:255
#, no-c-format
msgid ""
"For very complex systems, you should see the <ulink url=\"&url-multidisk-"
@@ -509,7 +523,7 @@ msgstr ""
"有用。"
#. Tag: para
-#: partitioning.xml:259
+#: partitioning.xml:262
#, no-c-format
msgid ""
"With respect to the issue of swap partition size, there are many views. One "
@@ -525,7 +539,7 @@ msgstr ""
"交换分区。"
#. Tag: para
-#: partitioning.xml:268
+#: partitioning.xml:271
#, no-c-format
msgid ""
"On some 32-bit architectures (m68k and PowerPC), the maximum size of a swap "
@@ -541,7 +555,7 @@ msgstr ""
"IDE 通道。内核将平衡使用多个交换分区以达到更好的性能。"
#. Tag: para
-#: partitioning.xml:278
+#: partitioning.xml:281
#, no-c-format
msgid ""
"As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE "
@@ -557,7 +571,7 @@ msgstr ""
"区。"
#. Tag: para
-#: partitioning.xml:287
+#: partitioning.xml:290
#, no-c-format
msgid ""
"For an idea of the space taken by tasks you might be interested in adding "
@@ -568,13 +582,13 @@ msgstr ""
"道,请查阅 <xref linkend=\"tasksel-size-list\"/>。"
#. Tag: title
-#: partitioning.xml:303
+#: partitioning.xml:306
#, no-c-format
msgid "Device Names in Linux"
msgstr "Linux 里面的设备名称"
#. Tag: para
-#: partitioning.xml:304
+#: partitioning.xml:307
#, no-c-format
msgid ""
"Linux disks and partition names may be different from other operating "
@@ -585,19 +599,19 @@ msgstr ""
"Linux 所使用的设备名称。这里是基本的命名方案:"
#. Tag: para
-#: partitioning.xml:312
+#: partitioning.xml:315
#, no-c-format
msgid "The first floppy drive is named <filename>/dev/fd0</filename>."
msgstr "第一个软盘驱动器被命名为 <filename>/dev/fd0</filename>。"
#. Tag: para
-#: partitioning.xml:317
+#: partitioning.xml:320
#, no-c-format
msgid "The second floppy drive is named <filename>/dev/fd1</filename>."
msgstr "第二个软盘驱动器被命名为 <filename>/dev/fd1</filename>。"
#. Tag: para
-#: partitioning.xml:322
+#: partitioning.xml:325
#, no-c-format
msgid ""
"The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
@@ -607,7 +621,7 @@ msgstr ""
"filename>。"
#. Tag: para
-#: partitioning.xml:328
+#: partitioning.xml:331
#, no-c-format
msgid ""
"The second SCSI disk (address-wise) is named <filename>/dev/sdb</filename>, "
@@ -617,7 +631,7 @@ msgstr ""
"等。"
#. Tag: para
-#: partitioning.xml:334
+#: partitioning.xml:337
#, no-c-format
msgid ""
"The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as "
@@ -627,7 +641,7 @@ msgstr ""
"<filename>/dev/sr0</filename>。"
#. Tag: para
-#: partitioning.xml:340
+#: partitioning.xml:343
#, no-c-format
msgid ""
"The master disk on IDE primary controller is named <filename>/dev/hda</"
@@ -635,7 +649,7 @@ msgid ""
msgstr "主 IDE 控制器下的主磁盘被命名为 <filename>/dev/hda</filename>。"
#. Tag: para
-#: partitioning.xml:346
+#: partitioning.xml:349
#, no-c-format
msgid ""
"The slave disk on IDE primary controller is named <filename>/dev/hdb</"
@@ -643,7 +657,7 @@ msgid ""
msgstr "主 IDE 控制器的从盘命名为 <filename>/dev/hdb</filename>。"
#. Tag: para
-#: partitioning.xml:352
+#: partitioning.xml:355
#, no-c-format
msgid ""
"The master and slave disks of the secondary controller can be called "
@@ -656,20 +670,20 @@ msgstr ""
"控制器的角色。"
#. Tag: para
-#: partitioning.xml:363
+#: partitioning.xml:366
#, no-c-format
msgid "The first DASD device is named <filename>/dev/dasda</filename>."
msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
#. Tag: para
-#: partitioning.xml:369
+#: partitioning.xml:372
#, no-c-format
msgid ""
"The second DASD device is named <filename>/dev/dasdb</filename>, and so on."
msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:377
+#: partitioning.xml:380
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -682,7 +696,7 @@ msgstr ""
"一个和第二个分区。"
#. Tag: para
-#: partitioning.xml:384
+#: partitioning.xml:387
#, no-c-format
msgid ""
"Here is a real-life example. Let's assume you have a system with 2 SCSI "
@@ -701,7 +715,7 @@ msgstr ""
"filename> 及其分区。"
#. Tag: para
-#: partitioning.xml:395
+#: partitioning.xml:398
#, no-c-format
msgid ""
"Note that if you have two SCSI host bus adapters (i.e., controllers), the "
@@ -713,7 +727,7 @@ msgstr ""
"的解决方案是观察引导信息,如果您知道驱动器型号和/或者容量。"
#. Tag: para
-#: partitioning.xml:402
+#: partitioning.xml:405
#, no-c-format
msgid ""
"Linux represents the primary partitions as the drive name, plus the numbers "
@@ -731,7 +745,7 @@ msgstr ""
"适用。"
#. Tag: para
-#: partitioning.xml:413
+#: partitioning.xml:416
#, no-c-format
msgid ""
"Sun disk partitions allow for 8 separate partitions (or slices). The third "
@@ -744,7 +758,7 @@ msgstr ""
"器(SILO 或者 SUN 的)使用。"
#. Tag: para
-#: partitioning.xml:420
+#: partitioning.xml:423
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -757,13 +771,13 @@ msgstr ""
"个 DASD 设备的第一个以及第二个分区。"
#. Tag: title
-#: partitioning.xml:435
+#: partitioning.xml:438
#, no-c-format
msgid "&debian; Partitioning Programs"
msgstr "&debian; 分区程序"
#. Tag: para
-#: partitioning.xml:436
+#: partitioning.xml:439
#, no-c-format
msgid ""
"Several varieties of partitioning programs have been adapted by &debian; "
@@ -775,13 +789,13 @@ msgstr ""
"合您的体系的程序列表。"
#. Tag: command
-#: partitioning.xml:448
+#: partitioning.xml:451
#, no-c-format
msgid "partman"
msgstr "partman"
#. Tag: para
-#: partitioning.xml:449
+#: partitioning.xml:452
#, no-c-format
msgid ""
"Recommended partitioning tool in &debian;. This Swiss army knife can also "
@@ -794,19 +808,19 @@ msgstr ""
"区至挂接点。"
#. Tag: command
-#: partitioning.xml:460
+#: partitioning.xml:463
#, no-c-format
msgid "fdisk"
msgstr "fdisk"
#. Tag: para
-#: partitioning.xml:461
+#: partitioning.xml:464
#, no-c-format
msgid "The original Linux disk partitioner, good for gurus."
msgstr "最早的 Linux 磁盘分区工具,对于老手很好用。"
#. Tag: para
-#: partitioning.xml:465
+#: partitioning.xml:468
#, no-c-format
msgid ""
"Be careful if you have existing FreeBSD partitions on your machine. The "
@@ -820,19 +834,19 @@ msgstr ""
"参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
#. Tag: command
-#: partitioning.xml:477
+#: partitioning.xml:480
#, no-c-format
msgid "cfdisk"
msgstr "cfdisk"
#. Tag: para
-#: partitioning.xml:478
+#: partitioning.xml:481
#, no-c-format
msgid "A simple-to-use, full-screen disk partitioner for the rest of us."
msgstr "一个简单易用、全屏幕的磁盘分区程序。供其他人员使用。"
#. Tag: para
-#: partitioning.xml:482
+#: partitioning.xml:485
#, no-c-format
msgid ""
"Note that <command>cfdisk</command> doesn't understand FreeBSD partitions at "
@@ -842,49 +856,49 @@ msgstr ""
"设备名称与结果可能不同。"
#. Tag: command
-#: partitioning.xml:491
+#: partitioning.xml:494
#, no-c-format
msgid "atari-fdisk"
msgstr "atari-fdisk"
#. Tag: para
-#: partitioning.xml:492
+#: partitioning.xml:495
#, no-c-format
msgid "Atari-aware version of <command>fdisk</command>."
msgstr "Atari 版本的 <command>fdisk</command>。"
#. Tag: command
-#: partitioning.xml:500
+#: partitioning.xml:503
#, no-c-format
msgid "amiga-fdisk"
msgstr "amiga-fdisk"
#. Tag: para
-#: partitioning.xml:501
+#: partitioning.xml:504
#, no-c-format
msgid "Amiga-aware version of <command>fdisk</command>."
msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
#. Tag: command
-#: partitioning.xml:509
+#: partitioning.xml:512
#, no-c-format
msgid "mac-fdisk"
msgstr "mac-fdisk"
#. Tag: para
-#: partitioning.xml:510
+#: partitioning.xml:513
#, no-c-format
msgid "Mac-aware version of <command>fdisk</command>."
msgstr "Mac-aware 版本的 <command>fdisk</command>。"
#. Tag: command
-#: partitioning.xml:518
+#: partitioning.xml:521
#, no-c-format
msgid "pmac-fdisk"
msgstr "pmac-fdisk"
#. Tag: para
-#: partitioning.xml:519
+#: partitioning.xml:522
#, no-c-format
msgid ""
"PowerMac-aware version of <command>fdisk</command>, also used by BVM and "
@@ -894,13 +908,13 @@ msgstr ""
"VMEbus 系统。"
#. Tag: command
-#: partitioning.xml:528
+#: partitioning.xml:531
#, no-c-format
msgid "fdasd"
msgstr "fdasd"
#. Tag: para
-#: partitioning.xml:529
+#: partitioning.xml:532
#, no-c-format
msgid ""
"&arch-title; version of <command>fdisk</command>; Please read the fdasd "
@@ -915,7 +929,7 @@ msgstr ""
"\"Installation Commands</ulink> 的第 13 章获得详细信息。"
#. Tag: para
-#: partitioning.xml:540
+#: partitioning.xml:543
#, no-c-format
msgid ""
"One of these programs will be run by default when you select "
@@ -928,13 +942,13 @@ msgstr ""
"式。"
#. Tag: para
-#: partitioning.xml:547
+#: partitioning.xml:550
#, no-c-format
msgid "Remember to mark your boot partition as <quote>Bootable</quote>."
msgstr "要记得标记您的引导分区为 <quote>Bootable</quote>。"
#. Tag: para
-#: partitioning.xml:550
+#: partitioning.xml:553
#, no-c-format
msgid ""
"One key point when partitioning for Mac type disks is that the swap "
@@ -951,14 +965,14 @@ 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:686
-#: partitioning.xml:800 partitioning.xml:877
+#: partitioning.xml:569 partitioning.xml:593 partitioning.xml:689
+#: partitioning.xml:803 partitioning.xml:880
#, no-c-format
msgid "Partitioning for &arch-title;"
msgstr "为 &arch-title; 准备分区"
#. Tag: para
-#: partitioning.xml:567
+#: partitioning.xml:570
#, no-c-format
msgid ""
"PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
@@ -984,7 +998,7 @@ msgstr ""
"25&ndash;50 MB 一般来说应该足够了。"
#. Tag: para
-#: partitioning.xml:591
+#: partitioning.xml:594
#, no-c-format
msgid ""
"If you have an existing other operating system such as DOS or Windows and "
@@ -1001,7 +1015,7 @@ msgstr ""
"<guimenuitem>Manual</guimenuitem> 选项,然后只需选择已有的分区,更改其尺寸。"
#. Tag: para
-#: partitioning.xml:601
+#: partitioning.xml:604
#, no-c-format
msgid ""
"The PC BIOS generally adds additional constraints for disk partitioning. "
@@ -1019,7 +1033,7 @@ msgstr ""
"的介绍,帮助您在大多数情况下进行规划。"
#. Tag: para
-#: partitioning.xml:611
+#: partitioning.xml:614
#, no-c-format
msgid ""
"<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -1037,7 +1051,7 @@ msgstr ""
"一个扩展分区。"
#. Tag: para
-#: partitioning.xml:622
+#: partitioning.xml:625
#, no-c-format
msgid ""
"Linux limits the partitions per drive to 255 partitions for SCSI disks (3 "
@@ -1053,7 +1067,7 @@ msgstr ""
"过 20 个的分区,除非您首先为这些分区手工创建了设备文件。"
#. Tag: para
-#: partitioning.xml:632
+#: partitioning.xml:635
#, no-c-format
msgid ""
"If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1067,7 +1081,7 @@ msgstr ""
"盘第一个 1024 柱面内(在没有 BIOS 转换的情况下,大约有 524MB)。"
#. Tag: para
-#: partitioning.xml:640
+#: partitioning.xml:643
#, no-c-format
msgid ""
"This restriction doesn't apply if you have a BIOS newer than around "
@@ -1091,7 +1105,7 @@ msgstr ""
"&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
#. Tag: para
-#: partitioning.xml:654
+#: partitioning.xml:657
#, no-c-format
msgid ""
"If you have a large disk, you might have to use cylinder translation "
@@ -1111,7 +1125,7 @@ msgstr ""
"</emphasis>的 1024 柱面内。"
#. Tag: para
-#: partitioning.xml:666
+#: partitioning.xml:669
#, no-c-format
msgid ""
"The recommended way of accomplishing this is to create a small "
@@ -1131,7 +1145,7 @@ msgstr ""
"起作用,甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
#. Tag: para
-#: partitioning.xml:687
+#: partitioning.xml:690
#, no-c-format
msgid ""
"The <command>partman</command> disk partitioner is the default partitioning "
@@ -1145,13 +1159,13 @@ msgstr ""
"<command>parted</command> 来进行磁盘分区的。"
#. Tag: title
-#: partitioning.xml:699
+#: partitioning.xml:702
#, no-c-format
msgid "EFI Recognized Formats"
msgstr "EFI 能够识别的格式"
#. Tag: para
-#: partitioning.xml:700
+#: partitioning.xml:703
#, no-c-format
msgid ""
"The IA-64 EFI firmware supports two partition table (or disk label) formats, "
@@ -1168,7 +1182,7 @@ msgstr ""
"DOS 分区表。"
#. Tag: para
-#: partitioning.xml:712
+#: partitioning.xml:715
#, no-c-format
msgid ""
"The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1182,7 +1196,7 @@ msgstr ""
"配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
#. Tag: para
-#: partitioning.xml:720
+#: partitioning.xml:723
#, no-c-format
msgid ""
"The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1227,13 +1241,13 @@ msgstr ""
"它可能要扫描坏区。"
#. Tag: title
-#: partitioning.xml:745
+#: partitioning.xml:748
#, no-c-format
msgid "Boot Loader Partition Requirements"
msgstr "启动引导器分区要求"
#. Tag: para
-#: partitioning.xml:746
+#: partitioning.xml:749
#, no-c-format
msgid ""
"ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
@@ -1248,7 +1262,7 @@ msgstr ""
"个内核的话,128MB 也许更好。"
#. Tag: para
-#: partitioning.xml:755
+#: partitioning.xml:758
#, no-c-format
msgid ""
"The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1270,7 +1284,7 @@ msgstr ""
"入一个 EFI 分区。"
#. Tag: para
-#: partitioning.xml:770
+#: partitioning.xml:773
#, no-c-format
msgid ""
"It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1280,13 +1294,13 @@ msgstr ""
"盘上。"
#. Tag: title
-#: partitioning.xml:778
+#: partitioning.xml:781
#, no-c-format
msgid "EFI Diagnostic Partitions"
msgstr "EFI 诊断分区"
#. Tag: para
-#: partitioning.xml:779
+#: partitioning.xml:782
#, no-c-format
msgid ""
"The EFI firmware is significantly more sophisticated than the usual BIOS "
@@ -1305,7 +1319,7 @@ msgstr ""
"区的时候。"
#. Tag: para
-#: partitioning.xml:801
+#: partitioning.xml:804
#, no-c-format
msgid ""
"SGI machines require an SGI disk label in order to make the system bootable "
@@ -1321,13 +1335,13 @@ msgstr ""
"入。注意 volume header 必须从 0 号扇区开始。"
#. Tag: title
-#: partitioning.xml:818
+#: partitioning.xml:821
#, no-c-format
msgid "Partitioning Newer PowerMacs"
msgstr "为较新的 PowerMacs 分区"
#. Tag: para
-#: partitioning.xml:819
+#: partitioning.xml:822
#, no-c-format
msgid ""
"If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1349,7 +1363,7 @@ msgstr ""
"command> 里面使用 <userinput>b</userinput> 命令。"
#. Tag: para
-#: partitioning.xml:832
+#: partitioning.xml:835
#, no-c-format
msgid ""
"The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1360,7 +1374,7 @@ msgstr ""
"为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
#. Tag: para
-#: partitioning.xml:839
+#: partitioning.xml:842
#, no-c-format
msgid ""
"Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1377,7 +1391,7 @@ msgstr ""
"command> 工具可以用来维护这个分区。"
#. Tag: para
-#: partitioning.xml:849
+#: partitioning.xml:852
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
@@ -1397,7 +1411,7 @@ msgstr ""
"顺序。"
#. Tag: para
-#: partitioning.xml:861
+#: partitioning.xml:864
#, no-c-format
msgid ""
"Apple disks normally have several small driver partitions. If you intend to "
@@ -1411,7 +1425,7 @@ msgstr ""
"启动的时候,会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
#. Tag: para
-#: partitioning.xml:878
+#: partitioning.xml:881
#, no-c-format
msgid ""
"Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1424,7 +1438,7 @@ msgstr ""
"<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
#. Tag: para
-#: partitioning.xml:886
+#: partitioning.xml:889
#, no-c-format
msgid ""
"Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1443,7 +1457,7 @@ msgstr ""
"或者 UFS 分区在那里;它们将隔离分区表和引导块。"
#. Tag: para
-#: partitioning.xml:897
+#: partitioning.xml:900
#, no-c-format
msgid ""
"It is also advised that the third partition should be of type <quote>Whole "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 28d45509f..e31e20ede 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: 2013-03-04 08:23+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-26 13:45+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1964,15 +1964,22 @@ msgstr ""
#. Tag: para
#: preparing.xml:1367
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Linux on this platform runs either natively on the bare machine, in a so-"
+#| "called LPAR (Logical Partition) or in a virtual machine supplied by the "
+#| "VM system. You can use a boot tape on all of those systems; you may use "
+#| "some other boot media, too, but those may not be generally available. For "
+#| "example, you can use the virtual card reader of a virtual machine, or "
+#| "boot from the HMC (Hardware Management Console) of an LPAR if the HMC and "
+#| "this option is available for you."
msgid ""
"Linux on this platform runs either natively on the bare machine, in a so-"
"called LPAR (Logical Partition) or in a virtual machine supplied by the VM "
-"system. You can use a boot tape on all of those systems; you may use some "
-"other boot media, too, but those may not be generally available. For "
-"example, you can use the virtual card reader of a virtual machine, or boot "
-"from the HMC (Hardware Management Console) of an LPAR if the HMC and this "
-"option is available for you."
+"system. Boot media differs depending on the runtime mode. For example, you "
+"can use the virtual card reader of a virtual machine, or boot from the HMC "
+"(Hardware Management Console) of an LPAR if the HMC and this option is "
+"available for you."
msgstr ""
"Linux 在该平台上可以是本地化方式运行于裸机上,以所谓的 LPAR(Logical "
"Partition) 方式或者 由 VM 系统提供的虚拟机方式。您可以在所有的系统上使用启动"
@@ -1981,7 +1988,7 @@ msgstr ""
"上的 HMC 启动。"
#. Tag: para
-#: preparing.xml:1377
+#: preparing.xml:1376
#, no-c-format
msgid ""
"Before you actually perform an installation, you have to go over some design "
@@ -2002,13 +2009,13 @@ msgstr ""
"回到本文档查看 &debian; 规格的安装步骤。"
#. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1393
#, no-c-format
msgid "Native and LPAR installations"
msgstr "本地化(Native)和 LPAR 安装"
#. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1394
#, no-c-format
msgid ""
"Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2024,13 +2031,13 @@ msgstr ""
"如何为 Linux 建立 LPAR 的部分。"
#. Tag: title
-#: preparing.xml:1409
+#: preparing.xml:1408
#, no-c-format
msgid "Installation as a VM guest"
msgstr "作为一个 VM guest 安装"
#. Tag: para
-#: preparing.xml:1411
+#: preparing.xml:1410
#, no-c-format
msgid ""
"Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2046,7 +2053,7 @@ msgstr ""
"如何为运行 Linux 建立 VM guest 的部分。"
#. Tag: para
-#: preparing.xml:1421
+#: preparing.xml:1420
#, no-c-format
msgid ""
"You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2066,13 +2073,13 @@ msgstr ""
"<filename>debian.exec</filename> 示例脚本,用于按正确次序存放文件。"
#. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1437
#, no-c-format
msgid "Setting up an installation server"
msgstr "建立安装服务器"
#. Tag: para
-#: preparing.xml:1440
+#: preparing.xml:1439
#, no-c-format
msgid ""
"If you don't have a connection to the Internet (either directly or via a web "
@@ -2085,7 +2092,7 @@ msgstr ""
"HTTP 或 FTP 访问。"
#. Tag: para
-#: preparing.xml:1448
+#: preparing.xml:1447
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
@@ -2097,25 +2104,25 @@ msgstr ""
"些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
#. Tag: emphasis
-#: preparing.xml:1457
+#: preparing.xml:1456
#, 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:1464
+#: preparing.xml:1463
#, no-c-format
msgid "Hardware Issues to Watch Out For"
msgstr "需要留心的硬件问题"
#. Tag: title
-#: preparing.xml:1467
+#: preparing.xml:1466
#, no-c-format
msgid "USB BIOS support and keyboards"
msgstr "USB BIOS 支持与键盘"
#. Tag: para
-#: preparing.xml:1468
+#: preparing.xml:1467
#, no-c-format
msgid ""
"If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2132,13 +2139,13 @@ msgstr ""
"keyboard support</quote> 选项。"
#. Tag: title
-#: preparing.xml:1481
+#: preparing.xml:1480
#, no-c-format
msgid "Display-visibility on OldWorld Powermacs"
msgstr "在 OldWorld Powermac 上正常显示"
#. Tag: para
-#: preparing.xml:1483
+#: preparing.xml:1482
#, 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 d920bdbd7..252476ca6 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: 2013-04-16 19:15+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-26 13:49+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -174,8 +174,9 @@ msgstr "基于软盘 (net-drivers)"
#. Tag: entry
#: preseed.xml:108
-#, no-c-format
-msgid "generic/tape"
+#, fuzzy, no-c-format
+#| msgid "generic/tape"
+msgid "generic"
msgstr "generic/tape"
#. Tag: para
@@ -1063,8 +1064,8 @@ msgid ""
"is a file to netboot, but if it appears to be an URL then installation media "
"that support network preseeding will download the file from the URL and use "
"it as a preconfiguration file. Here is an example of how to set it up in the "
-"dhcpd.conf for version 3 of the ISC DHCP server (the isc-dhcp-server &debian; "
-"package)."
+"dhcpd.conf for version 3 of the ISC DHCP server (the isc-dhcp-server "
+"&debian; package)."
msgstr ""
"还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
"netboot 的文件,但如果是一个 URL,那么支持网络预置的安装介质就会从该 URL 下"
@@ -2444,7 +2445,35 @@ msgstr ""
#. Tag: screen
#: preseed.xml:1035
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# You can choose to install non-free and contrib software.\n"
+#| "#d-i apt-setup/non-free boolean true\n"
+#| "#d-i apt-setup/contrib boolean true\n"
+#| "# Uncomment this if you don't want to use a network mirror.\n"
+#| "#d-i apt-setup/use_mirror boolean false\n"
+#| "# Select which update services to use; define the mirrors to be used.\n"
+#| "# Values shown below are the normal defaults.\n"
+#| "#d-i apt-setup/services-select multiselect security, volatile\n"
+#| "#d-i apt-setup/security_host string security.debian.org\n"
+#| "#d-i apt-setup/volatile_host string volatile.debian.org\n"
+#| "\n"
+#| "# Additional repositories, local[0-9] available\n"
+#| "#d-i apt-setup/local0/repository string \\\n"
+#| "# http://local.server/debian stable main\n"
+#| "#d-i apt-setup/local0/comment string local server\n"
+#| "# Enable deb-src lines\n"
+#| "#d-i apt-setup/local0/source boolean true\n"
+#| "# URL to the public key of the local repository; you must provide a key "
+#| "or\n"
+#| "# apt will complain about the unauthenticated repository and so the\n"
+#| "# sources.list line will be left commented out\n"
+#| "#d-i apt-setup/local0/key string http://local.server/key\n"
+#| "\n"
+#| "# By default the installer requires that repositories be authenticated\n"
+#| "# using a known gpg key. This setting can be used to disable that\n"
+#| "# authentication. Warning: Insecure, not recommended.\n"
+#| "#d-i debian-installer/allow_unauthenticated boolean true"
msgid ""
"# You can choose to install non-free and contrib software.\n"
"#d-i apt-setup/non-free boolean true\n"
@@ -2453,9 +2482,8 @@ msgid ""
"#d-i apt-setup/use_mirror boolean false\n"
"# Select which update services to use; define the mirrors to be used.\n"
"# Values shown below are the normal defaults.\n"
-"#d-i apt-setup/services-select multiselect security, volatile\n"
+"#d-i apt-setup/services-select multiselect security, updates\n"
"#d-i apt-setup/security_host string security.debian.org\n"
-"#d-i apt-setup/volatile_host string volatile.debian.org\n"
"\n"
"# Additional repositories, local[0-9] available\n"
"#d-i apt-setup/local0/repository string \\\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 3d856eb27..7e2a865a3 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: 2013-04-01 21:08+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
"PO-Revision-Date: 2012-11-26 15:04+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -3449,14 +3449,21 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2329
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you are installing at default priority, the installer will largely "
+#| "take care of the configuration automatically, based on the installation "
+#| "method you are using and possibly using choices made earlier in the "
+#| "installation. In most cases the installer will automatically add a "
+#| "security mirror and, if you are installing the stable distribution, a "
+#| "mirror for the <quote>volatile</quote> update service."
msgid ""
"If you are installing at default priority, the installer will largely take "
"care of the configuration automatically, based on the installation method "
"you are using and possibly using choices made earlier in the installation. "
"In most cases the installer will automatically add a security mirror and, if "
-"you are installing the stable distribution, a mirror for the "
-"<quote>volatile</quote> update service."
+"you are installing the stable distribution, a mirror for the <quote>stable-"
+"updates</quote> service."
msgstr ""
"如果您在默认优先级下进行安装,安装程序会自动处理大部分配置,它是根据您使用的"
"安装方法以及在安装开始时所做的选择。如果您安装的是稳定版,大多数情况下安装程"
@@ -3464,11 +3471,17 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2338
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you are installing at a lower priority (e.g. in expert mode), you will "
+#| "be able to make more decisions yourself. You can choose whether or not to "
+#| "use the security and/or volatile update services, and you can choose to "
+#| "add packages from the <quote>contrib</quote> and <quote>non-free</quote> "
+#| "sections of the archive."
msgid ""
"If you are installing at a lower priority (e.g. in expert mode), you will be "
"able to make more decisions yourself. You can choose whether or not to use "
-"the security and/or volatile update services, and you can choose to add "
+"the security and/or stable-updates services, and you can choose to add "
"packages from the <quote>contrib</quote> and <quote>non-free</quote> "
"sections of the archive."
msgstr ""
@@ -3672,23 +3685,32 @@ msgstr "已检测的 CD 或 DVD 上的软件包,并且"
#. Tag: para
#: using-d-i.xml:2469
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "whether any updated versions of packages included on the CDs or DVDs are "
+#| "available from a mirror (either a regular package mirror, or a mirror for "
+#| "security or volatile updates)."
msgid ""
"whether any updated versions of packages included on the CDs or DVDs are "
"available from a mirror (either a regular package mirror, or a mirror for "
-"security or volatile updates)."
+"security or stable-updates)."
msgstr ""
"CD 或 DVD 上面的软件包在网络镜像里面是否有更新版本(普通软件包的网络镜像,或者"
"安全更新的镜像)。"
#. Tag: para
#: using-d-i.xml:2478
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that the last point means that, even if you choose not to use a "
+#| "network mirror, some packages may still be downloaded from the Internet "
+#| "if there is a security or volatile update available for them and those "
+#| "services have been configured."
msgid ""
"Note that the last point means that, even if you choose not to use a network "
"mirror, some packages may still be downloaded from the Internet if there is "
-"a security or volatile update available for them and those services have "
-"been configured."
+"a security or stable-updates update available for them and those services "
+"have been configured."
msgstr ""
"注意,最后一点意味着,即使您没有选择使用网络镜像,如果配置了安全检测服务,并"
"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"