summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2006-08-18 17:34:21 +0000
committerFrans Pop <elendil@planet.nl>2006-08-18 17:34:21 +0000
commit1eedcadf865fa0fbcca9b9e2269ea2800527e284 (patch)
treeed5cf3932b5fea89c874aead1483de84b907137a /po/zh_CN
parentb7fa3d89d2de4862e96d1d9f0cd08b74d36faf56 (diff)
downloadinstallation-guide-1eedcadf865fa0fbcca9b9e2269ea2800527e284.zip
Update of POT and PO files for the manual
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/hardware.po592
-rw-r--r--po/zh_CN/install-methods.po195
-rw-r--r--po/zh_CN/partitioning.po101
-rw-r--r--po/zh_CN/post-install.po140
-rw-r--r--po/zh_CN/preseed.po19
5 files changed, 566 insertions, 481 deletions
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 6f3f68189..b428e6f55 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-16 18:10+0000\n"
+"POT-Creation-Date: 2006-08-18 17:32+0000\n"
"PO-Revision-Date: 2006-07-10 10:46+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -329,15 +329,15 @@ msgstr "DECstation"
# index.docbook:173, index.docbook:1002, index.docbook:1017, index.docbook:1027
#. Tag: entry
-#: hardware.xml:133 hardware.xml:1044 hardware.xml:1059 hardware.xml:1069
+#: hardware.xml:133 hardware.xml:1087 hardware.xml:1102 hardware.xml:1112
#, no-c-format
msgid "r4k-kn04"
msgstr "r4k-kn04"
# index.docbook:175, index.docbook:997, index.docbook:1007, index.docbook:1012, index.docbook:1022
#. Tag: entry
-#: hardware.xml:135 hardware.xml:1039 hardware.xml:1049 hardware.xml:1054
-#: hardware.xml:1064
+#: hardware.xml:135 hardware.xml:1082 hardware.xml:1092 hardware.xml:1097
+#: hardware.xml:1107
#, no-c-format
msgid "r3k-kn02"
msgstr "r3k-kn02"
@@ -570,8 +570,8 @@ 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:231 hardware.xml:690 hardware.xml:726 hardware.xml:802
-#: hardware.xml:821 hardware.xml:864 hardware.xml:906 hardware.xml:974
-#: hardware.xml:1133 hardware.xml:1579
+#: hardware.xml:821 hardware.xml:907 hardware.xml:949 hardware.xml:1017
+#: hardware.xml:1176 hardware.xml:1622
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
@@ -1764,7 +1764,7 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:699 hardware.xml:830 hardware.xml:947
+#: hardware.xml:699 hardware.xml:830 hardware.xml:990
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
@@ -1890,36 +1890,66 @@ msgstr ""
#: hardware.xml:831
#, no-c-format
msgid ""
-"Nearly all x86-based processors are supported; this includes AMD and VIA "
-"(former Cyrix) processors as well. Also the new processors like Athlon XP "
-"and Intel P4 Xeon are supported. However, Linux will <emphasis>not</"
-"emphasis> run on 286 or earlier processors."
+"Nearly all x86-based (IA-32) processors still in use in personal computers "
+"are supported, including all varieties of Intel's \"Pentium\" series. This "
+"also includes 32-bits AMD and VIA (former Cyrix) processors, and new "
+"processors like the Athlon XP and Intel P4 Xeon."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:839
+#, no-c-format
+msgid ""
+"If your system has a 64-bits AMD64, Intel EM64t or Intel Core 2 Duo "
+"processor, you will probably want to use the installer for the amd64 "
+"architecture instead of the installer for the (32-bits) i386 architecture."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:846
+#, no-c-format
+msgid ""
+"However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run on "
+"386 or earlier processors. Despite the architecture name \"i386\", Debian "
+"Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors "
+"(and their clones), which were supported by earlier releases<footnote> "
+"<para> We have long tried to avoid this, but in the end it was necessary due "
+"a unfortunate series of issues with the compiler and the kernel, starting "
+"with an bug in the C++ ABI provided by GCC. You should still be able to run "
+"Debian GNU/Linux on actual 80386 processors if you compile your own kernel "
+"and compile all packages from source, but that is beyond the scope of this "
+"manual. </para> </footnote>. (No version of Linux has ever supported the 286 "
+"or earlier chips in the series.) All i486 and later processors are still "
+"supported<footnote> <para> Many Debian packages will actually run slightly "
+"faster on modern computers as a positive side effect of dropping support for "
+"these old chips. The i486, introduced in 1989, has three opcodes (bswap, "
+"cmpxchg, and xadd) which the i386, introduced in 1986, did not have. "
+"Previously, these could not be easily used by most Debian packages; now they "
+"can. </para> </footnote>."
msgstr ""
-"几乎所有的 x86 体系处理器都被支持;同样包括 AMD 和 VIA(前身为 Cyrix)。还包括"
-"支持 Athlon XP 和 Intel P4 Xeon。但是,Linux <emphasis>不能</emphasis>运行在 "
-"286 或更早的处理器上。"
#. Tag: title
-#: hardware.xml:841
+#: hardware.xml:883
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:842
-#, no-c-format
+#: hardware.xml:884
+#, fuzzy, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
"communicate with peripherals such as storage devices. Your computer must use "
"the ISA, EISA, PCI, the Microchannel Architecture (MCA, used in IBM's PS/2 "
-"line), or VESA Local Bus (VLB, sometimes called the VL bus)."
+"line), or VESA Local Bus (VLB, sometimes called the VL bus). Essentially all "
+"personal computers sold in recent years use one of these."
msgstr ""
"系统总线作为主板的一部分用于 CPU 和诸如存储设备之类的周边设备通讯。您的计算机"
"必须使用 ISA、EISA、PCI、微通道(MCA,用于 IBM's PS/2 系列) 或者 VESA Local 总"
"线 (VLB, 有时称为 VL 总线)。"
#. Tag: para
-#: hardware.xml:865
+#: hardware.xml:908
#, no-c-format
msgid ""
"Complete information concerning supported M68000 based "
@@ -1931,7 +1961,7 @@ msgstr ""
"url=\"&url-m68k-faq;\">Linux/m68k FAQ</ulink>。本节只是基本概况。"
#. Tag: para
-#: hardware.xml:872
+#: hardware.xml:915
#, no-c-format
msgid ""
"The &architecture; port of Linux runs on any 680x0 with a PMMU (Paged Memory "
@@ -1947,7 +1977,7 @@ msgstr ""
"了解更多信息。"
#. Tag: para
-#: hardware.xml:880
+#: hardware.xml:923
#, no-c-format
msgid ""
"There are four major supported <emphasis>&architecture;</emphasis> flavors: "
@@ -1970,7 +2000,7 @@ msgstr ""
"Sun3 体系与 NeXT black box,还在进行中,且没有被 Debian 支持。"
#. Tag: para
-#: hardware.xml:907
+#: hardware.xml:950
#, no-c-format
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
@@ -2003,7 +2033,7 @@ msgstr ""
"listname; 邮件列表</ulink>。"
#. Tag: para
-#: hardware.xml:948
+#: hardware.xml:991
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -2021,7 +2051,7 @@ msgstr ""
"在 SMP 模式下获得支持。"
#. Tag: para
-#: hardware.xml:958
+#: hardware.xml:1001
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -2032,7 +2062,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:975
+#: hardware.xml:1018
#, no-c-format
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
@@ -2064,13 +2094,13 @@ msgstr ""
"\"&url-list-subscribe;\"> debian-&arch-listname; 邮件列表</ulink>。"
#. Tag: title
-#: hardware.xml:1015
+#: hardware.xml:1058
#, no-c-format
msgid "CPU/Machine types"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:1017
+#: hardware.xml:1060
#, no-c-format
msgid ""
"Currently only DECstations with R3000 and R4000/R4400 CPUs are supported by "
@@ -2081,120 +2111,120 @@ msgstr ""
"DECstation。Debian 安装系统可以在下列机器上工作:"
#. Tag: entry
-#: hardware.xml:1029
+#: hardware.xml:1072
#, no-c-format
msgid "System Type"
msgstr "系统类型"
#. Tag: entry
-#: hardware.xml:1029
+#: hardware.xml:1072
#, no-c-format
msgid "<entry>CPU</entry>"
msgstr "<entry>CPU</entry>"
#. Tag: entry
-#: hardware.xml:1029
+#: hardware.xml:1072
#, no-c-format
msgid "Code-name"
msgstr "代号(Code-name)"
#. Tag: entry
-#: hardware.xml:1030
+#: hardware.xml:1073
#, no-c-format
msgid "Debian subarchitecture"
msgstr "Debian 子系统"
#. Tag: entry
-#: hardware.xml:1036
+#: hardware.xml:1079
#, no-c-format
msgid "DECstation 5000/1xx"
msgstr "DECstation 5000/1xx"
# index.docbook:995, index.docbook:1005, index.docbook:1010, index.docbook:1020
#. Tag: entry
-#: hardware.xml:1037 hardware.xml:1047 hardware.xml:1052 hardware.xml:1062
+#: hardware.xml:1080 hardware.xml:1090 hardware.xml:1095 hardware.xml:1105
#, no-c-format
msgid "R3000"
msgstr "R3000"
# index.docbook:996, index.docbook:1001
#. Tag: entry
-#: hardware.xml:1038 hardware.xml:1043
+#: hardware.xml:1081 hardware.xml:1086
#, no-c-format
msgid "3MIN"
msgstr "3MIN"
#. Tag: entry
-#: hardware.xml:1041
+#: hardware.xml:1084
#, no-c-format
msgid "DECstation 5000/150"
msgstr "DECstation 5000/150"
# index.docbook:1000, index.docbook:1025
#. Tag: entry
-#: hardware.xml:1042 hardware.xml:1067
+#: hardware.xml:1085 hardware.xml:1110
#, no-c-format
msgid "R4000"
msgstr "R4000"
#. Tag: entry
-#: hardware.xml:1046
+#: hardware.xml:1089
#, no-c-format
msgid "DECstation 5000/200"
msgstr "DECstation 5000/200"
#. Tag: entry
-#: hardware.xml:1048
+#: hardware.xml:1091
#, no-c-format
msgid "3MAX"
msgstr "3MAX"
#. Tag: entry
-#: hardware.xml:1051
+#: hardware.xml:1094
#, no-c-format
msgid "DECstation 5000/240"
msgstr "DECstation 5000/240"
# index.docbook:1011, index.docbook:1016
#. Tag: entry
-#: hardware.xml:1053 hardware.xml:1058
+#: hardware.xml:1096 hardware.xml:1101
#, no-c-format
msgid "3MAX+"
msgstr "3MAX+"
#. Tag: entry
-#: hardware.xml:1056
+#: hardware.xml:1099
#, no-c-format
msgid "DECstation 5000/260"
msgstr "DECstation 5000/260"
#. Tag: entry
-#: hardware.xml:1057
+#: hardware.xml:1100
#, no-c-format
msgid "R4400"
msgstr "R4400"
#. Tag: entry
-#: hardware.xml:1061
+#: hardware.xml:1104
#, no-c-format
msgid "Personal DECstation 5000/xx"
msgstr "Personal DECstation 5000/xx"
# index.docbook:1021, index.docbook:1026
#. Tag: entry
-#: hardware.xml:1063 hardware.xml:1068
+#: hardware.xml:1106 hardware.xml:1111
#, no-c-format
msgid "Maxine"
msgstr "Maxine"
#. Tag: entry
-#: hardware.xml:1066
+#: hardware.xml:1109
#, no-c-format
msgid "Personal DECstation 5000/50"
msgstr "Personal DECstation 5000/50"
#. Tag: para
-#: hardware.xml:1073
+#: hardware.xml:1116
#, no-c-format
msgid ""
"All Cobalt machines are supported. In the past, only machines with a serial "
@@ -2205,7 +2235,7 @@ msgstr ""
"Qube 2700,即 Qube1 之外的机器)。但现在可以通过 SSH 进行安装。"
#. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1123
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board comes with an SB1 1250 chip with two "
@@ -2218,13 +2248,13 @@ msgstr ""
"模式获得支持。"
#. Tag: title
-#: hardware.xml:1090
+#: hardware.xml:1133
#, no-c-format
msgid "Supported console options"
msgstr "支持的控制台选项"
#. Tag: para
-#: hardware.xml:1091
+#: hardware.xml:1134
#, no-c-format
msgid ""
"A serial console is available on all supported DECstations (9600 bps, 8N1). "
@@ -2244,7 +2274,7 @@ msgstr ""
"5000/240 和 5000/260) 上,本地控制台可使用 PMAG-BA 和 PMAGB-B 图形选项。"
#. Tag: para
-#: hardware.xml:1102
+#: hardware.xml:1145
#, no-c-format
msgid ""
"If you have a Linux system to use as serial terminal, an easy way is to run "
@@ -2266,13 +2296,13 @@ msgstr ""
"口号,<literal>-s</literal> (speed) 是设置连接速度(9600 波特率)。"
#. Tag: para
-#: hardware.xml:1120
+#: hardware.xml:1163
#, no-c-format
msgid "Both Cobalt and Broadcom BCM91250A/BCM91480B use 115200 bps."
msgstr "Cobalt 和 Broadcom BCM91250A/BCM91480B 都使用 115200 bps。"
#. Tag: para
-#: hardware.xml:1134
+#: hardware.xml:1177
#, no-c-format
msgid ""
"There are four major supported <emphasis>&architecture;</emphasis> "
@@ -2286,7 +2316,7 @@ msgstr ""
"子体系都有各自的启动方式。并且,还有四种不同的内核变种,以支持不同的 CPU。"
#. Tag: para
-#: hardware.xml:1142
+#: hardware.xml:1185
#, no-c-format
msgid ""
"Ports to other <emphasis>&architecture;</emphasis> architectures, such as "
@@ -2297,13 +2327,13 @@ msgstr ""
"MBX 体系,仍在进行中,还不为 Debian 支持。将来我们也许会有 64 位的移植。"
#. Tag: title
-#: hardware.xml:1150
+#: hardware.xml:1193
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:1152
+#: hardware.xml:1195
#, no-c-format
msgid ""
"There are four flavours of the powerpc kernel in Debian, based on the CPU "
@@ -2311,13 +2341,13 @@ msgid ""
msgstr "在 Debian 中有四种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:1159
+#: hardware.xml:1202
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:1160
+#: hardware.xml:1203
#, no-c-format
msgid ""
"Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
@@ -2328,19 +2358,19 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:1170
+#: hardware.xml:1213
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:1171
+#: hardware.xml:1214
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:1175
+#: hardware.xml:1218
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -2352,7 +2382,7 @@ msgstr ""
"270。"
#. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1224
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -2362,7 +2392,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:1186
+#: hardware.xml:1229
#, no-c-format
msgid ""
"Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
@@ -2371,25 +2401,25 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: term
-#: hardware.xml:1195
+#: hardware.xml:1238
#, no-c-format
msgid "<term>prep</term>"
msgstr "<term>prep</term>"
#. Tag: para
-#: hardware.xml:1196
+#: hardware.xml:1239
#, no-c-format
msgid "This kernel flavour supports the PReP subarchitecture."
msgstr "这种内核支持 PReP 子系统。"
#. Tag: term
-#: hardware.xml:1204
+#: hardware.xml:1247
#, no-c-format
msgid "<term>apus</term>"
msgstr "<term>apus</term>"
#. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1248
#, no-c-format
msgid ""
"This kernel flavour supports the Amiga Power-UP System, though it is "
@@ -2397,13 +2427,13 @@ msgid ""
msgstr "这种内核支持 Amiga Power-UP 系统,当然已经禁用。"
#. Tag: title
-#: hardware.xml:1218
+#: hardware.xml:1261
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:1220
+#: hardware.xml:1263
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -2416,7 +2446,7 @@ msgstr ""
"(Debian 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:1227
+#: hardware.xml:1270
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -2429,7 +2459,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:1235
+#: hardware.xml:1278
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -2444,7 +2474,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:1243
+#: hardware.xml:1286
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -2459,384 +2489,384 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:1259 hardware.xml:1394 hardware.xml:1438 hardware.xml:1467
+#: hardware.xml:1302 hardware.xml:1437 hardware.xml:1481 hardware.xml:1510
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:1260
+#: hardware.xml:1303
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:1266
+#: hardware.xml:1309
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:1267
+#: hardware.xml:1310
#, 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:1268 hardware.xml:1271 hardware.xml:1274 hardware.xml:1277
-#: hardware.xml:1280 hardware.xml:1283 hardware.xml:1286 hardware.xml:1289
-#: hardware.xml:1292 hardware.xml:1295 hardware.xml:1298 hardware.xml:1301
-#: hardware.xml:1304 hardware.xml:1307 hardware.xml:1310 hardware.xml:1313
+#: hardware.xml:1311 hardware.xml:1314 hardware.xml:1317 hardware.xml:1320
+#: hardware.xml:1323 hardware.xml:1326 hardware.xml:1329 hardware.xml:1332
+#: hardware.xml:1335 hardware.xml:1338 hardware.xml:1341 hardware.xml:1344
+#: hardware.xml:1347 hardware.xml:1350 hardware.xml:1353 hardware.xml:1356
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:1270
+#: hardware.xml:1313
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:1273
+#: hardware.xml:1316
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:1276
+#: hardware.xml:1319
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:1279
+#: hardware.xml:1322
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:1282
+#: hardware.xml:1325
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:1285
+#: hardware.xml:1328
#, 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:1288
+#: hardware.xml:1331
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:1291
+#: hardware.xml:1334
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:1294
+#: hardware.xml:1337
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:1297
+#: hardware.xml:1340
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:1300
+#: hardware.xml:1343
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:1303
+#: hardware.xml:1346
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:1306
+#: hardware.xml:1349
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:1309
+#: hardware.xml:1352
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:1312
+#: hardware.xml:1355
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:1315
+#: hardware.xml:1358
#, 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:1316 hardware.xml:1319 hardware.xml:1322 hardware.xml:1325
-#: hardware.xml:1328 hardware.xml:1331 hardware.xml:1334 hardware.xml:1337
-#: hardware.xml:1340 hardware.xml:1343 hardware.xml:1346 hardware.xml:1349
-#: hardware.xml:1355 hardware.xml:1358 hardware.xml:1364 hardware.xml:1370
-#: hardware.xml:1376
+#: hardware.xml:1359 hardware.xml:1362 hardware.xml:1365 hardware.xml:1368
+#: hardware.xml:1371 hardware.xml:1374 hardware.xml:1377 hardware.xml:1380
+#: hardware.xml:1383 hardware.xml:1386 hardware.xml:1389 hardware.xml:1392
+#: hardware.xml:1398 hardware.xml:1401 hardware.xml:1407 hardware.xml:1413
+#: hardware.xml:1419
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:1318
+#: hardware.xml:1361
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:1321
+#: hardware.xml:1364
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:1324
+#: hardware.xml:1367
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:1327
+#: hardware.xml:1370
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:1330
+#: hardware.xml:1373
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:1333
+#: hardware.xml:1376
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:1336
+#: hardware.xml:1379
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:1339
+#: hardware.xml:1382
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:1342
+#: hardware.xml:1385
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:1345
+#: hardware.xml:1388
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:1348
+#: hardware.xml:1391
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:1353
+#: hardware.xml:1396
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:1354
+#: hardware.xml:1397
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:1357
+#: hardware.xml:1400
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:1362
+#: hardware.xml:1405
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:1363
+#: hardware.xml:1406
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:1368
+#: hardware.xml:1411
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:1369
+#: hardware.xml:1412
#, 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:1374 hardware.xml:1400
+#: hardware.xml:1417 hardware.xml:1443
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:1375
+#: hardware.xml:1418
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:1384
+#: hardware.xml:1427
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1401
+#: hardware.xml:1444
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:1403
+#: hardware.xml:1446
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:1405
+#: hardware.xml:1448
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:1407
+#: hardware.xml:1450
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:1409
+#: hardware.xml:1452
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:1413 hardware.xml:1444
+#: hardware.xml:1456 hardware.xml:1487
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:1414
+#: hardware.xml:1457
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:1416
+#: hardware.xml:1459
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:1418
+#: hardware.xml:1461
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:1420
+#: hardware.xml:1463
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:1428
+#: hardware.xml:1471
#, no-c-format
msgid "CHRP subarchitecture"
msgstr "CHRP 子体系"
#. Tag: entry
-#: hardware.xml:1445
+#: hardware.xml:1488
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:1448
+#: hardware.xml:1491
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:1449
+#: hardware.xml:1492
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: title
-#: hardware.xml:1457
+#: hardware.xml:1500
#, no-c-format
msgid "APUS subarchitecture"
msgstr "APUS 子体系"
#. Tag: entry
-#: hardware.xml:1473
+#: hardware.xml:1516
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:1474
+#: hardware.xml:1517
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:1482
+#: hardware.xml:1525
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 自体系 (未支持)"
#. Tag: para
-#: hardware.xml:1484
+#: hardware.xml:1527
#, no-c-format
msgid ""
"NuBus systems are not currently supported by Debian/powerpc. The monolithic "
@@ -2860,13 +2890,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:1521
+#: hardware.xml:1564
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:1523
+#: hardware.xml:1566
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -2882,7 +2912,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1532
+#: hardware.xml:1575
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -2897,7 +2927,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1540
+#: hardware.xml:1583
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -2908,25 +2938,23 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1556
+#: hardware.xml:1599
#, no-c-format
msgid "S/390 and zSeries machine types"
msgstr "S/390 与 zSeries 机器类型"
#. Tag: para
-#: hardware.xml:1557
-#, no-c-format
+#: hardware.xml:1600
+#, fuzzy, no-c-format
msgid ""
"Complete information regarding supported S/390 and zSeries machines can be "
"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://oss."
-"software.ibm.com/developerworks/opensource/linux390/documentation-2.4.shtml"
-"\">technical details web page</ulink> at <ulink url=\"http://oss.software."
-"ibm.com/developerworks/opensource/linux390/index.shtml\">developerWorks</"
-"ulink>. In short, G5, Multiprise 3000, G6 and all zSeries are fully "
-"supported; Multiprise 2000, G3 and G4 machines are supported with IEEE "
-"floating point emulation and thus degraded performance."
+"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
+"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
+"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
+"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
+"IEEE floating point emulation and thus degraded performance."
msgstr ""
"有关 S/390 和 zSeries 机器支持的完整信息参见 IBM 的 Redbook <ulink url="
"\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for "
@@ -2939,7 +2967,7 @@ msgstr ""
"拟来支持,因此会降低性能。"
#. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1623
#, no-c-format
msgid ""
"Currently the <emphasis>&architecture;</emphasis> port supports several "
@@ -2967,13 +2995,13 @@ msgstr ""
"息。"
#. Tag: title
-#: hardware.xml:1600
+#: hardware.xml:1643
#, no-c-format
msgid "Memory Configuration"
msgstr "内存配置"
#. Tag: para
-#: hardware.xml:1601
+#: hardware.xml:1644
#, no-c-format
msgid ""
"Some older Sun workstations, notably the Sun IPX and Sun IPC have memory "
@@ -2989,7 +3017,7 @@ msgstr ""
"Exception</quote>。"
#. Tag: para
-#: hardware.xml:1610
+#: hardware.xml:1653
#, no-c-format
msgid ""
"Thus you must configure the memory so that the lowest memory block is "
@@ -3003,7 +3031,7 @@ msgstr ""
"槽,用来储存内核与 RAMdisk。因此,4Mb 就<emphasis>不</emphasis>够用了。"
#. Tag: para
-#: hardware.xml:1618
+#: hardware.xml:1661
#, no-c-format
msgid ""
"Example: In a Sun IPX you have a 16Mb SIMM and a 4Mb SIMM. There are four "
@@ -3016,13 +3044,13 @@ msgstr ""
"上;然后按推荐方法 将 4Mb SIMM 插在插槽 2 上。"
#. Tag: title
-#: hardware.xml:1629
+#: hardware.xml:1672
#, no-c-format
msgid "Graphics Configuration"
msgstr "图形配置"
#. Tag: para
-#: hardware.xml:1630
+#: hardware.xml:1673
#, no-c-format
msgid ""
"Especially in the case of older Sun workstations, it is very common for "
@@ -3036,7 +3064,7 @@ msgstr ""
"这不会造成任何问题,因为它们都会被初始化。"
#. Tag: para
-#: hardware.xml:1639
+#: hardware.xml:1682
#, no-c-format
msgid ""
"However with Linux this can cause a problem, in that the boot PROM monitor "
@@ -3050,7 +3078,7 @@ msgstr ""
"emphasis>在屏幕上留下任何错误信息,表面上机器仍然加载 RAMdisk。"
#. Tag: para
-#: hardware.xml:1647
+#: hardware.xml:1690
#, no-c-format
msgid ""
"To avoid this problem, connect the monitor (if required) to the video card "
@@ -3061,13 +3089,13 @@ msgstr ""
"上计数低于外接槽)。另外一个方法是使用串行控制台。"
#. Tag: title
-#: hardware.xml:1659
+#: hardware.xml:1702
#, no-c-format
msgid "Graphics Card"
msgstr "图形卡"
#. Tag: para
-#: hardware.xml:1660
+#: hardware.xml:1703
#, no-c-format
msgid ""
"You should be using a VGA-compatible display interface for the console "
@@ -3081,7 +3109,7 @@ msgstr ""
"的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
-#: hardware.xml:1668
+#: hardware.xml:1711
#, no-c-format
msgid ""
"Debian's support for graphical interfaces is determined by the underlying "
@@ -3095,7 +3123,7 @@ msgstr ""
"<ulink url=\"&url-xorg;\"></ulink>。Debian &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1677
+#: hardware.xml:1720
#, no-c-format
msgid ""
"The X.Org X11 window system is only supported on the SGI Indy and the O2. "
@@ -3110,7 +3138,7 @@ msgstr ""
"hardware;\">兼容列表</ulink>。"
#. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1729
#, no-c-format
msgid ""
"The X.Org X11 window system is supported on some DECstation models. The "
@@ -3125,13 +3153,13 @@ msgstr ""
"hardware;\">兼容列表</ulink>。"
#. Tag: title
-#: hardware.xml:1697
+#: hardware.xml:1740
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1698
+#: hardware.xml:1741
#, no-c-format
msgid ""
"Laptops are also supported. Laptops are often specialized or contain "
@@ -3144,13 +3172,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1709 hardware.xml:1731 hardware.xml:1751 hardware.xml:1774
+#: hardware.xml:1752 hardware.xml:1774 hardware.xml:1794 hardware.xml:1817
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1710
+#: hardware.xml:1753
#, no-c-format
msgid ""
"Multi-processor support &mdash; also called <quote>symmetric multi-"
@@ -3165,7 +3193,7 @@ msgstr ""
"以这并不会影响安装。"
#. Tag: para
-#: hardware.xml:1718
+#: hardware.xml:1761
#, no-c-format
msgid ""
"In order to optimize the kernel for single CPU systems, you'll have to "
@@ -3181,7 +3209,7 @@ msgstr ""
"选择 <quote>&smp-config-option;</quote>。"
#. Tag: para
-#: hardware.xml:1733
+#: hardware.xml:1776
#, fuzzy, no-c-format
msgid ""
"Multi-processor support &mdash; also called <quote>symmetric multi-"
@@ -3197,7 +3225,7 @@ msgstr ""
"以这并不会影响安装。"
#. Tag: para
-#: hardware.xml:1742
+#: hardware.xml:1785
#, no-c-format
msgid ""
"The 486 flavour of the Debian kernel image packages for &arch-title; is not "
@@ -3205,7 +3233,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:1752
+#: hardware.xml:1795
#, no-c-format
msgid ""
"Multi-processor support &mdash; also called <quote>symmetric multi-"
@@ -3220,7 +3248,7 @@ msgstr ""
"用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1761
+#: hardware.xml:1804
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -3236,7 +3264,7 @@ msgstr ""
"config-option;</quote>。"
#. Tag: para
-#: hardware.xml:1775
+#: hardware.xml:1818
#, no-c-format
msgid ""
"Multi-processor support &mdash; also called <quote>symmetric multi-"
@@ -3252,7 +3280,7 @@ msgstr ""
"因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1785
+#: hardware.xml:1828
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -3270,13 +3298,13 @@ msgstr ""
"<quote>&smp-config-option;</quote>。"
#. Tag: title
-#: hardware.xml:1806
+#: hardware.xml:1849
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1808
+#: hardware.xml:1851
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -3292,13 +3320,13 @@ msgstr ""
"要返回来参考本页。"
#. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1862
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1820
+#: hardware.xml:1863
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -3309,19 +3337,19 @@ msgstr ""
"(1440kB)软驱。"
#. Tag: para
-#: hardware.xml:1826
+#: hardware.xml:1869
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1833
+#: hardware.xml:1876
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1835
+#: hardware.xml:1878
#, no-c-format
msgid ""
"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -3334,7 +3362,7 @@ msgstr ""
"IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
#. Tag: para
-#: hardware.xml:1842
+#: hardware.xml:1885
#, no-c-format
msgid ""
"CD-ROM based installation is supported for some architectures. On machines "
@@ -3352,7 +3380,7 @@ msgstr ""
"installer\"/>。"
#. Tag: para
-#: hardware.xml:1854
+#: hardware.xml:1897
#, no-c-format
msgid ""
"Both SCSI and IDE/ATAPI CD-ROMs are supported. In addition, all non-standard "
@@ -3370,7 +3398,7 @@ msgstr ""
"用 CD-ROM 详尽的信息。"
#. Tag: para
-#: hardware.xml:1864
+#: hardware.xml:1907
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -3380,7 +3408,7 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:1869
+#: hardware.xml:1912
#, no-c-format
msgid ""
"Both SCSI and IDE/ATAPI CD-ROMs are supported on &arch-title;, as long as "
@@ -3396,7 +3424,7 @@ msgstr ""
"制台支持,请参阅 <ulink url=\"&url-srm-howto;\">SRM HOWTO</ulink>。"
#. Tag: para
-#: hardware.xml:1878
+#: hardware.xml:1921
#, no-c-format
msgid ""
"IDE/ATAPI CD-ROMs are supported on all ARM machines. On RiscPCs, SCSI CD-"
@@ -3405,7 +3433,7 @@ msgstr ""
"所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。在 RiscPC 上,SCSI CD-ROM 也被支持。"
#. Tag: para
-#: hardware.xml:1883
+#: hardware.xml:1926
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -3430,7 +3458,7 @@ msgstr ""
"需要一个 PCI IDE、SATA 或 SCSI 卡。"
#. Tag: para
-#: hardware.xml:1898
+#: hardware.xml:1941
#, no-c-format
msgid ""
"On DECstations, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -3445,7 +3473,7 @@ msgstr ""
"线,请将其置于 <quote>Unix</quote> 或 <quote>512</quote> 的位置上。"
#. Tag: para
-#: hardware.xml:1907
+#: hardware.xml:1950
#, no-c-format
msgid ""
"CD 1 contains the installer for the r3k-kn02 subarchitecture (the R3000-"
@@ -3460,7 +3488,7 @@ msgstr ""
"站)。"
#. Tag: para
-#: hardware.xml:1916
+#: hardware.xml:1959
#, no-c-format
msgid ""
"To boot from CD, issue the command <userinput>boot <replaceable>#</"
@@ -3478,7 +3506,7 @@ msgstr ""
"额外的参数,可以按照下面语法选择添加:"
#. Tag: userinput
-#: hardware.xml:1928
+#: hardware.xml:1971
#, no-c-format
msgid ""
"boot <replaceable>#</replaceable>/rz<replaceable>id</replaceable> "
@@ -3488,13 +3516,13 @@ msgstr ""
"param1=value1 param2=value2 ..."
#. Tag: title
-#: hardware.xml:1935
+#: hardware.xml:1978
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:1937
+#: hardware.xml:1980
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -3505,7 +3533,7 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: hardware.xml:1943
+#: hardware.xml:1986
#, no-c-format
msgid ""
"In fact, installation from your local disk is the preferred installation "
@@ -3513,7 +3541,7 @@ msgid ""
msgstr "事实上,从本地磁盘安装,对大多数 &architecture; 机器是推荐的做法。"
#. Tag: para
-#: hardware.xml:1948
+#: hardware.xml:1991
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -3523,13 +3551,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:1956
+#: hardware.xml:1999
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1958
+#: hardware.xml:2001
#, no-c-format
msgid ""
"Many Debian boxes need their floppy and/or CD-ROM drives only for setting up "
@@ -3544,13 +3572,13 @@ msgstr ""
"系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
#. Tag: title
-#: hardware.xml:1970
+#: hardware.xml:2013
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1972
+#: hardware.xml:2015
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> your system over the network. <phrase "
@@ -3560,7 +3588,7 @@ msgstr ""
"是在 Mips 下推荐的安装技术</phrase>"
#. Tag: para
-#: hardware.xml:1978
+#: hardware.xml:2021
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -3570,7 +3598,7 @@ msgstr ""
"择。"
#. Tag: para
-#: hardware.xml:1983
+#: hardware.xml:2026
#, no-c-format
msgid ""
"After the operating system kernel is installed, you can install the rest of "
@@ -3581,13 +3609,13 @@ msgstr ""
"以后使用 PPP) 通过 FTP 或 HTTP 完成剩余的系统安装任务。"
#. Tag: title
-#: hardware.xml:1992
+#: hardware.xml:2035
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:1994
+#: hardware.xml:2037
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -3601,13 +3629,13 @@ msgstr ""
"户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/>。"
#. Tag: title
-#: hardware.xml:2006
+#: hardware.xml:2049
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:2008
+#: hardware.xml:2051
#, no-c-format
msgid ""
"The Debian boot disks contain a kernel which is built to maximize the number "
@@ -3623,7 +3651,7 @@ msgstr ""
"设计,这将使得 Debian 可以在尽可能多的硬件上安装。"
#. Tag: para
-#: hardware.xml:2018
+#: hardware.xml:2061
#, no-c-format
msgid ""
"Generally, the Debian installation system includes support for floppies, IDE "
@@ -3635,7 +3663,7 @@ msgstr ""
"制器和驱动器、USB 和火线。文件系统支持 FAT、Win-32 FAT 扩展(VFAT)、NTFS。"
#. Tag: para
-#: hardware.xml:2025
+#: hardware.xml:2068
#, no-c-format
msgid ""
"Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -3652,7 +3680,7 @@ msgstr ""
"ulink> 以获得更详细信息。"
#. Tag: para
-#: hardware.xml:2035
+#: hardware.xml:2078
#, no-c-format
msgid ""
"Pretty much all storage systems supported by the Linux kernel are supported "
@@ -3668,7 +3696,7 @@ msgstr ""
"支持 Atari(FAT) 文件系统。Amigas 支持 FAT 文件系统,HFS 则是受模块支持。"
#. Tag: para
-#: hardware.xml:2045
+#: hardware.xml:2088
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3690,7 +3718,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:2078
+#: hardware.xml:2121
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3705,7 +3733,7 @@ msgstr ""
"Jensen 启动的信息)"
#. Tag: para
-#: hardware.xml:2087
+#: hardware.xml:2130
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3716,7 +3744,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:2093
+#: hardware.xml:2136
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3727,7 +3755,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:2099
+#: hardware.xml:2142
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3735,7 +3763,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:2104
+#: hardware.xml:2147
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3747,13 +3775,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:2121
+#: hardware.xml:2164
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:2122
+#: hardware.xml:2165
#, no-c-format
msgid ""
"Linux supports a large variety of hardware devices such as mice, printers, "
@@ -3764,7 +3792,7 @@ msgstr ""
"而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:2128
+#: hardware.xml:2171
#, no-c-format
msgid ""
"USB hardware generally works fine, only some USB keyboards may require "
@@ -3774,7 +3802,7 @@ msgstr ""
"\"usb-keyboard-config\"/>)。"
#. Tag: para
-#: hardware.xml:2134
+#: hardware.xml:2177
#, no-c-format
msgid ""
"Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -3785,7 +3813,7 @@ msgstr ""
"Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
#. Tag: para
-#: hardware.xml:2140
+#: hardware.xml:2183
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -3796,7 +3824,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:2146
+#: hardware.xml:2189
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3807,7 +3835,7 @@ msgstr ""
"口。Broadcom BCM91480B 开发板有四个 64 位 PCI 插槽。"
#. Tag: para
-#: hardware.xml:2152
+#: hardware.xml:2195
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3820,13 +3848,13 @@ msgstr ""
"备,但 Qube 上有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:2162
+#: hardware.xml:2205
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/Linux"
msgstr "特别为 GNU/Linux 采购硬件"
#. Tag: para
-#: hardware.xml:2164
+#: hardware.xml:2207
#, no-c-format
msgid ""
"There are several vendors, who ship systems with Debian or other "
@@ -3840,7 +3868,7 @@ msgstr ""
"因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:2172
+#: hardware.xml:2215
#, no-c-format
msgid ""
"Unfortunately, it's quite rare to find any vendor shipping new &arch-title; "
@@ -3848,7 +3876,7 @@ msgid ""
msgstr "不幸的是,很少会有厂商出售新 &arch-title; 机器。"
#. Tag: para
-#: hardware.xml:2177
+#: hardware.xml:2220
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -3862,7 +3890,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:2185
+#: hardware.xml:2228
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with Linux bundled, or even a "
@@ -3876,13 +3904,13 @@ msgstr ""
"他)知道您是在为一个 Linux 系统采购设备。请支持对 Linux 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:2196
+#: hardware.xml:2239
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:2197
+#: hardware.xml:2240
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -3894,7 +3922,7 @@ msgstr ""
"不公开的契约才能接触文档,以阻止我们发布 Linux 驱动程序源代码。"
#. Tag: para
-#: hardware.xml:2204
+#: hardware.xml:2247
#, no-c-format
msgid ""
"Another example is the proprietary hardware in the older Macintosh line. In "
@@ -3911,7 +3939,7 @@ msgstr ""
"之,这就是为什么向 Macintosh 移植 Linux 的进度总是滞后于其他移植版的原因。"
#. Tag: para
-#: hardware.xml:2215
+#: hardware.xml:2258
#, no-c-format
msgid ""
"Since we haven't been granted access to the documentation on these devices, "
@@ -3924,13 +3952,13 @@ msgstr ""
"软件社区也是一个重要的市场。"
#. Tag: title
-#: hardware.xml:2227
+#: hardware.xml:2270
#, no-c-format
msgid "Windows-specific Hardware"
msgstr "Windows 专用硬件"
#. Tag: para
-#: hardware.xml:2228
+#: hardware.xml:2271
#, no-c-format
msgid ""
"A disturbing trend is the proliferation of Windows-specific modems and "
@@ -3952,7 +3980,7 @@ msgstr ""
"等功能的保留内嵌处理器的设备昂贵。"
#. Tag: para
-#: hardware.xml:2241
+#: hardware.xml:2284
#, no-c-format
msgid ""
"You should avoid Windows-specific hardware for two reasons. The first is "
@@ -3983,7 +4011,7 @@ msgstr ""
"是 Windows 2000 或 XP,都要忍受这些制造商克扣内嵌处理器造成的性能下降。"
#. Tag: para
-#: hardware.xml:2262
+#: hardware.xml:2305
#, no-c-format
msgid ""
"You can help improve this situation by encouraging these manufacturers to "
@@ -3997,13 +4025,13 @@ msgstr ""
"hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>。"
#. Tag: title
-#: hardware.xml:2275
+#: hardware.xml:2318
#, no-c-format
msgid "Fake or <quote>Virtual</quote> Parity RAM"
msgstr "假的或<quote>虚拟</quote>的奇偶校验内存"
#. Tag: para
-#: hardware.xml:2276
+#: hardware.xml:2319
#, no-c-format
msgid ""
"If you ask for Parity RAM in a computer store, you'll probably get "
@@ -4026,7 +4054,7 @@ msgstr ""
"奇偶校验多付钱。而应该为真奇偶校验 SIMM 多付,因为您真正为每8位多买了一位。"
#. Tag: para
-#: hardware.xml:2291
+#: hardware.xml:2334
#, no-c-format
msgid ""
"If you want complete information on &arch-title; RAM issues, and what is the "
@@ -4037,19 +4065,19 @@ msgstr ""
"参考 <ulink url=\"&url-pc-hw-faq;\">PC Hardware FAQ</ulink>。"
#. Tag: para
-#: hardware.xml:2297
+#: hardware.xml:2340
#, no-c-format
msgid "Most, if not all, Alpha systems require true-parity RAM."
msgstr "大多数的,但不是全部的,Alpha 系统都要求用真奇偶校验内存。"
#. Tag: title
-#: hardware.xml:2312
+#: hardware.xml:2355
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:2314
+#: hardware.xml:2357
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -4065,7 +4093,7 @@ msgstr ""
"要几个 G 的空间。"
#. Tag: para
-#: hardware.xml:2323
+#: hardware.xml:2366
#, no-c-format
msgid ""
"On the Amiga the size of FastRAM is relevant towards the total memory "
@@ -4080,7 +4108,7 @@ msgstr ""
"的内核可以自动禁止 16 位的 RAM。"
#. Tag: para
-#: hardware.xml:2332
+#: hardware.xml:2375
#, no-c-format
msgid ""
"On the Atari, both ST-RAM and Fast RAM (TT-RAM) are used by Linux. Many "
@@ -4093,7 +4121,7 @@ msgstr ""
"MB 的 ST-RAM。您需要额外的 12 MB 或更多的 TT-RAM。"
#. Tag: para
-#: hardware.xml:2340
+#: hardware.xml:2383
#, no-c-format
msgid ""
"On the Macintosh, care should be taken on machines with RAM-based video "
@@ -4106,19 +4134,19 @@ msgstr ""
"要 4 MB。"
#. Tag: emphasis
-#: hardware.xml:2350
+#: hardware.xml:2393
#, no-c-format
msgid "FIXME: is this still true?"
msgstr "FIXME: is this still true?"
#. Tag: title
-#: hardware.xml:2361
+#: hardware.xml:2404
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:2363
+#: hardware.xml:2406
#, no-c-format
msgid ""
"Most PCI and many older ISA network cards are supported. Some network "
@@ -4137,7 +4165,7 @@ msgstr ""
"指导。安装系统还不支持 FDDI 网络和协议。"
#. Tag: para
-#: hardware.xml:2382
+#: hardware.xml:2425
#, no-c-format
msgid ""
"As for ISDN, the D-channel protocol for the (old) German 1TR6 is not "
@@ -4147,7 +4175,7 @@ msgstr ""
"ISDN 板也不被 &d-i; 支持。"
#. Tag: para
-#: hardware.xml:2390
+#: hardware.xml:2433
#, no-c-format
msgid ""
"Any network interface card (NIC) supported by the Linux kernel should also "
@@ -4160,7 +4188,7 @@ msgstr ""
"解详细信息。"
#. Tag: para
-#: hardware.xml:2399
+#: hardware.xml:2442
#, no-c-format
msgid ""
"The following network interface cards (NICs) are supported from the bootable "
@@ -4168,19 +4196,19 @@ msgid ""
msgstr "下列网络接口卡(NIC)被引导内核直接支持:"
#. Tag: para
-#: hardware.xml:2405
+#: hardware.xml:2448
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:2411
+#: hardware.xml:2454
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:2419
+#: hardware.xml:2462
#, no-c-format
msgid ""
"The following network interface cards are supported as modules. They can be "
@@ -4191,27 +4219,27 @@ msgstr ""
"OpenPROM 的魔力,您可以从这些设备启动:"
#. Tag: para
-#: hardware.xml:2427
+#: hardware.xml:2470
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:2433
+#: hardware.xml:2476
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:2438
+#: hardware.xml:2481
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
# index.docbook:2337, index.docbook:2343, index.docbook:2349, index.docbook:2355, index.docbook:2361
#. Tag: para
-#: hardware.xml:2445 hardware.xml:2451 hardware.xml:2457 hardware.xml:2463
-#: hardware.xml:2469
+#: hardware.xml:2488 hardware.xml:2494 hardware.xml:2500 hardware.xml:2506
+#: hardware.xml:2512
#, no-c-format
msgid ""
"Any network interface card (NIC) supported by the Linux kernel should also "
@@ -4222,7 +4250,7 @@ msgstr ""
"驱动作为模块挂载。"
#. Tag: para
-#: hardware.xml:2475
+#: hardware.xml:2518
#, no-c-format
msgid ""
"Due to kernel limitations only the onboard network interfaces on DECstations "
@@ -4232,7 +4260,7 @@ msgstr ""
"还 不能工作。"
#. Tag: para
-#: hardware.xml:2481
+#: hardware.xml:2524
#, no-c-format
msgid ""
"Any network interface card (NIC) supported by the Linux kernel is also be "
@@ -4245,32 +4273,32 @@ msgstr ""
"表为:"
#. Tag: para
-#: hardware.xml:2489
+#: hardware.xml:2532
#, 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:2494
+#: hardware.xml:2537
#, 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:2499
+#: hardware.xml:2542
#, no-c-format
msgid ""
"Inter-User Communication Vehicle (IUCV) &mdash; available for VM guests only"
msgstr "Inter-User Communication Vehicle (IUCV) &mdash; 仅对 VM guests 有效"
#. Tag: para
-#: hardware.xml:2504
+#: hardware.xml:2547
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:2513
+#: hardware.xml:2556
#, no-c-format
msgid ""
"The following network interface cards are supported directly by the boot "
@@ -4278,19 +4306,19 @@ msgid ""
msgstr "以下网络接口卡在 Netwinder 和 CATS 机器上被安装盘直接支持:"
#. Tag: para
-#: hardware.xml:2519
+#: hardware.xml:2562
#, no-c-format
msgid "PCI-based NE2000"
msgstr "PCI-based NE2000"
#. Tag: para
-#: hardware.xml:2525
+#: hardware.xml:2568
#, no-c-format
msgid "DECchip Tulip"
msgstr "DECchip Tulip"
#. Tag: para
-#: hardware.xml:2532
+#: hardware.xml:2575
#, no-c-format
msgid ""
"The following network interface cards are supported directly by the boot "
@@ -4298,25 +4326,25 @@ msgid ""
msgstr "下列网络接口卡在 RiscPC 上被安装盘直接支持:"
#. Tag: para
-#: hardware.xml:2538
+#: hardware.xml:2581
#, no-c-format
msgid "Ether1"
msgstr "Ether1"
#. Tag: para
-#: hardware.xml:2543
+#: hardware.xml:2586
#, no-c-format
msgid "Ether3"
msgstr "Ether3"
#. Tag: para
-#: hardware.xml:2548
+#: hardware.xml:2591
#, no-c-format
msgid "EtherH"
msgstr "EtherH"
#. Tag: para
-#: hardware.xml:2555
+#: hardware.xml:2598
#, no-c-format
msgid ""
"If your card is mentioned in the lists above, the complete installation can "
@@ -4326,7 +4354,7 @@ msgstr ""
"盘。"
#. Tag: para
-#: hardware.xml:2561
+#: hardware.xml:2604
#, no-c-format
msgid ""
"Any other network interface card (NIC) supported by the Linux kernel should "
@@ -4337,6 +4365,16 @@ msgstr ""
"任何受 Linux 内核支持的网络接口卡(NIC)也全都被引导盘所支持。您可能需要将网络"
"驱动作为模块挂载。这意味着您不得不使用其他介质来安装操作系统内核。"
+#~ msgid ""
+#~ "Nearly all x86-based processors are supported; this includes AMD and VIA "
+#~ "(former Cyrix) processors as well. Also the new processors like Athlon XP "
+#~ "and Intel P4 Xeon are supported. However, Linux will <emphasis>not</"
+#~ "emphasis> run on 286 or earlier processors."
+#~ msgstr ""
+#~ "几乎所有的 x86 体系处理器都被支持;同样包括 AMD 和 VIA(前身为 Cyrix)。还包"
+#~ "括支持 Athlon XP 和 Intel P4 Xeon。但是,Linux <emphasis>不能</emphasis>运"
+#~ "行在 286 或更早的处理器上。"
+
#~ msgid "vanilla"
#~ msgstr "vanilla"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 3933b2c39..668022849 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-16 18:10+0000\n"
+"POT-Creation-Date: 2006-08-18 17:32+0000\n"
"PO-Revision-Date: 2006-08-10 10:52+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1607,9 +1607,9 @@ msgstr "设置 RARP 服务器"
#. Tag: para
#: install-methods.xml:1157
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"To setup RARP, you need to know the Ethernet address (a.k.a. the MAC "
+"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
"address) of the client computers to be installed. If you don't know this "
"information, you can <phrase arch=\"sparc\"> pick it off the initial "
"OpenPROM boot messages, use the OpenBoot <userinput>.enet-addr</userinput> "
@@ -1625,61 +1625,17 @@ msgstr ""
#. Tag: para
#: install-methods.xml:1169
-#, no-c-format
-msgid ""
-"On a RARP server system using a Linux 2.2.x kernel, you need to populate the "
-"kernel's RARP table. To do this, run the following commands: "
-"<informalexample><screen>\n"
-"# <userinput>/sbin/rarp -s\n"
-"<replaceable>client-hostname</replaceable>\n"
-"<replaceable>client-enet-addr</replaceable></userinput>\n"
-"\n"
-"# <userinput>/usr/sbin/arp -s\n"
-"<replaceable>client-ip</replaceable>\n"
-"<replaceable>client-enet-addr</replaceable></userinput>\n"
-"</screen></informalexample> If you get <informalexample><screen>\n"
-"SIOCSRARP: Invalid argument\n"
-"</screen></informalexample> you probably need to load the RARP kernel module "
-"or else recompile the kernel to support RARP. Try <userinput>modprobe rarp</"
-"userinput> and then try the <command>rarp</command> command again."
-msgstr ""
-"在使用 Linux 2.2.x 内核的 RARP 服务器系统上,您需要通以下的命令来植入内核 "
-"RARP 表: <informalexample><screen>\n"
-"# <userinput>/sbin/rarp -s \n"
-"<replaceable>client-hostname</replaceable>\n"
-"<replaceable>client-enet-addr</replaceable></userinput>\n"
-"\n"
-"# <userinput>/usr/sbin/arp -s \n"
-"<replaceable>client-ip</replaceable>\n"
-"<replaceable>client-enet-addr</replaceable></userinput>\n"
-"</screen></informalexample> 如果看到 <informalexample><screen>\n"
-"SIOCSRARP: Invalid argument\n"
-"</screen></informalexample> 您可能需要加载 RARP 内核模块或重新编译内核并使之"
-"支持 RARP。试试在运行 <userinput>modprobe rarp</userinput> 命令后再尝试一遍 "
-"<command>rarp</command> 命令。"
-
-#. Tag: para
-#: install-methods.xml:1185
-#, no-c-format
-msgid ""
-"On a RARP server system using a Linux 2.4.x kernel, there is no RARP module, "
-"and you should instead use the <command>rarpd</command> program. The "
-"procedure is similar to that used under SunOS in the following paragraph."
-msgstr ""
-"使用 Linux 2.4.x 内核的 RARP 服务器系统上并没有 RARP 模块,您应该使用 "
-"<command>rarpd</command> 程序替代。操作过程很类似下面将提到的在 SunOS 上的用"
-"法。"
-
-#. Tag: para
-#: install-methods.xml:1193
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"Under SunOS, you need to ensure that the Ethernet hardware address for the "
-"client is listed in the <quote>ethers</quote> database (either in the "
-"<filename>/etc/ethers</filename> file, or via NIS/NIS+) and in the "
-"<quote>hosts</quote> database. Then you need to start the RARP daemon. In "
-"SunOS 4, issue the command (as root): <userinput>/usr/etc/rarpd -a</"
-"userinput>; in SunOS 5, use <userinput>/usr/sbin/rarpd -a</userinput>."
+"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
+"you use the <command>rarpd</command> program. You need to ensure that the "
+"Ethernet hardware address for the client is listed in the <quote>ethers</"
+"quote> database (either in the <filename>/etc/ethers</filename> file, or via "
+"NIS/NIS+) and in the <quote>hosts</quote> database. Then you need to start "
+"the RARP daemon. Issue the command (as root): <userinput>/usr/sbin/rarpd -a</"
+"userinput> on most Linux systems and SunOS 5 (Solaris 2), <userinput>/usr/"
+"sbin/in.rarpd -a</userinput> on some other Linux systems, or <userinput>/usr/"
+"etc/rarpd -a</userinput> in SunOS 4 (Solaris 1)."
msgstr ""
"在 SunOS 里, 您需要确定客户机的以太网硬件地址已经列在<quote>ethers</quote>数"
"据库(在 <filename>/etc/ethers</filename> 文件中或者通过 NIS/NIS+)和"
@@ -1688,13 +1644,13 @@ msgstr ""
"里,则使用 <userinput>/usr/sbin/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1212
+#: install-methods.xml:1191
#, no-c-format
msgid "Setting up BOOTP server"
msgstr "设置 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1213
+#: install-methods.xml:1192
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1709,7 +1665,7 @@ msgstr ""
"classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:1221
+#: install-methods.xml:1200
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1771,7 +1727,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1254
+#: install-methods.xml:1233
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1791,13 +1747,13 @@ msgstr ""
"是:<userinput>/etc/init.d/dhcpd restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1275
+#: install-methods.xml:1254
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1276
+#: install-methods.xml:1255
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. In &debian;, "
@@ -1853,7 +1809,7 @@ msgstr ""
"件。"
#. Tag: para
-#: install-methods.xml:1288
+#: install-methods.xml:1267
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1869,7 +1825,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1298
+#: install-methods.xml:1277
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1879,13 +1835,13 @@ msgstr ""
"它:<userinput>/etc/init.d/dhcpd restart</userinput>作为其配置文件。"
#. Tag: title
-#: install-methods.xml:1306
+#: install-methods.xml:1285
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1307
+#: install-methods.xml:1286
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1957,13 +1913,13 @@ msgstr ""
"<xref linkend=\"tftp-images\"/> )。"
#. Tag: title
-#: install-methods.xml:1323
+#: install-methods.xml:1302
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1324
+#: install-methods.xml:1303
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -1981,7 +1937,7 @@ msgstr ""
"</screen></informalexample> Debian 包通常在安装后会自动把这条设置好。"
#. Tag: para
-#: install-methods.xml:1335
+#: install-methods.xml:1314
#, no-c-format
msgid ""
"Look in that file and remember the directory which is used as the argument "
@@ -2005,7 +1961,7 @@ msgstr ""
"<replaceable>inetd-pid</replaceable></userinput>。"
#. Tag: para
-#: install-methods.xml:1349
+#: install-methods.xml:1328
#, no-c-format
msgid ""
"If you intend to install Debian on an SGI machine and your TFTP server is a "
@@ -2033,13 +1989,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1371
+#: install-methods.xml:1350
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1372
+#: install-methods.xml:1351
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2056,7 +2012,7 @@ msgstr ""
"一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1382
+#: install-methods.xml:1361
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2073,7 +2029,7 @@ msgstr ""
"录。"
#. Tag: para
-#: install-methods.xml:1391
+#: install-methods.xml:1370
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2088,7 +2044,7 @@ msgstr ""
"动所需的文件名传递至<command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1399
+#: install-methods.xml:1378
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2103,13 +2059,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1411
+#: install-methods.xml:1390
#, no-c-format
msgid "DECstation TFTP Images"
msgstr "DECstation TFTP 映像文件"
#. Tag: para
-#: install-methods.xml:1412
+#: install-methods.xml:1391
#, no-c-format
msgid ""
"For DECstations, there are tftpimage files for each subarchitecture, which "
@@ -2126,7 +2082,7 @@ msgstr ""
"tftpboot.img</userinput>。"
#. Tag: para
-#: install-methods.xml:1422
+#: install-methods.xml:1401
#, no-c-format
msgid ""
"The DECstation firmware boots by TFTP with the command <userinput>boot "
@@ -2143,13 +2099,13 @@ msgstr ""
"按照如下语法加入:"
#. Tag: userinput
-#: install-methods.xml:1434
+#: install-methods.xml:1413
#, no-c-format
msgid "boot #/tftp/filename param1=value1 param2=value2 ..."
msgstr "boot #/tftp/filename param1=value1 param2=value2 ..."
#. Tag: para
-#: install-methods.xml:1436
+#: install-methods.xml:1415
#, no-c-format
msgid ""
"Several DECstation firmware revisions show a problem with regard to net "
@@ -2183,13 +2139,13 @@ msgstr ""
"www.netbsd.org/Ports/pmax/board-list.html#proms\"></ulink>。"
#. Tag: title
-#: install-methods.xml:1474
+#: install-methods.xml:1453
#, no-c-format
msgid "Alpha TFTP Booting"
msgstr "Alpha TFTP 引导"
#. Tag: para
-#: install-methods.xml:1475
+#: install-methods.xml:1454
#, no-c-format
msgid ""
"On Alpha, you must specify the filename (as a relative path to the boot "
@@ -2210,13 +2166,13 @@ msgstr ""
"个文件名。"
#. Tag: title
-#: install-methods.xml:1490
+#: install-methods.xml:1469
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1491
+#: install-methods.xml:1470
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2244,7 +2200,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1507
+#: install-methods.xml:1486
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2257,13 +2213,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1518
+#: install-methods.xml:1497
#, no-c-format
msgid "BVM/Motorola TFTP Booting"
msgstr "BVM/Motorola TFTP 引导"
#. Tag: para
-#: install-methods.xml:1519
+#: install-methods.xml:1498
#, no-c-format
msgid ""
"For BVM and Motorola VMEbus systems copy the files &bvme6000-tftp-files; to "
@@ -2273,7 +2229,7 @@ msgstr ""
"到 <filename>/tftpboot/</filename>。"
#. Tag: para
-#: install-methods.xml:1524
+#: install-methods.xml:1503
#, no-c-format
msgid ""
"Next, configure your boot ROMs or BOOTP server to initially load the "
@@ -2288,13 +2244,13 @@ msgstr ""
"体系的系统特殊配置信息。"
#. Tag: title
-#: install-methods.xml:1536
+#: install-methods.xml:1515
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1537
+#: install-methods.xml:1516
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2308,13 +2264,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1549
+#: install-methods.xml:1528
#, no-c-format
msgid "Broadcom BCM91250A and BCM91480B TFTP Booting"
msgstr "Broadcom BCM91250A 与 BCM91480B TFTP 引导"
#. Tag: para
-#: install-methods.xml:1550
+#: install-methods.xml:1529
#, no-c-format
msgid ""
"You don't have to configure DHCP in a special way because you'll pass the "
@@ -2323,13 +2279,13 @@ msgstr ""
"您不需要通过特殊方法设置 DHCP,因为您将传递文件的完全路径至装载的 CFE 。"
#. Tag: title
-#: install-methods.xml:1655
+#: install-methods.xml:1634
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1656
+#: install-methods.xml:1635
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2344,13 +2300,13 @@ msgstr ""
"<classname>autoinstall</classname>,以及 Debian 安装程序本身。"
#. Tag: title
-#: install-methods.xml:1669
+#: install-methods.xml:1648
#, no-c-format
msgid "Automatic Installation Using the Debian Installer"
msgstr "使用 Debian 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1670
+#: install-methods.xml:1649
#, no-c-format
msgid ""
"The Debian Installer supports automating installs via preconfiguration "
@@ -2362,7 +2318,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1677
+#: install-methods.xml:1656
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2370,3 +2326,46 @@ msgid ""
msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
+
+#~ msgid ""
+#~ "On a RARP server system using a Linux 2.2.x kernel, you need to populate "
+#~ "the kernel's RARP table. To do this, run the following commands: "
+#~ "<informalexample><screen>\n"
+#~ "# <userinput>/sbin/rarp -s\n"
+#~ "<replaceable>client-hostname</replaceable>\n"
+#~ "<replaceable>client-enet-addr</replaceable></userinput>\n"
+#~ "\n"
+#~ "# <userinput>/usr/sbin/arp -s\n"
+#~ "<replaceable>client-ip</replaceable>\n"
+#~ "<replaceable>client-enet-addr</replaceable></userinput>\n"
+#~ "</screen></informalexample> If you get <informalexample><screen>\n"
+#~ "SIOCSRARP: Invalid argument\n"
+#~ "</screen></informalexample> you probably need to load the RARP kernel "
+#~ "module or else recompile the kernel to support RARP. Try "
+#~ "<userinput>modprobe rarp</userinput> and then try the <command>rarp</"
+#~ "command> command again."
+#~ msgstr ""
+#~ "在使用 Linux 2.2.x 内核的 RARP 服务器系统上,您需要通以下的命令来植入内核 "
+#~ "RARP 表: <informalexample><screen>\n"
+#~ "# <userinput>/sbin/rarp -s \n"
+#~ "<replaceable>client-hostname</replaceable>\n"
+#~ "<replaceable>client-enet-addr</replaceable></userinput>\n"
+#~ "\n"
+#~ "# <userinput>/usr/sbin/arp -s \n"
+#~ "<replaceable>client-ip</replaceable>\n"
+#~ "<replaceable>client-enet-addr</replaceable></userinput>\n"
+#~ "</screen></informalexample> 如果看到 <informalexample><screen>\n"
+#~ "SIOCSRARP: Invalid argument\n"
+#~ "</screen></informalexample> 您可能需要加载 RARP 内核模块或重新编译内核并使"
+#~ "之支持 RARP。试试在运行 <userinput>modprobe rarp</userinput> 命令后再尝试"
+#~ "一遍 <command>rarp</command> 命令。"
+
+#~ msgid ""
+#~ "On a RARP server system using a Linux 2.4.x kernel, there is no RARP "
+#~ "module, and you should instead use the <command>rarpd</command> program. "
+#~ "The procedure is similar to that used under SunOS in the following "
+#~ "paragraph."
+#~ msgstr ""
+#~ "使用 Linux 2.4.x 内核的 RARP 服务器系统上并没有 RARP 模块,您应该使用 "
+#~ "<command>rarpd</command> 程序替代。操作过程很类似下面将提到的在 SunOS 上的"
+#~ "用法。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 2750a7e51..fc2e1344b 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-07 22:39+0000\n"
+"POT-Creation-Date: 2006-08-18 17:32+0000\n"
"PO-Revision-Date: 2006-08-10 11:07+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -838,7 +838,10 @@ msgid ""
"Recommended partitioning tool in Debian. This Swiss army knife can also "
"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
"quote> in Windows speak)</phrase> and assign them to the mountpoints."
-msgstr "推荐的 Debian 分区工具。这把瑞士军刀可以修改分区大小,创建文件系统 <phrase arch=\"x86\">(在 Windows 下的说法是 <quote>format</quote>)</phrase> 以及关联分区至挂接点。"
+msgstr ""
+"推荐的 Debian 分区工具。这把瑞士军刀可以修改分区大小,创建文件系统 <phrase "
+"arch=\"x86\">(在 Windows 下的说法是 <quote>format</quote>)</phrase> 以及关联"
+"分区至挂接点。"
#. Tag: command
#: partitioning.xml:495
@@ -997,17 +1000,23 @@ msgid ""
"</screen></informalexample> <phrase arch=\"x86\">Remember to mark your boot "
"partition as <quote>Bootable</quote>.</phrase>"
msgstr ""
-"如果您的 ide 磁盘上超过 20 个分区,您将需要为 21 以上的分区创建设备。除非有正确的设备存在,否则下一步初始化分区将失败。作为一个例子,这里列举了相关的命令,让您可以在 <userinput>tty2</userinput> 中使用或者在<guimenuitem>运行一个 shell</guimenuitem>下加入一个设备文件,令第 21 个的分区能够被初始化:<informalexample><screen>\n"
+"如果您的 ide 磁盘上超过 20 个分区,您将需要为 21 以上的分区创建设备。除非有正"
+"确的设备存在,否则下一步初始化分区将失败。作为一个例子,这里列举了相关的命"
+"令,让您可以在 <userinput>tty2</userinput> 中使用或者在<guimenuitem>运行一个 "
+"shell</guimenuitem>下加入一个设备文件,令第 21 个的分区能够被初始化:"
+"<informalexample><screen>\n"
"# cd /dev\n"
"# mknod hda21 b 3 21 \n"
"# chgrp disk hda21\n"
"# chmod 660 hda21\n"
-"</screen></informalexample> 除非在目标系统上有合适的设备名称,否则引导一个新的系统将会失败。在安装完内核和模块以后,执行: <informalexample><screen>\n"
+"</screen></informalexample> 除非在目标系统上有合适的设备名称,否则引导一个新"
+"的系统将会失败。在安装完内核和模块以后,执行: <informalexample><screen>\n"
"# cd /target/dev\n"
"# mknod hda21 b 3 21 \n"
"# chgrp disk hda21\n"
"# chmod 660 hda21\n"
-"</screen></informalexample> <phrase arch=\"x86\">记住标记您的引导分区为 <quote>Bootable</quote>。</phrase>"
+"</screen></informalexample> <phrase arch=\"x86\">记住标记您的引导分区为 "
+"<quote>Bootable</quote>。</phrase>"
#. Tag: para
#: partitioning.xml:601
@@ -1027,8 +1036,8 @@ msgstr ""
# index.docbook:612, index.docbook:672, index.docbook:696, index.docbook:793, index.docbook:912, index.docbook:989
#. Tag: title
-#: partitioning.xml:617 partitioning.xml:677 partitioning.xml:701
-#: partitioning.xml:798 partitioning.xml:912 partitioning.xml:989
+#: partitioning.xml:617 partitioning.xml:678 partitioning.xml:702
+#: partitioning.xml:799 partitioning.xml:913 partitioning.xml:990
#, no-c-format
msgid "Partitioning for &arch-title;"
msgstr "为 &arch-title; 准备分区"
@@ -1066,16 +1075,16 @@ msgstr ""
#. Tag: para
#: partitioning.xml:636
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Unless you wish to use the disk you are partitioning from Tru64 Unix or one "
"of the free 4.4BSD-Lite derived operating systems (FreeBSD, OpenBSD, or "
-"NetBSD), it is suggested that you do <emphasis>not</emphasis> make the third "
-"partition contain the whole disk. This is not required by <command>aboot</"
-"command>, and in fact, it may lead to confusion since the "
-"<command>swriteboot</command> utility used to install <command>aboot</"
-"command> in the boot sector will complain about a partition overlapping with "
-"the boot block."
+"NetBSD), you should <emphasis>not</emphasis> create the third partition as a "
+"<quote>whole disk</quote> partition (i.e. with start and end sectors to span "
+"the whole disk), as this renders the disk incompatible with the tools used "
+"to make it bootable with aboot. This means that the disk configured by the "
+"installer for use as the Debian boot disk will be inaccessible to the "
+"operating systems mentioned earlier."
msgstr ""
"除非您想在 Tru64 Unix 或者一个 free 4.4BSD-Lite 兼容的系统下(FreeBSD, "
"OpenBSD 或 NetBSD)使用这个磁盘,请 <emphasis>不要</emphasis> 建立包含整个磁盘"
@@ -1084,7 +1093,7 @@ msgstr ""
"<command>aboot</command> 将报怨引导扇区将被一个分区覆盖。"
#. Tag: para
-#: partitioning.xml:647
+#: partitioning.xml:648
#, no-c-format
msgid ""
"Also, because <command>aboot</command> is written to the first few sectors "
@@ -1105,7 +1114,7 @@ msgstr ""
"这是习惯所致。"
#. Tag: para
-#: partitioning.xml:659
+#: partitioning.xml:660
#, no-c-format
msgid ""
"For ARC installations, you should make a small FAT partition at the "
@@ -1123,7 +1132,7 @@ msgstr ""
"<command>mkdosfs</command> 然后再尝试安装启动引导器。"
#. Tag: para
-#: partitioning.xml:678
+#: partitioning.xml:679
#, no-c-format
msgid ""
"PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
@@ -1149,7 +1158,7 @@ msgstr ""
"25&ndash;50 MB 一般来说应该足够了。"
#. Tag: para
-#: partitioning.xml:702
+#: partitioning.xml:703
#, no-c-format
msgid ""
"If you have an existing other operating system such as DOS or Windows and "
@@ -1167,7 +1176,7 @@ msgstr ""
"分区,并更改其尺寸。"
#. Tag: para
-#: partitioning.xml:712
+#: partitioning.xml:713
#, no-c-format
msgid ""
"The PC BIOS generally adds additional constraints for disk partitioning. "
@@ -1187,7 +1196,7 @@ msgstr ""
"包含一个简单的介绍,来帮助在大部分情况下进行规划。"
#. Tag: para
-#: partitioning.xml:723
+#: partitioning.xml:724
#, no-c-format
msgid ""
"<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -1205,7 +1214,7 @@ msgstr ""
"盘您只能含有一个扩展分区。"
#. Tag: para
-#: partitioning.xml:734
+#: partitioning.xml:735
#, no-c-format
msgid ""
"Linux limits the partitions per drive to 15 partitions for SCSI disks (3 "
@@ -1221,7 +1230,7 @@ msgstr ""
"超过 20 个的分区,除非您为这些首先手工创建了设备文件。"
#. Tag: para
-#: partitioning.xml:744
+#: partitioning.xml:745
#, no-c-format
msgid ""
"If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1235,7 +1244,7 @@ msgstr ""
"个 1024 柱面内。(在没有 BIOS 转换的情况下,大约有 524MB)。"
#. Tag: para
-#: partitioning.xml:752
+#: partitioning.xml:753
#, no-c-format
msgid ""
"This restriction doesn't apply if you have a BIOS newer than around "
@@ -1259,7 +1268,7 @@ msgstr ""
"来进行磁盘寻址。"
#. Tag: para
-#: partitioning.xml:766
+#: partitioning.xml:767
#, no-c-format
msgid ""
"If you have a large disk, you might have to use cylinder translation "
@@ -1279,7 +1288,7 @@ msgstr ""
"换后</emphasis> 的 1024 柱面内。"
#. Tag: para
-#: partitioning.xml:778
+#: partitioning.xml:779
#, no-c-format
msgid ""
"The recommended way of accomplishing this is to create a small "
@@ -1299,7 +1308,7 @@ msgstr ""
"用,甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
#. Tag: para
-#: partitioning.xml:799
+#: partitioning.xml:800
#, no-c-format
msgid ""
"The <command>partman</command> disk partitioner is the default partitioning "
@@ -1313,13 +1322,13 @@ msgstr ""
"<command>parted</command> 来进行磁盘分区的。"
#. Tag: title
-#: partitioning.xml:811
+#: partitioning.xml:812
#, no-c-format
msgid "EFI Recognized Formats"
msgstr "EFI 能够识别的格式"
#. Tag: para
-#: partitioning.xml:812
+#: partitioning.xml:813
#, no-c-format
msgid ""
"The IA64 EFI firmware supports two partition table (or disk label) formats, "
@@ -1336,7 +1345,7 @@ msgstr ""
"DOS 分区表。"
#. Tag: para
-#: partitioning.xml:824
+#: partitioning.xml:825
#, no-c-format
msgid ""
"The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1350,7 +1359,7 @@ msgstr ""
"配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
#. Tag: para
-#: partitioning.xml:832
+#: partitioning.xml:833
#, no-c-format
msgid ""
"The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1395,13 +1404,13 @@ msgstr ""
"它可能要扫描坏区。"
#. Tag: title
-#: partitioning.xml:857
+#: partitioning.xml:858
#, no-c-format
msgid "Boot Loader Partition Requirements"
msgstr "启动引导器分区要求"
#. Tag: para
-#: partitioning.xml:858
+#: partitioning.xml:859
#, no-c-format
msgid ""
"ELILO, the ia64 boot loader, requires a partition containing a FAT file "
@@ -1416,7 +1425,7 @@ msgstr ""
"个内核的话,128MB 也许更好。"
#. Tag: para
-#: partitioning.xml:867
+#: partitioning.xml:868
#, no-c-format
msgid ""
"The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1438,7 +1447,7 @@ msgstr ""
"入一个 EFI 分区。"
#. Tag: para
-#: partitioning.xml:882
+#: partitioning.xml:883
#, no-c-format
msgid ""
"It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1448,13 +1457,13 @@ msgstr ""
"盘上。"
#. Tag: title
-#: partitioning.xml:890
+#: partitioning.xml:891
#, no-c-format
msgid "EFI Diagnostic Partitions"
msgstr "EFI 诊断分区"
#. Tag: para
-#: partitioning.xml:891
+#: partitioning.xml:892
#, no-c-format
msgid ""
"The EFI firmware is significantly more sophisticated than the usual BIOS "
@@ -1473,7 +1482,7 @@ msgstr ""
"区的时候。"
#. Tag: para
-#: partitioning.xml:913
+#: partitioning.xml:914
#, no-c-format
msgid ""
"SGI machines require an SGI disk label in order to make the system bootable "
@@ -1489,13 +1498,13 @@ msgstr ""
"入。注意 volume header 必须从 0 号扇区开始。"
#. Tag: title
-#: partitioning.xml:930
+#: partitioning.xml:931
#, no-c-format
msgid "Partitioning Newer PowerMacs"
msgstr "为较新的 PowerMacs 分区"
#. Tag: para
-#: partitioning.xml:931
+#: partitioning.xml:932
#, no-c-format
msgid ""
"If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1517,7 +1526,7 @@ msgstr ""
"userinput> 命令。"
#. Tag: para
-#: partitioning.xml:944
+#: partitioning.xml:945
#, no-c-format
msgid ""
"The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1528,7 +1537,7 @@ msgstr ""
"为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
#. Tag: para
-#: partitioning.xml:951
+#: partitioning.xml:952
#, no-c-format
msgid ""
"Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1545,7 +1554,7 @@ msgstr ""
"command> 工具可以用来维护这个分区。"
#. Tag: para
-#: partitioning.xml:961
+#: partitioning.xml:962
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian; the bootstrap "
@@ -1565,7 +1574,7 @@ msgstr ""
"顺序。"
#. Tag: para
-#: partitioning.xml:973
+#: partitioning.xml:974
#, no-c-format
msgid ""
"Apple disks normally have several small driver partitions. If you intend to "
@@ -1579,7 +1588,7 @@ msgstr ""
"启动的时候,会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
#. Tag: para
-#: partitioning.xml:990
+#: partitioning.xml:991
#, no-c-format
msgid ""
"Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1592,7 +1601,7 @@ msgstr ""
"<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
#. Tag: para
-#: partitioning.xml:998
+#: partitioning.xml:999
#, no-c-format
msgid ""
"Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1611,7 +1620,7 @@ msgstr ""
"或者 UFS 分区在那里;它们将隔离分区表和引导块。"
#. Tag: para
-#: partitioning.xml:1009
+#: partitioning.xml:1010
#, no-c-format
msgid ""
"It is also advised that the third partition should be of type <quote>Whole "
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 8b1e6c8cc..be636b21c 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-16 18:10+0000\n"
+"POT-Creation-Date: 2006-08-18 17:32+0000\n"
"PO-Revision-Date: 2006-08-10 11:10+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,11 +20,43 @@ msgstr "下一步该干什么"
#. Tag: title
#: post-install.xml:13
#, no-c-format
+msgid "Shutting down the system"
+msgstr ""
+
+#. Tag: para
+#: post-install.xml:15
+#, no-c-format
+msgid ""
+"To shut down a running Linux system, you must not reboot with the reset "
+"switch on the front or back of your computer, or just turn off the computer. "
+"Linux should be shut down in a controlled manner, otherwise files might get "
+"lost and/or disk damage might occur. If you run a desktop environment, there "
+"is usually an option to <quote>log out</quote> available from the "
+"application menu that allows you to shutdown (or reboot) the system."
+msgstr ""
+
+#. Tag: para
+#: post-install.xml:25
+#, no-c-format
+msgid ""
+"Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
+"keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch="
+"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</"
+"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A "
+"last option is to log in as root and type one of the commands "
+"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h "
+"now</command> if either of the key combinations do not work or you prefer to "
+"type commands; use <command>reboot</command> to reboot the system."
+msgstr ""
+
+#. Tag: title
+#: post-install.xml:46
+#, no-c-format
msgid "If You Are New to Unix"
msgstr "如果您不熟悉 Unix"
#. Tag: para
-#: post-install.xml:14
+#: post-install.xml:47
#, no-c-format
msgid ""
"If you are new to Unix, you probably should go out and buy some books and do "
@@ -39,7 +71,7 @@ msgstr ""
"它提供过去很有用的参考。"
#. Tag: para
-#: post-install.xml:22
+#: post-install.xml:55
#, no-c-format
msgid ""
"Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
@@ -59,13 +91,13 @@ msgstr ""
"HOWTO 的国际化版本。"
#. Tag: title
-#: post-install.xml:43
+#: post-install.xml:76
#, no-c-format
msgid "Orienting Yourself to Debian"
msgstr "让您自己转向 Debian"
#. Tag: para
-#: post-install.xml:44
+#: post-install.xml:77
#, no-c-format
msgid ""
"Debian is a little different from other distributions. Even if you're "
@@ -81,13 +113,13 @@ msgstr ""
"的介绍。"
#. Tag: title
-#: post-install.xml:55
+#: post-install.xml:88
#, no-c-format
msgid "Debian Packaging System"
msgstr "Debian 软件包系统"
#. Tag: para
-#: post-install.xml:56
+#: post-install.xml:89
#, no-c-format
msgid ""
"The most important concept to grasp is the Debian packaging system. In "
@@ -119,7 +151,7 @@ msgstr ""
"command>。"
#. Tag: para
-#: post-install.xml:97
+#: post-install.xml:130
#, no-c-format
msgid ""
"One of the best installation methods is apt. You can use the command line "
@@ -134,13 +166,13 @@ msgstr ""
"时使用限制出口的软件包。"
#. Tag: title
-#: post-install.xml:108
+#: post-install.xml:141
#, no-c-format
msgid "Application Version Management"
msgstr "应用程序版本管理"
#. Tag: para
-#: post-install.xml:109
+#: post-install.xml:142
#, no-c-format
msgid ""
"Alternative versions of applications are managed by update-alternatives. If "
@@ -151,13 +183,13 @@ msgstr ""
"应用程序,请参阅 update-alternatives 的 man 手册。"
#. Tag: title
-#: post-install.xml:119
+#: post-install.xml:152
#, no-c-format
msgid "Cron Job Management"
msgstr "定时任务管理"
#. Tag: para
-#: post-install.xml:120
+#: post-install.xml:153
#, no-c-format
msgid ""
"Any jobs under the purview of the system administrator should be in "
@@ -174,7 +206,7 @@ msgstr ""
"然后按照文件名的字典顺序依次运行。"
#. Tag: para
-#: post-install.xml:129
+#: post-install.xml:162
#, no-c-format
msgid ""
"On the other hand, if you have a cron job that (a) needs to run as a special "
@@ -189,7 +221,7 @@ msgstr ""
"以包含一个额外的域,允许您指定运行该定时任务的用户帐户。"
#. Tag: para
-#: post-install.xml:138
+#: post-install.xml:171
#, no-c-format
msgid ""
"In either case, you just edit the files and cron will notice them "
@@ -202,13 +234,13 @@ msgstr ""
"share/doc/cron/README.Debian</filename>。"
#. Tag: title
-#: post-install.xml:155
+#: post-install.xml:188
#, no-c-format
msgid "Reactivating DOS and Windows"
msgstr "重新激活 DOS 和 Windows"
#. Tag: para
-#: post-install.xml:156
+#: post-install.xml:189
#, no-c-format
msgid ""
"After installing the base system and writing to the <emphasis>Master Boot "
@@ -222,7 +254,7 @@ msgstr ""
"旧系统,以便可以再次启动 DOS 或 Windows。"
#. Tag: para
-#: post-install.xml:164
+#: post-install.xml:197
#, no-c-format
msgid ""
"<command>LILO</command> is a boot manager with which you can also boot other "
@@ -238,7 +270,7 @@ msgstr ""
"command>程序。这是因为只有您运行过该程序后,所做的更改才能生效。"
#. Tag: para
-#: post-install.xml:174
+#: post-install.xml:207
#, no-c-format
msgid ""
"Important parts of the <filename>lilo.conf</filename> file are the lines "
@@ -264,7 +296,7 @@ msgstr ""
"command> 没有被按下 <keycap>shift</keycap> 键中止的情况下。"
#. Tag: para
-#: post-install.xml:190
+#: post-install.xml:223
#, no-c-format
msgid ""
"After a fresh install of Debian, just the current system is configured for "
@@ -295,7 +327,7 @@ msgstr ""
"导扇区的说明。"
#. Tag: para
-#: post-install.xml:210
+#: post-install.xml:243
#, no-c-format
msgid ""
"Notice that there are other boot loaders available in &debian;, such as GRUB "
@@ -309,13 +341,13 @@ msgstr ""
"classname> 包中) 等。"
#. Tag: title
-#: post-install.xml:225
+#: post-install.xml:258
#, no-c-format
msgid "Further Reading and Information"
msgstr "更多信息"
#. Tag: para
-#: post-install.xml:226
+#: post-install.xml:259
#, no-c-format
msgid ""
"If you need information about a particular program, you should first try "
@@ -327,7 +359,7 @@ msgstr ""
"replaceable></userinput>。"
#. Tag: para
-#: post-install.xml:232
+#: post-install.xml:265
#, no-c-format
msgid ""
"There is lots of useful documentation in <filename>/usr/share/doc</filename> "
@@ -345,7 +377,7 @@ msgstr ""
"Debian</filename>。"
#. Tag: para
-#: post-install.xml:243
+#: post-install.xml:276
#, no-c-format
msgid ""
"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
@@ -372,7 +404,7 @@ msgstr ""
"Debian 丰富的信息。"
#. Tag: para
-#: post-install.xml:261
+#: post-install.xml:294
#, no-c-format
msgid ""
"A general source of information on GNU/Linux is the <ulink url=\"http://www."
@@ -385,13 +417,13 @@ msgstr ""
"部分的 非常有价值的 HOWTO 文档以及其他指导。"
#. Tag: title
-#: post-install.xml:276
+#: post-install.xml:309
#, no-c-format
msgid "Compiling a New Kernel"
msgstr "编译新内核"
#. Tag: para
-#: post-install.xml:277
+#: post-install.xml:310
#, no-c-format
msgid ""
"Why would someone want to compile a new kernel? It is often not necessary "
@@ -407,7 +439,7 @@ msgstr ""
"很有用的:"
#. Tag: para
-#: post-install.xml:287
+#: post-install.xml:320
#, no-c-format
msgid ""
"handle special hardware needs, or hardware conflicts with the pre-supplied "
@@ -415,7 +447,7 @@ msgid ""
msgstr "支持某些特殊的硬件,或者默认的内核配置和某些硬件冲突"
#. Tag: para
-#: post-install.xml:293
+#: post-install.xml:326
#, no-c-format
msgid ""
"use options of the kernel which are not supported in the pre-supplied "
@@ -423,43 +455,43 @@ msgid ""
msgstr "使用某些不为所提供的内核支持的选项 (例如,支持 high memory)"
#. Tag: para
-#: post-install.xml:299
+#: post-install.xml:332
#, no-c-format
msgid "optimize the kernel by removing useless drivers to speed up boot time"
msgstr "通过删除无用的驱动程序来优化内核,以减少启动时间"
#. Tag: para
-#: post-install.xml:304
+#: post-install.xml:337
#, no-c-format
msgid "create a monolithic instead of a modularized kernel"
msgstr "创建整体的而不是模块化的内核"
#. Tag: para
-#: post-install.xml:309
+#: post-install.xml:342
#, no-c-format
msgid "run an updated or development kernel"
msgstr "运行最新的内核或开发中的内核"
#. Tag: para
-#: post-install.xml:314
+#: post-install.xml:347
#, no-c-format
msgid "learn more about linux kernels"
msgstr "深入了解 linux 内核"
#. Tag: title
-#: post-install.xml:323
+#: post-install.xml:356
#, no-c-format
msgid "Kernel Image Management"
msgstr "内核映象管理"
#. Tag: para
-#: post-install.xml:324
+#: post-install.xml:357
#, no-c-format
msgid "Don't be afraid to try compiling the kernel. It's fun and profitable."
msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
#. Tag: para
-#: post-install.xml:328
+#: post-install.xml:361
#, no-c-format
msgid ""
"To compile a kernel the Debian way, you need some packages: "
@@ -480,7 +512,7 @@ msgstr ""
"gz</filename>)。"
#. Tag: para
-#: post-install.xml:339
+#: post-install.xml:372
#, no-c-format
msgid ""
"This method will make a .deb of your kernel source, and, if you have non-"
@@ -493,7 +525,7 @@ msgstr ""
"filename> 目录将保存内核,System.map,以及当前编译的活动配置文件的日志。"
#. Tag: para
-#: post-install.xml:347
+#: post-install.xml:380
#, no-c-format
msgid ""
"Note that you don't <emphasis>have</emphasis> to compile your kernel the "
@@ -512,7 +544,7 @@ msgstr ""
"<classname>kernel-package</classname> 的编译方法。"
#. Tag: para
-#: post-install.xml:357
+#: post-install.xml:390
#, no-c-format
msgid ""
"Note that you'll find complete documentation on using <classname>kernel-"
@@ -524,7 +556,7 @@ msgstr ""
"入门指南。"
#. Tag: para
-#: post-install.xml:364
+#: post-install.xml:397
#, no-c-format
msgid ""
"Hereafter, we'll assume you have free rein over your machine and will "
@@ -555,7 +587,7 @@ msgstr ""
"phrase> 刚才创建的目录。"
#. Tag: para
-#: post-install.xml:389
+#: post-install.xml:422
#, no-c-format
msgid ""
"Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
@@ -581,7 +613,7 @@ msgstr ""
"quote> (它们默认并没有被选择)。否则,您的 Debian 安装将会遇到问题。"
#. Tag: para
-#: post-install.xml:404
+#: post-install.xml:437
#, no-c-format
msgid ""
"Clean the source tree and reset the <classname>kernel-package</classname> "
@@ -591,7 +623,7 @@ msgstr ""
"<userinput>make-kpkg clean</userinput>。"
#. Tag: para
-#: post-install.xml:409
+#: post-install.xml:442
#, no-c-format
msgid ""
"Now, compile the kernel: <userinput>fakeroot make-kpkg --initrd --"
@@ -608,7 +640,7 @@ msgstr ""
"长的时间,这取决于您的机器的性能。"
#. Tag: para
-#: post-install.xml:419
+#: post-install.xml:452
#, fuzzy, no-c-format
msgid ""
"Once the compilation is complete, you can install your custom kernel like "
@@ -645,7 +677,7 @@ msgstr ""
"如 PCMCIA,</phrase>您也要同时安装该软件包。"
#. Tag: para
-#: post-install.xml:446
+#: post-install.xml:479
#, no-c-format
msgid ""
"It is time to reboot the system: read carefully any warning that the above "
@@ -655,7 +687,7 @@ msgstr ""
"<userinput>shutdown -r now</userinput>。"
#. Tag: para
-#: post-install.xml:451
+#: post-install.xml:484
#, no-c-format
msgid ""
"For more information on Debian kernels and kernel compilation, see the "
@@ -669,13 +701,13 @@ msgstr ""
"<filename>/usr/share/doc/kernel-package</filename>。"
#. Tag: title
-#: post-install.xml:467
+#: post-install.xml:500
#, no-c-format
msgid "Recovering a Broken System"
msgstr "修复损坏的系统"
#. Tag: para
-#: post-install.xml:468
+#: post-install.xml:501
#, no-c-format
msgid ""
"Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -693,7 +725,7 @@ msgstr ""
"用于此目的。"
#. Tag: para
-#: post-install.xml:478
+#: post-install.xml:511
#, no-c-format
msgid ""
"To access rescue mode, type <userinput>rescue</userinput> at the "
@@ -716,7 +748,7 @@ msgstr ""
"硬盘,网络设备等等可以使用。"
#. Tag: para
-#: post-install.xml:493
+#: post-install.xml:526
#, no-c-format
msgid ""
"Instead of the partitioning tool, you should now be presented with a list of "
@@ -730,7 +762,7 @@ msgstr ""
"您也可以选择 RAID 和 LVM 设备上的分区,与直接在磁盘上创建一样。"
#. Tag: para
-#: post-install.xml:501
+#: post-install.xml:534
#, no-c-format
msgid ""
"If possible, the installer will now present you with a shell prompt in the "
@@ -746,7 +778,7 @@ msgstr ""
"userinput>。</phrase>"
#. Tag: para
-#: post-install.xml:513
+#: post-install.xml:546
#, no-c-format
msgid ""
"If the installer cannot run a usable shell in the root file system you "
@@ -764,13 +796,13 @@ msgstr ""
"filename> 目录。"
#. Tag: para
-#: post-install.xml:522
+#: post-install.xml:555
#, no-c-format
msgid "In either case, after you exit the shell, the system will reboot."
msgstr "无论哪种情况,退出 shell 之后,系统将重启。"
#. Tag: para
-#: post-install.xml:526
+#: post-install.xml:559
#, no-c-format
msgid ""
"Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 3f644d722..e3097cdb8 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-18 17:32+0000\n"
"PO-Revision-Date: 2006-08-02 19:17+0800\n"
"Last-Translator: Ji YongGang <jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1099,7 +1099,7 @@ msgstr ""
#. Tag: screen
#: preseed.xml:648
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
"# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1112,6 +1112,9 @@ msgid ""
"d-i partman-auto/disk string /dev/discs/disc0/disc\n"
"# Or, if you want to use LVM:\n"
"#d-i partman-auto-lvm/disk string /dev/discs/disc0/disc\n"
+"# Or, LVM with more than one disk:\n"
+"#d-i partman-auto-lvm/disk string /dev/discs/disc0/disc /dev/discs/disc1/"
+"disc\n"
"\n"
"# You can choose from any of the predefined partitioning recipes.\n"
"# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1425,7 +1428,7 @@ msgstr "安装引导加载器"
#. Tag: screen
#: preseed.xml:729
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
"# instead, uncomment this:\n"
@@ -1443,9 +1446,11 @@ msgid ""
"\n"
"# Alternatively, if you want to install to a location other than the mbr,\n"
"# uncomment and edit these lines:\n"
-"#d-i grub-installer/bootdev string (hd0,0)\n"
"#d-i grub-installer/only_debian boolean false\n"
-"#d-i grub-installer/with_other_os boolean false"
+"#d-i grub-installer/with_other_os boolean false\n"
+"#d-i grub-installer/bootdev string (hd0,0)\n"
+"# To install grub to multiple disks:\n"
+"#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)"
msgstr ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
"# instead, uncomment this:\n"
@@ -1566,7 +1571,9 @@ msgid ""
"installed by tasks, you can use the parameter <classname>pkgsel/include</"
"classname>. The value of this parameter can be either comma-separated or "
"space-separated, so you can also use it easily on the kernel command line."
-msgstr "如果您打算安装一些安装任务之外的独立软件包,可以使用参数 <classname>pkgsel/include</classname>。该参数的值可以用逗号或空格分开,便于在内核命令行上使用。"
+msgstr ""
+"如果您打算安装一些安装任务之外的独立软件包,可以使用参数 <classname>pkgsel/"
+"include</classname>。该参数的值可以用逗号或空格分开,便于在内核命令行上使用。"
#. Tag: screen
#: preseed.xml:794