summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorFelipe Augusto van de Wiel <faw@debian.org>2008-10-17 00:15:23 +0000
committerFelipe Augusto van de Wiel <faw@debian.org>2008-10-17 00:15:23 +0000
commit95a93955b5d71e4b7757f3f9191371cb84929151 (patch)
tree961f30e187a70dff7d3500ee39a039ec70d4dcfc /po/zh_CN
parent32520e489f0ab60f696f3f094a0ea3c316b9160c (diff)
downloadinstallation-guide-95a93955b5d71e4b7757f3f9191371cb84929151.zip
[SILENT_COMMIT] Update of POT and PO files for the manual
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po13
-rw-r--r--po/zh_CN/hardware.po1034
-rw-r--r--po/zh_CN/install-methods.po679
-rw-r--r--po/zh_CN/using-d-i.po835
-rw-r--r--po/zh_CN/welcome.po48
5 files changed, 1426 insertions, 1183 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 35907502f..a823c2d23 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-10-05 00:05+0000\n"
+"POT-Creation-Date: 2008-10-17 00:09+0000\n"
"PO-Revision-Date: 2008-07-06 19:26+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1574,14 +1574,21 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:1141
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you wish or need to add any boot parameters for either the installer "
+#| "or the kernel, press &tabkey;. This will display the default boot command "
+#| "for the selected menu entry and allow to add additional options. The help "
+#| "screens (see below) list some common possible options. Press &enterkey; "
+#| "to boot the installer with your options; pressing &escapekey; will return "
+#| "you to the boot menu."
msgid ""
"If you wish or need to add any boot parameters for either the installer or "
"the kernel, press &tabkey;. This will display the default boot command for "
"the selected menu entry and allow to add additional options. The help "
"screens (see below) list some common possible options. Press &enterkey; to "
"boot the installer with your options; pressing &escapekey; will return you "
-"to the boot menu."
+"to the boot menu and undo any changes you made."
msgstr ""
"如果您希望或者需要添加引导参数给安装程序或内核,按下 &tabkey;。将显示对应菜单"
"项的默认引导命令,并允许添加额外的选项。帮助界面(下方)列出一些可能的选项。按"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 4f67a8c91..1885373b9 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: 2008-10-05 00:05+0000\n"
+"POT-Creation-Date: 2008-10-17 00:09+0000\n"
"PO-Revision-Date: 2008-09-11 23:30+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -167,393 +167,399 @@ msgstr "netwinder"
#. Tag: entry
#: hardware.xml:86
#, no-c-format
+msgid "armel"
+msgstr ""
+
+#. Tag: entry
+#: hardware.xml:87
+#, no-c-format
msgid "<entry>Versatile</entry>"
msgstr "<entry>Versatile</entry>"
#. Tag: entry
-#: hardware.xml:87
+#: hardware.xml:88
#, no-c-format
msgid "versatile"
msgstr "versatile"
#. Tag: entry
-#: hardware.xml:89
+#: hardware.xml:90
#, no-c-format
msgid "arm and armel"
msgstr ""
#. Tag: entry
-#: hardware.xml:90
+#: hardware.xml:91
#, no-c-format
msgid "Intel IOP32x"
msgstr "Intel IOP32x"
#. Tag: entry
-#: hardware.xml:91
+#: hardware.xml:92
#, no-c-format
msgid "iop32x"
msgstr "iop32x"
#. Tag: entry
-#: hardware.xml:93
+#: hardware.xml:94
#, no-c-format
msgid "Intel IXP4xx"
msgstr "Intel IXP4xx"
#. Tag: entry
-#: hardware.xml:94
+#: hardware.xml:95
#, no-c-format
msgid "ixp4xx"
msgstr "ixp4xx"
#. Tag: entry
-#: hardware.xml:96
+#: hardware.xml:97
#, no-c-format
msgid "Marvell Orion"
msgstr "Marvell Orion"
#. Tag: entry
-#: hardware.xml:97
+#: hardware.xml:98
#, no-c-format
msgid "orion5x"
msgstr "orion5x"
#. Tag: entry
-#: hardware.xml:101
+#: hardware.xml:102
#, no-c-format
msgid "HP PA-RISC"
msgstr "HP PA-RISC"
#. Tag: entry
-#: hardware.xml:102
+#: hardware.xml:103
#, no-c-format
msgid "hppa"
msgstr "hppa"
#. Tag: entry
-#: hardware.xml:103
+#: hardware.xml:104
#, no-c-format
msgid "PA-RISC 1.1"
msgstr "PA-RISC 1.1"
#. Tag: entry
-#: hardware.xml:104
+#: hardware.xml:105
#, no-c-format
msgid "<entry>32</entry>"
msgstr "<entry>32</entry>"
#. Tag: entry
-#: hardware.xml:106
+#: hardware.xml:107
#, no-c-format
msgid "PA-RISC 2.0"
msgstr "PA-RISC 2.0"
#. Tag: entry
-#: hardware.xml:107
+#: hardware.xml:108
#, no-c-format
msgid "<entry>64</entry>"
msgstr "<entry>64</entry>"
#. Tag: entry
-#: hardware.xml:111
+#: hardware.xml:112
#, no-c-format
msgid "Intel IA-64"
msgstr "Intel IA-64"
#. Tag: entry
-#: hardware.xml:112
+#: hardware.xml:113
#, no-c-format
msgid "ia64"
msgstr "ia64"
#. Tag: entry
-#: hardware.xml:118
+#: hardware.xml:119
#, no-c-format
msgid "MIPS (big endian)"
msgstr "MIPS (big endian)"
#. Tag: entry
-#: hardware.xml:119
+#: hardware.xml:120
#, no-c-format
msgid "mips"
msgstr "mips"
#. Tag: entry
-#: hardware.xml:120
+#: hardware.xml:121
#, no-c-format
msgid "SGI IP22 (Indy/Indigo 2)"
msgstr "SGI IP22 (Indy/Indigo 2)"
#. Tag: entry
-#: hardware.xml:121
+#: hardware.xml:122
#, no-c-format
msgid "r4k-ip22"
msgstr "r4k-ip22"
#. Tag: entry
-#: hardware.xml:123
+#: hardware.xml:124
#, no-c-format
msgid "SGI IP32 (O2)"
msgstr "SGI IP32 (O2)"
#. Tag: entry
-#: hardware.xml:124
+#: hardware.xml:125
#, no-c-format
msgid "r5k-ip32"
msgstr "r5k-ip32"
#. Tag: entry
-#: hardware.xml:126 hardware.xml:145
+#: hardware.xml:127 hardware.xml:146
#, no-c-format
msgid "MIPS Malta (32 bit)"
msgstr "MIPS Malta (32 bit)"
#. Tag: entry
-#: hardware.xml:127 hardware.xml:146
+#: hardware.xml:128 hardware.xml:147
#, no-c-format
msgid "4kc-malta"
msgstr "4kc-malta"
#. Tag: entry
-#: hardware.xml:129 hardware.xml:148
+#: hardware.xml:130 hardware.xml:149
#, no-c-format
msgid "MIPS Malta (64 bit)"
msgstr "MIPS Malta (64 bit)"
#. Tag: entry
-#: hardware.xml:130 hardware.xml:149
+#: hardware.xml:131 hardware.xml:150
#, no-c-format
msgid "5kc-malta"
msgstr "5kc-malta"
# index.docbook:162, index.docbook:177
#. Tag: entry
-#: hardware.xml:132 hardware.xml:151
+#: hardware.xml:133 hardware.xml:152
#, no-c-format
msgid "Broadcom BCM91250A (SWARM)"
msgstr "Broadcom BCM91250A (SQARM)"
# index.docbook:163, index.docbook:178
#. Tag: entry
-#: hardware.xml:133 hardware.xml:152
+#: hardware.xml:134 hardware.xml:153
#, no-c-format
msgid "sb1-bcm91250a"
msgstr "sb1-bcm91250a"
# index.docbook:162, index.docbook:177
#. Tag: entry
-#: hardware.xml:135 hardware.xml:154
+#: hardware.xml:136 hardware.xml:155
#, no-c-format
msgid "Broadcom BCM91480B (BigSur)"
msgstr "Broadcom BCM91480B (BigSur)"
# index.docbook:163, index.docbook:178
#. Tag: entry
-#: hardware.xml:136 hardware.xml:155
+#: hardware.xml:137 hardware.xml:156
#, no-c-format
msgid "sb1a-bcm91480b"
msgstr "sb1a-bcm91480b"
#. Tag: entry
-#: hardware.xml:140
+#: hardware.xml:141
#, no-c-format
msgid "MIPS (little endian)"
msgstr "MIPS (little endian)"
#. Tag: entry
-#: hardware.xml:141
+#: hardware.xml:142
#, no-c-format
msgid "mipsel"
msgstr "mipsel"
#. Tag: entry
-#: hardware.xml:142
+#: hardware.xml:143
#, no-c-format
msgid "Cobalt"
msgstr "Cobalt"
#. Tag: entry
-#: hardware.xml:143
+#: hardware.xml:144
#, no-c-format
msgid "cobalt"
msgstr "cobalt"
#. Tag: entry
-#: hardware.xml:159
+#: hardware.xml:160
#, no-c-format
msgid "Motorola 680x0"
msgstr "Motorola 680x0"
#. Tag: entry
-#: hardware.xml:160
+#: hardware.xml:161
#, no-c-format
msgid "m68k"
msgstr "m68k"
#. Tag: entry
-#: hardware.xml:161
+#: hardware.xml:162
#, no-c-format
msgid "Atari"
msgstr "Atari"
#. Tag: entry
-#: hardware.xml:162
+#: hardware.xml:163
#, no-c-format
msgid "atari"
msgstr "atari"
#. Tag: entry
-#: hardware.xml:164
+#: hardware.xml:165
#, no-c-format
msgid "Amiga"
msgstr "Amiga"
#. Tag: entry
-#: hardware.xml:165
+#: hardware.xml:166
#, no-c-format
msgid "amiga"
msgstr "amiga"
#. Tag: entry
-#: hardware.xml:167
+#: hardware.xml:168
#, no-c-format
msgid "68k Macintosh"
msgstr "68k Macintosh"
#. Tag: entry
-#: hardware.xml:168
+#: hardware.xml:169
#, no-c-format
msgid "<entry>mac</entry>"
msgstr "<entry>mac</entry>"
#. Tag: entry
-#: hardware.xml:170
+#: hardware.xml:171
#, no-c-format
msgid "<entry>VME</entry>"
msgstr "<entry>VME</entry>"
#. Tag: entry
-#: hardware.xml:171
+#: hardware.xml:172
#, no-c-format
msgid "bvme6000"
msgstr "bvme6000"
#. Tag: entry
-#: hardware.xml:173
+#: hardware.xml:174
#, no-c-format
msgid "mvme147"
msgstr "mvme147"
#. Tag: entry
-#: hardware.xml:175
+#: hardware.xml:176
#, no-c-format
msgid "mvme16x"
msgstr "mvme16x"
#. Tag: entry
-#: hardware.xml:179
+#: hardware.xml:180
#, no-c-format
msgid "IBM/Motorola PowerPC"
msgstr "IBM/Motorola PowerPC"
#. Tag: entry
-#: hardware.xml:180
+#: hardware.xml:181
#, no-c-format
msgid "<entry>powerpc</entry>"
msgstr "<entry>powerpc</entry>"
#. Tag: entry
-#: hardware.xml:181
+#: hardware.xml:182
#, no-c-format
msgid "PowerMac"
msgstr "PowerMac"
#. Tag: entry
-#: hardware.xml:182
+#: hardware.xml:183
#, no-c-format
msgid "pmac"
msgstr "pmac"
#. Tag: entry
-#: hardware.xml:184
+#: hardware.xml:185
#, no-c-format
msgid "PReP"
msgstr "PReP"
#. Tag: entry
-#: hardware.xml:185
+#: hardware.xml:186
#, no-c-format
msgid "prep"
msgstr ""
#. Tag: entry
-#: hardware.xml:189
+#: hardware.xml:190
#, no-c-format
msgid "Sun SPARC"
msgstr "Sun SPARC"
#. Tag: entry
-#: hardware.xml:190
+#: hardware.xml:191
#, no-c-format
msgid "sparc"
msgstr "sparc"
#. Tag: entry
-#: hardware.xml:191
+#: hardware.xml:192
#, no-c-format
msgid "<entry>sun4u</entry>"
msgstr "<entry>sun4u</entry>"
#. Tag: entry
-#: hardware.xml:192
+#: hardware.xml:193
#, no-c-format
msgid "sparc64"
msgstr "sparc64"
#. Tag: entry
-#: hardware.xml:194
+#: hardware.xml:195
#, no-c-format
msgid "<entry>sun4v</entry>"
msgstr "<entry>sun4v</entry>"
#. Tag: entry
-#: hardware.xml:198
+#: hardware.xml:199
#, no-c-format
msgid "IBM S/390"
msgstr "IBM S/390"
#. Tag: entry
-#: hardware.xml:199
+#: hardware.xml:200
#, no-c-format
msgid "s390"
msgstr "s390"
#. Tag: entry
-#: hardware.xml:200
+#: hardware.xml:201
#, no-c-format
msgid "IPL from VM-reader and DASD"
msgstr "来自 VM-reader 和 DASD 的 IPL"
#. Tag: entry
-#: hardware.xml:201
+#: hardware.xml:202
#, no-c-format
msgid "generic"
msgstr "generic"
#. Tag: entry
-#: hardware.xml:203
+#: hardware.xml:204
#, no-c-format
msgid "IPL from tape"
msgstr "来自 tape 的 IPL"
#. Tag: entry
-#: hardware.xml:204
+#: hardware.xml:205
#, no-c-format
msgid "tape"
msgstr "type"
#. Tag: para
-#: hardware.xml:209
+#: hardware.xml:210
#, no-c-format
msgid ""
"This document covers installation for the <emphasis>&arch-title;</emphasis> "
@@ -566,7 +572,7 @@ msgstr ""
"ports/\">Debian-Ports</ulink> 页面。"
#. Tag: para
-#: hardware.xml:217
+#: hardware.xml:218
#, no-c-format
msgid ""
"This is the first official release of &debian; for the &arch-title; "
@@ -587,15 +593,15 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:239 hardware.xml:698 hardware.xml:734 hardware.xml:838
-#: hardware.xml:857 hardware.xml:939 hardware.xml:981 hardware.xml:1055
-#: hardware.xml:1127
+#: hardware.xml:240 hardware.xml:699 hardware.xml:735 hardware.xml:839
+#: hardware.xml:858 hardware.xml:940 hardware.xml:982 hardware.xml:1056
+#: hardware.xml:1128
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
#. Tag: para
-#: hardware.xml:240
+#: hardware.xml:241
#, no-c-format
msgid ""
"Complete information regarding supported DEC Alphas can be found at <ulink "
@@ -606,7 +612,7 @@ msgstr ""
"Alpha HOWTO</ulink> 中找到。本节是描述启动盘对系统支持的概况。"
#. Tag: para
-#: hardware.xml:247
+#: hardware.xml:248
#, no-c-format
msgid ""
"Alpha machines are subdivided into different system types because there are "
@@ -620,7 +626,7 @@ msgstr ""
"能。因此,安装过程,更准确地说是启动过程,会因系统不同而不同。"
#. Tag: para
-#: hardware.xml:255
+#: hardware.xml:256
#, no-c-format
msgid ""
"The following table lists the system types supported by the Debian "
@@ -632,1133 +638,1133 @@ msgstr ""
"<emphasis>代号(code name)</emphasis>。当开始安装时,您需要知道这些代号。"
#. Tag: entry
-#: hardware.xml:272
+#: hardware.xml:273
#, no-c-format
msgid "Hardware Type"
msgstr "硬件类型"
#. Tag: entry
-#: hardware.xml:273
+#: hardware.xml:274
#, no-c-format
msgid "Aliases"
msgstr "别名"
#. Tag: entry
-#: hardware.xml:273
+#: hardware.xml:274
#, no-c-format
msgid "MILO image"
msgstr "MILO image"
#. Tag: entry
-#: hardware.xml:279
+#: hardware.xml:280
#, no-c-format
msgid "ALCOR"
msgstr "ALCOR"
#. Tag: entry
-#: hardware.xml:280
+#: hardware.xml:281
#, no-c-format
msgid "AlphaStation 500 5/266.300"
msgstr "AlphaStation 500 5/266.300"
#. Tag: entry
-#: hardware.xml:281
+#: hardware.xml:282
#, no-c-format
msgid "Maverick"
msgstr "Maverick"
# index.docbook:267, index.docbook:271, index.docbook:275
#. Tag: entry
-#: hardware.xml:282 hardware.xml:286 hardware.xml:290
+#: hardware.xml:283 hardware.xml:287 hardware.xml:291
#, no-c-format
msgid "alcor"
msgstr "alcor"
#. Tag: entry
-#: hardware.xml:284
+#: hardware.xml:285
#, no-c-format
msgid "AlphaStation 500 5/333...500"
msgstr "AlphaStation 500 5/333...500"
#. Tag: entry
-#: hardware.xml:285
+#: hardware.xml:286
#, no-c-format
msgid "Bret"
msgstr "Bret"
#. Tag: entry
-#: hardware.xml:288
+#: hardware.xml:289
#, no-c-format
msgid "AlphaStation 600/266...300"
msgstr "AlphaStation 600/266...300"
#. Tag: entry
-#: hardware.xml:289
+#: hardware.xml:290
#, no-c-format
msgid "Alcor"
msgstr "Alcor"
#. Tag: entry
-#: hardware.xml:292
+#: hardware.xml:293
#, no-c-format
msgid "AlphaStation 600/300...433"
msgstr "AlphaStation 600/300...433"
#. Tag: entry
-#: hardware.xml:293
+#: hardware.xml:294
#, no-c-format
msgid "<entry>XLT</entry>"
msgstr "<entry>XLT</entry>"
#. Tag: entry
-#: hardware.xml:294
+#: hardware.xml:295
#, no-c-format
msgid "<entry>xlt</entry>"
msgstr "<entry>xlt</entry>"
#. Tag: entry
-#: hardware.xml:298
+#: hardware.xml:299
#, no-c-format
msgid "BOOK1"
msgstr "BOOK1"
#. Tag: entry
-#: hardware.xml:299
+#: hardware.xml:300
#, no-c-format
msgid "AlphaBook1 (laptop)"
msgstr "AlphaBook1 (laptop)"
#. Tag: entry
-#: hardware.xml:300
+#: hardware.xml:301
#, no-c-format
msgid "Alphabook1/Burns"
msgstr "Alphabook1/Burns"
#. Tag: entry
-#: hardware.xml:301
+#: hardware.xml:302
#, no-c-format
msgid "book1"
msgstr "book1"
#. Tag: entry
-#: hardware.xml:305
+#: hardware.xml:306
#, no-c-format
msgid "AVANTI"
msgstr "AVANTI"
#. Tag: entry
-#: hardware.xml:306
+#: hardware.xml:307
#, no-c-format
msgid "AlphaStation 200 4/100...166"
msgstr "AlphaStation 200 4/100...166"
#. Tag: entry
-#: hardware.xml:307
+#: hardware.xml:308
#, no-c-format
msgid "Mustang"
msgstr "Mustang"
# index.docbook:293, index.docbook:297, index.docbook:301, index.docbook:305, index.docbook:309, index.docbook:313, index.docbook:317, index.docbook:321
#. Tag: entry
-#: hardware.xml:308 hardware.xml:312 hardware.xml:316 hardware.xml:320
-#: hardware.xml:324 hardware.xml:328 hardware.xml:332 hardware.xml:336
+#: hardware.xml:309 hardware.xml:313 hardware.xml:317 hardware.xml:321
+#: hardware.xml:325 hardware.xml:329 hardware.xml:333 hardware.xml:337
#, no-c-format
msgid "avanti"
msgstr "avanti"
#. Tag: entry
-#: hardware.xml:310
+#: hardware.xml:311
#, no-c-format
msgid "AlphaStation 200 4/233"
msgstr "AlphaStation 200 4/233"
#. Tag: entry
-#: hardware.xml:311
+#: hardware.xml:312
#, no-c-format
msgid "Mustang+"
msgstr "Mustang+"
#. Tag: entry
-#: hardware.xml:314
+#: hardware.xml:315
#, no-c-format
msgid "AlphaStation 205 4/133...333"
msgstr "AlphaStation 205 4/133...333"
#. Tag: entry
-#: hardware.xml:315
+#: hardware.xml:316
#, no-c-format
msgid "<entry>LX3</entry>"
msgstr "<entry>LX3</entry>"
#. Tag: entry
-#: hardware.xml:318
+#: hardware.xml:319
#, no-c-format
msgid "AlphaStation 250 4/300"
msgstr "AlphaStation 250 4/300"
#. Tag: entry
-#: hardware.xml:319
+#: hardware.xml:320
#, no-c-format
msgid "<entry>M3+</entry>"
msgstr "<entry>M3+</entry>"
#. Tag: entry
-#: hardware.xml:322
+#: hardware.xml:323
#, no-c-format
msgid "AlphaStation 255 4/133...333"
msgstr "AlphaStation 255 4/133...333"
#. Tag: entry
-#: hardware.xml:323
+#: hardware.xml:324
#, no-c-format
msgid "LX3+"
msgstr "LX3+"
#. Tag: entry
-#: hardware.xml:326
+#: hardware.xml:327
#, no-c-format
msgid "AlphaStation 300 4/266"
msgstr "AlphaStation 300 4/266"
#. Tag: entry
-#: hardware.xml:327
+#: hardware.xml:328
#, no-c-format
msgid "Melmac"
msgstr "Melmac"
#. Tag: entry
-#: hardware.xml:330
+#: hardware.xml:331
#, no-c-format
msgid "AlphaStation 400 4/166"
msgstr "AlphaStation 400 4/166"
#. Tag: entry
-#: hardware.xml:331
+#: hardware.xml:332
#, no-c-format
msgid "Chinet"
msgstr "Chinet"
#. Tag: entry
-#: hardware.xml:334
+#: hardware.xml:335
#, no-c-format
msgid "AlphaStation 400 4/233...300"
msgstr "AlphaStation 400 4/233...300"
#. Tag: entry
-#: hardware.xml:335
+#: hardware.xml:336
#, no-c-format
msgid "Avanti"
msgstr "Avanti"
# index.docbook:325, index.docbook:338, index.docbook:339
#. Tag: entry
-#: hardware.xml:340 hardware.xml:353 hardware.xml:354
+#: hardware.xml:341 hardware.xml:354 hardware.xml:355
#, no-c-format
msgid "EB164"
msgstr "EB164"
#. Tag: entry
-#: hardware.xml:341
+#: hardware.xml:342
#, no-c-format
msgid "AlphaPC164"
msgstr "AlphaPC164"
#. Tag: entry
-#: hardware.xml:342
+#: hardware.xml:343
#, no-c-format
msgid "PC164"
msgstr "PC164"
#. Tag: entry
-#: hardware.xml:343
+#: hardware.xml:344
#, no-c-format
msgid "pc164"
msgstr "pc164"
#. Tag: entry
-#: hardware.xml:345
+#: hardware.xml:346
#, no-c-format
msgid "AlphaPC164-LX"
msgstr "AlphaPC164-LX"
#. Tag: entry
-#: hardware.xml:346
+#: hardware.xml:347
#, no-c-format
msgid "LX164"
msgstr "LX164"
#. Tag: entry
-#: hardware.xml:347
+#: hardware.xml:348
#, no-c-format
msgid "lx164"
msgstr "lx164"
#. Tag: entry
-#: hardware.xml:349
+#: hardware.xml:350
#, no-c-format
msgid "AlphaPC164-SX"
msgstr "AlphaPC164-SX"
#. Tag: entry
-#: hardware.xml:350
+#: hardware.xml:351
#, no-c-format
msgid "SX164"
msgstr "SX164"
#. Tag: entry
-#: hardware.xml:351
+#: hardware.xml:352
#, no-c-format
msgid "sx164"
msgstr "sx164"
#. Tag: entry
-#: hardware.xml:355
+#: hardware.xml:356
#, no-c-format
msgid "eb164"
msgstr "eb164"
# index.docbook:344, index.docbook:353, index.docbook:354
#. Tag: entry
-#: hardware.xml:359 hardware.xml:368 hardware.xml:369
+#: hardware.xml:360 hardware.xml:369 hardware.xml:370
#, no-c-format
msgid "EB64+"
msgstr "EB64+"
#. Tag: entry
-#: hardware.xml:360
+#: hardware.xml:361
#, no-c-format
msgid "AlphaPC64"
msgstr "AlphaPC64"
# index.docbook:346, index.docbook:350
#. Tag: entry
-#: hardware.xml:361 hardware.xml:365
+#: hardware.xml:362 hardware.xml:366
#, no-c-format
msgid "Cabriolet"
msgstr "Cabriolet"
# index.docbook:347, index.docbook:351
#. Tag: entry
-#: hardware.xml:362 hardware.xml:366
+#: hardware.xml:363 hardware.xml:367
#, no-c-format
msgid "cabriolet"
msgstr "cabriolet"
#. Tag: entry
-#: hardware.xml:364
+#: hardware.xml:365
#, no-c-format
msgid "AlphaPCI64"
msgstr "AlphaPCI64"
#. Tag: entry
-#: hardware.xml:370
+#: hardware.xml:371
#, no-c-format
msgid "eb64p"
msgstr "eb64p"
# index.docbook:359, index.docbook:360, index.docbook:361
#. Tag: entry
-#: hardware.xml:374 hardware.xml:375 hardware.xml:376
+#: hardware.xml:375 hardware.xml:376 hardware.xml:377
#, no-c-format
msgid "EB66"
msgstr "EB66"
#. Tag: entry
-#: hardware.xml:377
+#: hardware.xml:378
#, no-c-format
msgid "eb66"
msgstr "eb66"
# index.docbook:364, index.docbook:365
#. Tag: entry
-#: hardware.xml:379 hardware.xml:380
+#: hardware.xml:380 hardware.xml:381
#, no-c-format
msgid "EB66+"
msgstr "EB66+"
#. Tag: entry
-#: hardware.xml:381
+#: hardware.xml:382
#, no-c-format
msgid "eb66p"
msgstr "eb66p"
#. Tag: entry
-#: hardware.xml:385
+#: hardware.xml:386
#, no-c-format
msgid "JENSEN"
msgstr "JENSEN"
#. Tag: entry
-#: hardware.xml:386
+#: hardware.xml:387
#, no-c-format
msgid "DEC 2000 Model 300(S)"
msgstr "DEC 2000 Model 300(S)"
# index.docbook:372, index.docbook:380
#. Tag: entry
-#: hardware.xml:387 hardware.xml:395
+#: hardware.xml:388 hardware.xml:396
#, no-c-format
msgid "Jensen"
msgstr "Jensen"
# index.docbook:373, index.docbook:377, index.docbook:381, index.docbook:442, index.docbook:446, index.docbook:464, index.docbook:468, index.docbook:472, index.docbook:476, index.docbook:480, index.docbook:484, index.docbook:488, index.docbook:502, index.docbook:506, index.docbook:510, index.docbook:514, index.docbook:518, index.docbook:552, index.docbook:556, index.docbook:560, index.docbook:564, index.docbook:578, index.docbook:582, index.docbook:586, index.docbook:590, index.docbook:597, index.docbook:601, index.docbook:605, index.docbook:609, index.docbook:613, index.docbook:617, index.docbook:621, index.docbook:625, index.docbook:629, index.docbook:633, index.docbook:637, index.docbook:641, index.docbook:645, index.docbook:652, index.docbook:656
#. Tag: entry
-#: hardware.xml:388 hardware.xml:392 hardware.xml:396 hardware.xml:457
-#: hardware.xml:461 hardware.xml:479 hardware.xml:483 hardware.xml:487
-#: hardware.xml:491 hardware.xml:495 hardware.xml:499 hardware.xml:503
-#: hardware.xml:517 hardware.xml:521 hardware.xml:525 hardware.xml:529
-#: hardware.xml:533 hardware.xml:567 hardware.xml:571 hardware.xml:575
-#: hardware.xml:579 hardware.xml:593 hardware.xml:597 hardware.xml:601
-#: hardware.xml:605 hardware.xml:612 hardware.xml:616 hardware.xml:620
-#: hardware.xml:624 hardware.xml:628 hardware.xml:632 hardware.xml:636
-#: hardware.xml:640 hardware.xml:644 hardware.xml:648 hardware.xml:652
-#: hardware.xml:656 hardware.xml:660 hardware.xml:667 hardware.xml:671
+#: hardware.xml:389 hardware.xml:393 hardware.xml:397 hardware.xml:458
+#: hardware.xml:462 hardware.xml:480 hardware.xml:484 hardware.xml:488
+#: hardware.xml:492 hardware.xml:496 hardware.xml:500 hardware.xml:504
+#: hardware.xml:518 hardware.xml:522 hardware.xml:526 hardware.xml:530
+#: hardware.xml:534 hardware.xml:568 hardware.xml:572 hardware.xml:576
+#: hardware.xml:580 hardware.xml:594 hardware.xml:598 hardware.xml:602
+#: hardware.xml:606 hardware.xml:613 hardware.xml:617 hardware.xml:621
+#: hardware.xml:625 hardware.xml:629 hardware.xml:633 hardware.xml:637
+#: hardware.xml:641 hardware.xml:645 hardware.xml:649 hardware.xml:653
+#: hardware.xml:657 hardware.xml:661 hardware.xml:668 hardware.xml:672
#, no-c-format
msgid "<entry>N/A</entry>"
msgstr "<entry>N/A</entry>"
#. Tag: entry
-#: hardware.xml:390
+#: hardware.xml:391
#, no-c-format
msgid "DEC 2000 Model 500"
msgstr "DEC 2000 Model 500"
#. Tag: entry
-#: hardware.xml:391
+#: hardware.xml:392
#, no-c-format
msgid "Culzen"
msgstr "Culzen"
#. Tag: entry
-#: hardware.xml:394
+#: hardware.xml:395
#, no-c-format
msgid "DECpc 150"
msgstr "DECpc 150"
#. Tag: entry
-#: hardware.xml:400
+#: hardware.xml:401
#, no-c-format
msgid "MIATA"
msgstr "MIATA"
#. Tag: entry
-#: hardware.xml:401
+#: hardware.xml:402
#, no-c-format
msgid "Personal WorkStation 433a"
msgstr "Personal WorkStation 433a"
# index.docbook:387, index.docbook:391, index.docbook:395, index.docbook:399, index.docbook:403, index.docbook:407, index.docbook:411, index.docbook:415
#. Tag: entry
-#: hardware.xml:402 hardware.xml:406 hardware.xml:410 hardware.xml:414
-#: hardware.xml:418 hardware.xml:422 hardware.xml:426 hardware.xml:430
+#: hardware.xml:403 hardware.xml:407 hardware.xml:411 hardware.xml:415
+#: hardware.xml:419 hardware.xml:423 hardware.xml:427 hardware.xml:431
#, no-c-format
msgid "Miata"
msgstr "Miata"
# index.docbook:388, index.docbook:392, index.docbook:396, index.docbook:400, index.docbook:404, index.docbook:408, index.docbook:412, index.docbook:416
#. Tag: entry
-#: hardware.xml:403 hardware.xml:407 hardware.xml:411 hardware.xml:415
-#: hardware.xml:419 hardware.xml:423 hardware.xml:427 hardware.xml:431
+#: hardware.xml:404 hardware.xml:408 hardware.xml:412 hardware.xml:416
+#: hardware.xml:420 hardware.xml:424 hardware.xml:428 hardware.xml:432
#, no-c-format
msgid "miata"
msgstr "miata"
#. Tag: entry
-#: hardware.xml:405
+#: hardware.xml:406
#, no-c-format
msgid "Personal WorkStation 433au"
msgstr "Personal WorkStation 433au"
#. Tag: entry
-#: hardware.xml:409
+#: hardware.xml:410
#, no-c-format
msgid "Personal WorkStation 466au"
msgstr "Personal WorkStation 466au"
#. Tag: entry
-#: hardware.xml:413
+#: hardware.xml:414
#, no-c-format
msgid "Personal WorkStation 500a"
msgstr "Personal WorkStation 500a"
#. Tag: entry
-#: hardware.xml:417
+#: hardware.xml:418
#, no-c-format
msgid "Personal WorkStation 500au"
msgstr "Personal WorkStation 500au"
#. Tag: entry
-#: hardware.xml:421
+#: hardware.xml:422
#, no-c-format
msgid "Personal WorkStation 550au"
msgstr "Personal WorkStation 550au"
#. Tag: entry
-#: hardware.xml:425
+#: hardware.xml:426
#, no-c-format
msgid "Personal WorkStation 600a"
msgstr "Personal WorkStation 600a"
#. Tag: entry
-#: hardware.xml:429
+#: hardware.xml:430
#, no-c-format
msgid "Personal WorkStation 600au"
msgstr "Personal WorkStation 600au"
#. Tag: entry
-#: hardware.xml:435
+#: hardware.xml:436
#, no-c-format
msgid "MIKASA"
msgstr "MIKASA"
#. Tag: entry
-#: hardware.xml:436
+#: hardware.xml:437
#, no-c-format
msgid "AlphaServer 1000 4/200"
msgstr "AlphaServer 1000 4/200"
#. Tag: entry
-#: hardware.xml:437
+#: hardware.xml:438
#, no-c-format
msgid "Mikasa"
msgstr "Mikasa"
# index.docbook:423, index.docbook:427, index.docbook:431, index.docbook:435
#. Tag: entry
-#: hardware.xml:438 hardware.xml:442 hardware.xml:446 hardware.xml:450
+#: hardware.xml:439 hardware.xml:443 hardware.xml:447 hardware.xml:451
#, no-c-format
msgid "mikasa"
msgstr "mikasa"
#. Tag: entry
-#: hardware.xml:440
+#: hardware.xml:441
#, no-c-format
msgid "AlphaServer 1000 4/233..266"
msgstr "AlphaServer 1000 4/233..266"
#. Tag: entry
-#: hardware.xml:441
+#: hardware.xml:442
#, no-c-format
msgid "Mikasa+"
msgstr "Mikasa+"
# index.docbook:429, index.docbook:433
#. Tag: entry
-#: hardware.xml:444 hardware.xml:448
+#: hardware.xml:445 hardware.xml:449
#, no-c-format
msgid "AlphaServer 1000 5/300"
msgstr "AlphaServer 1000 5/300"
#. Tag: entry
-#: hardware.xml:445
+#: hardware.xml:446
#, no-c-format
msgid "Mikasa-Pinnacle"
msgstr "Mikasa-Pinnacle"
#. Tag: entry
-#: hardware.xml:449
+#: hardware.xml:450
#, no-c-format
msgid "Mikasa-Primo"
msgstr "Mikasa-Primo"
#. Tag: entry
-#: hardware.xml:454
+#: hardware.xml:455
#, no-c-format
msgid "NAUTILUS"
msgstr "NAUTILUS"
#. Tag: entry
-#: hardware.xml:455
+#: hardware.xml:456
#, no-c-format
msgid "UP1000"
msgstr "UP1000"
#. Tag: entry
-#: hardware.xml:456
+#: hardware.xml:457
#, no-c-format
msgid "Nautilus"
msgstr "Nautilus"
#. Tag: entry
-#: hardware.xml:459
+#: hardware.xml:460
#, no-c-format
msgid "UP1100"
msgstr "UP1100"
#. Tag: entry
-#: hardware.xml:460
+#: hardware.xml:461
#, no-c-format
msgid "Galaxy-Train/Nautilus Jr."
msgstr "Galaxy-Train/Nautilus Jr."
#. Tag: entry
-#: hardware.xml:465
+#: hardware.xml:466
#, no-c-format
msgid "NONAME"
msgstr "NONAME"
#. Tag: entry
-#: hardware.xml:466
+#: hardware.xml:467
#, no-c-format
msgid "AXPpci33"
msgstr "AXPpci33"
#. Tag: entry
-#: hardware.xml:467
+#: hardware.xml:468
#, no-c-format
msgid "Noname"
msgstr "Noname"
# index.docbook:453, index.docbook:457
#. Tag: entry
-#: hardware.xml:468 hardware.xml:472
+#: hardware.xml:469 hardware.xml:473
#, no-c-format
msgid "noname"
msgstr "noname"
#. Tag: entry
-#: hardware.xml:470
+#: hardware.xml:471
#, no-c-format
msgid "<entry>UDB</entry>"
msgstr "<entry>UDB</entry>"
#. Tag: entry
-#: hardware.xml:471
+#: hardware.xml:472
#, no-c-format
msgid "Multia"
msgstr "Multia"
#. Tag: entry
-#: hardware.xml:476
+#: hardware.xml:477
#, no-c-format
msgid "NORITAKE"
msgstr "NORITAKE"
#. Tag: entry
-#: hardware.xml:477
+#: hardware.xml:478
#, no-c-format
msgid "AlphaServer 1000A 4/233...266"
msgstr "AlphaServer 1000A 4/233...266"
#. Tag: entry
-#: hardware.xml:478
+#: hardware.xml:479
#, no-c-format
msgid "Noritake"
msgstr "Noritake"
#. Tag: entry
-#: hardware.xml:481
+#: hardware.xml:482
#, no-c-format
msgid "AlphaServer 1000A 5/300"
msgstr "AlphaServer 1000A 5/300"
#. Tag: entry
-#: hardware.xml:482
+#: hardware.xml:483
#, no-c-format
msgid "Noritake-Pinnacle"
msgstr "Noritake-Pinnacle"
#. Tag: entry
-#: hardware.xml:485
+#: hardware.xml:486
#, no-c-format
msgid "AlphaServer 1000A 5/333...500"
msgstr "AlphaServer 1000A 5/333...500"
#. Tag: entry
-#: hardware.xml:486
+#: hardware.xml:487
#, no-c-format
msgid "Noritake-Primo"
msgstr "Noritake-Primo"
#. Tag: entry
-#: hardware.xml:489
+#: hardware.xml:490
#, no-c-format
msgid "AlphaServer 800 5/333...500"
msgstr "AlphaServer 800 5/333...500"
# index.docbook:475, index.docbook:483, index.docbook:487
#. Tag: entry
-#: hardware.xml:490 hardware.xml:498 hardware.xml:502
+#: hardware.xml:491 hardware.xml:499 hardware.xml:503
#, no-c-format
msgid "Corelle"
msgstr "Corelle"
#. Tag: entry
-#: hardware.xml:493
+#: hardware.xml:494
#, no-c-format
msgid "AlphaStation 600 A"
msgstr "AlphaStation 600 A"
#. Tag: entry
-#: hardware.xml:494
+#: hardware.xml:495
#, no-c-format
msgid "Alcor-Primo"
msgstr "Alcor-Primo"
#. Tag: entry
-#: hardware.xml:497
+#: hardware.xml:498
#, no-c-format
msgid "Digital Server 3300"
msgstr "Digital Server 3300"
#. Tag: entry
-#: hardware.xml:501
+#: hardware.xml:502
#, no-c-format
msgid "Digital Server 3300R"
msgstr "Digital Server 3300R"
#. Tag: entry
-#: hardware.xml:507
+#: hardware.xml:508
#, no-c-format
msgid "PLATFORM 2000"
msgstr "PLATFORM 2000"
# index.docbook:493, index.docbook:494
#. Tag: entry
-#: hardware.xml:508 hardware.xml:509
+#: hardware.xml:509 hardware.xml:510
#, no-c-format
msgid "<entry>P2K</entry>"
msgstr "<entry>P2K</entry>"
#. Tag: entry
-#: hardware.xml:510
+#: hardware.xml:511
#, no-c-format
msgid "<entry>p2k</entry>"
msgstr "<entry>p2k</entry>"
#. Tag: entry
-#: hardware.xml:514
+#: hardware.xml:515
#, no-c-format
msgid "RAWHIDE"
msgstr "RAWHIDE"
#. Tag: entry
-#: hardware.xml:515
+#: hardware.xml:516
#, no-c-format
msgid "AlphaServer 1200 5/xxx"
msgstr "AlphaServer 1200 5/xxx"
# index.docbook:501, index.docbook:513
#. Tag: entry
-#: hardware.xml:516 hardware.xml:528
+#: hardware.xml:517 hardware.xml:529
#, no-c-format
msgid "Tincup/DaVinci"
msgstr "Tincup/DaVinci"
#. Tag: entry
-#: hardware.xml:519
+#: hardware.xml:520
#, no-c-format
msgid "AlphaServer 4000 5/xxx"
msgstr "AlphaServer 4000 5/xxx"
#. Tag: entry
-#: hardware.xml:520
+#: hardware.xml:521
#, no-c-format
msgid "Wrangler/Durango"
msgstr "Wrangler/Durango"
#. Tag: entry
-#: hardware.xml:523
+#: hardware.xml:524
#, no-c-format
msgid "AlphaServer 4100 5/xxx"
msgstr "AlphaServer 4100 5/xxx"
# index.docbook:509, index.docbook:517
#. Tag: entry
-#: hardware.xml:524 hardware.xml:532
+#: hardware.xml:525 hardware.xml:533
#, no-c-format
msgid "Dodge"
msgstr "Dodge"
#. Tag: entry
-#: hardware.xml:527
+#: hardware.xml:528
#, no-c-format
msgid "Digital Server 5300"
msgstr "Digital Server 5300"
#. Tag: entry
-#: hardware.xml:531
+#: hardware.xml:532
#, no-c-format
msgid "Digital Server 7300"
msgstr "Digital Server 7300"
#. Tag: entry
-#: hardware.xml:537
+#: hardware.xml:538
#, no-c-format
msgid "RUFFIAN"
msgstr "RUFFIAN"
#. Tag: entry
-#: hardware.xml:538
+#: hardware.xml:539
#, no-c-format
msgid "DeskStation AlphaPC164-UX"
msgstr "DeskStation AlphaPC164-UX"
# index.docbook:524, index.docbook:528, index.docbook:532, index.docbook:536, index.docbook:540, index.docbook:544
#. Tag: entry
-#: hardware.xml:539 hardware.xml:543 hardware.xml:547 hardware.xml:551
-#: hardware.xml:555 hardware.xml:559
+#: hardware.xml:540 hardware.xml:544 hardware.xml:548 hardware.xml:552
+#: hardware.xml:556 hardware.xml:560
#, no-c-format
msgid "Ruffian"
msgstr "Ruffian"
# index.docbook:525, index.docbook:529, index.docbook:533, index.docbook:537, index.docbook:541, index.docbook:545
#. Tag: entry
-#: hardware.xml:540 hardware.xml:544 hardware.xml:548 hardware.xml:552
-#: hardware.xml:556 hardware.xml:560
+#: hardware.xml:541 hardware.xml:545 hardware.xml:549 hardware.xml:553
+#: hardware.xml:557 hardware.xml:561
#, no-c-format
msgid "ruffian"
msgstr "ruffian"
#. Tag: entry
-#: hardware.xml:542
+#: hardware.xml:543
#, no-c-format
msgid "DeskStation RPL164-2"
msgstr "DeskStation RPL164-2"
#. Tag: entry
-#: hardware.xml:546
+#: hardware.xml:547
#, no-c-format
msgid "DeskStation RPL164-4"
msgstr "DeskStation RPL164-4"
#. Tag: entry
-#: hardware.xml:550
+#: hardware.xml:551
#, no-c-format
msgid "DeskStation RPX164-2"
msgstr "DeskStation RPX164-2"
#. Tag: entry
-#: hardware.xml:554
+#: hardware.xml:555
#, no-c-format
msgid "DeskStation RPX164-4"
msgstr "DeskStation RPX164-4"
#. Tag: entry
-#: hardware.xml:558
+#: hardware.xml:559
#, no-c-format
msgid "Samsung AlphaPC164-BX"
msgstr "Samsung AlphaPC164-BX"
#. Tag: entry
-#: hardware.xml:564
+#: hardware.xml:565
#, no-c-format
msgid "SABLE"
msgstr "SABLE"
#. Tag: entry
-#: hardware.xml:565
+#: hardware.xml:566
#, no-c-format
msgid "AlphaServer 2000 4/xxx"
msgstr "AlphaServer 2000 4/xxx"
#. Tag: entry
-#: hardware.xml:566
+#: hardware.xml:567
#, no-c-format
msgid "Demi-Sable"
msgstr "Demi-Sable"
#. Tag: entry
-#: hardware.xml:569
+#: hardware.xml:570
#, no-c-format
msgid "AlphaServer 2000 5/xxx"
msgstr "AlphaServer 2000 5/xxx"
#. Tag: entry
-#: hardware.xml:570
+#: hardware.xml:571
#, no-c-format
msgid "Demi-Gamma-Sable"
msgstr "Demi-Gamma-Sable"
#. Tag: entry
-#: hardware.xml:573
+#: hardware.xml:574
#, no-c-format
msgid "AlphaServer 2100 4/xxx"
msgstr "AlphaServer 2100 4/xxx"
#. Tag: entry
-#: hardware.xml:574
+#: hardware.xml:575
#, no-c-format
msgid "Sable"
msgstr "Sable"
#. Tag: entry
-#: hardware.xml:577
+#: hardware.xml:578
#, no-c-format
msgid "AlphaServer 2100 5/xxx"
msgstr "AlphaServer 2100 5/xxx"
#. Tag: entry
-#: hardware.xml:578
+#: hardware.xml:579
#, no-c-format
msgid "Gamma-Sable"
msgstr "Gamma-Sable"
#. Tag: entry
-#: hardware.xml:583
+#: hardware.xml:584
#, no-c-format
msgid "TAKARA"
msgstr "TAKARA"
#. Tag: entry
-#: hardware.xml:584
+#: hardware.xml:585
#, no-c-format
msgid "21164 PICMG SBC"
msgstr "21164 PICMG SBC"
#. Tag: entry
-#: hardware.xml:585
+#: hardware.xml:586
#, no-c-format
msgid "Takara"
msgstr "Takara"
#. Tag: entry
-#: hardware.xml:586
+#: hardware.xml:587
#, no-c-format
msgid "takara"
msgstr "takara"
#. Tag: entry
-#: hardware.xml:590
+#: hardware.xml:591
#, no-c-format
msgid "TITAN"
msgstr "TITAN"
#. Tag: entry
-#: hardware.xml:591
+#: hardware.xml:592
#, no-c-format
msgid "AlphaServer DS15"
msgstr "AlphaServer DS15"
#. Tag: entry
-#: hardware.xml:592
+#: hardware.xml:593
#, no-c-format
msgid "HyperBrick2"
msgstr "HyperBrick2"
#. Tag: entry
-#: hardware.xml:595
+#: hardware.xml:596
#, no-c-format
msgid "AlphaServer DS25"
msgstr "AlphaServer DS25"
#. Tag: entry
-#: hardware.xml:596
+#: hardware.xml:597
#, no-c-format
msgid "Granite"
msgstr "Granite"
#. Tag: entry
-#: hardware.xml:599
+#: hardware.xml:600
#, no-c-format
msgid "AlphaServer ES45"
msgstr "AlphaServer ES45"
#. Tag: entry
-#: hardware.xml:600
+#: hardware.xml:601
#, no-c-format
msgid "Privateer"
msgstr "Privateer"
# index.docbook:588, index.docbook:627, index.docbook:631
#. Tag: entry
-#: hardware.xml:603 hardware.xml:642 hardware.xml:646
+#: hardware.xml:604 hardware.xml:643 hardware.xml:647
#, no-c-format
msgid "UNKNOWN"
msgstr "UNKNOWN"
#. Tag: entry
-#: hardware.xml:604
+#: hardware.xml:605
#, no-c-format
msgid "Yukon"
msgstr "Yukon"
#. Tag: entry
-#: hardware.xml:609
+#: hardware.xml:610
#, no-c-format
msgid "TSUNAMI"
msgstr "TSUNAMI"
#. Tag: entry
-#: hardware.xml:610
+#: hardware.xml:611
#, no-c-format
msgid "AlphaServer DS10"
msgstr "AlphaServer DS10"
# index.docbook:596, index.docbook:644
#. Tag: entry
-#: hardware.xml:611 hardware.xml:659
+#: hardware.xml:612 hardware.xml:660
#, no-c-format
msgid "Webbrick"
msgstr "Webbrick"
#. Tag: entry
-#: hardware.xml:614
+#: hardware.xml:615
#, no-c-format
msgid "AlphaServer DS10L"
msgstr "AlphaServer DS10L"
#. Tag: entry
-#: hardware.xml:615
+#: hardware.xml:616
#, no-c-format
msgid "Slate"
msgstr "Slate"
#. Tag: entry
-#: hardware.xml:618
+#: hardware.xml:619
#, no-c-format
msgid "AlphaServer DS20"
msgstr "AlphaServer DS20"
#. Tag: entry
-#: hardware.xml:619
+#: hardware.xml:620
#, no-c-format
msgid "Catamaran/Goldrush"
msgstr "Catamaran/Goldrush"
#. Tag: entry
-#: hardware.xml:622
+#: hardware.xml:623
#, no-c-format
msgid "AlphaServer DS20E"
msgstr "AlphaServer DS20E"
#. Tag: entry
-#: hardware.xml:623
+#: hardware.xml:624
#, no-c-format
msgid "Goldrack"
msgstr "Goldrack"
#. Tag: entry
-#: hardware.xml:626
+#: hardware.xml:627
#, no-c-format
msgid "AlphaServer DS20L"
msgstr "AlphaServer DS20L"
#. Tag: entry
-#: hardware.xml:627
+#: hardware.xml:628
#, no-c-format
msgid "Shark"
msgstr "Shark"
#. Tag: entry
-#: hardware.xml:630
+#: hardware.xml:631
#, no-c-format
msgid "AlphaServer ES40"
msgstr "AlphaServer ES40"
#. Tag: entry
-#: hardware.xml:631
+#: hardware.xml:632
#, no-c-format
msgid "Clipper"
msgstr "Clipper"
# index.docbook:619, index.docbook:620
#. Tag: entry
-#: hardware.xml:634 hardware.xml:635
+#: hardware.xml:635 hardware.xml:636
#, no-c-format
msgid "DP264"
msgstr "DP264"
#. Tag: entry
-#: hardware.xml:638
+#: hardware.xml:639
#, no-c-format
msgid "SMARTengine 21264 PCI/ISA SBC"
msgstr "SMARTengine 21264 PCI/ISA SBC"
#. Tag: entry
-#: hardware.xml:639
+#: hardware.xml:640
#, no-c-format
msgid "Eiger"
msgstr "Eiger"
#. Tag: entry
-#: hardware.xml:643
+#: hardware.xml:644
#, no-c-format
msgid "Warhol"
msgstr "Warhol"
#. Tag: entry
-#: hardware.xml:647
+#: hardware.xml:648
#, no-c-format
msgid "Windjammer"
msgstr "Windjammer"
#. Tag: entry
-#: hardware.xml:650
+#: hardware.xml:651
#, no-c-format
msgid "UP2000"
msgstr "UP2000"
#. Tag: entry
-#: hardware.xml:651
+#: hardware.xml:652
#, no-c-format
msgid "Swordfish"
msgstr "Swordfish"
#. Tag: entry
-#: hardware.xml:654
+#: hardware.xml:655
#, no-c-format
msgid "XP1000"
msgstr "XP1000"
#. Tag: entry
-#: hardware.xml:655
+#: hardware.xml:656
#, no-c-format
msgid "Monet/Brisbane"
msgstr "Monet/Brisbane"
#. Tag: entry
-#: hardware.xml:658
+#: hardware.xml:659
#, no-c-format
msgid "XP900"
msgstr "XP900"
#. Tag: entry
-#: hardware.xml:664
+#: hardware.xml:665
#, no-c-format
msgid "WILDFIRE"
msgstr "WILDFIRE"
#. Tag: entry
-#: hardware.xml:665
+#: hardware.xml:666
#, no-c-format
msgid "AlphaServer GS160"
msgstr "AlphaServer GS160"
# index.docbook:651, index.docbook:655
#. Tag: entry
-#: hardware.xml:666 hardware.xml:670
+#: hardware.xml:667 hardware.xml:671
#, no-c-format
msgid "Wildfire"
msgstr "Wildfire"
#. Tag: entry
-#: hardware.xml:669
+#: hardware.xml:670
#, no-c-format
msgid "AlphaServer GS320"
msgstr "AlphaServer GS320"
# index.docbook:660, index.docbook:662
#. Tag: entry
-#: hardware.xml:675 hardware.xml:677
+#: hardware.xml:676 hardware.xml:678
#, no-c-format
msgid "<entry>XL</entry>"
msgstr "<entry>XL</entry>"
#. Tag: entry
-#: hardware.xml:676
+#: hardware.xml:677
#, no-c-format
msgid "XL-233...266"
msgstr "XL-233...266"
#. Tag: entry
-#: hardware.xml:678
+#: hardware.xml:679
#, no-c-format
msgid "<entry>xl</entry>"
msgstr "<entry>xl</entry>"
#. Tag: para
-#: hardware.xml:683
+#: hardware.xml:684
#, no-c-format
msgid ""
"It is believed that Debian &releasename; supports installing on all alpha "
@@ -1770,7 +1776,7 @@ msgstr ""
"Titan 子体系之外,Debian &releasename; 支持安装到所有的 alpha 子体系上。"
#. Tag: para
-#: hardware.xml:699 hardware.xml:858
+#: hardware.xml:700 hardware.xml:859
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -1782,19 +1788,19 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:707 hardware.xml:866 hardware.xml:1028
+#: hardware.xml:708 hardware.xml:867 hardware.xml:1029
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
#. Tag: para
-#: hardware.xml:708
+#: hardware.xml:709
#, no-c-format
msgid "Both AMD64 and Intel EM64T processors are supported."
msgstr "AMD64 和 Intel EM64T 处理器都获得支持。"
#. Tag: para
-#: hardware.xml:736
+#: hardware.xml:737
#, no-c-format
msgid ""
"Each distinct ARM architecture requires its own kernel. Because of this the "
@@ -1807,7 +1813,7 @@ msgstr ""
"CPU 使用。"
#. Tag: para
-#: hardware.xml:745
+#: hardware.xml:746
#, no-c-format
msgid ""
"Most ARM CPUs may be run in either endian mode (big or little). However, the "
@@ -1819,19 +1825,19 @@ msgstr ""
"ARM 系统。"
#. Tag: para
-#: hardware.xml:753
+#: hardware.xml:754
#, no-c-format
msgid "The supported platforms are:"
msgstr "获得支持的平台有:"
#. Tag: term
-#: hardware.xml:760
+#: hardware.xml:761
#, no-c-format
msgid "Netwinder"
msgstr "Netwinder"
#. Tag: para
-#: hardware.xml:761
+#: hardware.xml:762
#, no-c-format
msgid ""
"This is actually the name for the group of machines based upon the StrongARM "
@@ -1845,13 +1851,13 @@ msgstr ""
"称为 EB110ATX)、EBSA 285 和 Compaq personal server (cps,也叫 skiff)。"
#. Tag: term
-#: hardware.xml:774
+#: hardware.xml:775
#, no-c-format
msgid "IOP32x"
msgstr "IOP32x"
#. Tag: para
-#: hardware.xml:775
+#: hardware.xml:776
#, no-c-format
msgid ""
"Intel's I/O Processor (IOP) line is found in a number of products related to "
@@ -1868,13 +1874,13 @@ msgstr ""
"\">Thecus N2100</ulink>。"
#. Tag: term
-#: hardware.xml:788
+#: hardware.xml:789
#, no-c-format
msgid "IXP4xx"
msgstr "IXP4xx"
#. Tag: para
-#: hardware.xml:789
+#: hardware.xml:790
#, no-c-format
msgid ""
"The IXP4xx platform is based on Intel's XScale ARM core. Currently, only one "
@@ -1892,13 +1898,13 @@ msgstr ""
"\">installation instructions</ulink>。"
#. Tag: term
-#: hardware.xml:803
+#: hardware.xml:804
#, no-c-format
msgid "Orion5x"
msgstr "Orion5x"
#. Tag: para
-#: hardware.xml:804
+#: hardware.xml:805
#, no-c-format
msgid ""
"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
@@ -1917,13 +1923,13 @@ msgstr ""
"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
#. Tag: term
-#: hardware.xml:819
+#: hardware.xml:820
#, no-c-format
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:820
+#: hardware.xml:821
#, no-c-format
msgid ""
"The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -1933,7 +1939,7 @@ msgstr ""
"Debian 是一个不错的方法。"
#. Tag: para
-#: hardware.xml:839
+#: hardware.xml:840
#, no-c-format
msgid ""
"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -1949,7 +1955,7 @@ msgstr ""
"位的 userland。"
#. Tag: para
-#: hardware.xml:867
+#: hardware.xml:868
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -1962,7 +1968,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:874
+#: hardware.xml:875
#, no-c-format
msgid ""
"However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run on "
@@ -1996,7 +2002,7 @@ msgstr ""
"para> </footnote>。"
#. Tag: para
-#: hardware.xml:907
+#: hardware.xml:908
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel EM64T "
@@ -2007,13 +2013,13 @@ msgstr ""
"的安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:916
+#: hardware.xml:917
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:917
+#: hardware.xml:918
#, fuzzy, no-c-format
#| msgid ""
#| "The system bus is the part of the motherboard which allows the CPU to "
@@ -2033,7 +2039,7 @@ msgstr ""
"线(VLB, 有时称为 VL 总线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:940
+#: hardware.xml:941
#, no-c-format
msgid ""
"Complete information concerning supported M68000 based "
@@ -2045,7 +2051,7 @@ msgstr ""
"url=\"&url-m68k-faq;\">Linux/m68k FAQ</ulink>。本节只是基本概况。"
#. Tag: para
-#: hardware.xml:947
+#: hardware.xml:948
#, no-c-format
msgid ""
"The &architecture; port of Linux runs on any 680x0 with a PMMU (Paged Memory "
@@ -2061,7 +2067,7 @@ msgstr ""
"了解更多信息。"
#. Tag: para
-#: hardware.xml:955
+#: hardware.xml:956
#, no-c-format
msgid ""
"There are four major supported <emphasis>&architecture;</emphasis> flavors: "
@@ -2084,7 +2090,7 @@ msgstr ""
"Sun3 体系与 NeXT black box,还在进行中,且没有被 Debian 支持。"
#. Tag: para
-#: hardware.xml:982
+#: hardware.xml:983
#, no-c-format
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
@@ -2122,7 +2128,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: hardware.xml:1029
+#: hardware.xml:1030
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -2140,7 +2146,7 @@ msgstr ""
"在 SMP 模式下获得支持。"
#. Tag: para
-#: hardware.xml:1039
+#: hardware.xml:1040
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -2151,7 +2157,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:1056
+#: hardware.xml:1057
#, no-c-format
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
@@ -2186,19 +2192,19 @@ msgstr ""
"ulink>。"
#. Tag: title
-#: hardware.xml:1097
+#: hardware.xml:1098
#, no-c-format
msgid "CPU/Machine types"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:1099
+#: hardware.xml:1100
#, no-c-format
msgid "All MIPS based Cobalt machines are supported."
msgstr "所有基于 MIPS 的 Cobalt 机器都支持。"
#. Tag: para
-#: hardware.xml:1103
+#: hardware.xml:1104
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board comes with an SB1 1250 chip with two "
@@ -2211,19 +2217,19 @@ msgstr ""
"模式获得支持。"
#. Tag: title
-#: hardware.xml:1113
+#: hardware.xml:1114
#, no-c-format
msgid "Supported console options"
msgstr "支持的控制台选项"
#. Tag: para
-#: hardware.xml:1114
+#: hardware.xml:1115
#, no-c-format
msgid "Both Cobalt and Broadcom BCM91250A/BCM91480B use 115200 bps."
msgstr "Cobalt 和 Broadcom BCM91250A/BCM91480B 都使用 115200 bps。"
#. Tag: para
-#: hardware.xml:1128
+#: hardware.xml:1129
#, no-c-format
msgid ""
"For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
@@ -2231,13 +2237,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:1149
+#: hardware.xml:1150
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:1151
+#: hardware.xml:1152
#, fuzzy, no-c-format
#| msgid ""
#| "There are four flavours of the powerpc kernel in Debian, based on the CPU "
@@ -2248,13 +2254,13 @@ msgid ""
msgstr "在 Debian 中有四种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:1158
+#: hardware.xml:1159
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:1159
+#: hardware.xml:1160
#, no-c-format
msgid ""
"Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
@@ -2265,19 +2271,19 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:1169
+#: hardware.xml:1170
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:1170
+#: hardware.xml:1171
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:1174
+#: hardware.xml:1175
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -2289,7 +2295,7 @@ msgstr ""
"270。"
#. Tag: para
-#: hardware.xml:1180
+#: hardware.xml:1181
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -2299,7 +2305,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:1185
+#: hardware.xml:1186
#, no-c-format
msgid ""
"Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
@@ -2308,13 +2314,13 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: title
-#: hardware.xml:1219
+#: hardware.xml:1220
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:1221
+#: hardware.xml:1222
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -2327,7 +2333,7 @@ msgstr ""
"(Debian 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:1228
+#: hardware.xml:1229
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -2340,7 +2346,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:1236
+#: hardware.xml:1237
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -2355,7 +2361,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:1244
+#: hardware.xml:1245
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -2370,386 +2376,386 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:1260 hardware.xml:1395 hardware.xml:1439 hardware.xml:1468
+#: hardware.xml:1261 hardware.xml:1396 hardware.xml:1440 hardware.xml:1469
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:1261
+#: hardware.xml:1262
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:1267
+#: hardware.xml:1268
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:1268
+#: hardware.xml:1269
#, 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:1269 hardware.xml:1272 hardware.xml:1275 hardware.xml:1278
-#: hardware.xml:1281 hardware.xml:1284 hardware.xml:1287 hardware.xml:1290
-#: hardware.xml:1293 hardware.xml:1296 hardware.xml:1299 hardware.xml:1302
-#: hardware.xml:1305 hardware.xml:1308 hardware.xml:1311 hardware.xml:1314
+#: hardware.xml:1270 hardware.xml:1273 hardware.xml:1276 hardware.xml:1279
+#: hardware.xml:1282 hardware.xml:1285 hardware.xml:1288 hardware.xml:1291
+#: hardware.xml:1294 hardware.xml:1297 hardware.xml:1300 hardware.xml:1303
+#: hardware.xml:1306 hardware.xml:1309 hardware.xml:1312 hardware.xml:1315
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:1271
+#: hardware.xml:1272
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:1274
+#: hardware.xml:1275
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:1277
+#: hardware.xml:1278
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:1280
+#: hardware.xml:1281
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:1283
+#: hardware.xml:1284
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:1286
+#: hardware.xml:1287
#, 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:1289
+#: hardware.xml:1290
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:1292
+#: hardware.xml:1293
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:1295
+#: hardware.xml:1296
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:1298
+#: hardware.xml:1299
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:1301
+#: hardware.xml:1302
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:1304
+#: hardware.xml:1305
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:1307
+#: hardware.xml:1308
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:1310
+#: hardware.xml:1311
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:1313
+#: hardware.xml:1314
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:1316
+#: hardware.xml:1317
#, 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: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:1356 hardware.xml:1359 hardware.xml:1365 hardware.xml:1371
-#: hardware.xml:1377
+#: hardware.xml:1318 hardware.xml:1321 hardware.xml:1324 hardware.xml:1327
+#: hardware.xml:1330 hardware.xml:1333 hardware.xml:1336 hardware.xml:1339
+#: hardware.xml:1342 hardware.xml:1345 hardware.xml:1348 hardware.xml:1351
+#: hardware.xml:1357 hardware.xml:1360 hardware.xml:1366 hardware.xml:1372
+#: hardware.xml:1378
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:1319
+#: hardware.xml:1320
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:1322
+#: hardware.xml:1323
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:1325
+#: hardware.xml:1326
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:1328
+#: hardware.xml:1329
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:1331
+#: hardware.xml:1332
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:1334
+#: hardware.xml:1335
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:1337
+#: hardware.xml:1338
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:1340
+#: hardware.xml:1341
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:1343
+#: hardware.xml:1344
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:1346
+#: hardware.xml:1347
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:1349
+#: hardware.xml:1350
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:1354
+#: hardware.xml:1355
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:1355
+#: hardware.xml:1356
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:1358
+#: hardware.xml:1359
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:1363
+#: hardware.xml:1364
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:1364
+#: hardware.xml:1365
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:1369
+#: hardware.xml:1370
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:1370
+#: hardware.xml:1371
#, 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:1375 hardware.xml:1401
+#: hardware.xml:1376 hardware.xml:1402
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:1376
+#: hardware.xml:1377
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:1385
+#: hardware.xml:1386
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1402
+#: hardware.xml:1403
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:1404
+#: hardware.xml:1405
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:1406
+#: hardware.xml:1407
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:1408
+#: hardware.xml:1409
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:1410
+#: hardware.xml:1411
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:1414 hardware.xml:1445
+#: hardware.xml:1415 hardware.xml:1446
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:1415
+#: hardware.xml:1416
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:1417
+#: hardware.xml:1418
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:1419
+#: hardware.xml:1420
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:1421
+#: hardware.xml:1422
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:1429
+#: hardware.xml:1430
#, fuzzy, no-c-format
#| msgid "Nubus PowerMac subarchitecture (unsupported)"
msgid "CHRP subarchitecture (unsupported)"
msgstr "Nubus PowerMac 自体系 (未支持)"
#. Tag: entry
-#: hardware.xml:1446
+#: hardware.xml:1447
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:1449
+#: hardware.xml:1450
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:1450
+#: hardware.xml:1451
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: title
-#: hardware.xml:1458
+#: hardware.xml:1459
#, fuzzy, no-c-format
#| msgid "Nubus PowerMac subarchitecture (unsupported)"
msgid "APUS subarchitecture (unsupported)"
msgstr "Nubus PowerMac 自体系 (未支持)"
#. Tag: entry
-#: hardware.xml:1474
+#: hardware.xml:1475
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:1475
+#: hardware.xml:1476
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:1483
+#: hardware.xml:1484
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 自体系 (未支持)"
#. Tag: para
-#: hardware.xml:1485
+#: hardware.xml:1486
#, no-c-format
msgid ""
"NuBus systems are not currently supported by Debian/powerpc. The monolithic "
@@ -2773,13 +2779,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:1522
+#: hardware.xml:1523
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1525
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -2795,7 +2801,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1533
+#: hardware.xml:1534
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -2810,7 +2816,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1541
+#: hardware.xml:1542
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -2821,13 +2827,13 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1557
+#: hardware.xml:1558
#, no-c-format
msgid "S/390 and zSeries machine types"
msgstr "S/390 与 zSeries 机器类型"
#. Tag: para
-#: hardware.xml:1558
+#: hardware.xml:1559
#, no-c-format
msgid ""
"Complete information regarding supported S/390 and zSeries machines can be "
@@ -2849,13 +2855,13 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:1580
+#: hardware.xml:1581
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1581
+#: hardware.xml:1582
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -2867,13 +2873,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1592
+#: hardware.xml:1593
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1594
+#: hardware.xml:1595
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -2886,7 +2892,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1601
+#: hardware.xml:1602
#, no-c-format
msgid ""
"The last Debian release to support sparc32 was Etch, but even then only for "
@@ -2897,13 +2903,13 @@ msgstr ""
"位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1611
+#: hardware.xml:1612
#, no-c-format
msgid "<term>sun4u</term>"
msgstr "<term>sun4u</term>"
#. Tag: para
-#: hardware.xml:1613
+#: hardware.xml:1614
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -2919,13 +2925,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1626
+#: hardware.xml:1627
#, no-c-format
msgid "<term>sun4v</term>"
msgstr "<term>sun4v</term>"
#. Tag: para
-#: hardware.xml:1628
+#: hardware.xml:1629
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -2938,7 +2944,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1639
+#: hardware.xml:1640
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -2948,13 +2954,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1648
+#: hardware.xml:1649
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1649
+#: hardware.xml:1650
#, fuzzy, no-c-format
#| msgid ""
#| "Laptops are also supported. Laptops are often specialized or contain "
@@ -2974,13 +2980,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1661 hardware.xml:1684 hardware.xml:1704 hardware.xml:1727
+#: hardware.xml:1662 hardware.xml:1685 hardware.xml:1705 hardware.xml:1728
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1662
+#: hardware.xml:1663
#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -3003,7 +3009,7 @@ msgstr ""
"只不过多些系统开销。"
#. Tag: para
-#: hardware.xml:1671
+#: hardware.xml:1672
#, no-c-format
msgid ""
"In order to optimize the kernel for single CPU systems, you'll have to "
@@ -3019,7 +3025,7 @@ msgstr ""
"选择 <quote>&smp-config-option;</quote>。"
#. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1687
#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -3042,7 +3048,7 @@ msgstr ""
"的数量(或者处理器核心数),并在单内核系统上自动关闭 SMP 的功能。"
#. Tag: para
-#: hardware.xml:1695
+#: hardware.xml:1696
#, no-c-format
msgid ""
"The 486 flavour of the Debian kernel image packages for &arch-title; is not "
@@ -3050,7 +3056,7 @@ msgid ""
msgstr "&arch-title; 的 486 Debian 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1705
+#: hardware.xml:1706
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -3065,7 +3071,7 @@ msgstr ""
"只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1714
+#: hardware.xml:1715
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -3081,7 +3087,7 @@ msgstr ""
"config-option;</quote>。"
#. Tag: para
-#: hardware.xml:1728
+#: hardware.xml:1729
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -3097,7 +3103,7 @@ msgstr ""
"因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1738
+#: hardware.xml:1739
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -3108,7 +3114,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1744
+#: hardware.xml:1745
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP. You can find a "
@@ -3123,13 +3129,13 @@ msgstr ""
"quote>。"
#. Tag: title
-#: hardware.xml:1755
+#: hardware.xml:1756
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1756
+#: hardware.xml:1757
#, no-c-format
msgid ""
"You should be using a VGA-compatible display interface for the console "
@@ -3143,7 +3149,7 @@ msgstr ""
"的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
-#: hardware.xml:1764
+#: hardware.xml:1765
#, no-c-format
msgid ""
"Debian's support for graphical interfaces is determined by the underlying "
@@ -3157,7 +3163,7 @@ msgstr ""
"<ulink url=\"&url-xorg;\"></ulink>。Debian &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1773
+#: hardware.xml:1774
#, no-c-format
msgid ""
"The X.Org X Window System is only supported on the SGI Indy and the O2. The "
@@ -3172,7 +3178,7 @@ msgstr ""
"hardware;\">兼容列表</ulink>。"
#. Tag: para
-#: hardware.xml:1782
+#: hardware.xml:1783
#, no-c-format
msgid ""
"The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v "
@@ -3185,7 +3191,7 @@ msgstr ""
"url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
#. Tag: para
-#: hardware.xml:1789
+#: hardware.xml:1790
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -3204,7 +3210,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1799
+#: hardware.xml:1800
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -3227,13 +3233,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1821
+#: hardware.xml:1822
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1822
+#: hardware.xml:1823
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the Linux kernel should "
@@ -3250,7 +3256,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: hardware.xml:1834
+#: hardware.xml:1835
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -3258,61 +3264,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1840
+#: hardware.xml:1841
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1845
+#: hardware.xml:1846
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1850
+#: hardware.xml:1851
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1855
+#: hardware.xml:1856
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1860
+#: hardware.xml:1861
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1867
+#: hardware.xml:1868
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1872
+#: hardware.xml:1873
#, 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:1877
+#: hardware.xml:1878
#, 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:1882
+#: hardware.xml:1883
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1892
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -3330,19 +3336,19 @@ msgstr ""
"址获得。"
#. Tag: para
-#: hardware.xml:1901
+#: hardware.xml:1902
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr ""
#. Tag: title
-#: hardware.xml:1908
+#: hardware.xml:1909
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1909
+#: hardware.xml:1910
#, fuzzy, no-c-format
#| msgid ""
#| "Wireless NICs are in general supported as well, with one big proviso. A "
@@ -3362,7 +3368,7 @@ msgstr ""
"作,但不被安装系统支持。"
#. Tag: para
-#: hardware.xml:1917
+#: hardware.xml:1918
#, fuzzy, no-c-format
#| msgid ""
#| "If there is no other NIC you can use during the installation, it is still "
@@ -3380,7 +3386,7 @@ msgstr ""
"&debian;。与要求固件的网卡步骤相同。"
#. Tag: para
-#: hardware.xml:1926
+#: hardware.xml:1927
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a Debian package. "
@@ -3396,13 +3402,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1940
+#: hardware.xml:1941
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1941
+#: hardware.xml:1942
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -3410,13 +3416,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1948
+#: hardware.xml:1949
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1950
+#: hardware.xml:1951
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -3432,7 +3438,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1960
+#: hardware.xml:1961
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -3445,7 +3451,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1968
+#: hardware.xml:1969
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -3462,13 +3468,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1981
+#: hardware.xml:1982
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1983
+#: hardware.xml:1984
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -3477,13 +3483,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1998
+#: hardware.xml:1999
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1999
+#: hardware.xml:2000
#, no-c-format
msgid ""
"Linux supports a large variety of hardware devices such as mice, printers, "
@@ -3494,7 +3500,7 @@ msgstr ""
"而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:2005
+#: hardware.xml:2006
#, no-c-format
msgid ""
"USB hardware generally works fine, only some USB keyboards may require "
@@ -3504,7 +3510,7 @@ msgstr ""
"\"hardware-issues\"/>)。"
#. Tag: para
-#: hardware.xml:2011
+#: hardware.xml:2012
#, no-c-format
msgid ""
"Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -3515,7 +3521,7 @@ msgstr ""
"Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
#. Tag: para
-#: hardware.xml:2017
+#: hardware.xml:2018
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -3526,7 +3532,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:2023
+#: hardware.xml:2024
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3537,7 +3543,7 @@ msgstr ""
"口。Broadcom BCM91480B 开发板有四个 64 位 PCI 插槽。"
#. Tag: para
-#: hardware.xml:2029
+#: hardware.xml:2030
#, no-c-format
msgid ""
"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3550,14 +3556,14 @@ msgstr ""
"备,但 Qube 上有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:2043
+#: hardware.xml:2044
#, fuzzy, no-c-format
#| msgid "Drivers Requiring Firmware"
msgid "Devices Requiring Firmware"
msgstr "需要固件的驱动程序"
#. Tag: para
-#: hardware.xml:2044
+#: hardware.xml:2045
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -3569,7 +3575,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2052
+#: hardware.xml:2053
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -3581,7 +3587,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2061
+#: hardware.xml:2062
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -3593,13 +3599,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: hardware.xml:2077
+#: hardware.xml:2078
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/Linux"
msgstr "特别为 GNU/Linux 采购硬件"
#. Tag: para
-#: hardware.xml:2079
+#: hardware.xml:2080
#, no-c-format
msgid ""
"There are several vendors, who ship systems with Debian or other "
@@ -3613,7 +3619,7 @@ msgstr ""
"因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:2087
+#: hardware.xml:2088
#, no-c-format
msgid ""
"Unfortunately, it's quite rare to find any vendor shipping new &arch-title; "
@@ -3621,7 +3627,7 @@ msgid ""
msgstr "不幸的是,很少会有厂商出售新 &arch-title; 机器。"
#. Tag: para
-#: hardware.xml:2092
+#: hardware.xml:2093
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -3635,7 +3641,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:2100
+#: hardware.xml:2101
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with Linux bundled, or even a "
@@ -3649,13 +3655,13 @@ msgstr ""
"他)知道您是在为一个 Linux 系统采购设备。请支持对 Linux 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:2111
+#: hardware.xml:2112
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:2112
+#: hardware.xml:2113
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -3667,7 +3673,7 @@ msgstr ""
"不公开的契约才能接触文档,以阻止我们发布 Linux 驱动程序源代码。"
#. Tag: para
-#: hardware.xml:2119
+#: hardware.xml:2120
#, no-c-format
msgid ""
"Another example is the proprietary hardware in the older Macintosh line. In "
@@ -3684,7 +3690,7 @@ msgstr ""
"之,这就是为什么向 Macintosh 移植 Linux 的进度总是滞后于其他移植版的原因。"
#. Tag: para
-#: hardware.xml:2130
+#: hardware.xml:2131
#, no-c-format
msgid ""
"Since we haven't been granted access to the documentation on these devices, "
@@ -3697,13 +3703,13 @@ msgstr ""
"软件社区也是一个重要的市场。"
#. Tag: title
-#: hardware.xml:2142
+#: hardware.xml:2143
#, no-c-format
msgid "Windows-specific Hardware"
msgstr "Windows 专用硬件"
#. Tag: para
-#: hardware.xml:2143
+#: hardware.xml:2144
#, no-c-format
msgid ""
"A disturbing trend is the proliferation of Windows-specific modems and "
@@ -3725,7 +3731,7 @@ msgstr ""
"等功能的保留内嵌处理器的设备昂贵。"
#. Tag: para
-#: hardware.xml:2156
+#: hardware.xml:2157
#, no-c-format
msgid ""
"You should avoid Windows-specific hardware for two reasons. The first is "
@@ -3756,7 +3762,7 @@ msgstr ""
"Windows 2000 或 XP,都要忍受这些制造商克扣内嵌处理器造成的性能下降。"
#. Tag: para
-#: hardware.xml:2177
+#: hardware.xml:2178
#, no-c-format
msgid ""
"You can help improve this situation by encouraging these manufacturers to "
@@ -3770,13 +3776,13 @@ msgstr ""
"hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>。"
#. Tag: title
-#: hardware.xml:2194
+#: hardware.xml:2195
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:2196
+#: hardware.xml:2197
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -3791,13 +3797,13 @@ msgstr ""
"\"/>,并列出了每种类型的优缺点。当您阅读那一章的时候,可能要返回来参考本页。"
#. Tag: title
-#: hardware.xml:2207
+#: hardware.xml:2208
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:2208
+#: hardware.xml:2209
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -3808,19 +3814,19 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:2214
+#: hardware.xml:2215
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:2221
+#: hardware.xml:2222
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:2223
+#: hardware.xml:2224
#, no-c-format
msgid ""
"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -3833,7 +3839,7 @@ msgstr ""
"IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
#. Tag: para
-#: hardware.xml:2230
+#: hardware.xml:2231
#, no-c-format
msgid ""
"CD-ROM based installation is supported for some architectures. On machines "
@@ -3851,7 +3857,7 @@ msgstr ""
"installer\"/>。"
#. Tag: para
-#: hardware.xml:2242
+#: hardware.xml:2243
#, no-c-format
msgid ""
"SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -3860,7 +3866,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:2248
+#: hardware.xml:2249
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -3870,7 +3876,7 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:2253
+#: hardware.xml:2254
#, no-c-format
msgid ""
"Both SCSI and IDE/ATAPI CD-ROMs are supported on &arch-title;, as long as "
@@ -3886,13 +3892,13 @@ msgstr ""
"制台支持,请参阅 <ulink url=\"&url-srm-howto;\">SRM HOWTO</ulink>。"
#. Tag: para
-#: hardware.xml:2262
+#: hardware.xml:2263
#, no-c-format
msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:2266
+#: hardware.xml:2267
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -3917,13 +3923,13 @@ msgstr ""
"需要一个 PCI IDE、SATA 或 SCSI 卡。"
#. Tag: title
-#: hardware.xml:2284
+#: hardware.xml:2285
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:2286
+#: hardware.xml:2287
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -3934,7 +3940,7 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: hardware.xml:2292
+#: hardware.xml:2293
#, no-c-format
msgid ""
"In fact, installation from your local disk is the preferred installation "
@@ -3942,7 +3948,7 @@ msgid ""
msgstr "事实上,从本地磁盘安装,对大多数 &architecture; 机器是推荐的做法。"
#. Tag: para
-#: hardware.xml:2297
+#: hardware.xml:2298
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -3952,13 +3958,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:2305
+#: hardware.xml:2306
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:2307
+#: hardware.xml:2308
#, no-c-format
msgid ""
"Many Debian boxes need their floppy and/or CD-ROM drives only for setting up "
@@ -3973,13 +3979,13 @@ msgstr ""
"系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
#. Tag: title
-#: hardware.xml:2319
+#: hardware.xml:2320
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:2321
+#: hardware.xml:2322
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -3996,7 +4002,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:2331
+#: hardware.xml:2332
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -4007,7 +4013,7 @@ msgstr ""
"在 &arch-title; 下推荐的安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:2337
+#: hardware.xml:2338
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -4017,13 +4023,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:2345
+#: hardware.xml:2346
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:2347
+#: hardware.xml:2348
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -4037,13 +4043,13 @@ msgstr ""
"户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/>。"
#. Tag: title
-#: hardware.xml:2359
+#: hardware.xml:2360
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:2361
+#: hardware.xml:2362
#, no-c-format
msgid ""
"The Debian boot disks contain a kernel which is built to maximize the number "
@@ -4059,7 +4065,7 @@ msgstr ""
"设计,这将使得 Debian 可以在尽可能多的硬件上安装。"
#. Tag: para
-#: hardware.xml:2371
+#: hardware.xml:2372
#, fuzzy, no-c-format
#| msgid ""
#| "Generally, the Debian installation system includes support for floppies, "
@@ -4077,7 +4083,7 @@ msgstr ""
"NTFS。"
#. Tag: para
-#: hardware.xml:2378
+#: hardware.xml:2379
#, fuzzy, no-c-format
#| msgid ""
#| "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -4100,7 +4106,7 @@ msgstr ""
"ulink> 以获得更详细信息。"
#. Tag: para
-#: hardware.xml:2386
+#: hardware.xml:2387
#, no-c-format
msgid ""
"Pretty much all storage systems supported by the Linux kernel are supported "
@@ -4116,7 +4122,7 @@ msgstr ""
"支持 Atari(FAT) 文件系统。Amigas 支持 FAT 文件系统,HFS 则是受模块支持。"
#. Tag: para
-#: hardware.xml:2396
+#: hardware.xml:2397
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -4138,7 +4144,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:2429
+#: hardware.xml:2430
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -4153,7 +4159,7 @@ msgstr ""
"Jensen 启动的信息)"
#. Tag: para
-#: hardware.xml:2438
+#: hardware.xml:2439
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -4164,7 +4170,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:2444
+#: hardware.xml:2445
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -4175,7 +4181,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:2450
+#: hardware.xml:2451
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -4183,7 +4189,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:2455
+#: hardware.xml:2456
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -4195,13 +4201,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:2472
+#: hardware.xml:2473
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:2474
+#: hardware.xml:2475
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -4214,7 +4220,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:2481
+#: hardware.xml:2482
#, no-c-format
msgid ""
"Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -4231,7 +4237,7 @@ msgstr ""
"统或许可行,但只针对有经验的用户。"
#. Tag: para
-#: hardware.xml:2498
+#: hardware.xml:2499
#, no-c-format
msgid ""
"On the Amiga the size of FastRAM is relevant towards the total memory "
@@ -4246,7 +4252,7 @@ msgstr ""
"的内核可以自动禁止 16 位的 RAM。"
#. Tag: para
-#: hardware.xml:2507
+#: hardware.xml:2508
#, no-c-format
msgid ""
"On the Atari, both ST-RAM and Fast RAM (TT-RAM) are used by Linux. Many "
@@ -4259,7 +4265,7 @@ msgstr ""
"MB 的 ST-RAM。您需要额外的 12 MB 或更多的 TT-RAM。"
#. Tag: para
-#: hardware.xml:2515
+#: hardware.xml:2516
#, no-c-format
msgid ""
"On the Macintosh, care should be taken on machines with RAM-based video "
@@ -4272,7 +4278,7 @@ msgstr ""
"要 4 MB。"
#. Tag: emphasis
-#: hardware.xml:2525
+#: hardware.xml:2526
#, no-c-format
msgid "FIXME: is this still true?"
msgstr "FIXME: is this still true?"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 98d990a95..b8b2d160f 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: 2008-09-28 00:09+0000\n"
+"POT-Creation-Date: 2008-10-17 00:09+0000\n"
"PO-Revision-Date: 2008-09-11 23:43+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -843,12 +843,59 @@ msgstr "为从 USB 闪盘引导准备文件"
#: install-methods.xml:636
#, no-c-format
msgid ""
+"There are two installation methods possible when booting from USB stick. The "
+"first is to install completely from the network. The second is to also copy "
+"a CD image onto the USB stick and use that as a source for packages, "
+"possibly in combination with a mirror. This second method is the more common."
+msgstr ""
+
+#. Tag: para
+#: install-methods.xml:644
+#, no-c-format
+msgid ""
+"For the first installation method you'll need to download an installer image "
+"from the <filename>netboot</filename> directory (at the location mentioned "
+"in <xref linkend=\"where-files\"/>) and use the <quote>flexible way</quote> "
+"explained below to copy the files to the USB stick."
+msgstr ""
+
+#. Tag: para
+#: install-methods.xml:652
+#, no-c-format
+msgid ""
+"Installation images for the second installation method can be found in the "
+"<filename>hd-media</filename> directory and either the <quote>easy way</"
+"quote> or the <quote>flexible way</quote> can be used to copy the image to "
+"the USB stick. For this installation method you will also need to download a "
+"CD image. The installation image and the CD image must be based on the same "
+"release of &d-i;. If they do not match you are likely to get "
+"errors<footnote> <para> The error message that is most likely to be "
+"displayed is that no kernel modules can be found. This means that the "
+"version of the kernel module udebs included on the CD image is different "
+"from the version of the running kernel. </para> </footnote> during the "
+"installation."
+msgstr ""
+
+#. Tag: para
+#: install-methods.xml:671
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To prepare the USB stick, you will need a system where GNU/Linux is "
+#| "already running and where USB is supported. You should ensure that the "
+#| "usb-storage kernel module is loaded (<userinput>modprobe usb-storage</"
+#| "userinput>) and try to find out which SCSI device the USB stick has been "
+#| "mapped to (in this example <filename>/dev/sda</filename> is used). To "
+#| "write to your stick, you may have to turn off its write protection switch."
+msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
-"running and where USB is supported. You should ensure that the usb-storage "
-"kernel module is loaded (<userinput>modprobe usb-storage</userinput>) and "
-"try to find out which SCSI device the USB stick has been mapped to (in this "
-"example <filename>/dev/sda</filename> is used). To write to your stick, you "
-"may have to turn off its write protection switch."
+"running and where USB is supported. With current GNU/Linux systems the USB "
+"stick should be automatically recognized when you insert it. If it is not "
+"you should check that the usb-storage kernel module is loaded. When the USB "
+"stick is inserted, it will be mapped to a device named <filename>/dev/sdX</"
+"filename>, where the <quote>X</quote> is a letter in the range a-z. You "
+"should be able to see to which device the USB stick was mapped by running "
+"the command <command>dmesg</command> after inserting it. To write to your "
+"stick, you may have to turn off its write protection switch."
msgstr ""
"为了准备 USB 闪盘,您需要一台支持 USB 的运行的 GNU/Linux 系统。应确定 usb-"
"storage 内核模块已经被加载(<userinput>modprobe usb-storage</userinput>),然后"
@@ -856,7 +903,21 @@ msgstr ""
"例)。为了写入闪盘,您可能需要关闭它的写保护开关。"
#. Tag: para
-#: install-methods.xml:646
+#: install-methods.xml:685
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Using this method will destroy anything already on the device. Make sure "
+#| "that you use the correct device name for your USB stick."
+msgid ""
+"The procedures described in this section will destroy anything already on "
+"the device! Make very sure that you use the correct device name for your USB "
+"stick. If you use the wrong device the result could be that all information "
+"on for example a hard disk could be lost."
+msgstr ""
+"采用这种方法将销毁设备上的任何内容。请确保您使用了 USB 闪盘的正确设备名。"
+
+#. Tag: para
+#: install-methods.xml:693
#, no-c-format
msgid ""
"Note that the USB stick should be at least 256 MB in size (smaller setups "
@@ -866,40 +927,71 @@ msgstr ""
"linkend=\"usb-copy-flexible\"/>)。"
#. Tag: title
-#: install-methods.xml:654
+#: install-methods.xml:701
#, no-c-format
msgid "Copying the files &mdash; the easy way"
msgstr "复制文件 &mdash; 轻松的途径"
#. Tag: para
-#: install-methods.xml:655
-#, no-c-format
+#: install-methods.xml:702
+#, fuzzy, no-c-format
+#| msgid ""
+#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
+#| "which contains all the installer files (including the kernel) as well as "
+#| "<command>SYSLINUX</command> and its configuration file. You only have to "
+#| "extract it directly to your USB stick:"
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
-"contains all the installer files (including the kernel) as well as "
-"<command>SYSLINUX</command> and its configuration file. You only have to "
-"extract it directly to your USB stick:"
+"contains all the installer files (including the kernel) <phrase arch=\"x86"
+"\">as well as <classname>syslinux</classname> and its configuration file.</"
+"phrase> <phrase arch=\"powerpc\">as well as <classname>yaboot</classname> "
+"and its configuration file.</phrase>"
msgstr ""
"这里有一个合集文件 <filename>hd-media/boot.img.gz</filename>,其中包含了所有"
"的安装程序文件(包括内核),以及 <command>SYSLINUX</command> 和它的配置文件。只"
"须把它直接解压到您的 USB 闪盘内即可:"
-#. Tag: screen
-#: install-methods.xml:662
+#. Tag: para
+#: install-methods.xml:711
#, no-c-format
-msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
-msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
+msgid ""
+"Note that, although convenient, this method does have one major "
+"disadvantage: the logical size of the device will be limited to 256 MB, even "
+"if the capacity of the USB stick is larger. You will need to repartition the "
+"USB stick and create new file systems to get its full capacity back if you "
+"ever want to use it for some different purpose. A second disadvantage is "
+"that you cannot copy a full CD image onto the USB stick, but only the "
+"smaller businesscard or netinst CD images."
+msgstr ""
#. Tag: para
-#: install-methods.xml:664
+#: install-methods.xml:721
#, no-c-format
msgid ""
-"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
-"contains all the installer files (including the kernel) as well as "
-"<command>yaboot</command> and its configuration file. Create a partition of "
-"type \"Apple_Bootstrap\" on your USB stick using <command>mac-fdisk</"
-"command>'s <userinput>C</userinput> command and extract the image directly "
-"to that:"
+"To use this image you only have to extract it directly to your USB stick:"
+msgstr ""
+
+#. Tag: screen
+#: install-methods.xml:725
+#, fuzzy, no-c-format
+#| msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
+msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
+msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
+
+#. Tag: para
+#: install-methods.xml:727
+#, fuzzy, no-c-format
+#| msgid ""
+#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
+#| "which contains all the installer files (including the kernel) as well as "
+#| "<command>yaboot</command> and its configuration file. Create a partition "
+#| "of type \"Apple_Bootstrap\" on your USB stick using <command>mac-fdisk</"
+#| "command>'s <userinput>C</userinput> command and extract the image "
+#| "directly to that:"
+msgid ""
+"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
+"<command>mac-fdisk</command>'s <userinput>C</userinput> command and extract "
+"the image directly to that:"
msgstr ""
"这里有一个合集文件 <filename>hd-media/boot.img.gz</filename>,其中包含了所有"
"的安装程序文件(包括内核),以及 <command>yaboot</command> 和它的配置文件。您可"
@@ -907,31 +999,32 @@ msgstr ""
"USB 闪盘上创建一个类型为 \"Apple_Bootstrap\" 的分区,然后直接解开映像文件到:"
#. Tag: screen
-#: install-methods.xml:673
-#, no-c-format
-msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
+#: install-methods.xml:733
+#, fuzzy, no-c-format
+#| msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
+msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
#. Tag: para
-#: install-methods.xml:676
-#, no-c-format
-msgid ""
-"Using this method will destroy anything already on the device. Make sure "
-"that you use the correct device name for your USB stick."
-msgstr ""
-"采用这种方法将销毁设备上的任何内容。请确保您使用了 USB 闪盘的正确设备名。"
-
-#. Tag: para
-#: install-methods.xml:682
-#, no-c-format
-msgid ""
-"After that, mount the USB memory stick (<userinput>mount <replaceable arch="
-"\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/sda2</"
-"replaceable> /mnt</userinput>), which will now have <phrase arch=\"x86\">a "
-"FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS filesystem</phrase> "
-"on it, and copy a Debian netinst or businesscard ISO image to it (see <xref "
-"linkend=\"usb-add-iso\"/>). Unmount the stick (<userinput>umount /mnt</"
-"userinput>) and you are done."
+#: install-methods.xml:735
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After that, mount the USB memory stick (<userinput>mount <replaceable "
+#| "arch=\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/"
+#| "sda2</replaceable> /mnt</userinput>), which will now have <phrase arch="
+#| "\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS "
+#| "filesystem</phrase> on it, and copy a Debian netinst or businesscard ISO "
+#| "image to it (see <xref linkend=\"usb-add-iso\"/>). Unmount the stick "
+#| "(<userinput>umount /mnt</userinput>) and you are done."
+msgid ""
+"After that, mount the USB memory stick <phrase arch=\"x86\">"
+"(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
+"phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
+"replaceable> /mnt</userinput>),</phrase> which will now have <phrase arch="
+"\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS "
+"filesystem</phrase> on it, and copy a Debian netinst or businesscard ISO "
+"image to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
+"are done."
msgstr ""
"然后,挂载 USB 闪盘(<userinput>mount <replaceable arch=\"x86\">/dev/sda</"
"replaceable> <replaceable arch=\"powerpc\">/dev/sda2</replaceable> /mnt</"
@@ -941,30 +1034,36 @@ msgstr ""
">)。卸载闪盘(<userinput>umount /mnt</userinput>)后结束。"
#. Tag: title
-#: install-methods.xml:698
+#: install-methods.xml:752
#, no-c-format
msgid "Copying the files &mdash; the flexible way"
msgstr "复制文件 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:699
-#, no-c-format
+#: install-methods.xml:753
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you like more flexibility or just want to know what's going on, you "
+#| "should use the following method to put the files on your stick."
msgid ""
"If you like more flexibility or just want to know what's going on, you "
-"should use the following method to put the files on your stick."
+"should use the following method to put the files on your stick. One "
+"advantage of using this method is that &mdash; if the capacity of your USB "
+"stick is large enough &mdash; you have the option of copying a full CD ISO "
+"image to it."
msgstr ""
"如果您需要更多的灵活性,或者只是想了解其间发生了什么,应该使用如下的方法来把"
"文件放到您的闪盘。"
-# index.docbook:645, index.docbook:739
#. Tag: title
-#: install-methods.xml:711 install-methods.xml:800
-#, no-c-format
-msgid "USB stick partitioning on &arch-title;"
-msgstr "在 &arch-title; 上为 USB 闪盘分区"
+#: install-methods.xml:768 install-methods.xml:865
+#, fuzzy, no-c-format
+#| msgid "Booting the USB stick"
+msgid "Partitioning the USB stick"
+msgstr "从 USB 闪盘启动"
#. Tag: para
-#: install-methods.xml:712
+#: install-methods.xml:769
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -972,15 +1071,25 @@ msgid ""
msgstr "我们将展示如何使用闪盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:717
-#, no-c-format
+#: install-methods.xml:774
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
+#| "you probably won't have to repartition or reformat the stick. If you have "
+#| "to do that anyway, use <command>cfdisk</command> or any other "
+#| "partitioning tool to create a FAT16 partition, and then create the "
+#| "filesystem using: <informalexample><screen>\n"
+#| "# mkdosfs /dev/<replaceable>sda1</replaceable>\n"
+#| "</screen></informalexample> Take care that you use the correct device "
+#| "name for your USB stick. The <command>mkdosfs</command> command is "
+#| "contained in the <classname>dosfstools</classname> Debian package."
msgid ""
"Since most USB sticks come pre-configured with a single FAT16 partition, you "
"probably won't have to repartition or reformat the stick. If you have to do "
"that anyway, use <command>cfdisk</command> or any other partitioning tool to "
"create a FAT16 partition, and then create the filesystem using: "
"<informalexample><screen>\n"
-"# mkdosfs /dev/<replaceable>sda1</replaceable>\n"
+"# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
"</screen></informalexample> Take care that you use the correct device name "
"for your USB stick. The <command>mkdosfs</command> command is contained in "
"the <classname>dosfstools</classname> Debian package."
@@ -993,15 +1102,23 @@ msgstr ""
"command> 命令包含在 <classname>dosfstools</classname> Debian 软件包中。"
#. Tag: para
-#: install-methods.xml:731
-#, no-c-format
+#: install-methods.xml:788
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order to start the kernel after booting from the USB stick, we will "
+#| "put a boot loader on the stick. Although any boot loader (e.g. "
+#| "<command>LILO</command>) should work, it's convenient to use "
+#| "<command>SYSLINUX</command>, since it uses a FAT16 partition and can be "
+#| "reconfigured by just editing a text file. Any operating system which "
+#| "supports the FAT file system can be used to make changes to the "
+#| "configuration of the boot loader."
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
-"boot loader on the stick. Although any boot loader (e.g. <command>LILO</"
-"command>) should work, it's convenient to use <command>SYSLINUX</command>, "
-"since it uses a FAT16 partition and can be reconfigured by just editing a "
-"text file. Any operating system which supports the FAT file system can be "
-"used to make changes to the configuration of the boot loader."
+"boot loader on the stick. Although any boot loader (e.g. <classname>lilo</"
+"classname>) should work, it's convenient to use <classname>syslinux</"
+"classname>, since it uses a FAT16 partition and can be reconfigured by just "
+"editing a text file. Any operating system which supports the FAT file system "
+"can be used to make changes to the configuration of the boot loader."
msgstr ""
"为了在 USB 闪盘引导后启动内核,我们要在 USB 闪盘上放入一个 boot loader。尽管"
"任何 boot loader (比如 <command>LILO</command>)都应该可以胜任,不过还是使用 "
@@ -1010,15 +1127,25 @@ msgstr ""
"改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:741
-#, no-c-format
-msgid ""
-"To put <command>SYSLINUX</command> on the FAT16 partition on your USB stick, "
-"install the <classname>syslinux</classname> and <classname>mtools</"
+#: install-methods.xml:798
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To put <command>SYSLINUX</command> on the FAT16 partition on your USB "
+#| "stick, install the <classname>syslinux</classname> and <classname>mtools</"
+#| "classname> packages on your system, and do: <informalexample><screen>\n"
+#| "# syslinux /dev/<replaceable>sda1</replaceable>\n"
+#| "</screen></informalexample> Again, take care that you use the correct "
+#| "device name. The partition must not be mounted when starting "
+#| "<command>SYSLINUX</command>. This procedure writes a boot sector to the "
+#| "partition and creates the file <filename>ldlinux.sys</filename> which "
+#| "contains the boot loader code."
+msgid ""
+"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
+"stick, install the <classname>syslinux</classname> and <classname>mtools</"
"classname> packages on your system, and do: <informalexample><screen>\n"
-"# syslinux /dev/<replaceable>sda1</replaceable>\n"
+"# syslinux /dev/<replaceable>sdX1</replaceable>\n"
"</screen></informalexample> Again, take care that you use the correct device "
-"name. The partition must not be mounted when starting <command>SYSLINUX</"
+"name. The partition must not be mounted when starting <command>syslinux</"
"command>. This procedure writes a boot sector to the partition and creates "
"the file <filename>ldlinux.sys</filename> which contains the boot loader "
"code."
@@ -1032,19 +1159,36 @@ msgstr ""
"程中会向分区的引导扇区写入数据,并且创建包含 boot loader 代码的 "
"<filename>ldlinux.sys</filename> 文件。"
+#. Tag: title
+#: install-methods.xml:815 install-methods.xml:912
+#, fuzzy, no-c-format
+#| msgid "Adding an ISO image"
+msgid "Adding the installer image"
+msgstr "添加 ISO 映像"
+
#. Tag: para
-#: install-methods.xml:754
-#, no-c-format
-msgid ""
-"Mount the partition (<userinput>mount /dev/sda1 /mnt</userinput>) and copy "
-"the following files from the Debian archives to the stick: <itemizedlist> "
-"<listitem><para> <filename>vmlinuz</filename> (kernel binary) </para></"
-"listitem> <listitem><para> <filename>initrd.gz</filename> (initial ramdisk "
-"image) </para></listitem> <listitem><para> <filename>syslinux.cfg</filename> "
-"(SYSLINUX configuration file) </para></listitem> <listitem><para> Optional "
-"kernel modules </para></listitem> </itemizedlist> If you want to rename the "
-"files, please note that <command>SYSLINUX</command> can only process DOS "
-"(8.3) file names."
+#: install-methods.xml:816
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Mount the partition (<userinput>mount /dev/sda1 /mnt</userinput>) and "
+#| "copy the following files from the Debian archives to the stick: "
+#| "<itemizedlist> <listitem><para> <filename>vmlinuz</filename> (kernel "
+#| "binary) </para></listitem> <listitem><para> <filename>initrd.gz</"
+#| "filename> (initial ramdisk image) </para></listitem> <listitem><para> "
+#| "<filename>syslinux.cfg</filename> (SYSLINUX configuration file) </para></"
+#| "listitem> <listitem><para> Optional kernel modules </para></listitem> </"
+#| "itemizedlist> If you want to rename the files, please note that "
+#| "<command>SYSLINUX</command> can only process DOS (8.3) file names."
+msgid ""
+"Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
+"mnt</userinput>) and copy the following installer image files to the stick: "
+"<itemizedlist> <listitem><para> <filename>vmlinuz</filename> (kernel binary) "
+"</para></listitem> <listitem><para> <filename>initrd.gz</filename> (initial "
+"ramdisk image) </para></listitem> </itemizedlist> You can choose between "
+"either the regular version or the graphical version of the installer. The "
+"latter can be found in the <filename>gtk</filename> subdirectory. If you "
+"want to rename the files, please note that <classname>syslinux</classname> "
+"can only process DOS (8.3) file names."
msgstr ""
"接下来就是挂载分区(<userinput>mount /dev/sda1 /mnt</userinput>),以及将下列文"
"件从 Debian 文件库拷贝到闪盘上: <itemizedlist> <listitem><para> "
@@ -1056,35 +1200,53 @@ msgstr ""
"处理 DOS (8.3) 格式的文件名。"
#. Tag: para
-#: install-methods.xml:785
+#: install-methods.xml:840
#, no-c-format
msgid ""
-"The <filename>syslinux.cfg</filename> configuration file should contain the "
-"following two lines:"
-msgstr "<filename>syslinux.cfg</filename> 配置文件应包含以下两行:"
+"Next you should create a <filename>syslinux.cfg</filename> configuration "
+"file, which at a bare minimum should contain the following two lines: "
+"<informalexample><screen>\n"
+"default vmlinuz\n"
+"append initrd=initrd.gz\n"
+"</screen></informalexample> For the graphical installer you should add "
+"<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
+msgstr ""
-#. Tag: screen
-#: install-methods.xml:790
+#. Tag: para
+#: install-methods.xml:850 install-methods.xml:952
#, no-c-format
msgid ""
-"default vmlinuz\n"
-"append initrd=initrd.gz"
+"If you used an <filename>hd-media</filename> image, you should now copy a "
+"Debian ISO image (businesscard, netinst or full CD image; be sure to select "
+"one that fits) onto the stick. When you are done, unmount the USB memory "
+"stick (<userinput>umount /mnt</userinput>)."
msgstr ""
-"default vmlinuz\n"
-"append initrd=initrd.gz"
#. Tag: para
-#: install-methods.xml:801
-#, no-c-format
+#: install-methods.xml:866
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Most USB sticks do not come pre-configured in such a way that Open "
+#| "Firmware can boot from them, so you will need to repartition the stick. "
+#| "On Mac systems, run <userinput>mac-fdisk /dev/sda</userinput>, initialise "
+#| "a new partition map using the <userinput>i</userinput> command, and "
+#| "create a new partition of type Apple_Bootstrap using the <userinput>C</"
+#| "userinput> command. (Note that the first \"partition\" will always be the "
+#| "partition map itself.) Then type <informalexample><screen>\n"
+#| "$ hformat /dev/<replaceable>sda2</replaceable>\n"
+#| "</screen></informalexample> Take care that you use the correct device "
+#| "name for your USB stick. The <command>hformat</command> command is "
+#| "contained in the <classname>hfsutils</classname> Debian package."
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
"can boot from them, so you will need to repartition the stick. On Mac "
-"systems, run <userinput>mac-fdisk /dev/sda</userinput>, initialise a new "
-"partition map using the <userinput>i</userinput> command, and create a new "
-"partition of type Apple_Bootstrap using the <userinput>C</userinput> "
-"command. (Note that the first \"partition\" will always be the partition map "
-"itself.) Then type <informalexample><screen>\n"
-"$ hformat /dev/<replaceable>sda2</replaceable>\n"
+"systems, run <userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></"
+"userinput>, initialise a new partition map using the <userinput>i</"
+"userinput> command, and create a new partition of type Apple_Bootstrap using "
+"the <userinput>C</userinput> command. (Note that the first \"partition\" "
+"will always be the partition map itself.) Then type "
+"<informalexample><screen>\n"
+"$ hformat /dev/<replaceable>sdX2</replaceable>\n"
"</screen></informalexample> Take care that you use the correct device name "
"for your USB stick. The <command>hformat</command> command is contained in "
"the <classname>hfsutils</classname> Debian package."
@@ -1099,7 +1261,7 @@ msgstr ""
"command> 命令包含在 <classname>hfsutils</classname> Debian 包中。"
#. Tag: para
-#: install-methods.xml:817
+#: install-methods.xml:883
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1114,14 +1276,30 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:826
-#, no-c-format
+#: install-methods.xml:892
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The normal <command>ybin</command> tool that comes with <command>yaboot</"
+#| "command> does not yet understand USB storage devices, so you will have to "
+#| "install <command>yaboot</command> by hand using the <classname>hfsutils</"
+#| "classname> tools. Type <informalexample><screen>\n"
+#| "$ hmount /dev/sda2\n"
+#| "$ hcopy -r /usr/lib/yaboot/yaboot :\n"
+#| "$ hattrib -c UNIX -t tbxi :yaboot\n"
+#| "$ hattrib -b :\n"
+#| "$ humount\n"
+#| "</screen></informalexample> Again, take care that you use the correct "
+#| "device name. The partition must not be otherwise mounted during this "
+#| "procedure. This procedure writes the boot loader to the partition, and "
+#| "uses the HFS utilities to mark it in such a way that Open Firmware will "
+#| "boot it. Having done this, the rest of the USB stick may be prepared "
+#| "using the normal Unix utilities."
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
"command> does not yet understand USB storage devices, so you will have to "
"install <command>yaboot</command> by hand using the <classname>hfsutils</"
"classname> tools. Type <informalexample><screen>\n"
-"$ hmount /dev/sda2\n"
+"$ hmount /dev/<replaceable>sdX2</replaceable>\n"
"$ hcopy -r /usr/lib/yaboot/yaboot :\n"
"$ hattrib -c UNIX -t tbxi :yaboot\n"
"$ hattrib -b :\n"
@@ -1148,47 +1326,44 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:842
-#, no-c-format
+#: install-methods.xml:913
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and "
+#| "copy the following files from the Debian archives to the stick:"
msgid ""
-"Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and copy "
-"the following files from the Debian archives to the stick:"
+"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
+"mnt</userinput>) and copy the following installer image files to the stick:"
msgstr ""
"接下来就是挂接分区(<userinput>mount /dev/sda2 /mnt</userinput>)以及将下列文件"
"从 Debian 文件库拷贝到闪盘上:"
#. Tag: para
-#: install-methods.xml:848
+#: install-methods.xml:920
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:853
+#: install-methods.xml:925
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:858
+#: install-methods.xml:930
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:863
+#: install-methods.xml:935
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:868
-#, no-c-format
-msgid "Optional kernel modules"
-msgstr "可选的内核模块"
-
-#. Tag: para
-#: install-methods.xml:875
+#: install-methods.xml:942
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1224,58 +1399,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:892
-#, no-c-format
-msgid "Adding an ISO image"
-msgstr "添加 ISO 映像"
-
-#. Tag: para
-#: install-methods.xml:893
-#, no-c-format
-msgid ""
-"The installer will look for a Debian ISO image on the stick as its source "
-"for additional data needed for the installation. So your next step is to "
-"copy a Debian ISO image (businesscard, netinst or even a full CD image) onto "
-"your stick (be sure to select one that fits). The file name of the image "
-"must end in <filename>.iso</filename>."
-msgstr ""
-"安装程序将在盘上寻找一个 Debian ISO 映像作为安装其他数据的源。因此您下一步是"
-"复制一个 Debian ISO 映像(businesscard、netinst 或者甚至是完全版)到您的 USB 闪"
-"盘内(确定选择适合的那个)。映像文件的后缀名必须是 <filename>.iso</filename>。"
-
-#. Tag: para
-#: install-methods.xml:901
-#, no-c-format
-msgid ""
-"If you want to install over the network, without using an ISO image, you "
-"will of course skip the previous step. Moreover you will have to use the "
-"initial ramdisk from the <filename>netboot</filename> directory instead of "
-"the one from <filename>hd-media</filename>, because <filename>hd-media/"
-"initrd.gz</filename> does not have network support."
-msgstr ""
-"如果您想直接通过网络安装而不使用 ISO 映像,当然就可以跳过上述步骤。并且您必须"
-"要使用 <filename>netboot</filename> 目录中的初始化内存映像来取代来自 "
-"<filename>hd-media</filename> 的相同文件。这是因为 <filename>hd-media/initrd."
-"gz</filename> 并不包含网络支持。"
-
-#. Tag: para
-#: install-methods.xml:910
-#, no-c-format
-msgid ""
-"When you are done, unmount the USB memory stick (<userinput>umount /mnt</"
-"userinput>) and activate its write protection switch."
-msgstr ""
-"当您完成后,卸载 USB 闪盘(<userinput>umount /mnt</userinput>),并打开写保护开"
-"关。"
-
-#. Tag: title
-#: install-methods.xml:920
+#: install-methods.xml:967
#, no-c-format
msgid "Booting the USB stick"
msgstr "从 USB 闪盘启动"
#. Tag: para
-#: install-methods.xml:921
+#: install-methods.xml:968
#, no-c-format
msgid ""
"If your system refuses to boot from the memory stick, the stick may contain "
@@ -1287,19 +1417,20 @@ msgstr ""
"自 <classname>mbr</classname> 软件包:"
#. Tag: screen
-#: install-methods.xml:928
-#, no-c-format
-msgid "# install-mbr /dev/<replaceable>sda</replaceable>"
+#: install-methods.xml:975
+#, fuzzy, no-c-format
+#| msgid "# install-mbr /dev/<replaceable>sda</replaceable>"
+msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
msgstr "# install-mbr /dev/<replaceable>sda</replaceable>"
#. Tag: title
-#: install-methods.xml:939
+#: install-methods.xml:986
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:940
+#: install-methods.xml:987
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1310,7 +1441,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:946
+#: install-methods.xml:993
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1323,13 +1454,13 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:953
+#: install-methods.xml:1000
#, no-c-format
msgid "The installer cannot boot from files on an NTFS file system."
msgstr "安装程序无法从 NTFS 文件系统上进行引导。"
#. Tag: para
-#: install-methods.xml:957
+#: install-methods.xml:1004
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1349,7 +1480,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:968
+#: install-methods.xml:1015
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1360,7 +1491,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:977
+#: install-methods.xml:1024
#, no-c-format
msgid ""
"Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1369,7 +1500,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:979
+#: install-methods.xml:1026
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1379,7 +1510,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:985
+#: install-methods.xml:1032
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1390,7 +1521,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:1038
#, no-c-format
msgid ""
"Copy the following files from the Debian archives to a convenient location "
@@ -1400,19 +1531,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:998
+#: install-methods.xml:1045
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:1003
+#: install-methods.xml:1050
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:1010
+#: install-methods.xml:1057
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1420,13 +1551,13 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:1020
+#: install-methods.xml:1067
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1021
+#: install-methods.xml:1068
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1448,7 +1579,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1034
+#: install-methods.xml:1081
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1475,13 +1606,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1054
+#: install-methods.xml:1101
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1055
+#: install-methods.xml:1102
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1499,7 +1630,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1066
+#: install-methods.xml:1113
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1512,31 +1643,31 @@ msgstr ""
"盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1076 install-methods.xml:1433
+#: install-methods.xml:1123 install-methods.xml:1480
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1081 install-methods.xml:1438
+#: install-methods.xml:1128 install-methods.xml:1485
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1086 install-methods.xml:1443
+#: install-methods.xml:1133 install-methods.xml:1490
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1091 install-methods.xml:1448
+#: install-methods.xml:1138 install-methods.xml:1495
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1096
+#: install-methods.xml:1143
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1550,19 +1681,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1104
+#: install-methods.xml:1151
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1117
+#: install-methods.xml:1164
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1118
+#: install-methods.xml:1165
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1576,7 +1707,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1126
+#: install-methods.xml:1173
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1588,7 +1719,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1133
+#: install-methods.xml:1180
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1610,7 +1741,7 @@ msgstr ""
"活,向后兼容的 BOOTP 扩展。有些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1150
+#: install-methods.xml:1197
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1621,7 +1752,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1156
+#: install-methods.xml:1203
#, no-c-format
msgid ""
"Unlike the Open Firmware found on Sparc and PowerPC machines, the SRM "
@@ -1642,7 +1773,7 @@ msgstr ""
"footnote>。您也可以直接在 SRM 控制台中直接输入网络接口的 IP 配置。"
#. Tag: para
-#: install-methods.xml:1173
+#: install-methods.xml:1220
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1652,7 +1783,7 @@ msgstr ""
"<classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1178
+#: install-methods.xml:1225
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1666,7 +1797,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1186
+#: install-methods.xml:1233
#, no-c-format
msgid ""
"To use the Pre-boot Execution Environment (PXE) method of TFTP booting, you "
@@ -1680,13 +1811,13 @@ msgstr ""
"求,我们推荐 <classname>tftpd-hpa</classname>。"
#. Tag: title
-#: install-methods.xml:1204
+#: install-methods.xml:1251
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1205
+#: install-methods.xml:1252
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1704,7 +1835,7 @@ msgstr ""
"ifconfig eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1217
+#: install-methods.xml:1264
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1727,13 +1858,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1239
+#: install-methods.xml:1286
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1240
+#: install-methods.xml:1287
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1748,7 +1879,7 @@ msgstr ""
"server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1248
+#: install-methods.xml:1295
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1810,7 +1941,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1281
+#: install-methods.xml:1328
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1830,13 +1961,13 @@ msgstr ""
"是:<userinput>/etc/init.d/dhcpd3-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1302
+#: install-methods.xml:1349
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1303
+#: install-methods.xml:1350
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian;, "
@@ -1849,7 +1980,7 @@ msgstr ""
"文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1310
+#: install-methods.xml:1357
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1893,7 +2024,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1312
+#: install-methods.xml:1359
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1909,7 +2040,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1322
+#: install-methods.xml:1369
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1919,13 +2050,13 @@ msgstr ""
"<userinput>/etc/init.d/dhcpd3-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1330
+#: install-methods.xml:1377
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1331
+#: install-methods.xml:1378
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1995,13 +2126,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1347
+#: install-methods.xml:1394
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1348
+#: install-methods.xml:1395
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -2019,7 +2150,7 @@ msgstr ""
"</screen></informalexample> Debian 包通常在安装后会自动把这条设置好。"
#. Tag: para
-#: install-methods.xml:1360
+#: install-methods.xml:1407
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2036,7 +2167,7 @@ msgstr ""
"整一下配置文件示例。"
#. Tag: para
-#: install-methods.xml:1370
+#: install-methods.xml:1417
#, no-c-format
msgid ""
"Look in <filename>/etc/inetd.conf</filename> and remember the directory "
@@ -2065,7 +2196,7 @@ msgstr ""
"<replaceable>inetd-pid</replaceable></userinput>。"
#. Tag: para
-#: install-methods.xml:1390
+#: install-methods.xml:1437
#, no-c-format
msgid ""
"If you intend to install Debian on an SGI machine and your TFTP server is a "
@@ -2093,13 +2224,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1412
+#: install-methods.xml:1459
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1413
+#: install-methods.xml:1460
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2114,7 +2245,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1422
+#: install-methods.xml:1469
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2129,13 +2260,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1453
+#: install-methods.xml:1500
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1458
+#: install-methods.xml:1505
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2150,7 +2281,7 @@ msgstr ""
"所需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1466
+#: install-methods.xml:1513
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2165,13 +2296,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1478
+#: install-methods.xml:1525
#, no-c-format
msgid "Alpha TFTP Booting"
msgstr "Alpha TFTP 引导"
#. Tag: para
-#: install-methods.xml:1479
+#: install-methods.xml:1526
#, no-c-format
msgid ""
"On Alpha, you must specify the filename (as a relative path to the boot "
@@ -2192,13 +2323,13 @@ msgstr ""
"个文件名。"
#. Tag: title
-#: install-methods.xml:1494
+#: install-methods.xml:1541
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1495
+#: install-methods.xml:1542
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2226,7 +2357,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1511
+#: install-methods.xml:1558
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2238,7 +2369,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1518
+#: install-methods.xml:1565
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2251,13 +2382,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1529
+#: install-methods.xml:1576
#, no-c-format
msgid "BVM/Motorola TFTP Booting"
msgstr "BVM/Motorola TFTP 引导"
#. Tag: para
-#: install-methods.xml:1530
+#: install-methods.xml:1577
#, no-c-format
msgid ""
"For BVM and Motorola VMEbus systems copy the files &bvme6000-tftp-files; to "
@@ -2267,7 +2398,7 @@ msgstr ""
"到 <filename>/tftpboot/</filename>。"
#. Tag: para
-#: install-methods.xml:1535
+#: install-methods.xml:1582
#, no-c-format
msgid ""
"Next, configure your boot ROMs or BOOTP server to initially load the "
@@ -2282,13 +2413,13 @@ msgstr ""
"体系的系统特殊配置信息。"
#. Tag: title
-#: install-methods.xml:1547
+#: install-methods.xml:1594
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1548
+#: install-methods.xml:1595
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2302,13 +2433,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1560
+#: install-methods.xml:1607
#, no-c-format
msgid "Broadcom BCM91250A and BCM91480B TFTP Booting"
msgstr "Broadcom BCM91250A 与 BCM91480B TFTP 引导"
#. Tag: para
-#: install-methods.xml:1561
+#: install-methods.xml:1608
#, no-c-format
msgid ""
"You don't have to configure DHCP in a special way because you'll pass the "
@@ -2317,13 +2448,13 @@ msgstr ""
"您不需要通过特殊方法设置 DHCP,因为您将传递文件的完全路径至装载的 CFE 。"
#. Tag: title
-#: install-methods.xml:1666
+#: install-methods.xml:1713
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1667
+#: install-methods.xml:1714
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2338,13 +2469,13 @@ msgstr ""
"<classname>autoinstall</classname>,以及 Debian 安装程序本身。"
#. Tag: title
-#: install-methods.xml:1680
+#: install-methods.xml:1727
#, no-c-format
msgid "Automatic Installation Using the Debian Installer"
msgstr "使用 Debian 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1681
+#: install-methods.xml:1728
#, no-c-format
msgid ""
"The Debian Installer supports automating installs via preconfiguration "
@@ -2356,7 +2487,7 @@ msgstr ""
"质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1688
+#: install-methods.xml:1735
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2364,3 +2495,53 @@ msgid ""
msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
+
+# index.docbook:645, index.docbook:739
+#~ msgid "USB stick partitioning on &arch-title;"
+#~ msgstr "在 &arch-title; 上为 USB 闪盘分区"
+
+#~ msgid ""
+#~ "The <filename>syslinux.cfg</filename> configuration file should contain "
+#~ "the following two lines:"
+#~ msgstr "<filename>syslinux.cfg</filename> 配置文件应包含以下两行:"
+
+#~ msgid ""
+#~ "default vmlinuz\n"
+#~ "append initrd=initrd.gz"
+#~ msgstr ""
+#~ "default vmlinuz\n"
+#~ "append initrd=initrd.gz"
+
+#~ msgid "Optional kernel modules"
+#~ msgstr "可选的内核模块"
+
+#~ msgid ""
+#~ "The installer will look for a Debian ISO image on the stick as its source "
+#~ "for additional data needed for the installation. So your next step is to "
+#~ "copy a Debian ISO image (businesscard, netinst or even a full CD image) "
+#~ "onto your stick (be sure to select one that fits). The file name of the "
+#~ "image must end in <filename>.iso</filename>."
+#~ msgstr ""
+#~ "安装程序将在盘上寻找一个 Debian ISO 映像作为安装其他数据的源。因此您下一步"
+#~ "是复制一个 Debian ISO 映像(businesscard、netinst 或者甚至是完全版)到您的 "
+#~ "USB 闪盘内(确定选择适合的那个)。映像文件的后缀名必须是 <filename>.iso</"
+#~ "filename>。"
+
+#~ msgid ""
+#~ "If you want to install over the network, without using an ISO image, you "
+#~ "will of course skip the previous step. Moreover you will have to use the "
+#~ "initial ramdisk from the <filename>netboot</filename> directory instead "
+#~ "of the one from <filename>hd-media</filename>, because <filename>hd-media/"
+#~ "initrd.gz</filename> does not have network support."
+#~ msgstr ""
+#~ "如果您想直接通过网络安装而不使用 ISO 映像,当然就可以跳过上述步骤。并且您"
+#~ "必须要使用 <filename>netboot</filename> 目录中的初始化内存映像来取代来自 "
+#~ "<filename>hd-media</filename> 的相同文件。这是因为 <filename>hd-media/"
+#~ "initrd.gz</filename> 并不包含网络支持。"
+
+#~ msgid ""
+#~ "When you are done, unmount the USB memory stick (<userinput>umount /mnt</"
+#~ "userinput>) and activate its write protection switch."
+#~ msgstr ""
+#~ "当您完成后,卸载 USB 闪盘(<userinput>umount /mnt</userinput>),并打开写保"
+#~ "护开关。"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 6a888d0ba..7e6d12aac 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-10-06 00:09+0000\n"
+"POT-Creation-Date: 2008-10-17 00:09+0000\n"
"PO-Revision-Date: 2008-09-26 12:06+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -343,17 +343,17 @@ msgstr "iso-scan"
#: using-d-i.xml:196
#, no-c-format
msgid ""
-"Looks for ISO file systems, which may be on a CD-ROM or on the hard drive."
-msgstr "寻找 ISO 文件系统,它可能存在于 CD-ROM 或者硬盘上。"
+"Searches for ISO images (<filename>.iso</filename> files) on hard drives."
+msgstr ""
#. Tag: term
-#: using-d-i.xml:205
+#: using-d-i.xml:204
#, no-c-format
msgid "choose-mirror"
msgstr "choose-mirror"
#. Tag: para
-#: using-d-i.xml:205
+#: using-d-i.xml:204
#, no-c-format
msgid ""
"Presents a list of Debian archive mirrors. The user may choose the source of "
@@ -361,13 +361,13 @@ msgid ""
msgstr "列出 Debian 软件包镜像。用户可以选择从哪里安装软件包。"
#. Tag: term
-#: using-d-i.xml:214
+#: using-d-i.xml:213
#, no-c-format
msgid "cdrom-checker"
msgstr "cdrom-checker"
#. Tag: para
-#: using-d-i.xml:214
+#: using-d-i.xml:213
#, no-c-format
msgid ""
"Checks integrity of a CD-ROM. This way, the user may assure him/herself that "
@@ -375,13 +375,13 @@ msgid ""
msgstr "检验 CD-ROM 的完整。这种方法让用户确保所用的安装 CD-ROM 没有损坏。"
#. Tag: term
-#: using-d-i.xml:223
+#: using-d-i.xml:222
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: using-d-i.xml:223
+#: using-d-i.xml:222
#, no-c-format
msgid ""
"Lowmem tries to detect systems with low memory and then does various tricks "
@@ -392,13 +392,13 @@ msgstr ""
"是丧失一些特性)。"
#. Tag: term
-#: using-d-i.xml:233
+#: using-d-i.xml:232
#, no-c-format
msgid "anna"
msgstr "anna"
#. Tag: para
-#: using-d-i.xml:233
+#: using-d-i.xml:232
#, no-c-format
msgid ""
"Anna's Not Nearly APT. Installs packages which have been retrieved from the "
@@ -406,13 +406,13 @@ msgid ""
msgstr "Anna's Not Nearly APT。安装软件包从选择的镜像或 CD 获取。"
#. Tag: term
-#: using-d-i.xml:242
+#: using-d-i.xml:241
#, no-c-format
msgid "clock-setup"
msgstr "clock-setup"
#. Tag: para
-#: using-d-i.xml:242
+#: using-d-i.xml:241
#, no-c-format
msgid ""
"Updates the system clock and determines whether the clock is set to UTC or "
@@ -420,25 +420,25 @@ msgid ""
msgstr "更新系统时钟,并决定时钟是否使用 UTC。"
#. Tag: term
-#: using-d-i.xml:251
+#: using-d-i.xml:250
#, no-c-format
msgid "tzsetup"
msgstr "tzsetup"
#. Tag: para
-#: using-d-i.xml:251
+#: using-d-i.xml:250
#, no-c-format
msgid "Selects the time zone, based on the location selected earlier."
msgstr "选择时区,并基于前面选择的地点。"
#. Tag: term
-#: using-d-i.xml:259
+#: using-d-i.xml:258
#, no-c-format
msgid "partman"
msgstr "partman"
#. Tag: para
-#: using-d-i.xml:259
+#: using-d-i.xml:258
#, no-c-format
msgid ""
"Allows the user to partition disks attached to the system, create file "
@@ -450,13 +450,13 @@ msgstr ""
"如自动模式或 LVM 支持。在 Debian 里这是推荐的分区工具。"
#. Tag: term
-#: using-d-i.xml:271
+#: using-d-i.xml:270
#, no-c-format
msgid "partitioner"
msgstr "partitioner"
#. Tag: para
-#: using-d-i.xml:271
+#: using-d-i.xml:270
#, no-c-format
msgid ""
"Allows the user to partition disks attached to the system. A partitioning "
@@ -464,13 +464,13 @@ msgid ""
msgstr "允许用户为系统安排磁盘分区。根据用户计算机的体系选择和善的分区工具。"
#. Tag: term
-#: using-d-i.xml:281
+#: using-d-i.xml:280
#, no-c-format
msgid "partconf"
msgstr "partconf"
#. Tag: para
-#: using-d-i.xml:281
+#: using-d-i.xml:280
#, no-c-format
msgid ""
"Displays a list of partitions, and creates file systems on the selected "
@@ -478,13 +478,13 @@ msgid ""
msgstr "显示分区列表,按用户指令为选择的分区创建文件系统。"
#. Tag: term
-#: using-d-i.xml:290
+#: using-d-i.xml:289
#, no-c-format
msgid "lvmcfg"
msgstr "lvmcfg"
#. Tag: para
-#: using-d-i.xml:290
+#: using-d-i.xml:289
#, no-c-format
msgid ""
"Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -492,13 +492,13 @@ msgid ""
msgstr "帮助用户配置 <firstterm>LVM</firstterm> (Logical Volume Manager)。"
#. Tag: term
-#: using-d-i.xml:299
+#: using-d-i.xml:298
#, no-c-format
msgid "mdcfg"
msgstr "mdcfg"
#. Tag: para
-#: using-d-i.xml:299
+#: using-d-i.xml:298
#, no-c-format
msgid ""
"Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -510,13 +510,13 @@ msgstr ""
"器的高级管理。"
#. Tag: term
-#: using-d-i.xml:310
+#: using-d-i.xml:309
#, no-c-format
msgid "base-installer"
msgstr "base-installer"
#. Tag: para
-#: using-d-i.xml:310
+#: using-d-i.xml:309
#, no-c-format
msgid ""
"Installs the most basic set of packages which would allow the computer to "
@@ -524,25 +524,25 @@ msgid ""
msgstr "安装一些基本的包,让计算机重启后能在 Linux 下运行。"
#. Tag: term
-#: using-d-i.xml:319
+#: using-d-i.xml:318
#, no-c-format
msgid "user-setup"
msgstr "user-setup"
#. Tag: para
-#: using-d-i.xml:319
+#: using-d-i.xml:318
#, no-c-format
msgid "Sets up the root password, and adds a non-root user."
msgstr "建立 root 密码,然后添加一个非 root 用户。"
#. Tag: term
-#: using-d-i.xml:327
+#: using-d-i.xml:326
#, no-c-format
msgid "apt-setup"
msgstr "apt-setup"
#. Tag: para
-#: using-d-i.xml:327
+#: using-d-i.xml:326
#, no-c-format
msgid ""
"Configures apt, mostly automatically, based on what media the installer is "
@@ -550,13 +550,13 @@ msgid ""
msgstr "配置 apt,大部分是自动完成,基于安装程序所运行的介质。"
#. Tag: term
-#: using-d-i.xml:336
+#: using-d-i.xml:335
#, no-c-format
msgid "pkgsel"
msgstr "pkgsel"
#. Tag: para
-#: using-d-i.xml:336
+#: using-d-i.xml:335
#, no-c-format
msgid ""
"Uses <classname>tasksel</classname> to select and install additional "
@@ -564,13 +564,13 @@ msgid ""
msgstr "用 <classname>tasksel</classname> 选择安装额外的软件。"
#. Tag: term
-#: using-d-i.xml:344
+#: using-d-i.xml:343
#, no-c-format
msgid "os-prober"
msgstr "os-prober"
#. Tag: para
-#: using-d-i.xml:344
+#: using-d-i.xml:343
#, no-c-format
msgid ""
"Detects currently installed operating systems on the computer and passes "
@@ -584,13 +584,13 @@ msgstr ""
"统。"
#. Tag: term
-#: using-d-i.xml:356
+#: using-d-i.xml:355
#, no-c-format
msgid "bootloader-installer"
msgstr "bootloader-installer"
#. Tag: para
-#: using-d-i.xml:356
+#: using-d-i.xml:355
#, no-c-format
msgid ""
"The various bootloader installers each install a boot loader program on the "
@@ -602,26 +602,26 @@ msgstr ""
"CD-ROM 启动。许多启动加载程序都允许用户在启动的时候选择使用哪个操作系统。"
#. Tag: term
-#: using-d-i.xml:367
+#: using-d-i.xml:366
#, no-c-format
msgid "shell"
msgstr "shell"
#. Tag: para
-#: using-d-i.xml:367
+#: using-d-i.xml:366
#, no-c-format
msgid ""
"Allows the user to execute a shell from the menu, or in the second console."
msgstr "让用户能从菜单或者第二控制台执行 shell。"
#. Tag: term
-#: using-d-i.xml:376
+#: using-d-i.xml:375
#, no-c-format
msgid "save-logs"
msgstr "save-logs"
#. Tag: para
-#: using-d-i.xml:376
+#: using-d-i.xml:375
#, no-c-format
msgid ""
"Provides a way for the user to record information on a floppy disk, network, "
@@ -632,13 +632,13 @@ msgstr ""
"给 Debian 开发人员精确地报告安装程序的问题。"
#. Tag: title
-#: using-d-i.xml:394
+#: using-d-i.xml:393
#, no-c-format
msgid "Using Individual Components"
msgstr "使用单独的组件"
#. Tag: para
-#: using-d-i.xml:395
+#: using-d-i.xml:394
#, no-c-format
msgid ""
"In this section we will describe each installer component in detail. The "
@@ -653,13 +653,13 @@ msgstr ""
"到,取决于您使用的安装方法以及硬件。"
#. Tag: title
-#: using-d-i.xml:407
+#: using-d-i.xml:406
#, no-c-format
msgid "Setting up Debian Installer and Hardware Configuration"
msgstr "启动 Debian 安装程序与配置硬件"
#. Tag: para
-#: using-d-i.xml:408
+#: using-d-i.xml:407
#, no-c-format
msgid ""
"Let's assume the Debian Installer has booted and you are facing its first "
@@ -679,7 +679,7 @@ msgstr ""
"言,键盘布局或网络镜像)。"
#. Tag: para
-#: using-d-i.xml:421
+#: using-d-i.xml:420
#, no-c-format
msgid ""
"You will notice that &d-i; performs <firstterm>hardware detection</"
@@ -693,7 +693,7 @@ msgstr ""
"是所有的驱动程序都就绪,硬件侦测会在后续过程里面多次重复。"
#. Tag: para
-#: using-d-i.xml:429
+#: using-d-i.xml:428
#, no-c-format
msgid ""
"During hardware detection &d-i; checks if any of the drivers for the "
@@ -704,13 +704,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:444
+#: using-d-i.xml:443
#, no-c-format
msgid "Check available memory / low memory mode"
msgstr "检测可用内存/小内存模式"
#. Tag: para
-#: using-d-i.xml:446
+#: using-d-i.xml:445
#, no-c-format
msgid ""
"One of the first things &d-i; does, is to check available memory. If the "
@@ -722,7 +722,7 @@ msgstr ""
"进程,使您可以将 &debian; 安装到您的系统上。"
#. Tag: para
-#: using-d-i.xml:453
+#: using-d-i.xml:452
#, no-c-format
msgid ""
"The first measure taken to reduce memory consumption by the installer is to "
@@ -734,7 +734,7 @@ msgstr ""
"行。当然,您在安装完成之后还是可以进行本地化设置。"
#. Tag: para
-#: using-d-i.xml:460
+#: using-d-i.xml:459
#, no-c-format
msgid ""
"If that is not sufficient, the installer will further reduce memory "
@@ -749,7 +749,7 @@ msgstr ""
"多的内存,可能会使安装失败。"
#. Tag: para
-#: using-d-i.xml:469
+#: using-d-i.xml:468
#, no-c-format
msgid ""
"If the installer runs in low memory mode, it is recommended to create a "
@@ -765,7 +765,7 @@ msgstr ""
"能,增加磁盘活动。"
#. Tag: para
-#: using-d-i.xml:479
+#: using-d-i.xml:478
#, no-c-format
msgid ""
"Despite these measures, it is still possible that your system freezes, that "
@@ -777,7 +777,7 @@ msgstr ""
"<quote>Out of memory</quote> 信息),出现没有预期的错误,或者进程被内核杀死。"
#. Tag: para
-#: using-d-i.xml:486
+#: using-d-i.xml:485
#, no-c-format
msgid ""
"For example, it has been reported that creating a big ext3 file system fails "
@@ -791,7 +791,7 @@ msgstr ""
"组件)。安装之后可以将 ext2 分区改成 ext3。"
#. Tag: para
-#: using-d-i.xml:494
+#: using-d-i.xml:493
#, no-c-format
msgid ""
"It is possible to force the installer to use a higher lowmem level than the "
@@ -802,13 +802,13 @@ msgstr ""
"lowmem 等级,说明见 <xref linkend=\"installer-args\"/>。"
#. Tag: title
-#: using-d-i.xml:509
+#: using-d-i.xml:508
#, no-c-format
msgid "Selecting Localization Options"
msgstr "选择地区选项"
#. Tag: para
-#: using-d-i.xml:511
+#: using-d-i.xml:510
#, no-c-format
msgid ""
"In most cases the first questions you will be asked concern the selection of "
@@ -820,7 +820,7 @@ msgstr ""
"地区选项由语言,国家和地点组成。"
#. Tag: para
-#: using-d-i.xml:518
+#: using-d-i.xml:517
#, no-c-format
msgid ""
"The language you choose will be used for the rest of the installation "
@@ -832,7 +832,7 @@ msgstr ""
"的语言没有对应翻译的版本,安装将默认使用英文。"
#. Tag: para
-#: using-d-i.xml:525
+#: using-d-i.xml:524
#, no-c-format
msgid ""
"The selected country will be used later in the installation process to pick "
@@ -845,7 +845,7 @@ msgstr ""
"盘。"
#. Tag: para
-#: using-d-i.xml:532
+#: using-d-i.xml:531
#, no-c-format
msgid ""
"You will first be asked to select your preferred language. The language "
@@ -865,7 +865,7 @@ msgstr ""
"件包也不会安装。"
#. Tag: para
-#: using-d-i.xml:544
+#: using-d-i.xml:543
#, no-c-format
msgid ""
"If you selected a language that is recognized as an official language for "
@@ -883,7 +883,7 @@ msgstr ""
"项)。您将看到大洲列表;选择洲之后会看到该大洲上的国家。"
#. Tag: para
-#: using-d-i.xml:562
+#: using-d-i.xml:561
#, no-c-format
msgid ""
"If the language has only one country associated with it, that country will "
@@ -897,7 +897,7 @@ msgstr ""
"言。"
#. Tag: para
-#: using-d-i.xml:570
+#: using-d-i.xml:569
#, no-c-format
msgid ""
"A default locale will be selected based on the selected language and "
@@ -909,13 +909,13 @@ msgstr ""
"装,可以选择不同的默认 locale 以及为安装好的系统生成额外的 locale。"
#. Tag: title
-#: using-d-i.xml:585
+#: using-d-i.xml:584
#, no-c-format
msgid "Choosing a Keyboard"
msgstr "选择键盘"
#. Tag: para
-#: using-d-i.xml:587
+#: using-d-i.xml:586
#, no-c-format
msgid ""
"Keyboards are often tailored to the characters used in a language. Select a "
@@ -930,7 +930,7 @@ msgstr ""
"(在安装完之后用 root 执行 <command>kbdconfig</command>)。"
#. Tag: para
-#: using-d-i.xml:597
+#: using-d-i.xml:596
#, no-c-format
msgid ""
"Move the highlight to the keyboard selection you desire and press "
@@ -944,7 +944,7 @@ msgstr ""
"是具有 <keycap>F1</keycap> 到 <keycap>F10</keycap> 健,与顶端平行。"
#. Tag: para
-#: using-d-i.xml:606
+#: using-d-i.xml:605
#, no-c-format
msgid ""
"There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us "
@@ -962,13 +962,13 @@ msgstr ""
"方这两种布局相似。"
#. Tag: title
-#: using-d-i.xml:636
+#: using-d-i.xml:635
#, no-c-format
msgid "Looking for the Debian Installer ISO Image"
msgstr "寻找 Debian 安装程序 ISO 映像"
#. Tag: para
-#: using-d-i.xml:637
+#: using-d-i.xml:636
#, no-c-format
msgid ""
"When installing via the <emphasis>hd-media</emphasis> method, there will be "
@@ -981,7 +981,7 @@ msgstr ""
"command> 正是用来完成此任务。"
#. Tag: para
-#: using-d-i.xml:644
+#: using-d-i.xml:643
#, no-c-format
msgid ""
"At first, <command>iso-scan</command> automatically mounts all block devices "
@@ -1008,7 +1008,7 @@ msgstr ""
"command> 搜索其它的映象。"
#. Tag: para
-#: using-d-i.xml:661
+#: using-d-i.xml:660
#, no-c-format
msgid ""
"In case the previous attempt to find an installer iso image fails, "
@@ -1020,7 +1020,7 @@ msgstr ""
"行完整的搜索。这次不只查看最上级目录,而是真正地贯穿整个文件系统。"
#. Tag: para
-#: using-d-i.xml:668
+#: using-d-i.xml:667
#, no-c-format
msgid ""
"If <command>iso-scan</command> does not discover your installer iso image, "
@@ -1036,13 +1036,13 @@ msgstr ""
"用户可以在第二个控制台上完成这些动作,而毋须重新启动。"
#. Tag: title
-#: using-d-i.xml:689
+#: using-d-i.xml:688
#, no-c-format
msgid "Configuring the Network"
msgstr "配置网络"
#. Tag: para
-#: using-d-i.xml:691
+#: using-d-i.xml:690
#, no-c-format
msgid ""
"As you enter this step, if the system detects that you have more than one "
@@ -1060,7 +1060,7 @@ msgstr ""
"citerefentry> man 手册。"
#. Tag: para
-#: using-d-i.xml:702
+#: using-d-i.xml:701
#, no-c-format
msgid ""
"By default, &d-i; tries to configure your computer's network automatically "
@@ -1080,7 +1080,7 @@ msgstr ""
"服务器有时候响应很慢,如果您确定都正常,请再试一次。"
#. Tag: para
-#: using-d-i.xml:714
+#: using-d-i.xml:713
#, no-c-format
msgid ""
"The manual network setup in turn asks you a number of questions about your "
@@ -1102,7 +1102,7 @@ msgstr ""
"\"needed-info\"/>。"
#. Tag: para
-#: using-d-i.xml:728
+#: using-d-i.xml:727
#, no-c-format
msgid ""
"Some technical details you might, or might not, find handy: the program "
@@ -1121,13 +1121,13 @@ msgstr ""
"network/interfaces</filename>。"
#. Tag: title
-#: using-d-i.xml:773
+#: using-d-i.xml:772
#, no-c-format
msgid "Configuring the Clock"
msgstr "配置时钟"
#. Tag: para
-#: using-d-i.xml:775
+#: using-d-i.xml:774
#, no-c-format
msgid ""
"The installer will first attempt to connect to a time server on the Internet "
@@ -1142,7 +1142,7 @@ msgstr ""
"的。在安装过程中没法手动对系统时间进行设置。"
#. Tag: para
-#: using-d-i.xml:793
+#: using-d-i.xml:792
#, no-c-format
msgid ""
"Depending on the location selected earlier in the installation process, you "
@@ -1154,7 +1154,7 @@ msgstr ""
"如果该地只对应一个时区,那么系统就不会询问而直接使用该时区。"
#. Tag: para
-#: using-d-i.xml:800
+#: using-d-i.xml:799
#, no-c-format
msgid ""
"If for some reason you wish to set a time zone for the installed system that "
@@ -1165,7 +1165,7 @@ msgstr ""
"选项。"
#. Tag: para
-#: using-d-i.xml:811
+#: using-d-i.xml:810
#, no-c-format
msgid ""
"The simplest option is to just select a different timezone after the "
@@ -1175,13 +1175,13 @@ msgstr ""
"简易的方法是,在安装完成后重新启动进入新系统,选择一个不同的时区。该命令为:"
#. Tag: screen
-#: using-d-i.xml:817
+#: using-d-i.xml:816
#, no-c-format
msgid "# dpkg-reconfigure tzdata"
msgstr "# dpkg-reconfigure tzdata"
#. Tag: para
-#: using-d-i.xml:823
+#: using-d-i.xml:822
#, no-c-format
msgid ""
"Alternatively, the time zone can be set at the very start of the "
@@ -1196,20 +1196,20 @@ msgstr ""
"userinput> 或 <userinput>UTC</userinput>。"
#. Tag: para
-#: using-d-i.xml:837
+#: using-d-i.xml:836
#, no-c-format
msgid ""
"For automated installations the time zone can also be set using preseeding."
msgstr "自动安装可以通过预置设置时区。"
#. Tag: title
-#: using-d-i.xml:850
+#: using-d-i.xml:849
#, no-c-format
msgid "Partitioning and Mount Point Selection"
msgstr "分区与选择挂载点"
#. Tag: para
-#: using-d-i.xml:851
+#: using-d-i.xml:850
#, no-c-format
msgid ""
"At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1224,7 +1224,7 @@ msgstr ""
"并为近似选项进行配置,比如 RAID、LVM 或加密设备。"
#. Tag: para
-#: using-d-i.xml:872
+#: using-d-i.xml:871
#, no-c-format
msgid ""
"If you are uncomfortable with partitioning, or just want to know more "
@@ -1234,7 +1234,7 @@ msgstr ""
"\"partitioning\"/>。"
#. Tag: para
-#: using-d-i.xml:878
+#: using-d-i.xml:877
#, no-c-format
msgid ""
"If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1254,7 +1254,7 @@ msgstr ""
"</screen></informalexample> 注意,这会是磁盘上已有的数据无法访问。"
#. Tag: para
-#: using-d-i.xml:891
+#: using-d-i.xml:890
#, no-c-format
msgid ""
"First you will be given the opportunity to automatically partition either an "
@@ -1267,13 +1267,13 @@ msgstr ""
"<guimenuitem>Manual</guimenuitem> 。"
#. Tag: title
-#: using-d-i.xml:901
+#: using-d-i.xml:900
#, no-c-format
msgid "Guided Partitioning"
msgstr "导引式分区"
#. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:901
#, no-c-format
msgid ""
"If you choose guided partitioning, you may have three options: to create "
@@ -1289,14 +1289,14 @@ msgstr ""
"footnote>"
#. Tag: para
-#: using-d-i.xml:917
+#: using-d-i.xml:916
#, no-c-format
msgid ""
"The option to use (encrypted) LVM may not be available on all architectures."
msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
#. Tag: para
-#: using-d-i.xml:922
+#: using-d-i.xml:921
#, no-c-format
msgid ""
"When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1310,7 +1310,7 @@ msgstr ""
"大分区将无法读取,对您的(私有)数据提供了额外的安全性。"
#. Tag: para
-#: using-d-i.xml:931
+#: using-d-i.xml:930
#, no-c-format
msgid ""
"When using encrypted LVM, the installer will also automatically erase the "
@@ -1324,7 +1324,7 @@ msgstr ""
"时间。"
#. Tag: para
-#: using-d-i.xml:940
+#: using-d-i.xml:939
#, no-c-format
msgid ""
"If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1339,7 +1339,7 @@ msgstr ""
"安装程序会在写入磁盘之前让您确认。"
#. Tag: para
-#: using-d-i.xml:950
+#: using-d-i.xml:949
#, no-c-format
msgid ""
"If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1354,7 +1354,7 @@ msgstr ""
"的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
#. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:958
#, no-c-format
msgid ""
"Any data on the disk you select will eventually be lost, but you will always "
@@ -1368,7 +1368,7 @@ msgstr ""
"销。"
#. Tag: para
-#: using-d-i.xml:967
+#: using-d-i.xml:966
#, no-c-format
msgid ""
"Next, you will be able to choose from the schemes listed in the table below. "
@@ -1384,73 +1384,73 @@ msgstr ""
"1GB 以上的空间(具体大小视所选的方式而不同),那么导引式分区将以失败告终。"
#. Tag: entry
-#: using-d-i.xml:983
+#: using-d-i.xml:982
#, no-c-format
msgid "Partitioning scheme"
msgstr "分区方式"
#. Tag: entry
-#: using-d-i.xml:984
+#: using-d-i.xml:983
#, no-c-format
msgid "Minimum space"
msgstr "所需最小空间"
#. Tag: entry
-#: using-d-i.xml:985
+#: using-d-i.xml:984
#, no-c-format
msgid "Created partitions"
msgstr "所新建的分区"
#. Tag: entry
-#: using-d-i.xml:991
+#: using-d-i.xml:990
#, no-c-format
msgid "All files in one partition"
msgstr "所有文件在同一分区"
#. Tag: entry
-#: using-d-i.xml:992
+#: using-d-i.xml:991
#, no-c-format
msgid "600MB"
msgstr "600MB"
#. Tag: entry
-#: using-d-i.xml:993
+#: using-d-i.xml:992
#, no-c-format
msgid "<filename>/</filename>, swap"
msgstr "<filename>/</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:995
+#: using-d-i.xml:994
#, no-c-format
msgid "Separate /home partition"
msgstr "建立 /home 分区"
#. Tag: entry
-#: using-d-i.xml:996
+#: using-d-i.xml:995
#, no-c-format
msgid "500MB"
msgstr "500MB"
#. Tag: entry
-#: using-d-i.xml:997
+#: using-d-i.xml:996
#, no-c-format
msgid "<filename>/</filename>, <filename>/home</filename>, swap"
msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1001
+#: using-d-i.xml:1000
#, no-c-format
msgid "Separate /home, /usr, /var and /tmp partitions"
msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
#. Tag: entry
-#: using-d-i.xml:1002
+#: using-d-i.xml:1001
#, no-c-format
msgid "<entry>1GB</entry>"
msgstr "<entry>1GB</entry>"
#. Tag: entry
-#: using-d-i.xml:1003
+#: using-d-i.xml:1002
#, no-c-format
msgid ""
"<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1460,7 +1460,7 @@ msgstr ""
"filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
#. Tag: para
-#: using-d-i.xml:1012
+#: using-d-i.xml:1011
#, no-c-format
msgid ""
"If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1472,7 +1472,7 @@ msgstr ""
"boot</filename> 分区。其他的分区,除了交换分区,都会建在 LVM 分区之内。"
#. Tag: para
-#: using-d-i.xml:1018
+#: using-d-i.xml:1017
#, no-c-format
msgid ""
"If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1485,7 +1485,7 @@ msgstr ""
"手动把某个分区作为 EFI 引导分区。"
#. Tag: para
-#: using-d-i.xml:1026
+#: using-d-i.xml:1025
#, no-c-format
msgid ""
"If you choose guided partitioning for your Alpha system, an additional, "
@@ -1496,7 +1496,7 @@ msgstr ""
"始处,为 aboot boot loader 的保留空间。"
#. Tag: para
-#: using-d-i.xml:1032
+#: using-d-i.xml:1031
#, no-c-format
msgid ""
"After selecting a scheme, the next screen will show your new partition "
@@ -1507,7 +1507,7 @@ msgstr ""
"区是否将被格式化,将以何种方式格式化,以及它们将被挂载到哪里的相关信息。"
#. Tag: para
-#: using-d-i.xml:1038
+#: using-d-i.xml:1037
#, no-c-format
msgid ""
"The list of partitions might look like this: <informalexample><screen>\n"
@@ -1555,7 +1555,7 @@ msgstr ""
"置,但使用手动方式分区的结果会有所不同。"
#. Tag: para
-#: using-d-i.xml:1051
+#: using-d-i.xml:1050
#, no-c-format
msgid ""
"This concludes the guided partitioning. If you are satisfied with the "
@@ -1573,19 +1573,19 @@ msgstr ""
"后再次运行导引式分区,或者按照下面的介绍进行手动分区。"
#. Tag: title
-#: using-d-i.xml:1065
+#: using-d-i.xml:1064
#, no-c-format
msgid "Manual Partitioning"
msgstr "手动分区"
#. Tag: para
-#: using-d-i.xml:1066
+#: using-d-i.xml:1065
#, no-c-format
msgid ""
"A similar screen to the one shown just above will be displayed if you choose "
"manual partitioning except that your existing partition table will be shown "
-"and without the mount points. How to manually set up your partition table and "
-"the usage of partitions by your new Debian system will be covered in the "
+"and without the mount points. How to manually set up your partition table "
+"and the usage of partitions by your new Debian system will be covered in the "
"remainder of this section."
msgstr ""
"如果您选择手动分区的话,它的界面和上面介绍的导引式分区大体上相同。不同之处在"
@@ -1594,7 +1594,7 @@ msgstr ""
"谈到。"
#. Tag: para
-#: using-d-i.xml:1074
+#: using-d-i.xml:1073
#, no-c-format
msgid ""
"If you select a pristine disk which has neither partitions nor free space on "
@@ -1607,7 +1607,7 @@ msgstr ""
"的磁盘条目下出现一个新行,上面写着 <quote>FREE SPACE</quote>。"
#. Tag: para
-#: using-d-i.xml:1082
+#: using-d-i.xml:1081
#, no-c-format
msgid ""
"If you select some free space, you will have the opportunity to create a new "
@@ -1642,7 +1642,7 @@ msgstr ""
"动退回到 <command>partman</command> 的主界面。"
#. Tag: para
-#: using-d-i.xml:1104
+#: using-d-i.xml:1103
#, no-c-format
msgid ""
"If you decide you want to change something about your partition, simply "
@@ -1661,7 +1661,7 @@ msgstr ""
"这个菜单中,您还可以删除分区。"
#. Tag: para
-#: using-d-i.xml:1115
+#: using-d-i.xml:1114
#, no-c-format
msgid ""
"Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -1676,7 +1676,7 @@ msgstr ""
"面的步骤,直到您纠正了这个错误。"
#. Tag: para
-#: using-d-i.xml:1123
+#: using-d-i.xml:1122
#, no-c-format
msgid ""
"If you forget to select and format an EFI boot partition, <command>partman</"
@@ -1687,7 +1687,7 @@ msgstr ""
"点,不让您继续操作,直到您划分出这样一个分区。"
#. Tag: para
-#: using-d-i.xml:1129
+#: using-d-i.xml:1128
#, no-c-format
msgid ""
"Capabilities of <command>partman</command> can be extended with installer "
@@ -1703,7 +1703,7 @@ msgstr ""
"filename> 或者 <filename>partman-lvm</filename>)。"
#. Tag: para
-#: using-d-i.xml:1137
+#: using-d-i.xml:1136
#, no-c-format
msgid ""
"After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -1717,18 +1717,26 @@ msgstr ""
"此分区。"
#. Tag: title
-#: using-d-i.xml:1165
+#: using-d-i.xml:1164
#, no-c-format
msgid "Configuring Multidisk Devices (Software RAID)"
msgstr "配置多磁盘设备(软 RAID)"
#. Tag: para
-#: using-d-i.xml:1166
-#, no-c-format
+#: using-d-i.xml:1165
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you have more than one harddrive<footnote><para> To be honest, you can "
+#| "construct MD device even from partitions residing on single physical "
+#| "drive, but that won't bring you anything useful. </para></footnote> in "
+#| "your computer, you can use <command>mdcfg</command> to set up your drives "
+#| "for increased performance and/or better reliability of your data. The "
+#| "result is called <firstterm>Multidisk Device</firstterm> (or after its "
+#| "most famous variant <firstterm>software RAID</firstterm>)."
msgid ""
"If you have more than one harddrive<footnote><para> To be honest, you can "
-"construct MD device even from partitions residing on single physical drive, "
-"but that won't bring you anything useful. </para></footnote> in your "
+"construct an MD device even from partitions residing on single physical "
+"drive, but that won't give any benefits. </para></footnote> in your "
"computer, you can use <command>mdcfg</command> to set up your drives for "
"increased performance and/or better reliability of your data. The result is "
"called <firstterm>Multidisk Device</firstterm> (or after its most famous "
@@ -1741,7 +1749,7 @@ msgstr ""
"firstterm>)。"
#. Tag: para
-#: using-d-i.xml:1180
+#: using-d-i.xml:1178
#, no-c-format
msgid ""
"MD is basically a bunch of partitions located on different disks and "
@@ -1754,7 +1762,7 @@ msgstr ""
"command> 格式化,分配挂载点,等等)。"
#. Tag: para
-#: using-d-i.xml:1188
+#: using-d-i.xml:1186
#, no-c-format
msgid ""
"What benefits this brings depends on the type of MD device you are creating. "
@@ -1846,101 +1854,101 @@ msgstr ""
"listitem> </varlistentry></variablelist> 总结:"
#. Tag: entry
-#: using-d-i.xml:1302
+#: using-d-i.xml:1300
#, no-c-format
msgid "Type"
msgstr "类型"
#. Tag: entry
-#: using-d-i.xml:1303
+#: using-d-i.xml:1301
#, no-c-format
msgid "Minimum Devices"
msgstr "最少设备"
#. Tag: entry
-#: using-d-i.xml:1304
+#: using-d-i.xml:1302
#, no-c-format
msgid "Spare Device"
msgstr "备用设备"
#. Tag: entry
-#: using-d-i.xml:1305
+#: using-d-i.xml:1303
#, no-c-format
msgid "Survives disk failure?"
msgstr "幸免于磁盘损坏?"
#. Tag: entry
-#: using-d-i.xml:1306
+#: using-d-i.xml:1304
#, no-c-format
msgid "Available Space"
msgstr "可用空间"
#. Tag: entry
-#: using-d-i.xml:1312
+#: using-d-i.xml:1310
#, no-c-format
msgid "RAID0"
msgstr "RAID0"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1313 using-d-i.xml:1321 using-d-i.xml:1351
+#: using-d-i.xml:1311 using-d-i.xml:1319 using-d-i.xml:1349
#, no-c-format
msgid "<entry>2</entry>"
msgstr "<entry>2</entry>"
# index.docbook:1106, index.docbook:1107
#. Tag: entry
-#: using-d-i.xml:1314 using-d-i.xml:1315
+#: using-d-i.xml:1312 using-d-i.xml:1313
#, no-c-format
msgid "<entry>no</entry>"
msgstr "<entry>否</entry>"
#. Tag: entry
-#: using-d-i.xml:1316
+#: using-d-i.xml:1314
#, no-c-format
msgid "Size of the smallest partition multiplied by number of devices in RAID"
msgstr "容量为最小分区乘以 RAID 设备数"
#. Tag: entry
-#: using-d-i.xml:1320
+#: using-d-i.xml:1318
#, no-c-format
msgid "RAID1"
msgstr "RAID1"
# index.docbook:1114, index.docbook:1122
#. Tag: entry
-#: using-d-i.xml:1322 using-d-i.xml:1330 using-d-i.xml:1341 using-d-i.xml:1352
+#: using-d-i.xml:1320 using-d-i.xml:1328 using-d-i.xml:1339 using-d-i.xml:1350
#, no-c-format
msgid "optional"
msgstr "可选"
# index.docbook:1115, index.docbook:1123
#. Tag: entry
-#: using-d-i.xml:1323 using-d-i.xml:1331 using-d-i.xml:1342 using-d-i.xml:1353
+#: using-d-i.xml:1321 using-d-i.xml:1329 using-d-i.xml:1340 using-d-i.xml:1351
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>是</entry>"
#. Tag: entry
-#: using-d-i.xml:1324
+#: using-d-i.xml:1322
#, no-c-format
msgid "Size of the smallest partition in RAID"
msgstr "容量为 RAID 最小分区"
#. Tag: entry
-#: using-d-i.xml:1328
+#: using-d-i.xml:1326
#, no-c-format
msgid "RAID5"
msgstr "RAID5"
#. Tag: entry
-#: using-d-i.xml:1329
+#: using-d-i.xml:1327
#, no-c-format
msgid "<entry>3</entry>"
msgstr "<entry>3</entry>"
#. Tag: entry
-#: using-d-i.xml:1332
+#: using-d-i.xml:1330
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -1948,20 +1956,20 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减一)"
#. Tag: entry
-#: using-d-i.xml:1339
+#: using-d-i.xml:1337
#, no-c-format
msgid "RAID6"
msgstr "RAID6"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1340
+#: using-d-i.xml:1338
#, no-c-format
msgid "<entry>4</entry>"
msgstr "<entry>4</entry>"
#. Tag: entry
-#: using-d-i.xml:1343
+#: using-d-i.xml:1341
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -1969,13 +1977,13 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减二)"
#. Tag: entry
-#: using-d-i.xml:1350
+#: using-d-i.xml:1348
#, no-c-format
msgid "RAID10"
msgstr "RAID10"
#. Tag: entry
-#: using-d-i.xml:1354
+#: using-d-i.xml:1352
#, no-c-format
msgid ""
"Total of all partitions divided by the number of chunk copies (defaults to "
@@ -1983,7 +1991,7 @@ msgid ""
msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
#. Tag: para
-#: using-d-i.xml:1361
+#: using-d-i.xml:1359
#, no-c-format
msgid ""
"If you want to know more about Software RAID, have a look at <ulink url="
@@ -1993,7 +2001,7 @@ msgstr ""
"\">Software RAID HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1366
+#: using-d-i.xml:1364
#, no-c-format
msgid ""
"To create an MD device, you need to have the desired partitions it should "
@@ -2008,7 +2016,7 @@ msgstr ""
"volume for RAID</guimenuitem> </menuchoice>。)"
#. Tag: para
-#: using-d-i.xml:1375
+#: using-d-i.xml:1373
#, no-c-format
msgid ""
"Make sure that the system can be booted with the partitioning scheme you are "
@@ -2026,7 +2034,7 @@ msgstr ""
"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
#. Tag: para
-#: using-d-i.xml:1387
+#: using-d-i.xml:1385
#, no-c-format
msgid ""
"Support for MD is a relatively new addition to the installer. You may "
@@ -2041,7 +2049,7 @@ msgstr ""
"验的用户,从 shell 手动地处理一些配置和安装步骤,也许会绕开这些问题。"
#. Tag: para
-#: using-d-i.xml:1396
+#: using-d-i.xml:1394
#, no-c-format
msgid ""
"Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2061,7 +2069,7 @@ msgstr ""
"RAID1)。后续操作会根据您选择的 MD 类型而定。"
#. Tag: para
-#: using-d-i.xml:1409
+#: using-d-i.xml:1407
#, no-c-format
msgid ""
"RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2072,16 +2080,24 @@ msgstr ""
"组成 MD 的分区。"
#. Tag: para
-#: using-d-i.xml:1416
-#, no-c-format
+#: using-d-i.xml:1414
+#, fuzzy, no-c-format
+#| msgid ""
+#| "RAID1 is a bit more tricky. First, you will be asked to enter the number "
+#| "of active devices and the number of spare devices which will form the MD. "
+#| "Next, you need to select from the list of available RAID partitions those "
+#| "that will be active and then those that will be spare. The count of "
+#| "selected partitions must be equal to the number provided few seconds ago. "
+#| "Don't worry. If you make a mistake and select a different number of "
+#| "partitions, the &d-i; won't let you continue until you correct the issue."
msgid ""
"RAID1 is a bit more tricky. First, you will be asked to enter the number of "
"active devices and the number of spare devices which will form the MD. Next, "
"you need to select from the list of available RAID partitions those that "
"will be active and then those that will be spare. The count of selected "
-"partitions must be equal to the number provided few seconds ago. Don't "
-"worry. If you make a mistake and select a different number of partitions, the "
-"&d-i; won't let you continue until you correct the issue."
+"partitions must be equal to the number provided earlier. Don't worry. If you "
+"make a mistake and select a different number of partitions, &d-i; won't let "
+"you continue until you correct the issue."
msgstr ""
"RAID1 需要一些技巧。首先,您将要求输入组成 MD 的活动设备和备用设备数量。其"
"次,您需要从 RAID 可用分区列表中选择哪些是活动分区,哪些是备用的。选择的分区"
@@ -2089,7 +2105,7 @@ msgstr ""
"将不会允许您继续下去,直到纠正错误。"
#. Tag: para
-#: using-d-i.xml:1428
+#: using-d-i.xml:1426
#, no-c-format
msgid ""
"RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2099,7 +2115,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1434
+#: using-d-i.xml:1432
#, fuzzy, no-c-format
#| msgid ""
#| "RAID6 also has a setup procedure similar to RAID1 except thatat least "
@@ -2112,7 +2128,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1440
+#: using-d-i.xml:1438
#, no-c-format
msgid ""
"RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2130,7 +2146,7 @@ msgstr ""
"贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
#. Tag: para
-#: using-d-i.xml:1454
+#: using-d-i.xml:1452
#, no-c-format
msgid ""
"It is perfectly possible to have several types of MD at once. For example, "
@@ -2146,7 +2162,7 @@ msgstr ""
"RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
#. Tag: para
-#: using-d-i.xml:1463
+#: using-d-i.xml:1461
#, no-c-format
msgid ""
"After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2159,13 +2175,13 @@ msgstr ""
"您的新 MD 设备,并分配挂载点这样的属性。"
#. Tag: title
-#: using-d-i.xml:1478
+#: using-d-i.xml:1476
#, no-c-format
msgid "Configuring the Logical Volume Manager (LVM)"
msgstr "配置逻辑卷管理(LVM)"
#. Tag: para
-#: using-d-i.xml:1479
+#: using-d-i.xml:1477
#, no-c-format
msgid ""
"If you are working with computers at the level of system administrator or "
@@ -2179,7 +2195,7 @@ msgstr ""
"或符号链接等方法来折腾。"
#. Tag: para
-#: using-d-i.xml:1487
+#: using-d-i.xml:1485
#, no-c-format
msgid ""
"To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2197,7 +2213,7 @@ msgstr ""
"点在于它可以跨越多个物理磁盘。"
#. Tag: para
-#: using-d-i.xml:1497
+#: using-d-i.xml:1495
#, no-c-format
msgid ""
"Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2215,7 +2231,7 @@ msgstr ""
"阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1508
+#: using-d-i.xml:1506
#, no-c-format
msgid ""
"LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2230,7 +2246,7 @@ msgstr ""
"<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
#. Tag: para
-#: using-d-i.xml:1517
+#: using-d-i.xml:1515
#, no-c-format
msgid ""
"When you return to the main <command>partman</command> screen, you will see "
@@ -2247,7 +2263,7 @@ msgstr ""
"了 LVM 配置的小结。菜单项本身是与内容相关,只显示可用的操作。可能的操作有:"
#. Tag: para
-#: using-d-i.xml:1528
+#: using-d-i.xml:1526
#, no-c-format
msgid ""
"<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2257,43 +2273,43 @@ msgstr ""
"名称和逻辑卷尺寸等"
#. Tag: guimenuitem
-#: using-d-i.xml:1533
+#: using-d-i.xml:1531
#, no-c-format
msgid "Create volume group"
msgstr "Create volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1536
+#: using-d-i.xml:1534
#, no-c-format
msgid "Create logical volume"
msgstr "Create logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1539
+#: using-d-i.xml:1537
#, no-c-format
msgid "Delete volume group"
msgstr "Delete volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1542
+#: using-d-i.xml:1540
#, no-c-format
msgid "Delete logical volume"
msgstr "Delete logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1545
+#: using-d-i.xml:1543
#, no-c-format
msgid "Extend volume group"
msgstr "Extend volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1548
+#: using-d-i.xml:1546
#, no-c-format
msgid "Reduce volume group"
msgstr "Reduce volume group"
#. Tag: para
-#: using-d-i.xml:1550
+#: using-d-i.xml:1548
#, no-c-format
msgid ""
"<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2302,7 +2318,7 @@ msgstr ""
"<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
#. Tag: para
-#: using-d-i.xml:1556
+#: using-d-i.xml:1554
#, no-c-format
msgid ""
"Use the options in that menu to first create a volume group and then create "
@@ -2310,7 +2326,7 @@ msgid ""
msgstr "使用该菜单内的选项首先创建卷组,然后在里面创建逻辑卷。"
#. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1559
#, no-c-format
msgid ""
"After you return to the main <command>partman</command> screen, any created "
@@ -2321,13 +2337,13 @@ msgstr ""
"通的分区一样(您也应该这样对待它们)。"
#. Tag: title
-#: using-d-i.xml:1575
+#: using-d-i.xml:1573
#, no-c-format
msgid "Configuring Encrypted Volumes"
msgstr "配置加密卷"
#. Tag: para
-#: using-d-i.xml:1576
+#: using-d-i.xml:1574
#, no-c-format
msgid ""
"&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2345,7 +2361,7 @@ msgstr ""
"许可以访问硬盘,但是没有正确的口令,硬盘上的数据看起来就像是随机的字符。"
#. Tag: para
-#: using-d-i.xml:1588
+#: using-d-i.xml:1586
#, no-c-format
msgid ""
"The two most important partitions to encrypt are: the home partition, where "
@@ -2368,7 +2384,7 @@ msgstr ""
"加载内核。"
#. Tag: para
-#: using-d-i.xml:1603
+#: using-d-i.xml:1601
#, no-c-format
msgid ""
"Please note that the performance of encrypted partitions will be less than "
@@ -2380,7 +2396,7 @@ msgstr ""
"密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
#. Tag: para
-#: using-d-i.xml:1610
+#: using-d-i.xml:1608
#, no-c-format
msgid ""
"To use encryption, you have to create a new partition by selecting some free "
@@ -2398,7 +2414,7 @@ msgstr ""
"guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
#. Tag: para
-#: using-d-i.xml:1621
+#: using-d-i.xml:1619
#, no-c-format
msgid ""
"&d-i; supports several encryption methods. The default method is "
@@ -2413,7 +2429,7 @@ msgstr ""
"使用默认的方法。"
#. Tag: para
-#: using-d-i.xml:1633
+#: using-d-i.xml:1631
#, no-c-format
msgid ""
"First, let's have a look at the options available when you select "
@@ -2426,13 +2442,13 @@ msgstr ""
"的安全考虑的选择。"
#. Tag: term
-#: using-d-i.xml:1643
+#: using-d-i.xml:1641
#, no-c-format
msgid "Encryption: <userinput>aes</userinput>"
msgstr "Encryption: <userinput>aes</userinput>"
#. Tag: para
-#: using-d-i.xml:1645
+#: using-d-i.xml:1643
#, no-c-format
msgid ""
"This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2455,13 +2471,13 @@ msgstr ""
"纪的敏感信息。"
#. Tag: term
-#: using-d-i.xml:1663
+#: using-d-i.xml:1661
#, no-c-format
msgid "Key size: <userinput>256</userinput>"
msgstr "Key size: <userinput>256</userinput>"
#. Tag: para
-#: using-d-i.xml:1665
+#: using-d-i.xml:1663
#, no-c-format
msgid ""
"Here you can specify the length of the encryption key. With a larger key "
@@ -2473,13 +2489,13 @@ msgstr ""
"加长度自然会降低性能。cipher 决定可用的密钥长度。"
#. Tag: term
-#: using-d-i.xml:1677
+#: using-d-i.xml:1675
#, no-c-format
msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
#. Tag: para
-#: using-d-i.xml:1679
+#: using-d-i.xml:1677
#, no-c-format
msgid ""
"The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2495,7 +2511,7 @@ msgstr ""
"复模板推断信息。"
#. Tag: para
-#: using-d-i.xml:1689
+#: using-d-i.xml:1687
#, no-c-format
msgid ""
"From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2508,25 +2524,25 @@ msgstr ""
"法时,才使用其他的算法。"
#. Tag: term
-#: using-d-i.xml:1701
+#: using-d-i.xml:1699
#, no-c-format
msgid "Encryption key: <userinput>Passphrase</userinput>"
msgstr "Encryption key: <userinput>Passphrase</userinput>"
#. Tag: para
-#: using-d-i.xml:1703
+#: using-d-i.xml:1701
#, no-c-format
msgid "Here you can choose the type of the encryption key for this partition."
msgstr "这里您可以为分区选择所使用的加密密钥类型。"
#. Tag: term
-#: using-d-i.xml:1709
+#: using-d-i.xml:1707
#, no-c-format
msgid "Passphrase"
msgstr "Passphrase"
#. Tag: para
-#: using-d-i.xml:1710
+#: using-d-i.xml:1708
#, no-c-format
msgid ""
"The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2539,13 +2555,13 @@ msgstr ""
"使用时要求输入。"
#. Tag: term
-#: using-d-i.xml:1725 using-d-i.xml:1818
+#: using-d-i.xml:1723 using-d-i.xml:1816
#, no-c-format
msgid "Random key"
msgstr "Random key"
#. Tag: para
-#: using-d-i.xml:1726
+#: using-d-i.xml:1724
#, no-c-format
msgid ""
"A new encryption key will be generated from random data each time you try to "
@@ -2560,7 +2576,7 @@ msgstr ""
"面临暴力破解,但是除非加密算法中有未知的弱点,这辈子也不会被攻破。)"
#. Tag: para
-#: using-d-i.xml:1735
+#: using-d-i.xml:1733
#, no-c-format
msgid ""
"Random keys are useful for swap partitions because you do not need to bother "
@@ -2577,13 +2593,13 @@ msgstr ""
"写入到交换分区的数据。"
#. Tag: term
-#: using-d-i.xml:1754 using-d-i.xml:1831
+#: using-d-i.xml:1752 using-d-i.xml:1829
#, no-c-format
msgid "Erase data: <userinput>yes</userinput>"
msgstr "Erase data: <userinput>yes</userinput>"
#. Tag: para
-#: using-d-i.xml:1756
+#: using-d-i.xml:1754
#, no-c-format
msgid ""
"Determines whether the content of this partition should be overwritten with "
@@ -2601,7 +2617,7 @@ msgstr ""
"备上的数据。</para></footnote>。"
#. Tag: para
-#: using-d-i.xml:1776
+#: using-d-i.xml:1774
#, no-c-format
msgid ""
"If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -2613,13 +2629,13 @@ msgstr ""
"下面内容:"
#. Tag: term
-#: using-d-i.xml:1785
+#: using-d-i.xml:1783
#, no-c-format
msgid "Encryption: <userinput>AES256</userinput>"
msgstr "Encryption: <userinput>AES256</userinput>"
#. Tag: para
-#: using-d-i.xml:1787
+#: using-d-i.xml:1785
#, no-c-format
msgid ""
"For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -2630,25 +2646,25 @@ msgstr ""
"时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
#. Tag: term
-#: using-d-i.xml:1797
+#: using-d-i.xml:1795
#, no-c-format
msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
#. Tag: para
-#: using-d-i.xml:1799
+#: using-d-i.xml:1797
#, no-c-format
msgid "Here you can select the type of the encryption key for this partition."
msgstr "这里您可以为分区选择加密密钥的类型。"
#. Tag: term
-#: using-d-i.xml:1805
+#: using-d-i.xml:1803
#, no-c-format
msgid "Keyfile (GnuPG)"
msgstr "Keyfile (GnuPG)"
#. Tag: para
-#: using-d-i.xml:1806
+#: using-d-i.xml:1804
#, no-c-format
msgid ""
"The encryption key will be generated from random data during the "
@@ -2660,19 +2676,19 @@ msgstr ""
"application> 加密。要使用它,您需要输入正确的 passphrase (在以后会要求提供)。"
#. Tag: para
-#: using-d-i.xml:1819
+#: using-d-i.xml:1817
#, no-c-format
msgid "Please see the section on random keys above."
msgstr "请查阅前面有关随机密钥的章节。"
#. Tag: para
-#: using-d-i.xml:1833
+#: using-d-i.xml:1831
#, no-c-format
msgid "Please see the the section on erasing data above."
msgstr "请查阅前面有关删除数据的章节。"
#. Tag: para
-#: using-d-i.xml:1842
+#: using-d-i.xml:1840
#, no-c-format
msgid ""
"After you have selected the desired parameters for your encrypted "
@@ -2687,7 +2703,7 @@ msgstr ""
"标记分区上的数据,以及写新分区表等动作。对于大的分区,这会花一些时间。"
#. Tag: para
-#: using-d-i.xml:1852
+#: using-d-i.xml:1850
#, no-c-format
msgid ""
"Next you will be asked to enter a passphrase for partitions configured to "
@@ -2701,7 +2717,7 @@ msgstr ""
"(比如生日、爱好、宠物的名字、以及家里其他成员的名字,等等)。"
#. Tag: para
-#: using-d-i.xml:1861
+#: using-d-i.xml:1859
#, no-c-format
msgid ""
"Before you input any passphrases, you should have made sure that your "
@@ -2721,7 +2737,7 @@ msgstr ""
"所选择的键盘布局未能正确建立,而且是在为根文件系统输入 passphrase 的时候。"
#. Tag: para
-#: using-d-i.xml:1874
+#: using-d-i.xml:1872
#, no-c-format
msgid ""
"If you selected to use methods other than a passphrase to create encryption "
@@ -2740,7 +2756,7 @@ msgstr ""
"程在每个要加密的分区重复进行。"
#. Tag: para
-#: using-d-i.xml:1890
+#: using-d-i.xml:1888
#, no-c-format
msgid ""
"After returning to the main partitioning menu, you will see all encrypted "
@@ -2771,16 +2787,23 @@ msgstr ""
"您不合适,可以进行修改。"
#. Tag: para
-#: using-d-i.xml:1903
-#, no-c-format
-msgid ""
-"One thing to note here are the identifiers in parentheses "
-"(<replaceable>sda2_crypt</replaceable> and <replaceable>loop0</replaceable> "
-"in this case) and the mount points you assigned to each encrypted volume. "
-"You will need this information later when booting the new system. The "
-"differences between ordinary boot process and boot process with encryption "
-"involved will be covered later in <xref linkend=\"mount-encrypted-volumes\"/"
-">."
+#: using-d-i.xml:1901
+#, fuzzy, no-c-format
+#| msgid ""
+#| "One thing to note here are the identifiers in parentheses "
+#| "(<replaceable>sda2_crypt</replaceable> and <replaceable>loop0</"
+#| "replaceable> in this case) and the mount points you assigned to each "
+#| "encrypted volume. You will need this information later when booting the "
+#| "new system. The differences between ordinary boot process and boot "
+#| "process with encryption involved will be covered later in <xref linkend="
+#| "\"mount-encrypted-volumes\"/>."
+msgid ""
+"Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
+"replaceable> and <replaceable>loop0</replaceable> in this case) and the "
+"mount points you assigned to each encrypted volume. You will need this "
+"information later when booting the new system. The differences between the "
+"ordinary boot process and the boot process with encryption involved will be "
+"covered later in <xref linkend=\"mount-encrypted-volumes\"/>."
msgstr ""
"这里有一点要注意,即 parentheses 里的标识(本例中 <replaceable>sda2_crypt</"
"replaceable> 和 <replaceable>loop0</replaceable>),以及您为每个加密卷所设置的"
@@ -2788,7 +2811,7 @@ msgstr ""
"程的差异,将在后面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
#. Tag: para
-#: using-d-i.xml:1913
+#: using-d-i.xml:1911
#, no-c-format
msgid ""
"Once you are satisfied with the partitioning scheme, continue with the "
@@ -2796,13 +2819,13 @@ msgid ""
msgstr "当您满意分区之后,可以继续安装过程。"
#. Tag: title
-#: using-d-i.xml:1924
+#: using-d-i.xml:1922
#, no-c-format
msgid "Installing the Base System"
msgstr "安装基本系统"
#. Tag: para
-#: using-d-i.xml:1925
+#: using-d-i.xml:1923
#, no-c-format
msgid ""
"Although this stage is the least problematic, it consumes a significant "
@@ -2814,7 +2837,7 @@ msgstr ""
"果您用较慢的计算机或网络,这要花费好一会儿时间。"
#. Tag: para
-#: using-d-i.xml:1938
+#: using-d-i.xml:1936
#, no-c-format
msgid ""
"During installation of the base system, package unpacking and setup messages "
@@ -2829,7 +2852,7 @@ msgstr ""
"keycap><keycap>F1</keycap></keycombo>。"
#. Tag: para
-#: using-d-i.xml:1947
+#: using-d-i.xml:1945
#, no-c-format
msgid ""
"The unpack/setup messages generated during this phase are also saved in "
@@ -2840,7 +2863,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: para
-#: using-d-i.xml:1953
+#: using-d-i.xml:1951
#, no-c-format
msgid ""
"As part of the installation, a Linux kernel will be installed. At the "
@@ -2852,13 +2875,13 @@ msgstr ""
"您硬件最匹配的内核。在较低的优先级下,您可以从列表中选择一个有效的内核。"
#. Tag: title
-#: using-d-i.xml:1965
+#: using-d-i.xml:1963
#, no-c-format
msgid "Setting Up Users And Passwords"
msgstr "设置用户和密码"
#. Tag: para
-#: using-d-i.xml:1966
+#: using-d-i.xml:1964
#, no-c-format
msgid ""
"After the base system has been installed, the installer will allow you to "
@@ -2869,13 +2892,13 @@ msgstr ""
"号。其他的用户帐号可以在安装完成之后创建。"
#. Tag: title
-#: using-d-i.xml:1980
+#: using-d-i.xml:1978
#, no-c-format
msgid "Set the Root Password"
msgstr "设置 root 密码"
#. Tag: para
-#: using-d-i.xml:1984
+#: using-d-i.xml:1982
#, no-c-format
msgid ""
"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
@@ -2888,7 +2911,7 @@ msgstr ""
"理,而且使用时间应该尽可能短。"
#. Tag: para
-#: using-d-i.xml:1992
+#: using-d-i.xml:1990
#, no-c-format
msgid ""
"Any password you create should contain at least 6 characters, and should "
@@ -2902,7 +2925,7 @@ msgstr ""
"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
#. Tag: para
-#: using-d-i.xml:2000
+#: using-d-i.xml:1998
#, no-c-format
msgid ""
"If anyone ever tells you they need your root password, be extremely wary. "
@@ -2913,13 +2936,13 @@ msgstr ""
"员,否则通常不应该将超级用户密码交给别人。"
#. Tag: title
-#: using-d-i.xml:2010
+#: using-d-i.xml:2008
#, no-c-format
msgid "Create an Ordinary User"
msgstr "创建一个普通用户"
#. Tag: para
-#: using-d-i.xml:2012
+#: using-d-i.xml:2010
#, no-c-format
msgid ""
"The system will ask you whether you wish to create an ordinary user account "
@@ -2931,7 +2954,7 @@ msgstr ""
"记,平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
#. Tag: para
-#: using-d-i.xml:2021
+#: using-d-i.xml:2019
#, no-c-format
msgid ""
"Why not? Well, one reason to avoid using root's privileges is that it is "
@@ -2949,7 +2972,7 @@ msgstr ""
"容,建议找一本进行学习。"
#. Tag: para
-#: using-d-i.xml:2031
+#: using-d-i.xml:2029
#, no-c-format
msgid ""
"You will first be prompted for the user's full name. Then you'll be asked "
@@ -2961,7 +2984,7 @@ msgstr ""
"便满足要求,并为缺省值。最后,您将要求输入该帐号的密码。"
#. Tag: para
-#: using-d-i.xml:2038
+#: using-d-i.xml:2036
#, no-c-format
msgid ""
"If at any point after installation you would like to create another account, "
@@ -2971,13 +2994,13 @@ msgstr ""
"令。"
#. Tag: title
-#: using-d-i.xml:2049
+#: using-d-i.xml:2047
#, no-c-format
msgid "Installing Additional Software"
msgstr "安装额外的软件"
#. Tag: para
-#: using-d-i.xml:2050
+#: using-d-i.xml:2048
#, no-c-format
msgid ""
"At this point you have a usable but limited system. Most users will want to "
@@ -2990,13 +3013,13 @@ msgstr ""
"装基本系统还要花时间。"
#. Tag: title
-#: using-d-i.xml:2065
+#: using-d-i.xml:2063
#, no-c-format
msgid "Configuring apt"
msgstr "配置 apt"
#. Tag: para
-#: using-d-i.xml:2067
+#: using-d-i.xml:2065
#, no-c-format
msgid ""
"One of the tools used to install packages on a &debian; system is a program "
@@ -3027,7 +3050,7 @@ msgstr ""
"软件包管理工具使用。"
#. Tag: para
-#: using-d-i.xml:2091
+#: using-d-i.xml:2089
#, no-c-format
msgid ""
"<command>apt</command> must be configured so that it knows from where to "
@@ -3040,7 +3063,7 @@ msgstr ""
"并编辑成自己喜欢的地方。"
#. Tag: para
-#: using-d-i.xml:2098
+#: using-d-i.xml:2096
#, no-c-format
msgid ""
"If you are installing at default priority, the installer will largely take "
@@ -3055,7 +3078,7 @@ msgstr ""
"序程序会自动加上安全镜像,它是 <quote>volatile</quote> 更新服务的镜像。"
#. Tag: para
-#: using-d-i.xml:2107
+#: using-d-i.xml:2105
#, no-c-format
msgid ""
"If you are installing at a lower priority (e.g. in expert mode), you will be "
@@ -3069,13 +3092,13 @@ msgstr ""
"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title
-#: using-d-i.xml:2118
+#: using-d-i.xml:2116
#, no-c-format
msgid "Installing from more than one CD or DVD"
msgstr "从多个 CD 或 DVD 安装"
#. Tag: para
-#: using-d-i.xml:2120
+#: using-d-i.xml:2118
#, no-c-format
msgid ""
"If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -3088,7 +3111,7 @@ msgstr ""
"们里面的软件包了。"
#. Tag: para
-#: using-d-i.xml:2127
+#: using-d-i.xml:2125
#, no-c-format
msgid ""
"If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -3100,7 +3123,7 @@ msgstr ""
"节说明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
#. Tag: para
-#: using-d-i.xml:2135
+#: using-d-i.xml:2133
#, no-c-format
msgid ""
"Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -3112,7 +3135,7 @@ msgstr ""
"常用的软件,而最后一张光盘里面包含的是很少有人用到的软件。"
#. Tag: para
-#: using-d-i.xml:2142
+#: using-d-i.xml:2140
#, no-c-format
msgid ""
"It also means that buying or downloading and burning a full CD set is just a "
@@ -3126,7 +3149,7 @@ msgstr ""
"DVD 的情况类似:只要一张,或者前两张 DVD 就能满足您大部分要求。"
#. Tag: para
-#: using-d-i.xml:2151
+#: using-d-i.xml:2149
#, no-c-format
msgid ""
"A good rule of thumb is that for a regular desktop installation (using the "
@@ -3139,7 +3162,7 @@ msgstr ""
"境。"
#. Tag: para
-#: using-d-i.xml:2159
+#: using-d-i.xml:2157
#, no-c-format
msgid ""
"If you do scan multiple CDs or DVDs, the installer will prompt you to "
@@ -3154,13 +3177,13 @@ msgstr ""
"照次序来可以降低出错的几率。"
#. Tag: title
-#: using-d-i.xml:2172
+#: using-d-i.xml:2170
#, no-c-format
msgid "Using a network mirror"
msgstr "使用网络镜像"
#. Tag: para
-#: using-d-i.xml:2174
+#: using-d-i.xml:2172
#, no-c-format
msgid ""
"One question that will be asked during most installs is whether or not to "
@@ -3171,7 +3194,7 @@ msgstr ""
"默认答案会很好,但还是有一些例外。"
#. Tag: para
-#: using-d-i.xml:2180
+#: using-d-i.xml:2178
#, no-c-format
msgid ""
"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -3187,7 +3210,7 @@ msgstr ""
"<literal>desktop</literal> 任务。"
#. Tag: para
-#: using-d-i.xml:2189
+#: using-d-i.xml:2187
#, no-c-format
msgid ""
"If you are installing from a single full CD or using a full CD image, using "
@@ -3204,7 +3227,7 @@ msgstr ""
"装,以后(比如,重新启动到新系统)再安装额外的软件包。"
#. Tag: para
-#: using-d-i.xml:2200
+#: using-d-i.xml:2198
#, no-c-format
msgid ""
"If you are installing from a DVD or using a DVD image, any packages needed "
@@ -3217,7 +3240,7 @@ msgstr ""
"项。"
#. Tag: para
-#: using-d-i.xml:2207
+#: using-d-i.xml:2205
#, no-c-format
msgid ""
"One advantage of adding a network mirror is that updates that have occurred "
@@ -3230,7 +3253,7 @@ msgstr ""
"可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
#. Tag: para
-#: using-d-i.xml:2214
+#: using-d-i.xml:2212
#, no-c-format
msgid ""
"In summary: selecting a network mirror is generally a good idea, except if "
@@ -3244,26 +3267,26 @@ msgstr ""
"的数据量取决于"
#. Tag: para
-#: using-d-i.xml:2223
+#: using-d-i.xml:2221
#, no-c-format
msgid "the tasks you select in the next step of the installation,"
msgstr "安装下一步选择的任务,"
#. Tag: para
-#: using-d-i.xml:2228
+#: using-d-i.xml:2226
#, no-c-format
msgid "which packages are needed for those tasks,"
msgstr "这些任务所需的软件包,"
#. Tag: para
-#: using-d-i.xml:2233
+#: using-d-i.xml:2231
#, no-c-format
msgid ""
"which of those packages are present on the CDs or DVDs you have scanned, and"
msgstr "已检测的 CD 或 DVD 上的软件包,并且"
#. Tag: para
-#: using-d-i.xml:2238
+#: using-d-i.xml:2236
#, no-c-format
msgid ""
"whether any updated versions of packages included on the CDs or DVDs are "
@@ -3274,7 +3297,7 @@ msgstr ""
"安全更新的镜像)。"
#. Tag: para
-#: using-d-i.xml:2247
+#: using-d-i.xml:2245
#, no-c-format
msgid ""
"Note that the last point means that, even if you choose not to use a network "
@@ -3286,13 +3309,13 @@ msgstr ""
"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"
#. Tag: title
-#: using-d-i.xml:2263
+#: using-d-i.xml:2261
#, no-c-format
msgid "Selecting and Installing Software"
msgstr "选择和安装软件"
#. Tag: para
-#: using-d-i.xml:2265
+#: using-d-i.xml:2263
#, no-c-format
msgid ""
"During the installation process, you are given the opportunity to select "
@@ -3307,7 +3330,7 @@ msgstr ""
"来快速建立您的计算机应对各种任务。"
#. Tag: para
-#: using-d-i.xml:2274
+#: using-d-i.xml:2272
#, no-c-format
msgid ""
"So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3337,7 +3360,7 @@ msgstr ""
"空间。"
#. Tag: para
-#: using-d-i.xml:2301
+#: using-d-i.xml:2299
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3348,7 +3371,7 @@ msgstr ""
"些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2308
+#: using-d-i.xml:2306
#, no-c-format
msgid ""
"Unless you are using the special KDE or Xfce CDs, the <quote>Desktop "
@@ -3358,7 +3381,7 @@ msgstr ""
"桌面环境。"
#. Tag: para
-#: using-d-i.xml:2315
+#: using-d-i.xml:2313
#, no-c-format
msgid ""
"It is not possible to interactively select a different desktop during the "
@@ -3376,7 +3399,7 @@ msgstr ""
"literal>。"
#. Tag: para
-#: using-d-i.xml:2325
+#: using-d-i.xml:2323
#, no-c-format
msgid ""
"Note that this will only work if the packages needed for KDE or Xfce are "
@@ -3390,7 +3413,7 @@ msgstr ""
"Xfce 同样适用于 DVD 映象或其他的安装方法。"
#. Tag: para
-#: using-d-i.xml:2333
+#: using-d-i.xml:2331
#, fuzzy, no-c-format
#| msgid ""
#| "The various server tasks will install software roughly as follows. DNS "
@@ -3417,7 +3440,7 @@ msgstr ""
"classname>。"
#. Tag: para
-#: using-d-i.xml:2345
+#: using-d-i.xml:2343
#, no-c-format
msgid ""
"Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3428,7 +3451,7 @@ msgstr ""
"选中的软件包。"
#. Tag: para
-#: using-d-i.xml:2352
+#: using-d-i.xml:2350
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -3436,7 +3459,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2358
+#: using-d-i.xml:2356
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -3451,7 +3474,7 @@ msgstr ""
"间。一旦启动,安装软件包过程将无法取消。"
#. Tag: para
-#: using-d-i.xml:2367
+#: using-d-i.xml:2365
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -3466,7 +3489,7 @@ msgstr ""
"新);如果您安装的是测试版本,这会出现在使用旧映像安装时。"
#. Tag: para
-#: using-d-i.xml:2376
+#: using-d-i.xml:2374
#, no-c-format
msgid ""
"Each package you selected with <command>tasksel</command> is downloaded, "
@@ -3479,13 +3502,13 @@ msgstr ""
"序需要用户提供信息,它会在此过程中给出提示。"
#. Tag: title
-#: using-d-i.xml:2389
+#: using-d-i.xml:2387
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2391
+#: using-d-i.xml:2389
#, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -3498,13 +3521,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2406
+#: using-d-i.xml:2404
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2408
+#: using-d-i.xml:2406
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -3518,7 +3541,7 @@ msgstr ""
"Debian 一起,计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2416
+#: using-d-i.xml:2414
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -3532,13 +3555,13 @@ msgstr ""
"管理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2434
+#: using-d-i.xml:2432
#, no-c-format
msgid "Install <command>aboot</command> on a Hard Disk"
msgstr "安装 <command>aboot</command> 到硬盘上"
#. Tag: para
-#: using-d-i.xml:2435
+#: using-d-i.xml:2433
#, no-c-format
msgid ""
"If you have booted from SRM and you select this option, the installer will "
@@ -3557,13 +3580,13 @@ msgstr ""
"装 Debian 的磁盘上装有不同的操作系统,将不得不从一个软盘启动 GNU/Linux。"
#. Tag: title
-#: using-d-i.xml:2455
+#: using-d-i.xml:2453
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2456
+#: using-d-i.xml:2454
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3578,19 +3601,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2465
+#: using-d-i.xml:2463
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2477
+#: using-d-i.xml:2475
#, no-c-format
msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2479
+#: using-d-i.xml:2477
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3601,7 +3624,7 @@ msgstr ""
"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
-#: using-d-i.xml:2485
+#: using-d-i.xml:2483
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3613,7 +3636,7 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2491
+#: using-d-i.xml:2489
#, no-c-format
msgid ""
"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3624,13 +3647,13 @@ msgstr ""
"用的任何 bootloader。"
#. Tag: title
-#: using-d-i.xml:2504
+#: using-d-i.xml:2502
#, no-c-format
msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2506
+#: using-d-i.xml:2504
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3646,7 +3669,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2516
+#: using-d-i.xml:2514
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -3659,7 +3682,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2524
+#: using-d-i.xml:2522
#, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3667,13 +3690,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader:"
#. Tag: term
-#: using-d-i.xml:2531
+#: using-d-i.xml:2529
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2531
+#: using-d-i.xml:2529
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -3681,13 +3704,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2538
+#: using-d-i.xml:2536
#, no-c-format
msgid "new Debian partition"
msgstr "新 Debian 分区"
#. Tag: para
-#: using-d-i.xml:2538
+#: using-d-i.xml:2536
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3698,13 +3721,13 @@ msgstr ""
"新 Debian 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2547
+#: using-d-i.xml:2545
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2547
+#: using-d-i.xml:2545
#, no-c-format
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
@@ -3717,7 +3740,7 @@ msgstr ""
"filename> 或 <filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2557
+#: using-d-i.xml:2555
#, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3731,13 +3754,13 @@ msgstr ""
"录 &mdash; 但这也意味着您要使用其他方法才能启动 Debian!"
#. Tag: title
-#: using-d-i.xml:2573
+#: using-d-i.xml:2571
#, no-c-format
msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2575
+#: using-d-i.xml:2573
#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3762,7 +3785,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2591
+#: using-d-i.xml:2589
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3777,13 +3800,13 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2603
+#: using-d-i.xml:2601
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2605
+#: using-d-i.xml:2603
#, no-c-format
msgid ""
"The criteria for selecting a partition is that it is FAT format filesystem "
@@ -3799,13 +3822,13 @@ msgstr ""
"有内容!"
#. Tag: title
-#: using-d-i.xml:2620
+#: using-d-i.xml:2618
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2622
+#: using-d-i.xml:2620
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3831,13 +3854,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2644
+#: using-d-i.xml:2642
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2645
+#: using-d-i.xml:2643
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -3848,13 +3871,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2654
+#: using-d-i.xml:2652
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2655
+#: using-d-i.xml:2653
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3867,13 +3890,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2665
+#: using-d-i.xml:2663
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2666
+#: using-d-i.xml:2664
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3886,13 +3909,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2678
+#: using-d-i.xml:2676
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2679
+#: using-d-i.xml:2677
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -3903,13 +3926,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2689
+#: using-d-i.xml:2687
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2690
+#: using-d-i.xml:2688
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3922,13 +3945,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2710
+#: using-d-i.xml:2708
#, no-c-format
msgid "<command>arcboot</command>-installer"
msgstr "<command>arcboot</command>-installer"
#. Tag: para
-#: using-d-i.xml:2711
+#: using-d-i.xml:2709
#, no-c-format
msgid ""
"The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -3968,13 +3991,13 @@ msgstr ""
"</screen></informalexample> ,然后键入 <command>boot</command>。"
#. Tag: replaceable
-#: using-d-i.xml:2730
+#: using-d-i.xml:2728
#, no-c-format
msgid "scsi"
msgstr "scsi"
#. Tag: para
-#: using-d-i.xml:2731
+#: using-d-i.xml:2729
#, no-c-format
msgid ""
"is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -3982,13 +4005,13 @@ msgid ""
msgstr "是启动的 SCSI 总线,<userinput>0</userinput> 为板载控制器"
#. Tag: replaceable
-#: using-d-i.xml:2739
+#: using-d-i.xml:2737
#, no-c-format
msgid "disk"
msgstr "disk"
#. Tag: para
-#: using-d-i.xml:2740
+#: using-d-i.xml:2738
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -3997,13 +4020,13 @@ msgstr "硬盘的 SCSI ID,<command>arcboot</command> 安装在其上"
# index.docbook:1643, index.docbook:1712
#. Tag: replaceable
-#: using-d-i.xml:2748
+#: using-d-i.xml:2746
#, no-c-format
msgid "partnr"
msgstr "partnr"
#. Tag: para
-#: using-d-i.xml:2749
+#: using-d-i.xml:2747
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4011,13 +4034,13 @@ msgid ""
msgstr "分区号,<filename>/etc/arcboot.conf</filename> 处于该分区"
#. Tag: replaceable
-#: using-d-i.xml:2757
+#: using-d-i.xml:2755
#, no-c-format
msgid "config"
msgstr "config"
#. Tag: para
-#: using-d-i.xml:2758
+#: using-d-i.xml:2756
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4027,13 +4050,13 @@ msgstr ""
"quote> 。"
#. Tag: title
-#: using-d-i.xml:2779
+#: using-d-i.xml:2777
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2780
+#: using-d-i.xml:2778
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4051,13 +4074,13 @@ msgstr ""
"设为启动 &debian;。"
#. Tag: title
-#: using-d-i.xml:2798
+#: using-d-i.xml:2796
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2799
+#: using-d-i.xml:2797
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4070,13 +4093,13 @@ msgstr ""
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
#. Tag: title
-#: using-d-i.xml:2815
+#: using-d-i.xml:2813
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:2816
+#: using-d-i.xml:2814
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4091,13 +4114,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:2833
+#: using-d-i.xml:2831
#, no-c-format
msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2835
+#: using-d-i.xml:2833
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4124,13 +4147,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:2860
+#: using-d-i.xml:2858
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用 boot loader 继续进行"
#. Tag: para
-#: using-d-i.xml:2862
+#: using-d-i.xml:2860
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -4146,7 +4169,7 @@ msgstr ""
"在机器上,以用于启动 GNU/Linux。</phrase>"
#. Tag: para
-#: using-d-i.xml:2871
+#: using-d-i.xml:2869
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -4165,13 +4188,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:2888
+#: using-d-i.xml:2886
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:2889
+#: using-d-i.xml:2887
#, no-c-format
msgid ""
"This is the last step in the Debian installation process during which the "
@@ -4182,13 +4205,13 @@ msgstr ""
"i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:2902
+#: using-d-i.xml:2900
#, no-c-format
msgid "Setting the System Clock"
msgstr "设置系统时钟"
#. Tag: para
-#: using-d-i.xml:2904
+#: using-d-i.xml:2902
#, no-c-format
msgid ""
"The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4200,7 +4223,7 @@ msgstr ""
"装程序依据是否有其他系统已经安装这类事情,来决定时钟要不要设为 UTC。"
#. Tag: para
-#: using-d-i.xml:2911
+#: using-d-i.xml:2909
#, no-c-format
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
@@ -4216,7 +4239,7 @@ msgstr ""
"为本地时间。如果您需要多重引导,请选择本地时间而不是 GMT。</phrase>"
#. Tag: para
-#: using-d-i.xml:2922
+#: using-d-i.xml:2920
#, no-c-format
msgid ""
"At this point &d-i; will also attempt to save the current time to the "
@@ -4227,13 +4250,13 @@ msgstr ""
"决于刚才的选择。"
#. Tag: title
-#: using-d-i.xml:2937
+#: using-d-i.xml:2935
#, no-c-format
msgid "Reboot the System"
msgstr "重新启动系统"
#. Tag: para
-#: using-d-i.xml:2939
+#: using-d-i.xml:2937
#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4244,7 +4267,7 @@ msgstr ""
"Debian 系统。"
#. Tag: para
-#: using-d-i.xml:2945
+#: using-d-i.xml:2943
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
@@ -4256,13 +4279,13 @@ msgstr ""
"上的 IPL &debian;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:2958
+#: using-d-i.xml:2956
#, no-c-format
msgid "Miscellaneous"
msgstr "杂项"
#. Tag: para
-#: using-d-i.xml:2959
+#: using-d-i.xml:2957
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -4273,13 +4296,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:2972
+#: using-d-i.xml:2970
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:2974
+#: using-d-i.xml:2972
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -4290,7 +4313,7 @@ msgstr ""
"<filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:2981
+#: using-d-i.xml:2979
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4304,13 +4327,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:3001
+#: using-d-i.xml:2999
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:3003
+#: using-d-i.xml:3001
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -4334,13 +4357,13 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: using-d-i.xml:3021
+#: using-d-i.xml:3019
#, no-c-format
msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
msgstr "对于图形安装程序,请参阅 <xref linkend=\"gtk-using\"/>。"
#. Tag: para
-#: using-d-i.xml:3025
+#: using-d-i.xml:3023
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4355,7 +4378,7 @@ msgstr ""
"到安装程序。"
#. Tag: para
-#: using-d-i.xml:3033
+#: using-d-i.xml:3031
#, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -4371,7 +4394,7 @@ msgstr ""
"Bourne shell 的克隆,有一些如自动完成与历史纪录这样的好特性。"
#. Tag: para
-#: using-d-i.xml:3042
+#: using-d-i.xml:3040
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4382,7 +4405,7 @@ msgstr ""
"以在 <filename>/var/log</filename> 目录找到。"
#. Tag: para
-#: using-d-i.xml:3049
+#: using-d-i.xml:3047
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -4393,7 +4416,7 @@ msgstr ""
"题时进行调试。"
#. Tag: para
-#: using-d-i.xml:3055
+#: using-d-i.xml:3053
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -4405,13 +4428,13 @@ msgstr ""
"该让安装程序激活交换分区,而不是在 shell 里面自己动手。"
#. Tag: title
-#: using-d-i.xml:3070
+#: using-d-i.xml:3068
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:3072
+#: using-d-i.xml:3070
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -4426,7 +4449,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:3082
+#: using-d-i.xml:3080
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -4446,7 +4469,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:3095
+#: using-d-i.xml:3093
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -4454,7 +4477,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:3100
+#: using-d-i.xml:3098
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4474,7 +4497,7 @@ msgstr ""
"quote>。"
#. Tag: para
-#: using-d-i.xml:3112
+#: using-d-i.xml:3110
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -4485,7 +4508,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:3118
+#: using-d-i.xml:3116
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4513,7 +4536,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:3135
+#: using-d-i.xml:3133
#, no-c-format
msgid ""
"The <command>ssh</command> server in the installer uses a default "
@@ -4534,7 +4557,7 @@ msgstr ""
"接在安装过程中的哪一点断开,您在连接之后可能继续,也可能无法继续安装过程。"
#. Tag: para
-#: using-d-i.xml:3148
+#: using-d-i.xml:3146
#, no-c-format
msgid ""
"You may be able to avoid the connection being dropped by adding the option "
@@ -4554,7 +4577,7 @@ msgstr ""
"需要的时候采用。"
#. Tag: para
-#: using-d-i.xml:3161
+#: using-d-i.xml:3159
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -4576,7 +4599,7 @@ msgstr ""
"footnote>,再重新来过。"
#. Tag: para
-#: using-d-i.xml:3177
+#: using-d-i.xml:3175
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -4593,7 +4616,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:3187
+#: using-d-i.xml:3185
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -4606,13 +4629,13 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: title
-#: using-d-i.xml:3207
+#: using-d-i.xml:3205
#, no-c-format
msgid "Loading Missing Firmware"
msgstr ""
#. Tag: para
-#: using-d-i.xml:3208
+#: using-d-i.xml:3206
#, no-c-format
msgid ""
"As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4622,7 +4645,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3216
+#: using-d-i.xml:3214
#, no-c-format
msgid ""
"If a device driver requests firmware that is not available, &d-i; will "
@@ -4634,7 +4657,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3226
+#: using-d-i.xml:3224
#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
@@ -4646,7 +4669,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3236
+#: using-d-i.xml:3234
#, no-c-format
msgid ""
"Note that it is possible to skip loading the firmware if you know the device "
@@ -4655,7 +4678,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3243
+#: using-d-i.xml:3241
#, no-c-format
msgid ""
"Support for loading firmware is still relatively basic and is likely to be "
@@ -4666,13 +4689,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:3254
+#: using-d-i.xml:3252
#, no-c-format
msgid "Preparing a medium"
msgstr ""
#. Tag: para
-#: using-d-i.xml:3255
+#: using-d-i.xml:3253
#, no-c-format
msgid ""
"Although in some cases the firmware can also be loaded from a partition on a "
@@ -4685,7 +4708,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3265
+#: using-d-i.xml:3263
#, no-c-format
msgid ""
"Tarballs containing current packages for the most common firmware are "
@@ -4696,7 +4719,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3279
+#: using-d-i.xml:3277
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -4707,7 +4730,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3293
+#: using-d-i.xml:3291
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -4716,13 +4739,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:3302
+#: using-d-i.xml:3300
#, no-c-format
msgid "Firmware and the Installed System"
msgstr ""
#. Tag: para
-#: using-d-i.xml:3303
+#: using-d-i.xml:3301
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -4734,7 +4757,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3312
+#: using-d-i.xml:3310
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -4745,7 +4768,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3320
+#: using-d-i.xml:3318
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -4754,7 +4777,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3327
+#: using-d-i.xml:3325
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -4764,6 +4787,10 @@ msgid ""
msgstr ""
#~ msgid ""
+#~ "Looks for ISO file systems, which may be on a CD-ROM or on the hard drive."
+#~ msgstr "寻找 ISO 文件系统,它可能存在于 CD-ROM 或者硬盘上。"
+
+#~ msgid ""
#~ "Also, if you are running the SSH session from an X terminal, you should "
#~ "not resize the window as that will result in the connection being "
#~ "terminated."
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 1819c1b7b..d9de847c2 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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: 2007-02-22 15:36+0000\n"
+"POT-Creation-Date: 2008-10-17 00:09+0000\n"
"PO-Revision-Date: 2007-02-26 11:28+0800\n"
"Last-Translator: Ji YongGang<jungle@soforge.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -48,7 +48,13 @@ msgid ""
"\"&url-gnu-intro;\">GNU</ulink> philosophy, has grown over the years into an "
"organization of around &num-of-debian-developers; <firstterm>Debian "
"Developers</firstterm>."
-msgstr "Debian 是一个致力于自由软件开发并宣扬自由软件基金会之理念的自愿者组织。Debian 计划创建于 1993 年。当时,Ian Murdock 发出一份公开信,邀请软件开发者们参与构建一个基于较新的 Linux 内核的完整而紧密的软件发行版。经过多年的成长,那群由 <ulink url=\"&url-fsf;\">自由软件基金会</ulink> 资助并受 <ulink url=\"&url-gnu-intro;\">GNU</ulink> 哲理影响的爱好者已经演变为一个拥有大约 &num-of-debian-developers; 位 <firstterm>Debian 开发人员的组织</firstterm>。"
+msgstr ""
+"Debian 是一个致力于自由软件开发并宣扬自由软件基金会之理念的自愿者组织。"
+"Debian 计划创建于 1993 年。当时,Ian Murdock 发出一份公开信,邀请软件开发者们"
+"参与构建一个基于较新的 Linux 内核的完整而紧密的软件发行版。经过多年的成长,那"
+"群由 <ulink url=\"&url-fsf;\">自由软件基金会</ulink> 资助并受 <ulink url="
+"\"&url-gnu-intro;\">GNU</ulink> 哲理影响的爱好者已经演变为一个拥有大约 &num-"
+"of-debian-developers; 位 <firstterm>Debian 开发人员的组织</firstterm>。"
#. Tag: para
#: welcome.xml:35
@@ -238,7 +244,9 @@ msgid ""
"Development of what later became GNU/Linux began in 1984, when the <ulink "
"url=\"&url-fsf;\">Free Software Foundation</ulink> began development of a "
"free Unix-like operating system called GNU."
-msgstr "后来演变为 GNU/Linux 系统的开发工作开始于 1984 年。当时,<ulink url=\"&url-fsf;\">自由软件基金会</ulink> 开始研发被称为 GNU 的自由的类 Unix 操作系统。"
+msgstr ""
+"后来演变为 GNU/Linux 系统的开发工作开始于 1984 年。当时,<ulink url=\"&url-"
+"fsf;\">自由软件基金会</ulink> 开始研发被称为 GNU 的自由的类 Unix 操作系统。"
#. Tag: para
#: welcome.xml:168
@@ -250,7 +258,11 @@ msgid ""
"tasks ranging from the mundane (such as copying or removing files from the "
"system) to the arcane (such as writing and compiling programs or doing "
"sophisticated editing in a variety of document formats)."
-msgstr "<ulink url=\"&url-gnu;\">GNU 工程</ulink> 开发了大量用于 Unix&trade; 的自由软件工具和类 Unix 操作系统,例如 Linux。这些工具使用户能执行从日常俗事(例如在系统中复制和删除文件)到神秘操作(例如书写和编译程序或对多种文档格式进行熟练的编辑工作)的各种任务。"
+msgstr ""
+"<ulink url=\"&url-gnu;\">GNU 工程</ulink> 开发了大量用于 Unix&trade; 的自由软"
+"件工具和类 Unix 操作系统,例如 Linux。这些工具使用户能执行从日常俗事(例如在系"
+"统中复制和删除文件)到神秘操作(例如书写和编译程序或对多种文档格式进行熟练的编"
+"辑工作)的各种任务。"
#. Tag: para
#: welcome.xml:178
@@ -599,8 +611,8 @@ msgstr ""
msgid ""
"Backup your system, perform any necessary planning and hardware "
"configuration prior to installing Debian, in <xref linkend=\"preparing\"/>. "
-"If you are preparing a multi-boot system, you may need to create partition"
-"able space on your hard disk for Debian to use."
+"If you are preparing a multi-boot system, you may need to create "
+"partitionable space on your hard disk for Debian to use."
msgstr ""
"备份系统,在安装 Debian 之前进行必要的规划和硬件配置,位于 <xref linkend="
"\"preparing\"/>。如果需要多重引导系统,您可能需要为 Debian 创建分区空间。"
@@ -712,17 +724,27 @@ msgstr "关于版权与软件协议"
#. Tag: para
#: welcome.xml:513
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "We're sure that you've read some of the licenses that come with most "
+#| "commercial software &mdash; they usually say that you can only use one "
+#| "copy of the software on a single computer. This system's license isn't "
+#| "like that at all. We encourage you to put a copy of on every computer in "
+#| "your school or place of business. Lend your installation media to your "
+#| "friends and help them install it on their computers! You can even make "
+#| "thousands of copies and <emphasis>sell</emphasis> them &mdash; albeit "
+#| "with a few restrictions. Your freedom to install and use the system comes "
+#| "directly from Debian being based on <emphasis>free software</emphasis>."
msgid ""
"We're sure that you've read some of the licenses that come with most "
"commercial software &mdash; they usually say that you can only use one copy "
"of the software on a single computer. This system's license isn't like that "
-"at all. We encourage you to put a copy of on every computer in your school "
-"or place of business. Lend your installation media to your friends and help "
-"them install it on their computers! You can even make thousands of copies "
-"and <emphasis>sell</emphasis> them &mdash; albeit with a few restrictions. "
-"Your freedom to install and use the system comes directly from Debian being "
-"based on <emphasis>free software</emphasis>."
+"at all. We encourage you to put a copy of &debian; on every computer in your "
+"school or place of business. Lend your installation media to your friends "
+"and help them install it on their computers! You can even make thousands of "
+"copies and <emphasis>sell</emphasis> them &mdash; albeit with a few "
+"restrictions. Your freedom to install and use the system comes directly from "
+"Debian being based on <emphasis>free software</emphasis>."
msgstr ""
"我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将拷贝用到您学校或商业"