Update translations for recent changes in hardware chapter and preseed appendix

Fix preseed translations that became fuzzy only due to the 586-686
change.

Delete the '586 is not SMP' paragraph from XML translations.

1 files changed, 449 insertions, 441 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index edaf19f38..8aa3feaf6 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: 2015-05-25 11:27+0000\n"
+"POT-Creation-Date: 2015-12-24 22:12+0000\n"
 "PO-Revision-Date: 2012-11-25 23:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -145,252 +145,240 @@ msgstr "armel"
 #. Tag: entry
 #: hardware.xml:76
 #, no-c-format
-msgid "Intel IXP4xx"
-msgstr "Intel IXP4xx"
-
-#. Tag: entry
-#: hardware.xml:77
-#, no-c-format
-msgid "ixp4xx"
-msgstr "ixp4xx"
-
-#. Tag: entry
-#: hardware.xml:79
-#, no-c-format
 msgid "Marvell Kirkwood"
 msgstr "Marvell Kirkwood"
 
 #. Tag: entry
-#: hardware.xml:80
+#: hardware.xml:77
 #, no-c-format
 msgid "kirkwood"
 msgstr "kirkwood"
 
 #. Tag: entry
-#: hardware.xml:82
+#: hardware.xml:79
 #, no-c-format
 msgid "Marvell Orion"
 msgstr "Marvell Orion"
 
 #. Tag: entry
-#: hardware.xml:83
+#: hardware.xml:80
 #, no-c-format
 msgid "orion5x"
 msgstr "orion5x"
 
 #. Tag: entry
-#: hardware.xml:90
+#: hardware.xml:82
 #, no-c-format
 msgid "<entry>Versatile</entry>"
 msgstr "<entry>Versatile</entry>"
 
 #. Tag: entry
-#: hardware.xml:91
+#: hardware.xml:83
 #, no-c-format
 msgid "versatile"
 msgstr "versatile"
 
 #. Tag: entry
-#: hardware.xml:95
+#: hardware.xml:87
 #, no-c-format
 msgid "ARM with hardware FPU"
 msgstr "带 FPU 的 ARM"
 
 #. Tag: entry
-#: hardware.xml:96
+#: hardware.xml:88
 #, no-c-format
 msgid "armhf"
 msgstr "armhf"
 
 #. Tag: entry
-#: hardware.xml:97
+#: hardware.xml:89
 #, no-c-format
 msgid "multiplatform"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:98
+#: hardware.xml:90
 #, no-c-format
 msgid "armmp"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:100
+#: hardware.xml:92
 #, no-c-format
 msgid "multiplatform for LPAE-capable systems"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:101
+#: hardware.xml:93
 #, no-c-format
 msgid "armmp-lpae"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:105
+#: hardware.xml:97
 #, no-c-format
 msgid "64bit ARM"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:106
+#: hardware.xml:98
 #, no-c-format
 msgid "arm64"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:112
+#: hardware.xml:104
 #, no-c-format
 msgid "MIPS (big endian)"
 msgstr "MIPS (big endian)"
 
 #. Tag: entry
-#: hardware.xml:113
+#: hardware.xml:105
 #, no-c-format
 msgid "mips"
 msgstr "mips"
 
 #. Tag: entry
-#: hardware.xml:114
+#: hardware.xml:106
 #, no-c-format
 msgid "SGI IP22 (Indy/Indigo 2)"
 msgstr "SGI IP22 (Indy/Indigo 2)"
 
 #. Tag: entry
-#: hardware.xml:115
+#: hardware.xml:107
 #, no-c-format
 msgid "r4k-ip22"
 msgstr "r4k-ip22"
 
 #. Tag: entry
-#: hardware.xml:117
+#: hardware.xml:109
 #, no-c-format
 msgid "SGI IP32 (O2)"
 msgstr "SGI IP32 (O2)"
 
 #. Tag: entry
-#: hardware.xml:118
+#: hardware.xml:110
 #, no-c-format
 msgid "r5k-ip32"
 msgstr "r5k-ip32"
 
 #. Tag: entry
-#: hardware.xml:120 hardware.xml:130
+#: hardware.xml:112 hardware.xml:122
 #, no-c-format
 msgid "MIPS Malta (32 bit)"
 msgstr "MIPS Malta (32 bit)"
 
 #. Tag: entry
-#: hardware.xml:121 hardware.xml:131
+#: hardware.xml:113 hardware.xml:123
 #, no-c-format
 msgid "4kc-malta"
 msgstr "4kc-malta"
 
 #. Tag: entry
-#: hardware.xml:123 hardware.xml:133
+#: hardware.xml:115 hardware.xml:125
 #, no-c-format
 msgid "MIPS Malta (64 bit)"
 msgstr "MIPS Malta (64 bit)"
 
 #. Tag: entry
-#: hardware.xml:124 hardware.xml:134
+#: hardware.xml:116 hardware.xml:126
 #, no-c-format
 msgid "5kc-malta"
 msgstr "5kc-malta"
 
 #. Tag: entry
-#: hardware.xml:128
+#: hardware.xml:120
 #, no-c-format
 msgid "MIPS (little endian)"
 msgstr "MIPS (little endian)"
 
 #. Tag: entry
-#: hardware.xml:129
+#: hardware.xml:121
 #, no-c-format
 msgid "mipsel"
 msgstr "mipsel"
 
 #. Tag: entry
-#: hardware.xml:138
+#: hardware.xml:130
 #, no-c-format
 msgid "IBM/Motorola PowerPC"
 msgstr "IBM/Motorola PowerPC"
 
 #. Tag: entry
-#: hardware.xml:139
+#: hardware.xml:131
 #, no-c-format
 msgid "<entry morerows=\"1\">powerpc</entry>"
 msgstr "<entry morerows=\"1\">powerpc</entry>"
 
 #. Tag: entry
-#: hardware.xml:140
+#: hardware.xml:132
 #, no-c-format
 msgid "PowerMac"
 msgstr "PowerMac"
 
 #. Tag: entry
-#: hardware.xml:141
+#: hardware.xml:133
 #, no-c-format
 msgid "pmac"
 msgstr "pmac"
 
 #. Tag: entry
-#: hardware.xml:143
+#: hardware.xml:135
 #, no-c-format
 msgid "PReP"
 msgstr "PReP"
 
 #. Tag: entry
-#: hardware.xml:144
+#: hardware.xml:136
 #, no-c-format
 msgid "prep"
 msgstr "prep"
 
 #. Tag: entry
-#: hardware.xml:148
+#: hardware.xml:140
 #, fuzzy, no-c-format
 #| msgid "Amiga Power-UP Systems (APUS)"
 msgid "Power Systems"
 msgstr "Amiga Power-UP Systems (APUS)"
 
 #. Tag: entry
-#: hardware.xml:149
+#: hardware.xml:141
 #, no-c-format
 msgid "ppc64el"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:150
+#: hardware.xml:142
 #, no-c-format
 msgid "IBM POWER8 or newer machines"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:175
+#: hardware.xml:167
 #, no-c-format
 msgid "64bit IBM S/390"
 msgstr "64bit IBM S/390"
 
 #. Tag: entry
-#: hardware.xml:176
+#: hardware.xml:168
 #, no-c-format
 msgid "s390x"
 msgstr "s390x"
 
 #. Tag: entry
-#: hardware.xml:177
+#: hardware.xml:169
 #, no-c-format
 msgid "IPL from VM-reader and DASD"
 msgstr "来自 VM-reader 和 DASD 的 IPL"
 
 #. Tag: entry
-#: hardware.xml:178
+#: hardware.xml:170
 #, no-c-format
 msgid "generic"
 msgstr "generic"
 
 #. Tag: para
-#: hardware.xml:185
+#: hardware.xml:177
 #, no-c-format
 msgid ""
 "This document covers installation for the <emphasis>&arch-title;</emphasis> "
@@ -404,7 +392,7 @@ msgstr ""
 "org/ports/\">&debian;-Ports</ulink> 网页。"
 
 #. Tag: para
-#: hardware.xml:195
+#: hardware.xml:187
 #, no-c-format
 msgid ""
 "This is the first official release of &debian-gnu; for the &arch-title; "
@@ -425,25 +413,25 @@ msgstr ""
 "\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
 
 #. Tag: title
-#: hardware.xml:217
+#: hardware.xml:209
 #, no-c-format
 msgid "CPU Support"
 msgstr "CPU 支持"
 
 #. Tag: para
-#: hardware.xml:218
+#: hardware.xml:210
 #, no-c-format
 msgid "Both AMD64 and Intel 64 processors are supported."
 msgstr "AMD64 和 Intel 64 处理器都获得支持。"
 
 #. Tag: title
-#: hardware.xml:242
+#: hardware.xml:234
 #, no-c-format
 msgid "Three different ARM ports"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:244
+#: hardware.xml:236
 #, no-c-format
 msgid ""
 "The ARM architecture has evolved over time and modern ARM processors provide "
@@ -453,7 +441,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:250
+#: hardware.xml:242
 #, no-c-format
 msgid ""
 "&debian;/armel targets older 32-bit ARM processors without support for a "
@@ -461,7 +449,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:254
+#: hardware.xml:246
 #, no-c-format
 msgid ""
 "&debian;/armhf works only on newer 32-bit ARM processors which implement at "
@@ -471,7 +459,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:261
+#: hardware.xml:253
 #, no-c-format
 msgid ""
 "&debian;/arm64 works on 64-bit ARM processors which implement at least the "
@@ -479,7 +467,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:268
+#: hardware.xml:260
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Most ARM CPUs may be run in either endian mode (big or little). However, "
@@ -496,13 +484,13 @@ msgstr ""
 "ARM 系统。"
 
 #. Tag: title
-#: hardware.xml:277
+#: hardware.xml:269
 #, no-c-format
 msgid "Variations in ARM CPU designs and support complexity"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:279
+#: hardware.xml:271
 #, no-c-format
 msgid ""
 "ARM systems are much more heterogeneous than those based on the i386/amd64-"
@@ -510,7 +498,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:285
+#: hardware.xml:277
 #, no-c-format
 msgid ""
 "The ARM architecture is used mainly in so-called <quote>system-on-chip</"
@@ -524,7 +512,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:297
+#: hardware.xml:289
 #, no-c-format
 msgid ""
 "At the beginning of the ARM support in the Linux kernel, the hardware "
@@ -542,7 +530,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:313
+#: hardware.xml:305
 #, no-c-format
 msgid ""
 "The ARM architecture is used mainly in so-called <quote>system-on-chip</"
@@ -555,7 +543,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:324
+#: hardware.xml:316
 #, no-c-format
 msgid ""
 "Server versions of ARMv8 hardware are typically configured using the Unified "
@@ -566,13 +554,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:334
+#: hardware.xml:326
 #, no-c-format
 msgid "Platforms supported by Debian/arm64"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:336
+#: hardware.xml:328
 #, no-c-format
 msgid ""
 "Arm64/AArch64/ARMv8 hardware became available quite late in the &debian; "
@@ -584,13 +572,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:348
+#: hardware.xml:340
 #, no-c-format
 msgid "Applied Micro (APM) Mustang/X-Gene"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:350
+#: hardware.xml:342
 #, no-c-format
 msgid ""
 "The APM Mustang was the first Linux-capable ARMv8 system available. It uses "
@@ -602,13 +590,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:364
+#: hardware.xml:356
 #, no-c-format
 msgid "ARM Juno Development Platform"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:366
+#: hardware.xml:358
 #, no-c-format
 msgid ""
 "Juno is a capable development board with a 6-core (2xA57, 4xA53) ARMv8-A "
@@ -619,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:380
+#: hardware.xml:372
 #, no-c-format
 msgid ""
 "When using &d-i; on non-UEFI systems, you may have to manually make the "
@@ -629,14 +617,14 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:388
+#: hardware.xml:380
 #, fuzzy, no-c-format
 #| msgid "The supported platforms are:"
 msgid "Other platforms"
 msgstr "获得支持的平台有："
 
 #. Tag: para
-#: hardware.xml:389
+#: hardware.xml:381
 #, no-c-format
 msgid ""
 "The multiplatform support in the arm64 Linux kernel may also allow running "
@@ -650,13 +638,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:405
+#: hardware.xml:397
 #, no-c-format
 msgid "Platforms supported by Debian/armhf"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:407
+#: hardware.xml:399
 #, no-c-format
 msgid ""
 "The following systems are known to work with &debian;/armhf using the "
@@ -664,26 +652,26 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:414
+#: hardware.xml:406
 #, no-c-format
-msgid "Freescale MX53 Quick Start Board"
+msgid "Freescale MX53 Quick Start Board (MX53 LOCO Board)"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:416
+#: hardware.xml:408
 #, no-c-format
 msgid "The IMX53QSB is a development board based on the i.MX53 SoC."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:423
+#: hardware.xml:415
 #, fuzzy, no-c-format
 #| msgid "versatile"
 msgid "Versatile Express"
 msgstr "versatile"
 
 #. Tag: para
-#: hardware.xml:425
+#: hardware.xml:417
 #, no-c-format
 msgid ""
 "The Versatile Express is a development board series from ARM consisting of a "
@@ -691,13 +679,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:434
+#: hardware.xml:426
 #, no-c-format
 msgid "Certain Allwinner sunXi-based development boards and embedded systems"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:437
+#: hardware.xml:429
 #, no-c-format
 msgid ""
 "The armmp kernel supports several development boards and embedded systems "
@@ -708,37 +696,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:445
+#: hardware.xml:437
 #, no-c-format
 msgid "Cubietech Cubieboard 1 + 2 / Cubietruck"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:448
+#: hardware.xml:440
 #, no-c-format
 msgid "LeMaker Banana Pi and Banana Pro"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:451
+#: hardware.xml:443
 #, no-c-format
 msgid "LinkSprite pcDuino and pcDuino3"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:454
+#: hardware.xml:446
 #, no-c-format
 msgid "Mele A1000"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:457
+#: hardware.xml:449
 #, no-c-format
 msgid "Miniand Hackberry"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:460
+#: hardware.xml:452
 #, no-c-format
 msgid ""
 "Olimex A10-Olinuxino-LIME / A10s-Olinuxino Micro / A13-Olinuxino / A13-"
@@ -747,13 +735,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:465
+#: hardware.xml:457
 #, no-c-format
 msgid "PineRiver Mini X-Plus"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:471
+#: hardware.xml:463
 #, no-c-format
 msgid ""
 "System support for Allwinner sunXi-based devices is limited to drivers and "
@@ -762,7 +750,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:477
+#: hardware.xml:469
 #, no-c-format
 msgid ""
 "The mainline Linux kernel generally supports serial console, ethernet, SATA, "
@@ -773,23 +761,23 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:485
+#: hardware.xml:477
 #, no-c-format
 msgid ""
 "Using a local display is technically possible without native display drivers "
 "via the <quote>simplefb</quote> infrastructure in the mainline kernel, which "
 "relies on the <quote>U-Boot</quote> bootloader for initialising the display "
-"hardware, but this is not supported by the U-Boot version in &debian; 8."
+"hardware."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:497
+#: hardware.xml:488
 #, no-c-format
 msgid "SolidRun Cubox-i2eX / Cubox-i4Pro"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:499
+#: hardware.xml:490
 #, no-c-format
 msgid ""
 "The Cubox-i series is a set of small, cubical-shaped systems based on the "
@@ -802,13 +790,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:514
+#: hardware.xml:505
 #, no-c-format
 msgid "Wandboard Quad"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:516
+#: hardware.xml:507
 #, no-c-format
 msgid ""
 "The Wandboard Quad is a development board based on the Freescale i.MX6 Quad "
@@ -822,7 +810,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:534
+#: hardware.xml:525
 #, no-c-format
 msgid ""
 "Generally, the ARM multiplatform support in the Linux kernel allows running "
@@ -835,7 +823,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:546
+#: hardware.xml:537
 #, no-c-format
 msgid ""
 "When using &d-i; on such systems, you may have to manually make the system "
@@ -844,19 +832,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:555
+#: hardware.xml:546
 #, no-c-format
 msgid "Platforms no longer supported by Debian/armhf"
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:559
+#: hardware.xml:550
 #, no-c-format
 msgid "EfikaMX"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:560
+#: hardware.xml:551
 #, no-c-format
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) was "
@@ -869,13 +857,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:578
+#: hardware.xml:569
 #, no-c-format
 msgid "Platforms supported by Debian/armel"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:580
+#: hardware.xml:571
 #, no-c-format
 msgid ""
 "The following platforms are supported by &debian;/armel; they require "
@@ -883,77 +871,58 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:588
+#: hardware.xml:579
 #, no-c-format
-msgid "IXP4xx"
-msgstr "IXP4xx"
+msgid "Kirkwood"
+msgstr "Kirkwood"
 
 #. Tag: para
-#: hardware.xml:589
+#: hardware.xml:580
 #, no-c-format
 msgid ""
-"The Intel IXP4xx processor series is used in commonly used network attached "
-"storage (NAS) devices like the Linksys NSLU2."
+"Kirkwood is a system-on-chip (SoC) from Marvell that integrates an ARM CPU, "
+"Ethernet, SATA, USB, and other functionality in one chip. &debian; currently "
+"supports the following Kirkwood based devices:"
 msgstr ""
 
-#. Tag: para
-#: hardware.xml:594
+#. Tag: ulink
+#: hardware.xml:588
 #, no-c-format
 msgid ""
-"While there is kernel support for this platform in &debian; 8, it is not "
-"supported by the &d-i;. It is possible to do a <quote>dist-upgrade</quote> "
-"from &debian; 7 to &debian; 8 for existing installations, though. Due to the "
-"small amount of RAM that systems based on the IXP4xx typically have, this "
-"requires that swap space is enabled prior to upgrading. Support for the "
-"IXP4xx platform will be dropped completely in &debian; 9."
+"Plug computers (SheevaPlug, GuruPlug, DreamPlug and Seagate FreeAgent "
+"DockStar)"
 msgstr ""
 
-#. Tag: term
-#: hardware.xml:608
+#. Tag: para
+#: hardware.xml:591
 #, no-c-format
-msgid "Kirkwood"
-msgstr "Kirkwood"
+msgid ""
+"<ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> "
+"(all TS-11x/TS-12x, HS-210, TS-21x/TS-22x and TS-41x/TS-42x models)"
+msgstr ""
 
 #. Tag: para
-#: hardware.xml:609
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
-#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
-#| "currently support the following Kirkwood based devices: OpenRD (OpenRD-"
-#| "Base, OpenRD-Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-"
-#| "sheevaplug;\">plug computers (SheevaPlug, GuruPlug and DreamPlug)</"
-#| "ulink>, <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</"
-#| "ulink> (all TS-11x, TS-21x and TS-41x models), and LaCie NASes (Network "
-#| "Space v2, Network Space Max v2, Internet Space v2, d2 Network v2, 2Big "
-#| "Network v2 and 5Big Network v2)."
+#: hardware.xml:595
+#, no-c-format
 msgid ""
-"Kirkwood is a system-on-chip (SoC) from Marvell that integrates an ARM CPU, "
-"Ethernet, SATA, USB, and other functionality in one chip. &debian; currently "
-"supports the following Kirkwood based devices: OpenRD (OpenRD-Base, OpenRD-"
-"Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-sheevaplug;\">plug "
-"computers (SheevaPlug, GuruPlug and DreamPlug)</ulink>, <ulink url=\"&url-"
-"arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x "
-"and TS-41x models), and LaCie NASes (Network Space v2, Network Space Max v2, "
-"Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2)."
-msgstr ""
-"Kirkwood 是 Marvell 的 SoC 产品，集成了 ARM CPU、Ethernet、SATA、USB，以及其"
-"他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备：OpenRD (OpenRD-Base, "
-"OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-sheevaplug;"
-"\">plug computers (SheevaPlug、GuruPlug 和 DreamPlug)</ulink>， <ulink url="
-"\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (所有 TS-11x、"
-"TS-21x 和 TS-41x 型号)，以及 LaCie NASes (Network Space v2、Network Space "
-"Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network "
-"v2)。"
+"LaCie NASes (Network Space v2, Network Space Max v2, Internet Space v2, d2 "
+"Network v2, 2Big Network v2 and 5Big Network v2)"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:599
+#, no-c-format
+msgid "OpenRD (OpenRD-Base, OpenRD-Client and OpenRD-Ultimate)"
+msgstr ""
 
 #. Tag: term
-#: hardware.xml:626
+#: hardware.xml:608 hardware.xml:652
 #, no-c-format
 msgid "Orion5x"
 msgstr "Orion5x"
 
 #. Tag: para
-#: hardware.xml:627
+#: hardware.xml:609
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Orion is a system on a chip (SoC) from Marvell that integrates an ARM "
@@ -968,9 +937,8 @@ msgid ""
 "Ethernet, SATA, USB, and other functionality in one chip. There are many "
 "Network Attached Storage (NAS) devices on the market that are based on an "
 "Orion chip. &debian; currently supports the following Orion based devices: "
-"<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink "
-"url=\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> and <ulink url=\"&url-"
-"arm-cyrius-mv2120;\">HP mv2120</ulink>."
+"<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink> and "
+"<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>."
 msgstr ""
 "Orion 是 Marvell 的 SoC 产品，集成了 ARM CPU、Ethernet、SATA、USB，以及其他一"
 "些功能。市场上有很多 NAS 设备基于 Orion 芯片。我们当前支持以下几种基于 Orion "
@@ -979,13 +947,13 @@ msgstr ""
 "\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
 
 #. Tag: term
-#: hardware.xml:642
+#: hardware.xml:623
 #, no-c-format
 msgid "<term>Versatile</term>"
 msgstr "<term>Versatile</term>"
 
 #. Tag: para
-#: hardware.xml:643
+#: hardware.xml:624
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -998,56 +966,45 @@ msgstr ""
 "&debian; 是一个不错的方法。"
 
 #. Tag: title
-#: hardware.xml:656
+#: hardware.xml:637
 #, no-c-format
-msgid "Platforms no longer supported by Debian/armel"
+msgid "Platforms and devices no longer supported by Debian/armel"
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:660
+#: hardware.xml:641
 #, no-c-format
-msgid "IOP32x"
-msgstr "IOP32x"
+msgid "IXP4xx"
+msgstr "IXP4xx"
 
 #. Tag: para
-#: hardware.xml:661
+#: hardware.xml:642
 #, no-c-format
 msgid ""
-"Intel's I/O Processor (IOP) line is found in a number of products related to "
-"data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-"glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-"cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-"platform in &debian; 7, but does not support it any longer from version 8 on "
-"due to hardware constraints of the platform which make it unsuitable for the "
-"installation of newer &debian; releases."
-msgstr ""
-
-#. Tag: term
-#: hardware.xml:676
-#, no-c-format
-msgid "MV78xx0"
+"Support for the Intel IXP4xx platform has been dropped in &debian; 9. The "
+"Linksys NSLU2 device is based on IXP4xx and is therefore no longer supported."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:677
+#: hardware.xml:653
 #, no-c-format
 msgid ""
-"The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-"board. It was supported in &debian; 7 with a platform-specific kernel (based "
-"on the Linux kernel version 3.2), but is not supported any more from "
-"&debian; 8 onwards."
+"Support for the D-Link DNS-323 and Conceptronic CH3SNAS devices has been "
+"dropped from the Orion5x platform in &debian; 9. The Linux kernel no longer "
+"fits into the flash on these devices. Other Orion devices, such as Buffalo "
+"Kurobox and HP mv2120, are still supported."
 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:696 hardware.xml:753 hardware.xml:811 hardware.xml:841
-#: hardware.xml:1284
+#: hardware.xml:672 hardware.xml:722 hardware.xml:780 hardware.xml:810
+#: hardware.xml:1253
 #, no-c-format
 msgid "CPU, Main Boards, and Video Support"
 msgstr "CPU，主板和视频支持"
 
 #. Tag: para
-#: hardware.xml:697
+#: hardware.xml:673
 #, no-c-format
 msgid ""
 "Complete information concerning supported peripherals can be found at <ulink "
@@ -1059,39 +1016,38 @@ msgstr ""
 
 # index.docbook:808, index.docbook:914
 #. Tag: title
-#: hardware.xml:705 hardware.xml:788
+#: hardware.xml:681 hardware.xml:757
 #, no-c-format
 msgid "<title>CPU</title>"
 msgstr "<title>CPU</title>"
 
 #. Tag: para
-#: hardware.xml:706
-#, no-c-format
+#: hardware.xml:682
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Nearly all x86-based (IA-32) processors still in use in personal "
+#| "computers are supported, including all varieties of Intel's \"Pentium\" "
+#| "series. This also includes 32-bit AMD and VIA (former Cyrix) processors, "
+#| "and processors like the Athlon XP and Intel P4 Xeon."
 msgid ""
 "Nearly all x86-based (IA-32) processors still in use in personal computers "
-"are supported, including all varieties of Intel's \"Pentium\" series. This "
-"also includes 32-bit AMD and VIA (former Cyrix) processors, and processors "
-"like the Athlon XP and Intel P4 Xeon."
+"are supported. This also includes 32-bit AMD and VIA (former Cyrix) "
+"processors, and processors like the Athlon XP and Intel P4 Xeon."
 msgstr ""
 "几乎所有个人计算机中基于 x86 (IA-32) 的处理器都支持，包括所有的 Intel "
 "\"Pentium\" 系列变种。还包括 32 位 AMD 和 VIA (前身是 Cyrix) 处理器，以及像 "
 "Athlon XP 和 Intel P4 Xeon 这些处理器。"
 
 #. Tag: para
-#: hardware.xml:713
+#: hardware.xml:689
 #, no-c-format
 msgid ""
 "However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
-"on 486 or earlier processors. Despite the architecture name \"i386\", "
-"support for actual 80386 and 80486 processors (and their clones) was dropped "
-"with the Sarge (r3.1) and Squeeze (r6.0) releases of &debian;, respectively. "
-"The Intel Pentium and clones, including those without an FPU (Floating-Point "
-"Unit or math coprocessor), are supported. The Intel Quark is <emphasis>not</"
-"emphasis> supported, due to hardware errata."
+"on 586 (Pentium) or earlier processors."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:725
+#: hardware.xml:695
 #, no-c-format
 msgid ""
 "If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
@@ -1102,27 +1058,32 @@ msgstr ""
 "安装程序替代 (32位) i386 架构的安装程序。"
 
 #. Tag: title
-#: hardware.xml:734
+#: hardware.xml:704
 #, no-c-format
 msgid "I/O Bus"
 msgstr "I/O 总线"
 
 #. Tag: para
-#: hardware.xml:735
-#, no-c-format
+#: hardware.xml:705
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The system bus is the part of the motherboard which allows the CPU to "
+#| "communicate with peripherals such as storage devices. Your computer must "
+#| "use the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes "
+#| "called the VL bus). Essentially all personal computers sold in recent "
+#| "years use one of these."
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called "
-"the VL bus). Essentially all personal computers sold in recent years use one "
-"of these."
+"the PCI, PCIe, or PCI-X bus. Essentially all personal computers sold in "
+"recent years use one of these."
 msgstr ""
 "系统总线作为主板的一部分用于 CPU 和诸如存储设备之类的周边设备通讯。您的计算机"
 "必须使用 ISA、EISA、PCI、PCIe、PCI-X 或者 VESA Local Bus(VLB, 有时称为 VL 总"
 "线)。近年来出售的个人电脑都会使用里面的一种。"
 
 #. Tag: para
-#: hardware.xml:754
+#: hardware.xml:723
 #, no-c-format
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1152,7 +1113,7 @@ msgstr ""
 "\"> debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: para
-#: hardware.xml:789
+#: hardware.xml:758
 #, no-c-format
 msgid ""
 "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -1165,7 +1126,7 @@ msgstr ""
 "持 R5000。"
 
 #. Tag: para
-#: hardware.xml:795
+#: hardware.xml:764
 #, no-c-format
 msgid ""
 "Some MIPS machines can be operated in both big and little endian mode. For "
@@ -1176,7 +1137,7 @@ msgstr ""
 "endian MIPS，请阅读 mipsel 体系的相关文档。"
 
 #. Tag: para
-#: hardware.xml:812
+#: hardware.xml:781
 #, fuzzy, no-c-format
 #| msgid ""
 #| "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1213,7 +1174,7 @@ msgstr ""
 "mailing list</ulink>。"
 
 #. Tag: para
-#: hardware.xml:842
+#: hardware.xml:811
 #, no-c-format
 msgid ""
 "For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -1223,13 +1184,13 @@ msgstr ""
 "PreP 子体系获得支持。"
 
 #. Tag: title
-#: hardware.xml:863
+#: hardware.xml:832
 #, no-c-format
 msgid "Kernel Flavours"
 msgstr "内核变种"
 
 #. Tag: para
-#: hardware.xml:865
+#: hardware.xml:834
 #, no-c-format
 msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -1237,13 +1198,13 @@ msgid ""
 msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核："
 
 #. Tag: term
-#: hardware.xml:872
+#: hardware.xml:841
 #, no-c-format
 msgid "<term>powerpc</term>"
 msgstr "<term>powerpc</term>"
 
 #. Tag: para
-#: hardware.xml:873
+#: hardware.xml:842
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Most systems use this kernel flavour, which supports the PowerPC 601, "
@@ -1258,31 +1219,31 @@ msgstr ""
 "器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
 
 #. Tag: term
-#: hardware.xml:883
+#: hardware.xml:852
 #, no-c-format
 msgid "powerpc-smp"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:884
+#: hardware.xml:853
 #, no-c-format
 msgid "All Apple PowerMac G4 SMP machines."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:892
+#: hardware.xml:861
 #, no-c-format
 msgid "power64"
 msgstr "power64"
 
 #. Tag: para
-#: hardware.xml:893
+#: hardware.xml:862
 #, no-c-format
 msgid "The power64 kernel flavour supports the following CPUs:"
 msgstr "power64 内核支持以下的 CPU："
 
 #. Tag: para
-#: hardware.xml:897
+#: hardware.xml:866
 #, no-c-format
 msgid ""
 "The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -1294,7 +1255,7 @@ msgstr ""
 "7044-270。"
 
 #. Tag: para
-#: hardware.xml:903
+#: hardware.xml:872
 #, no-c-format
 msgid ""
 "The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -1304,7 +1265,7 @@ msgstr ""
 "630、650、655、670 和 690。"
 
 #. Tag: para
-#: hardware.xml:908
+#: hardware.xml:877
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
@@ -1317,19 +1278,19 @@ msgstr ""
 "采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系，并使用这种内核。"
 
 #. Tag: para
-#: hardware.xml:914
+#: hardware.xml:883
 #, no-c-format
 msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:947
+#: hardware.xml:916
 #, no-c-format
 msgid "Power Macintosh (pmac) subarchitecture"
 msgstr "Power Macintosh (pmac) 子体系"
 
 #. Tag: para
-#: hardware.xml:949
+#: hardware.xml:918
 #, no-c-format
 msgid ""
 "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -1342,7 +1303,7 @@ msgstr ""
 "NuBus(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
 
 #. Tag: para
-#: hardware.xml:956
+#: hardware.xml:925
 #, no-c-format
 msgid ""
 "OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -1355,7 +1316,7 @@ msgstr ""
 "些 Apple iMac PowerPC 前身使用 4 位数字命名方式，它们都是 OldWorld 的。"
 
 #. Tag: para
-#: hardware.xml:964
+#: hardware.xml:933
 #, no-c-format
 msgid ""
 "The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1370,7 +1331,7 @@ msgstr ""
 "MacOS 的系统。"
 
 #. Tag: para
-#: hardware.xml:972
+#: hardware.xml:941
 #, no-c-format
 msgid ""
 "Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1385,397 +1346,397 @@ msgstr ""
 
 # index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
 #. Tag: entry
-#: hardware.xml:988 hardware.xml:1123 hardware.xml:1167 hardware.xml:1200
+#: hardware.xml:957 hardware.xml:1092 hardware.xml:1136 hardware.xml:1169
 #, no-c-format
 msgid "Model Name/Number"
 msgstr "型号名称/编号"
 
 #. Tag: entry
-#: hardware.xml:989
+#: hardware.xml:958
 #, no-c-format
 msgid "Generation"
 msgstr "世代"
 
 #. Tag: entry
-#: hardware.xml:995
+#: hardware.xml:964
 #, no-c-format
 msgid "Apple"
 msgstr "Apple"
 
 #. Tag: entry
-#: hardware.xml:996
+#: hardware.xml:965
 #, 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:997 hardware.xml:1000 hardware.xml:1003 hardware.xml:1006
-#: hardware.xml:1009 hardware.xml:1012 hardware.xml:1015 hardware.xml:1018
-#: hardware.xml:1021 hardware.xml:1024 hardware.xml:1027 hardware.xml:1030
-#: hardware.xml:1033 hardware.xml:1036 hardware.xml:1039 hardware.xml:1042
+#: hardware.xml:966 hardware.xml:969 hardware.xml:972 hardware.xml:975
+#: hardware.xml:978 hardware.xml:981 hardware.xml:984 hardware.xml:987
+#: hardware.xml:990 hardware.xml:993 hardware.xml:996 hardware.xml:999
+#: hardware.xml:1002 hardware.xml:1005 hardware.xml:1008 hardware.xml:1011
 #, no-c-format
 msgid "NewWorld"
 msgstr "NewWorld"
 
 #. Tag: entry
-#: hardware.xml:999
+#: hardware.xml:968
 #, no-c-format
 msgid "iMac Summer 2000, Early 2001"
 msgstr "iMac Summer 2000, Early 2001"
 
 #. Tag: entry
-#: hardware.xml:1002
+#: hardware.xml:971
 #, no-c-format
 msgid "iMac G5"
 msgstr "iMac G5"
 
 #. Tag: entry
-#: hardware.xml:1005
+#: hardware.xml:974
 #, no-c-format
 msgid "iBook, iBook SE, iBook Dual USB"
 msgstr "iBook, iBook SE, iBook Dual USB"
 
 #. Tag: entry
-#: hardware.xml:1008
+#: hardware.xml:977
 #, no-c-format
 msgid "iBook2"
 msgstr "iBook2"
 
 #. Tag: entry
-#: hardware.xml:1011
+#: hardware.xml:980
 #, no-c-format
 msgid "iBook G4"
 msgstr "iBook G4"
 
 #. Tag: entry
-#: hardware.xml:1014
+#: hardware.xml:983
 #, 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:1017
+#: hardware.xml:986
 #, no-c-format
 msgid "Power Macintosh G4 PCI, AGP, Cube"
 msgstr "Power Macintosh G4 PCI, AGP, Cube"
 
 #. Tag: entry
-#: hardware.xml:1020
+#: hardware.xml:989
 #, no-c-format
 msgid "Power Macintosh G4 Gigabit Ethernet"
 msgstr "Power Macintosh G4 Gigabit Ethernet"
 
 #. Tag: entry
-#: hardware.xml:1023
+#: hardware.xml:992
 #, no-c-format
 msgid "Power Macintosh G4 Digital Audio, Quicksilver"
 msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
 
 #. Tag: entry
-#: hardware.xml:1026
+#: hardware.xml:995
 #, no-c-format
 msgid "Power Macintosh G5"
 msgstr "Power Macintosh G5"
 
 #. Tag: entry
-#: hardware.xml:1029
+#: hardware.xml:998
 #, no-c-format
 msgid "PowerBook G3 FireWire Pismo (2000)"
 msgstr "PowerBook G3 FireWire Pismo (2000)"
 
 #. Tag: entry
-#: hardware.xml:1032
+#: hardware.xml:1001
 #, no-c-format
 msgid "PowerBook G3 Lombard (1999)"
 msgstr "PowerBook G3 Lombard (1999)"
 
 #. Tag: entry
-#: hardware.xml:1035
+#: hardware.xml:1004
 #, no-c-format
 msgid "PowerBook G4 Titanium"
 msgstr "PowerBook G4 Titanium"
 
 #. Tag: entry
-#: hardware.xml:1038
+#: hardware.xml:1007
 #, no-c-format
 msgid "PowerBook G4 Aluminum"
 msgstr "PowerBook G4 Aluminum"
 
 #. Tag: entry
-#: hardware.xml:1041
+#: hardware.xml:1010
 #, no-c-format
 msgid "Xserve G5"
 msgstr "Xserve G5"
 
 #. Tag: entry
-#: hardware.xml:1044
+#: hardware.xml:1013
 #, 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:1045 hardware.xml:1048 hardware.xml:1051 hardware.xml:1054
-#: hardware.xml:1057 hardware.xml:1060 hardware.xml:1063 hardware.xml:1066
-#: hardware.xml:1069 hardware.xml:1072 hardware.xml:1075 hardware.xml:1078
-#: hardware.xml:1084 hardware.xml:1087 hardware.xml:1093 hardware.xml:1099
-#: hardware.xml:1105
+#: hardware.xml:1014 hardware.xml:1017 hardware.xml:1020 hardware.xml:1023
+#: hardware.xml:1026 hardware.xml:1029 hardware.xml:1032 hardware.xml:1035
+#: hardware.xml:1038 hardware.xml:1041 hardware.xml:1044 hardware.xml:1047
+#: hardware.xml:1053 hardware.xml:1056 hardware.xml:1062 hardware.xml:1068
+#: hardware.xml:1074
 #, no-c-format
 msgid "OldWorld"
 msgstr "OldWorld"
 
 #. Tag: entry
-#: hardware.xml:1047
+#: hardware.xml:1016
 #, no-c-format
 msgid "Performa 6360, 6400, 6500"
 msgstr "Performa 6360, 6400, 6500"
 
 #. Tag: entry
-#: hardware.xml:1050
+#: hardware.xml:1019
 #, no-c-format
 msgid "Power Macintosh 4400, 5400"
 msgstr "Power Macintosh 4400, 5400"
 
 #. Tag: entry
-#: hardware.xml:1053
+#: hardware.xml:1022
 #, no-c-format
 msgid "Power Macintosh 7200, 7300, 7500, 7600"
 msgstr "Power Macintosh 7200, 7300, 7500, 7600"
 
 #. Tag: entry
-#: hardware.xml:1056
+#: hardware.xml:1025
 #, no-c-format
 msgid "Power Macintosh 8200, 8500, 8600"
 msgstr "Power Macintosh 8200, 8500, 8600"
 
 #. Tag: entry
-#: hardware.xml:1059
+#: hardware.xml:1028
 #, no-c-format
 msgid "Power Macintosh 9500, 9600"
 msgstr "Power Macintosh 9500, 9600"
 
 #. Tag: entry
-#: hardware.xml:1062
+#: hardware.xml:1031
 #, no-c-format
 msgid "Power Macintosh (Beige) G3 Minitower"
 msgstr "Power Macintosh (Beige) G3 Minitower"
 
 #. Tag: entry
-#: hardware.xml:1065
+#: hardware.xml:1034
 #, no-c-format
 msgid "Power Macintosh (Beige) Desktop, All-in-One"
 msgstr "Power Macintosh (Beige) Desktop, All-in-One"
 
 #. Tag: entry
-#: hardware.xml:1068
+#: hardware.xml:1037
 #, no-c-format
 msgid "PowerBook 2400, 3400, 3500"
 msgstr "PowerBook 2400, 3400, 3500"
 
 #. Tag: entry
-#: hardware.xml:1071
+#: hardware.xml:1040
 #, no-c-format
 msgid "PowerBook G3 Wallstreet (1998)"
 msgstr "PowerBook G3 Wallstreet (1998)"
 
 #. Tag: entry
-#: hardware.xml:1074
+#: hardware.xml:1043
 #, no-c-format
 msgid "Twentieth Anniversary Macintosh"
 msgstr "Twentieth Anniversary Macintosh"
 
 #. Tag: entry
-#: hardware.xml:1077
+#: hardware.xml:1046
 #, no-c-format
 msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
 msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
 
 #. Tag: entry
-#: hardware.xml:1082
+#: hardware.xml:1051
 #, no-c-format
 msgid "Power Computing"
 msgstr "Power Computing"
 
 #. Tag: entry
-#: hardware.xml:1083
+#: hardware.xml:1052
 #, no-c-format
 msgid "PowerBase, PowerTower / Pro, PowerWave"
 msgstr "PowerBase, PowerTower / Pro, PowerWave"
 
 #. Tag: entry
-#: hardware.xml:1086
+#: hardware.xml:1055
 #, no-c-format
 msgid "PowerCenter / Pro, PowerCurve"
 msgstr "PowerCenter / Pro, PowerCurve"
 
 #. Tag: entry
-#: hardware.xml:1091
+#: hardware.xml:1060
 #, no-c-format
 msgid "UMAX"
 msgstr "UMAX"
 
 #. Tag: entry
-#: hardware.xml:1092
+#: hardware.xml:1061
 #, no-c-format
 msgid "C500, C600, J700, S900"
 msgstr "C500, C600, J700, S900"
 
 #. Tag: entry
-#: hardware.xml:1097
+#: hardware.xml:1066
 #, no-c-format
 msgid "<entry>APS</entry>"
 msgstr "<entry>APS</entry>"
 
 #. Tag: entry
-#: hardware.xml:1098
+#: hardware.xml:1067
 #, 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:1103 hardware.xml:1129
+#: hardware.xml:1072 hardware.xml:1098
 #, no-c-format
 msgid "Motorola"
 msgstr "Motorola"
 
 #. Tag: entry
-#: hardware.xml:1104
+#: hardware.xml:1073
 #, no-c-format
 msgid "Starmax 3000, 4000, 5000, 5500"
 msgstr "Starmax 3000, 4000, 5000, 5500"
 
 #. Tag: title
-#: hardware.xml:1113
+#: hardware.xml:1082
 #, no-c-format
 msgid "PReP subarchitecture"
 msgstr "PReP 子体系"
 
 #. Tag: entry
-#: hardware.xml:1130
+#: hardware.xml:1099
 #, no-c-format
 msgid "Firepower, PowerStack Series E, PowerStack II"
 msgstr "Firepower, PowerStack Series E, PowerStack II"
 
 #. Tag: entry
-#: hardware.xml:1132
+#: hardware.xml:1101
 #, no-c-format
 msgid "MPC 7xx, 8xx"
 msgstr "MPC 7xx, 8xx"
 
 #. Tag: entry
-#: hardware.xml:1134
+#: hardware.xml:1103
 #, no-c-format
 msgid "MTX, MTX+"
 msgstr "MTX, MTX+"
 
 #. Tag: entry
-#: hardware.xml:1136
+#: hardware.xml:1105
 #, no-c-format
 msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
 msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
 
 #. Tag: entry
-#: hardware.xml:1138
+#: hardware.xml:1107
 #, no-c-format
 msgid "MCP(N)750"
 msgstr "MCP(N)750"
 
 # index.docbook:1394, index.docbook:1425
 #. Tag: entry
-#: hardware.xml:1142 hardware.xml:1173
+#: hardware.xml:1111 hardware.xml:1142
 #, no-c-format
 msgid "IBM RS/6000"
 msgstr "IBM RS/6000"
 
 #. Tag: entry
-#: hardware.xml:1143
+#: hardware.xml:1112
 #, no-c-format
 msgid "40P, 43P"
 msgstr "40P, 43P"
 
 #. Tag: entry
-#: hardware.xml:1145
+#: hardware.xml:1114
 #, no-c-format
 msgid "Power 830/850/860 (6070, 6050)"
 msgstr "Power 830/850/860 (6070, 6050)"
 
 #. Tag: entry
-#: hardware.xml:1147
+#: hardware.xml:1116
 #, no-c-format
 msgid "6030, 7025, 7043"
 msgstr "6030, 7025, 7043"
 
 #. Tag: entry
-#: hardware.xml:1149
+#: hardware.xml:1118
 #, no-c-format
 msgid "p640"
 msgstr "p640"
 
 #. Tag: title
-#: hardware.xml:1157
+#: hardware.xml:1126
 #, fuzzy, no-c-format
 #| msgid "PReP subarchitecture"
 msgid "CHRP subarchitecture"
 msgstr "PReP 子体系"
 
 #. Tag: entry
-#: hardware.xml:1174
+#: hardware.xml:1143
 #, no-c-format
 msgid "B50, 43P-150, 44P"
 msgstr "B50, 43P-150, 44P"
 
 #. Tag: entry
-#: hardware.xml:1177
+#: hardware.xml:1146
 #, no-c-format
 msgid "Genesi"
 msgstr "Genesi"
 
 #. Tag: entry
-#: hardware.xml:1178
+#: hardware.xml:1147
 #, no-c-format
 msgid "Pegasos I, Pegasos II"
 msgstr "Pegasos I, Pegasos II"
 
 #. Tag: entry
-#: hardware.xml:1181
+#: hardware.xml:1150
 #, no-c-format
 msgid "Fixstars"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:1182
+#: hardware.xml:1151
 #, no-c-format
 msgid "YDL PowerStation"
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1190
+#: hardware.xml:1159
 #, no-c-format
 msgid "APUS subarchitecture (unsupported)"
 msgstr "APUS 子体系 (不支持)"
 
 #. Tag: entry
-#: hardware.xml:1206
+#: hardware.xml:1175
 #, no-c-format
 msgid "Amiga Power-UP Systems (APUS)"
 msgstr "Amiga Power-UP Systems (APUS)"
 
 #. Tag: entry
-#: hardware.xml:1207
+#: hardware.xml:1176
 #, no-c-format
 msgid "A1200, A3000, A4000"
 msgstr "A1200, A3000, A4000"
 
 #. Tag: title
-#: hardware.xml:1215
+#: hardware.xml:1184
 #, no-c-format
 msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgstr "Nubus PowerMac 子体系 (不支持)"
 
 #. Tag: para
-#: hardware.xml:1217
+#: hardware.xml:1186
 #, no-c-format
 msgid ""
 "NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1799,13 +1760,13 @@ msgstr ""
 "nubus-pmac.sourceforge.net/\"></ulink>"
 
 #. Tag: title
-#: hardware.xml:1254
+#: hardware.xml:1223
 #, no-c-format
 msgid "Non-PowerPC Macs"
 msgstr "Non-PowerPC Macs"
 
 #. Tag: para
-#: hardware.xml:1256
+#: hardware.xml:1225
 #, no-c-format
 msgid ""
 "Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1821,7 +1782,7 @@ msgstr ""
 "字，像 Mac IIcx、LCIII 或 Quadra 950。"
 
 #. Tag: para
-#: hardware.xml:1265
+#: hardware.xml:1234
 #, no-c-format
 msgid ""
 "This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1836,7 +1797,7 @@ msgstr ""
 "840AV, 900, 950), 最后是 Performa 200-640CD。"
 
 #. Tag: para
-#: hardware.xml:1273
+#: hardware.xml:1242
 #, no-c-format
 msgid ""
 "In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1847,57 +1808,67 @@ msgstr ""
 "Duo 210-550c (不包含带有 Nubus 的 PowerBook 500，见前面说明。)"
 
 #. Tag: title
-#: hardware.xml:1287
+#: hardware.xml:1256
 #, fuzzy, no-c-format
 #| msgid "CPU/Machine types"
 msgid "Machines"
 msgstr "CPU/机器类型"
 
 #. Tag: para
-#: hardware.xml:1290
+#: hardware.xml:1259
 #, no-c-format
 msgid "S822L"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1295
+#: hardware.xml:1264
 #, no-c-format
 msgid "S821L"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1300
+#: hardware.xml:1269
 #, no-c-format
 msgid "S822"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1305
+#: hardware.xml:1274
 #, no-c-format
 msgid "S821"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1310
+#: hardware.xml:1279
 #, no-c-format
 msgid "TYAN GN70-BP010"
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1325
+#: hardware.xml:1294
 #, no-c-format
 msgid "zSeries and System z machine types"
 msgstr "zSeries 和 System z 机器类型"
 
 #. Tag: para
-#: hardware.xml:1326
-#, no-c-format
+#: hardware.xml:1295
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+#| "Your machine needs to support the z/Architecture, 64-bit support is "
+#| "mandatory. The userland of the s390 port is still compiled for ESA/390, "
+#| "though. All zSeries and System z hardware is fully supported. &arch-"
+#| "title; support software is included from the kernel 3.1 development "
+#| "stream. The most current information about IBM's Linux support can be "
+#| "found at the <ulink url=\"http://www.ibm.com/developerworks/linux/"
+#| "linux390/development_technical.html\"> Linux on <trademark class="
+#| "\"registered\">System z</trademark> page on developerWorks</ulink>."
 msgid ""
 "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
 "Your machine needs to support the z/Architecture, 64-bit support is "
 "mandatory. The userland of the s390 port is still compiled for ESA/390, "
 "though. All zSeries and System z hardware is fully supported. &arch-title; "
-"support software is included from the kernel 3.1 development stream. The "
+"support software is included from the kernel 4.2 development stream. The "
 "most current information about IBM's Linux support can be found at the "
 "<ulink url=\"http://www.ibm.com/developerworks/linux/linux390/"
 "development_technical.html\"> Linux on <trademark class=\"registered"
@@ -1912,13 +1883,13 @@ msgstr ""
 "ulink>。"
 
 #. Tag: title
-#: hardware.xml:1343
+#: hardware.xml:1312
 #, no-c-format
 msgid "PAV and HyperPAV"
 msgstr "PAV 和 HyperPAV"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1313
 #, no-c-format
 msgid ""
 "PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1931,13 +1902,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:1360
+#: hardware.xml:1329
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU 和主板支持"
 
 #. Tag: para
-#: hardware.xml:1361
+#: hardware.xml:1330
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1949,13 +1920,13 @@ msgstr ""
 "sun4m、sun4u 或 sun4v。下面说明包括哪些机器，以及每个获得支持的级别。"
 
 #. Tag: term
-#: hardware.xml:1372
+#: hardware.xml:1341
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1374
+#: hardware.xml:1343
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1968,7 +1939,7 @@ msgstr ""
 "SPARCstation page</ulink>。"
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1350
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1979,13 +1950,13 @@ msgstr ""
 "32 位子体系在上一版本后已经停止支持。"
 
 #. Tag: term
-#: hardware.xml:1391
+#: hardware.xml:1360
 #, no-c-format
 msgid "sun4u"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1393
+#: hardware.xml:1362
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -2001,13 +1972,13 @@ msgstr ""
 "到 UP 和 SMP 配置中。"
 
 #. Tag: term
-#: hardware.xml:1406
+#: hardware.xml:1375
 #, no-c-format
 msgid "sun4v"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1408
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -2020,7 +1991,7 @@ msgstr ""
 "smp 内核。"
 
 #. Tag: para
-#: hardware.xml:1419
+#: hardware.xml:1388
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -2030,13 +2001,13 @@ msgstr ""
 "持而得不到支持。"
 
 #. Tag: title
-#: hardware.xml:1428
+#: hardware.xml:1397
 #, no-c-format
 msgid "Laptops"
 msgstr "便携机"
 
 #. Tag: para
-#: hardware.xml:1429
+#: hardware.xml:1398
 #, no-c-format
 msgid ""
 "From a technical point of view, laptops are normal PCs, so all information "
@@ -2058,13 +2029,13 @@ msgstr ""
 
 # index.docbook:1624, index.docbook:1649, index.docbook:1672
 #. Tag: title
-#: hardware.xml:1446 hardware.xml:1466 hardware.xml:1493 hardware.xml:1516
+#: hardware.xml:1415 hardware.xml:1435 hardware.xml:1457 hardware.xml:1480
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "多处理器"
 
 #. Tag: para
-#: hardware.xml:1447
+#: hardware.xml:1416
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -2091,7 +2062,7 @@ msgstr ""
 "集成在一个物理芯片上。"
 
 #. Tag: para
-#: hardware.xml:1457
+#: hardware.xml:1426
 #, no-c-format
 msgid ""
 "The standard &debian; &release; kernel image has been compiled with SMP "
@@ -2101,7 +2072,7 @@ msgstr ""
 "使用也没有问题。"
 
 #. Tag: para
-#: hardware.xml:1468
+#: hardware.xml:1437
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2117,7 +2088,7 @@ msgstr ""
 "者核心)数量，并可以在单处理器系统上关闭 SMP 功能。"
 
 #. Tag: para
-#: hardware.xml:1477
+#: hardware.xml:1446
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Having multiple processors in a computer was originally only an issue for "
@@ -2137,15 +2108,7 @@ msgstr ""
 "两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
 
 #. Tag: para
-#: hardware.xml:1484
-#, no-c-format
-msgid ""
-"The 586 flavour of the &debian; kernel image packages for &arch-title; is "
-"not compiled with SMP support."
-msgstr "&arch-title; 的 586 &debian; 内核映像软件包没有支持 SMP 。"
-
-#. Tag: para
-#: hardware.xml:1494
+#: hardware.xml:1458
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2160,7 +2123,7 @@ msgstr ""
 "核仅使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1503
+#: hardware.xml:1467
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -2176,7 +2139,7 @@ msgstr ""
 "</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1517
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2192,7 +2155,7 @@ msgstr ""
 "装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1527
+#: hardware.xml:1491
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -2203,7 +2166,7 @@ msgstr ""
 "一个合适的内核软件包。"
 
 #. Tag: para
-#: hardware.xml:1533
+#: hardware.xml:1497
 #, no-c-format
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
@@ -2218,14 +2181,14 @@ msgstr ""
 "<quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1544
+#: hardware.xml:1508
 #, fuzzy, no-c-format
 #| msgid "Graphics Card Support"
 msgid "Graphics Hardware Support"
 msgstr "图形卡支持"
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1509
 #, fuzzy, no-c-format
 #| msgid ""
 #| "&debian;'s support for graphical interfaces is determined by the "
@@ -2255,7 +2218,7 @@ msgstr ""
 "功能也需要安装额外的固件，但这是罕有的例子。"
 
 #. Tag: para
-#: hardware.xml:1557
+#: hardware.xml:1521
 #, no-c-format
 msgid ""
 "On modern PCs, having a graphical display usually works out of the box. In "
@@ -2267,7 +2230,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1568
+#: hardware.xml:1532
 #, no-c-format
 msgid ""
 "Nearly all ARM machines have the graphics hardware built-in, rather than "
@@ -2283,7 +2246,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1582
+#: hardware.xml:1546
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Details on supported graphics cards and pointing devices can be found at "
@@ -2298,13 +2261,13 @@ msgstr ""
 "&debian; &release; 包含 X.Org &x11ver; 版。"
 
 #. Tag: para
-#: hardware.xml:1587
+#: hardware.xml:1551
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
 
 #. Tag: para
-#: hardware.xml:1592
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2323,7 +2286,7 @@ msgstr ""
 "卡。"
 
 #. Tag: para
-#: hardware.xml:1602
+#: hardware.xml:1566
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2346,13 +2309,13 @@ msgstr ""
 "自动激活串口控制台。"
 
 #. Tag: title
-#: hardware.xml:1624
+#: hardware.xml:1588
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "网络连接硬件"
 
 #. Tag: para
-#: hardware.xml:1625
+#: hardware.xml:1589
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2367,7 +2330,7 @@ msgstr ""
 "很好。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1635
+#: hardware.xml:1599
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2375,61 +2338,61 @@ msgid ""
 msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡："
 
 #. Tag: para
-#: hardware.xml:1641
+#: hardware.xml:1605
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1646
+#: hardware.xml:1610
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1651
+#: hardware.xml:1615
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1656
+#: hardware.xml:1620
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1661
+#: hardware.xml:1625
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1668
+#: hardware.xml:1632
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "支持的网络设备有："
 
 #. Tag: para
-#: hardware.xml:1673
+#: hardware.xml:1637
 #, 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:1678
+#: hardware.xml:1642
 #, 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:1683
+#: hardware.xml:1647
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO 模式的 OSA-Express，HiperSockets 和 Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1656
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2439,19 +2402,19 @@ msgstr ""
 "块。"
 
 #. Tag: para
-#: hardware.xml:1697
+#: hardware.xml:1661
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN 虽也获得支持，不过不能在安装阶段使用。"
 
 #. Tag: title
-#: hardware.xml:1704
+#: hardware.xml:1668
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "无线网卡"
 
 #. Tag: para
-#: hardware.xml:1705
+#: hardware.xml:1669
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2462,7 +2425,7 @@ msgstr ""
 "核能支持的无线网卡也越来越多。"
 
 #. Tag: para
-#: hardware.xml:1712
+#: hardware.xml:1676
 #, no-c-format
 msgid ""
 "If firmware is needed, the installer will prompt you to load firmware. See "
@@ -2473,7 +2436,7 @@ msgstr ""
 "> 了解如何在安装过程中加载固件的更多信息。"
 
 #. Tag: para
-#: hardware.xml:1717
+#: hardware.xml:1681
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2484,7 +2447,7 @@ msgstr ""
 "作，但是却不能在安装过程中使用。"
 
 #. Tag: para
-#: hardware.xml:1722
+#: hardware.xml:1686
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2500,7 +2463,7 @@ msgstr ""
 "件，并手动配置网络。"
 
 #. Tag: para
-#: hardware.xml:1732
+#: hardware.xml:1696
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2516,13 +2479,13 @@ msgstr ""
 "classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1746
+#: hardware.xml:1710
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; 的一些已知问题"
 
 #. Tag: para
-#: hardware.xml:1747
+#: hardware.xml:1711
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2530,13 +2493,13 @@ msgid ""
 msgstr "有些特定的网卡事项需要在此提及。"
 
 #. Tag: title
-#: hardware.xml:1754
+#: hardware.xml:1718
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip 和 dfme 驱动程序之间的冲突"
 
 #. Tag: para
-#: hardware.xml:1756
+#: hardware.xml:1720
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2552,7 +2515,7 @@ msgstr ""
 "如果使用不正确的驱动程序，网卡可能不工作，或者工作不正常。"
 
 #. Tag: para
-#: hardware.xml:1766
+#: hardware.xml:1730
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2565,7 +2528,7 @@ msgstr ""
 "\"module-blacklist\"/> 将错误的驱动模块加入黑名单，以阻止这种情况发生。"
 
 #. Tag: para
-#: hardware.xml:1774
+#: hardware.xml:1738
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2582,13 +2545,13 @@ msgstr ""
 "之后错误的模块可能还会加载。"
 
 #. Tag: title
-#: hardware.xml:1787
+#: hardware.xml:1751
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1789
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2597,13 +2560,13 @@ msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
 
 #. Tag: title
-#: hardware.xml:1804
+#: hardware.xml:1768
 #, no-c-format
 msgid "Braille Displays"
 msgstr "盲文点触设备(Braille Display)"
 
 #. Tag: para
-#: hardware.xml:1805
+#: hardware.xml:1769
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2620,13 +2583,13 @@ msgstr ""
 "的 <classname>brltty</classname> 版本是 &brlttyver; 。"
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1783
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "硬件语音合成(Hardware Speech Synthesis)"
 
 #. Tag: para
-#: hardware.xml:1820
+#: hardware.xml:1784
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2645,13 +2608,13 @@ msgstr ""
 "gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
 
 #. Tag: title
-#: hardware.xml:1840
+#: hardware.xml:1804
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "外围设备与其他硬件"
 
 #. Tag: para
-#: hardware.xml:1841
+#: hardware.xml:1805
 #, fuzzy, no-c-format
 #| msgid ""
 #| "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2666,7 +2629,7 @@ msgstr ""
 "设备。然而，在安装系统的时候，并不需要其中的大部分设备。"
 
 #. Tag: para
-#: hardware.xml:1847
+#: hardware.xml:1811
 #, no-c-format
 msgid ""
 "USB hardware generally works fine. On some very old PC systems some USB "
@@ -2679,7 +2642,7 @@ msgstr ""
 "要任何额外的配置就能工作。"
 
 #. Tag: para
-#: hardware.xml:1856
+#: hardware.xml:1820
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2690,13 +2653,13 @@ msgstr ""
 "通过 NFS、HTTP、FTP 从网络上取得。"
 
 #. Tag: title
-#: hardware.xml:1869
+#: hardware.xml:1833
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "需要固件的设备"
 
 #. Tag: para
-#: hardware.xml:1870
+#: hardware.xml:1834
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2715,7 +2678,7 @@ msgstr ""
 "系统中。"
 
 #. Tag: para
-#: hardware.xml:1881
+#: hardware.xml:1845
 #, no-c-format
 msgid ""
 "On many older devices which require firmware to work, the firmware file was "
@@ -2729,7 +2692,7 @@ msgstr ""
 "主系统上传到设备中。"
 
 #. Tag: para
-#: hardware.xml:1889
+#: hardware.xml:1853
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2744,7 +2707,7 @@ msgstr ""
 "gnu; 可以合法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
-#: hardware.xml:1898
+#: hardware.xml:1862
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2759,7 +2722,7 @@ msgstr ""
 "\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
 
 #. Tag: para
-#: hardware.xml:1907
+#: hardware.xml:1871
 #, no-c-format
 msgid ""
 "If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -2776,13 +2739,13 @@ msgstr ""
 "卡上)。"
 
 #. Tag: title
-#: hardware.xml:1924
+#: hardware.xml:1888
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
-#: hardware.xml:1926
+#: hardware.xml:1890
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2796,7 +2759,7 @@ msgstr ""
 "心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
 
 #. Tag: para
-#: hardware.xml:1934
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2810,7 +2773,7 @@ msgstr ""
 "<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
 
 #. Tag: para
-#: hardware.xml:1942
+#: hardware.xml:1906
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2826,13 +2789,13 @@ msgstr ""
 "&arch-kernel; 友好的硬件销售商。"
 
 #. Tag: title
-#: hardware.xml:1953
+#: hardware.xml:1917
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
-#: hardware.xml:1954
+#: hardware.xml:1918
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2847,7 +2810,7 @@ msgstr ""
 "于我们未被授权使用这些文档，造成它们无法在 &arch-kernel; 下工作。"
 
 #. Tag: para
-#: hardware.xml:1964
+#: hardware.xml:1928
 #, no-c-format
 msgid ""
 "In many cases there are standards (or at least some de-facto standards) "
@@ -2867,7 +2830,7 @@ msgstr ""
 "所有设备都是符合标准的。"
 
 #. Tag: para
-#: hardware.xml:1976
+#: hardware.xml:1940
 #, no-c-format
 msgid ""
 "In other fields, among them e.g. printers, this is unfortunately not the "
@@ -2885,7 +2848,7 @@ msgstr ""
 "于厂商提供的闭源驱动程序。"
 
 #. Tag: para
-#: hardware.xml:1987
+#: hardware.xml:1951
 #, no-c-format
 msgid ""
 "Even if there is a vendor-provided closed-source driver for such hardware "
@@ -2906,7 +2869,7 @@ msgstr ""
 "统升级造成的不便。"
 
 #. Tag: para
-#: hardware.xml:2000
+#: hardware.xml:1964
 #, no-c-format
 msgid ""
 "You can help improve this situation by encouraging manufacturers of closed "
@@ -2917,13 +2880,13 @@ msgstr ""
 "来改变这种状况。"
 
 #. Tag: title
-#: hardware.xml:2015
+#: hardware.xml:1979
 #, no-c-format
 msgid "Installation Media"
 msgstr "安装介质"
 
 #. Tag: para
-#: hardware.xml:2017
+#: hardware.xml:1981
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2937,13 +2900,13 @@ msgstr ""
 "读那一章的时候，可能需要回过头来参考本页。"
 
 #. Tag: title
-#: hardware.xml:2027
+#: hardware.xml:1991
 #, no-c-format
 msgid "Floppies"
 msgstr "软盘"
 
 #. Tag: para
-#: hardware.xml:2028
+#: hardware.xml:1992
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2954,20 +2917,20 @@ msgstr ""
 "(1440 千字节)软驱。"
 
 #. Tag: para
-#: hardware.xml:2034
+#: hardware.xml:1998
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "用于 CHRP 的软盘支持已经被停止。"
 
 #. Tag: title
-#: hardware.xml:2041
+#: hardware.xml:2005
 #, fuzzy, no-c-format
 #| msgid "CD-ROM/DVD-ROM"
 msgid "CD-ROM/DVD-ROM/BD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:2043
+#: hardware.xml:2007
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
@@ -2982,13 +2945,13 @@ msgstr ""
 "作系统的角度看，它们所用的技术是相同的。"
 
 #. Tag: para
-#: hardware.xml:2049
+#: hardware.xml:2013
 #, no-c-format
 msgid "CD-ROM based installation is supported for most architectures."
 msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
 
 #. Tag: para
-#: hardware.xml:2053
+#: hardware.xml:2017
 #, fuzzy, no-c-format
 #| msgid ""
 #| "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -3001,7 +2964,7 @@ msgstr ""
 "获得支持。"
 
 #. Tag: para
-#: hardware.xml:2068
+#: hardware.xml:2032
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -3019,13 +2982,13 @@ msgstr ""
 "固件上选择 <quote>System installation</quote> 项。"
 
 #. Tag: title
-#: hardware.xml:2082
+#: hardware.xml:2046
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "U 盘"
 
 #. Tag: para
-#: hardware.xml:2084
+#: hardware.xml:2048
 #, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
@@ -3040,13 +3003,13 @@ msgstr ""
 "CD/DVD-ROM 驱动器，从 U 盘引导是安装操作系统的标准方法。"
 
 #. Tag: title
-#: hardware.xml:2096
+#: hardware.xml:2060
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. Tag: para
-#: hardware.xml:2098
+#: hardware.xml:2062
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -3063,7 +3026,7 @@ msgstr ""
 "用 ISDN 和 PPP。"
 
 #. Tag: para
-#: hardware.xml:2108
+#: hardware.xml:2072
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -3082,7 +3045,7 @@ msgstr ""
 "安装技术。</phrase>"
 
 #. Tag: para
-#: hardware.xml:2121
+#: hardware.xml:2085
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -3092,13 +3055,13 @@ msgstr ""
 "择。"
 
 #. Tag: title
-#: hardware.xml:2130
+#: hardware.xml:2094
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. Tag: para
-#: hardware.xml:2132
+#: hardware.xml:2096
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -3110,7 +3073,7 @@ msgstr ""
 "安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
 
 #. Tag: para
-#: hardware.xml:2139
+#: hardware.xml:2103
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -3120,13 +3083,13 @@ msgstr ""
 "(UFS slices)进行安装。"
 
 #. Tag: title
-#: hardware.xml:2148
+#: hardware.xml:2112
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
-#: hardware.xml:2150
+#: hardware.xml:2114
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -3143,13 +3106,13 @@ msgstr ""
 ">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
 
 #. Tag: title
-#: hardware.xml:2163
+#: hardware.xml:2127
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "受支持的存储系统"
 
 #. Tag: para
-#: hardware.xml:2165
+#: hardware.xml:2129
 #, no-c-format
 msgid ""
 "The &debian; installer contains a kernel which is built to maximize the "
@@ -3157,7 +3120,7 @@ msgid ""
 msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
 
 #. Tag: para
-#: hardware.xml:2169
+#: hardware.xml:2133
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for IDE (also "
@@ -3169,7 +3132,7 @@ msgstr ""
 "动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
 
 #. Tag: para
-#: hardware.xml:2186
+#: hardware.xml:2150
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3191,7 +3154,7 @@ msgstr ""
 "以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
 
 #. Tag: para
-#: hardware.xml:2219
+#: hardware.xml:2183
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3202,7 +3165,7 @@ msgstr ""
 "支持 CHRP 系统上的软盘。"
 
 #. Tag: para
-#: hardware.xml:2225
+#: hardware.xml:2189
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3213,7 +3176,7 @@ msgstr ""
 "支持软驱。"
 
 #. Tag: para
-#: hardware.xml:2231
+#: hardware.xml:2195
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3221,7 +3184,7 @@ msgid ""
 msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
 
 #. Tag: para
-#: hardware.xml:2236
+#: hardware.xml:2200
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3233,13 +3196,13 @@ msgstr ""
 "持。"
 
 #. Tag: title
-#: hardware.xml:2253
+#: hardware.xml:2217
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "内存与磁盘空间的需求"
 
 #. Tag: para
-#: hardware.xml:2255
+#: hardware.xml:2219
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3252,7 +3215,7 @@ msgstr ""
 "hardware-reqts\"/>。"
 
 #. Tag: para
-#: hardware.xml:2262
+#: hardware.xml:2226
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Installation on systems with less memory<footnote condition=\"gtk\"> "
@@ -3268,14 +3231,59 @@ msgid ""
 "than images that support only the textual installer and should not be used "
 "on systems with less than &minimum-memory; of memory. If there is a choice "
 "between booting the text-based and the graphical installer, the former "
-"should be selected. </para> </footnote> or disk space available may be "
-"possible but is only advised for experienced users."
+"should be selected on such systems. </para> </footnote> or disk space "
+"available may be possible but is only advised for experienced users."
 msgstr ""
 "在较小的内存<footnote condition=\"gtk\"> <para> 支持图形界面的安装映象会比文"
 "本界面需要更多的内存，并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
 "形界面两种方式之间选择，应选择普通方式。</para> </footnote>或磁盘空间上安装系"
 "统或许可行，但只针对有经验的用户。"
 
+#~ msgid "Intel IXP4xx"
+#~ msgstr "Intel IXP4xx"
+
+#~ msgid "ixp4xx"
+#~ msgstr "ixp4xx"
+
+#, fuzzy
+#~| msgid ""
+#~| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
+#~| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
+#~| "currently support the following Kirkwood based devices: OpenRD (OpenRD-"
+#~| "Base, OpenRD-Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-"
+#~| "sheevaplug;\">plug computers (SheevaPlug, GuruPlug and DreamPlug)</"
+#~| "ulink>, <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo "
+#~| "Station</ulink> (all TS-11x, TS-21x and TS-41x models), and LaCie NASes "
+#~| "(Network Space v2, Network Space Max v2, Internet Space v2, d2 Network "
+#~| "v2, 2Big Network v2 and 5Big Network v2)."
+#~ msgid ""
+#~ "Kirkwood is a system-on-chip (SoC) from Marvell that integrates an ARM "
+#~ "CPU, Ethernet, SATA, USB, and other functionality in one chip. &debian; "
+#~ "currently supports the following Kirkwood based devices: OpenRD (OpenRD-"
+#~ "Base, OpenRD-Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-"
+#~ "sheevaplug;\">plug computers (SheevaPlug, GuruPlug and DreamPlug)</"
+#~ "ulink>, <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</"
+#~ "ulink> (all TS-11x, TS-21x and TS-41x models), and LaCie NASes (Network "
+#~ "Space v2, Network Space Max v2, Internet Space v2, d2 Network v2, 2Big "
+#~ "Network v2 and 5Big Network v2)."
+#~ msgstr ""
+#~ "Kirkwood 是 Marvell 的 SoC 产品，集成了 ARM CPU、Ethernet、SATA、USB，以及"
+#~ "其他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备：OpenRD (OpenRD-"
+#~ "Base, OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-"
+#~ "sheevaplug;\">plug computers (SheevaPlug、GuruPlug 和 DreamPlug)</"
+#~ "ulink>， <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo "
+#~ "Station</ulink> (所有 TS-11x、TS-21x 和 TS-41x 型号)，以及 LaCie NASes "
+#~ "(Network Space v2、Network Space Max v2、Internet Space v2、d2 Network "
+#~ "v2、2Big Network v2 和 5Big Network v2)。"
+
+#~ msgid "IOP32x"
+#~ msgstr "IOP32x"
+
+#~ msgid ""
+#~ "The 586 flavour of the &debian; kernel image packages for &arch-title; is "
+#~ "not compiled with SMP support."
+#~ msgstr "&arch-title; 的 586 &debian; 内核映像软件包没有支持 SMP 。"
+
 #~ msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 #~ msgstr "&debian; GNU/kFreeBSD &release; 支持两种架构。"