[SILENT_COMMIT] Update of POT and PO files for the manual

1 files changed, 199 insertions, 152 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 2e86e9c33..775fa74a0 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: 2009-05-03 00:14+0000\n"
+"POT-Creation-Date: 2009-05-04 00:13+0000\n"
 "PO-Revision-Date: 2009-05-03 12:15+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -176,7 +176,6 @@ msgstr "ixp4xx"
 #. Tag: entry
 #: hardware.xml:89
 #, no-c-format
-#| msgid "Marvell Orion"
 msgid "Marvell Kirkwood"
 msgstr "Marvell Kirkwood"
 
@@ -1872,22 +1871,18 @@ msgstr "Kirkwood"
 #. Tag: para
 #: hardware.xml:789
 #, no-c-format
-#| msgid ""
-#| "Orion is a system on a chip (SoC) from Marvell that integrates an ARM "
-#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. There are "
-#| "many Network Attached Storage (NAS) devices on the market that are based "
-#| "on an Orion chip. We currently support the following Orion based devices: "
-#| "<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, "
-#| "<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url="
-#| "\"&url-arm-cyrius-qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and "
-#| "TS-409)."
 msgid ""
 "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: <ulink url=\"&url-arm-cyrius-"
 "sheevaplug;\">SheevaPlug</ulink> and <ulink url=\"&url-arm-cyrius-qnap-"
 "kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)."
-msgstr "Kirkwood 是 Marvell 的 SoC (system on a chip) 产品，芯片上集成了 ARM CPU、以太网、SATA、USB，以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood 的设备: <ulink url=\"&url-arm-cyrius-sheevaplug;\">SheevaPlug</ulink> 和 <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-119 and TS-219)。"
+msgstr ""
+"Kirkwood 是 Marvell 的 SoC (system on a chip) 产品，芯片上集成了 ARM CPU、以"
+"太网、SATA、USB，以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood 的设"
+"备: <ulink url=\"&url-arm-cyrius-sheevaplug;\">SheevaPlug</ulink> 和 <ulink "
+"url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (TS-119 "
+"and TS-219)。"
 
 #. Tag: term
 #: hardware.xml:802
@@ -2144,19 +2139,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1055
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
+#| "covered here. This includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and "
+#| "RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> "
+#| "MIPS Malta: this platform is emulated by QEMU and is therefore a nice way "
+#| "to test and run Debian on MIPS if you don't have the hardware. </para></"
+#| "listitem> <listitem><para> Broadcom BCM91250A (SWARM): this is an ATX "
+#| "form factor evaluation board from Broadcom based on the dual-core SB1 "
+#| "1250 CPU. </para></listitem> <listitem><para> Broadcom BCM91480B "
+#| "(BigSur): this is an ATX form factor evaluation board from Broadcom based "
+#| "on the quad-core SB1A 1480 CPU. </para></listitem> </itemizedlist> "
+#| "Complete information regarding supported mips/mipsel machines can be "
+#| "found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. "
+#| "In the following, only the systems supported by the Debian installer will "
+#| "be covered. If you are looking for support for other subarchitectures, "
+#| "please contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-"
+#| "listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-"covered here. This includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and "
-"RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> MIPS "
-"Malta: this platform is emulated by QEMU and is therefore a nice way to test "
-"and run Debian on MIPS if you don't have the hardware. </para></listitem> "
-"<listitem><para> Broadcom BCM91250A (SWARM): this is an ATX form factor "
-"evaluation board from Broadcom based on the dual-core SB1 1250 CPU. </para></"
-"listitem> <listitem><para> Broadcom BCM91480B (BigSur): this is an ATX form "
-"factor evaluation board from Broadcom based on the quad-core SB1A 1480 CPU. "
-"</para></listitem> </itemizedlist> Complete information regarding supported "
+"covered here. This includes the Cobalt RaQ, Qube2 and RaQ2, and the Gateway "
+"Microserver. </para></listitem> <listitem><para> MIPS Malta: this platform "
+"is emulated by QEMU and is therefore a nice way to test and run Debian on "
+"MIPS if you don't have the hardware. </para></listitem> <listitem><para> "
+"Broadcom BCM91250A (SWARM): this is an ATX form factor evaluation board from "
+"Broadcom based on the dual-core SB1 1250 CPU. </para></listitem> "
+"<listitem><para> Broadcom BCM91480B (BigSur): this is an ATX form factor "
+"evaluation board from Broadcom based on the quad-core SB1A 1480 CPU. </"
+"para></listitem> </itemizedlist> Complete information regarding supported "
 "mips/mipsel machines can be found at the <ulink url=\"&url-linux-mips;"
 "\">Linux-MIPS homepage</ulink>. In the following, only the systems supported "
 "by the Debian installer will be covered. If you are looking for support for "
@@ -2178,15 +2191,18 @@ msgstr ""
 "ulink>。"
 
 #. Tag: title
-#: hardware.xml:1096
+#: hardware.xml:1095
 #, no-c-format
 msgid "CPU/Machine types"
 msgstr "CPU/机器类型"
 
 #. Tag: para
-#: hardware.xml:1098
-#, no-c-format
-msgid "All MIPS based Cobalt machines are supported."
+#: hardware.xml:1097
+#, fuzzy, no-c-format
+#| msgid "All MIPS based Cobalt machines are supported."
+msgid ""
+"All MIPS based Cobalt machines are supported with the exception of the Qube "
+"2700 (Qube 1)."
 msgstr "所有基于 MIPS 的 Cobalt 机器都支持。"
 
 #. Tag: para
@@ -3129,20 +3145,11 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1772
 #, no-c-format
-msgid ""
-"The X.Org X Window System is only supported on the SGI Indy and the O2. The "
-"Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI "
-"slots and support VGA emulation or Linux framebuffer on a selected range of "
-"graphics cards. A <ulink url=\"&url-bcm91250a-hardware;\">compatibility "
-"listing</ulink> for Broadcom evaluation boards is available."
+msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr ""
-"X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。Broadcom BCM91250A 和 BCM91480B 开"
-"发板具有标准的 3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真或者 Linux "
-"framebuffer。这里有一份 Broadcom 开发板的 <ulink url=\"&url-bcm91250a-"
-"hardware;\">兼容列表</ulink>。"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1777
 #, no-c-format
 msgid ""
 "The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v "
@@ -3155,7 +3162,7 @@ msgstr ""
 "url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
 
 #. Tag: para
-#: hardware.xml:1788
+#: hardware.xml:1784
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -3174,7 +3181,7 @@ msgstr ""
 "卡。"
 
 #. Tag: para
-#: hardware.xml:1798
+#: hardware.xml:1794
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -3197,13 +3204,13 @@ msgstr ""
 "自动激活串口控制台。"
 
 #. Tag: title
-#: hardware.xml:1820
+#: hardware.xml:1816
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "网络连接硬件"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1817
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the Linux kernel should "
@@ -3220,7 +3227,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: hardware.xml:1833
+#: hardware.xml:1829
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -3228,61 +3235,61 @@ msgid ""
 msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡："
 
 #. Tag: para
-#: hardware.xml:1839
+#: hardware.xml:1835
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1844
+#: hardware.xml:1840
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1849
+#: hardware.xml:1845
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1854
+#: hardware.xml:1850
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1859
+#: hardware.xml:1855
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1866
+#: hardware.xml:1862
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "支持的网络设备有："
 
 #. Tag: para
-#: hardware.xml:1871
+#: hardware.xml:1867
 #, 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:1876
+#: hardware.xml:1872
 #, 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:1881
+#: hardware.xml:1877
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO 模式的 OSA-Express，HiperSockets 和 Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1890
+#: hardware.xml:1886
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -3300,19 +3307,19 @@ msgstr ""
 "址获得。"
 
 #. Tag: para
-#: hardware.xml:1900
+#: hardware.xml:1896
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN 虽也获得支持，不过不能在安装阶段使用。"
 
 #. Tag: title
-#: hardware.xml:1907
+#: hardware.xml:1903
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "无线网卡"
 
 #. Tag: para
-#: hardware.xml:1908
+#: hardware.xml:1904
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -3326,7 +3333,7 @@ msgstr ""
 "的网卡，不能在安装系统中使用。"
 
 #. Tag: para
-#: hardware.xml:1916
+#: hardware.xml:1912
 #, no-c-format
 msgid ""
 "The use of wireless networking during installation is still under "
@@ -3344,7 +3351,7 @@ msgstr ""
 "您可以在安装完成之后(重新启动)安装驱动程序和固件，手动配置网络。"
 
 #. Tag: para
-#: hardware.xml:1928
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a Debian package. "
@@ -3360,13 +3367,13 @@ msgstr ""
 "classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1942
+#: hardware.xml:1938
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; 的一些已知问题"
 
 #. Tag: para
-#: hardware.xml:1943
+#: hardware.xml:1939
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -3374,13 +3381,13 @@ msgid ""
 msgstr "有些特定的网卡事项需要在此提及。"
 
 #. Tag: title
-#: hardware.xml:1950
+#: hardware.xml:1946
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip 和 dfme 驱动程序之间的冲突"
 
 #. Tag: para
-#: hardware.xml:1952
+#: hardware.xml:1948
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -3396,7 +3403,7 @@ msgstr ""
 "如果使用不正确的驱动程序，网卡可能不工作，或者工作不正常。"
 
 #. Tag: para
-#: hardware.xml:1962
+#: hardware.xml:1958
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -3409,7 +3416,7 @@ msgstr ""
 "\"module-blacklist\"/> 将错误的驱动模块加入黑名单，以阻止这种情况发生。"
 
 #. Tag: para
-#: hardware.xml:1970
+#: hardware.xml:1966
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -3426,13 +3433,13 @@ msgstr ""
 "之后错误的模块可能还会加载。"
 
 #. Tag: title
-#: hardware.xml:1983
+#: hardware.xml:1979
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1985
+#: hardware.xml:1981
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -3441,13 +3448,13 @@ msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
 
 #. Tag: title
-#: hardware.xml:2000
+#: hardware.xml:1996
 #, no-c-format
 msgid "Braille Displays"
 msgstr "盲文点触设备(Braille Display)"
 
 #. Tag: para
-#: hardware.xml:2001
+#: hardware.xml:1997
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -3464,13 +3471,13 @@ msgstr ""
 "<classname>brltty</classname> 版本是 &brlttyver; 。"
 
 #. Tag: title
-#: hardware.xml:2015
+#: hardware.xml:2011
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "硬件语音合成(Hardware Speech Synthesis)"
 
 #. Tag: para
-#: hardware.xml:2016
+#: hardware.xml:2012
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -3489,13 +3496,13 @@ msgstr ""
 "&release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
 
 #. Tag: title
-#: hardware.xml:2036
+#: hardware.xml:2032
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "外围设备与其他硬件"
 
 #. Tag: para
-#: hardware.xml:2037
+#: hardware.xml:2033
 #, no-c-format
 msgid ""
 "Linux supports a large variety of hardware devices such as mice, printers, "
@@ -3506,7 +3513,7 @@ msgstr ""
 "而，在安装系统的时候，并不需要其中的大部分设备。"
 
 #. Tag: para
-#: hardware.xml:2043
+#: hardware.xml:2039
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -3516,7 +3523,7 @@ msgstr ""
 "\"hardware-issues\"/>)。"
 
 #. Tag: para
-#: hardware.xml:2049
+#: hardware.xml:2045
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -3527,7 +3534,7 @@ msgstr ""
 "Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
 
 #. Tag: para
-#: hardware.xml:2055
+#: hardware.xml:2051
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -3538,7 +3545,7 @@ msgstr ""
 "通过 NFS、HTTP、FTP 从网络上取得。"
 
 #. Tag: para
-#: hardware.xml:2061
+#: hardware.xml:2057
 #, no-c-format
 msgid ""
 "The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
@@ -3549,26 +3556,21 @@ msgstr ""
 "口。Broadcom BCM91480B 开发板有四个 64 位 PCI 插槽。"
 
 #. Tag: para
-#: hardware.xml:2067
+#: hardware.xml:2063
 #, no-c-format
 msgid ""
-"The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and 64 "
-"bit PCI slots as well as USB connectors. The Broadcom BCM91480B evaluation "
-"board features four 64 bit PCI slots. The Cobalt RaQ has no support for "
-"additional devices but the Qube has one PCI slot."
+"The Cobalt RaQ has no support for additional devices but the Qube has one "
+"PCI slot."
 msgstr ""
-"Broadcom BCM91250A 开发板提供标准的 3.3v 32 位和 64 位 PCI 插槽，以及 USB 接"
-"口。Broadcom BCM91480B 开发板有四个 64 位 PCI 插槽。Cobalt RaQ 不支持额外的设"
-"备，但 Qube 上有一个 PCI 插槽。"
 
 #. Tag: title
-#: hardware.xml:2081
+#: hardware.xml:2075
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "需要固件的设备"
 
 #. Tag: para
-#: hardware.xml:2082
+#: hardware.xml:2076
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -3583,7 +3585,7 @@ msgstr ""
 "说很常见，但有些 USB 设备甚至是硬盘控制器也需要固件(fireware)。"
 
 #. Tag: para
-#: hardware.xml:2090
+#: hardware.xml:2084
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -3598,7 +3600,7 @@ msgstr ""
 "法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
-#: hardware.xml:2099
+#: hardware.xml:2093
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -3614,13 +3616,13 @@ msgstr ""
 "息。"
 
 #. Tag: title
-#: hardware.xml:2115
+#: hardware.xml:2109
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/Linux"
 msgstr "特别为 GNU/Linux 采购硬件"
 
 #. Tag: para
-#: hardware.xml:2117
+#: hardware.xml:2111
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with Debian or other "
@@ -3634,7 +3636,7 @@ msgstr ""
 "因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
 
 #. Tag: para
-#: hardware.xml:2125
+#: hardware.xml:2119
 #, no-c-format
 msgid ""
 "Unfortunately, it's quite rare to find any vendor shipping new &arch-title; "
@@ -3642,7 +3644,7 @@ msgid ""
 msgstr "不幸的是，很少会有厂商出售新 &arch-title; 机器。"
 
 #. Tag: para
-#: hardware.xml:2130
+#: hardware.xml:2124
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -3656,7 +3658,7 @@ msgstr ""
 "<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
 
 #. Tag: para
-#: hardware.xml:2138
+#: hardware.xml:2132
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with Linux bundled, or even a "
@@ -3670,13 +3672,13 @@ msgstr ""
 "他)知道您是在为一个 Linux 系统采购设备。请支持对 Linux 友好的硬件销售商。"
 
 #. Tag: title
-#: hardware.xml:2149
+#: hardware.xml:2143
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
-#: hardware.xml:2150
+#: hardware.xml:2144
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -3688,7 +3690,7 @@ msgstr ""
 "不公开的契约才能接触文档，以阻止我们发布 Linux 驱动程序源代码。"
 
 #. Tag: para
-#: hardware.xml:2157
+#: hardware.xml:2151
 #, no-c-format
 msgid ""
 "Another example is the proprietary hardware in the older Macintosh line. In "
@@ -3705,7 +3707,7 @@ msgstr ""
 "之，这就是为什么向 Macintosh 移植 Linux 的进度总是滞后于其他移植版的原因。"
 
 #. Tag: para
-#: hardware.xml:2168
+#: hardware.xml:2162
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -3718,13 +3720,13 @@ msgstr ""
 "软件社区也是一个重要的市场。"
 
 #. Tag: title
-#: hardware.xml:2180
+#: hardware.xml:2174
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows 专用硬件"
 
 #. Tag: para
-#: hardware.xml:2181
+#: hardware.xml:2175
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -3746,7 +3748,7 @@ msgstr ""
 "等功能的保留内嵌处理器的设备昂贵。"
 
 #. Tag: para
-#: hardware.xml:2194
+#: hardware.xml:2188
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -3777,7 +3779,7 @@ msgstr ""
 "Windows 2000 或 XP，都要忍受这些制造商克扣内嵌处理器造成的性能下降。"
 
 #. Tag: para
-#: hardware.xml:2215
+#: hardware.xml:2209
 #, no-c-format
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
@@ -3791,13 +3793,13 @@ msgstr ""
 "hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>。"
 
 #. Tag: title
-#: hardware.xml:2232
+#: hardware.xml:2226
 #, no-c-format
 msgid "Installation Media"
 msgstr "安装介质"
 
 #. Tag: para
-#: hardware.xml:2234
+#: hardware.xml:2228
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -3812,13 +3814,13 @@ msgstr ""
 "\"/>，并列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回来参考本页。"
 
 #. Tag: title
-#: hardware.xml:2245
+#: hardware.xml:2239
 #, no-c-format
 msgid "Floppies"
 msgstr "软盘"
 
 #. Tag: para
-#: hardware.xml:2246
+#: hardware.xml:2240
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -3829,19 +3831,19 @@ msgstr ""
 "(1440 千字节)软驱。"
 
 #. Tag: para
-#: hardware.xml:2252
+#: hardware.xml:2246
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "用于 CHRP 的软盘支持已经被停止。"
 
 #. Tag: title
-#: hardware.xml:2259
+#: hardware.xml:2253
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:2261
+#: hardware.xml:2255
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -3854,7 +3856,7 @@ msgstr ""
 "IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
 
 #. Tag: para
-#: hardware.xml:2268
+#: hardware.xml:2262
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -3872,7 +3874,7 @@ msgstr ""
 "installer\"/>。"
 
 #. Tag: para
-#: hardware.xml:2280
+#: hardware.xml:2274
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -3883,7 +3885,7 @@ msgstr ""
 "\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
 
 #. Tag: para
-#: hardware.xml:2286
+#: hardware.xml:2280
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -3893,7 +3895,7 @@ msgstr ""
 "获得支持。"
 
 #. Tag: para
-#: hardware.xml:2291
+#: hardware.xml:2285
 #, no-c-format
 msgid ""
 "Both SCSI and IDE/ATAPI CD-ROMs are supported on &arch-title;, as long as "
@@ -3909,14 +3911,26 @@ msgstr ""
 "制台支持，请参阅 <ulink url=\"&url-srm-howto;\">SRM HOWTO</ulink>。"
 
 #. Tag: para
-#: hardware.xml:2300
+#: hardware.xml:2294
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
 
 #. Tag: para
-#: hardware.xml:2304
-#, no-c-format
+#: hardware.xml:2298
+#, fuzzy, no-c-format
+#| msgid ""
+#| "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable "
+#| "of working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
+#| "drives sold on the PC market do not have this capability. If your CD-ROM "
+#| "drive has a jumper labeled <quote>Unix/PC</quote> or <quote>512/2048</"
+#| "quote>, place it in the <quote>Unix</quote> or <quote>512</quote> "
+#| "position. To start the install, simply choose the <quote>System "
+#| "installation</quote> entry in the firmware. The Broadcom BCM91250A "
+#| "supports standard IDE devices, including CD-ROM drives, but CD images for "
+#| "this platform are currently not provided because the firmware doesn't "
+#| "recognize CD drives. In order to install Debian on an Broadcom BCM91480B "
+#| "evaluation board, you need an PCI IDE, SATA or SCSI card."
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
 "working with a logical blocksize of 512 bytes. Many of the SCSI CD-ROM "
@@ -3924,11 +3938,7 @@ msgid ""
 "drive has a jumper labeled <quote>Unix/PC</quote> or <quote>512/2048</"
 "quote>, place it in the <quote>Unix</quote> or <quote>512</quote> position. "
 "To start the install, simply choose the <quote>System installation</quote> "
-"entry in the firmware. The Broadcom BCM91250A supports standard IDE devices, "
-"including CD-ROM drives, but CD images for this platform are currently not "
-"provided because the firmware doesn't recognize CD drives. In order to "
-"install Debian on an Broadcom BCM91480B evaluation board, you need an PCI "
-"IDE, SATA or SCSI card."
+"entry in the firmware."
 msgstr ""
 "在 SGI 的机器上，从 CD-ROM 启动需要一台能使用 512 字节逻辑块的 SCSI CD-ROM 驱"
 "动器。很多面向 PC 市场的 SCSI CD-ROM 驱动器并不具有这个能力。如果您的 CD-ROM "
@@ -3939,14 +3949,24 @@ msgstr ""
 "提供针对此平台的光盘映象。要将 Debian 安装到 Broadcom BCM91480B 开发板上，您"
 "需要一个 PCI IDE、SATA 或 SCSI 卡。"
 
+#. Tag: para
+#: hardware.xml:2309
+#, no-c-format
+msgid ""
+"The Broadcom BCM91250A supports standard IDE devices, including CD-ROM "
+"drives, but CD images for this platform are currently not provided because "
+"the firmware doesn't recognize CD drives. In order to install Debian on an "
+"Broadcom BCM91480B evaluation board, you need an PCI IDE, SATA or SCSI card."
+msgstr ""
+
 #. Tag: title
-#: hardware.xml:2322
+#: hardware.xml:2320
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. Tag: para
-#: hardware.xml:2324
+#: hardware.xml:2322
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -3957,7 +3977,7 @@ msgstr ""
 "安装程序。"
 
 #. Tag: para
-#: hardware.xml:2330
+#: hardware.xml:2328
 #, no-c-format
 msgid ""
 "In fact, installation from your local disk is the preferred installation "
@@ -3965,7 +3985,7 @@ msgid ""
 msgstr "事实上，从本地磁盘安装，对大多数 &architecture; 机器是推荐的做法。"
 
 #. Tag: para
-#: hardware.xml:2335
+#: hardware.xml:2333
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -3975,13 +3995,13 @@ msgstr ""
 "(UFS slices)进行安装。"
 
 #. Tag: title
-#: hardware.xml:2343
+#: hardware.xml:2341
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "U 盘"
 
 #. Tag: para
-#: hardware.xml:2345
+#: hardware.xml:2343
 #, no-c-format
 msgid ""
 "Many Debian boxes need their floppy and/or CD-ROM drives only for setting up "
@@ -3996,13 +4016,13 @@ msgstr ""
 "系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
 
 #. Tag: title
-#: hardware.xml:2357
+#: hardware.xml:2355
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. Tag: para
-#: hardware.xml:2359
+#: hardware.xml:2357
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -4019,18 +4039,22 @@ msgstr ""
 "用 ISDN 和 PPP。"
 
 #. Tag: para
-#: hardware.xml:2369
-#, no-c-format
+#: hardware.xml:2367
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also <emphasis>boot</emphasis> the installation system over the "
+#| "network. <phrase arch=\"mips\">This is the preferred installation "
+#| "technique for &arch-title;.</phrase>"
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
-"network. <phrase arch=\"mips\">This is the preferred installation technique "
-"for &arch-title;.</phrase>"
+"network. <phrase arch=\"mips;mipsel\">This is the preferred installation "
+"technique for &arch-title;.</phrase>"
 msgstr ""
 "您还可以从网络<emphasis>引导(boot)</emphasis>系统。<phrase arch=\"mips\">这是"
 "在 &arch-title; 下推荐的安装技术。</phrase>"
 
 #. Tag: para
-#: hardware.xml:2375
+#: hardware.xml:2373
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -4040,13 +4064,13 @@ msgstr ""
 "择。"
 
 #. Tag: title
-#: hardware.xml:2383
+#: hardware.xml:2381
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
-#: hardware.xml:2385
+#: hardware.xml:2383
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -4060,13 +4084,13 @@ msgstr ""
 "户有用。如果您对此技术感兴趣，请直接跳到 <xref linkend=\"linux-upgrade\"/>。"
 
 #. Tag: title
-#: hardware.xml:2397
+#: hardware.xml:2395
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "受支持的存储系统"
 
 #. Tag: para
-#: hardware.xml:2399
+#: hardware.xml:2397
 #, no-c-format
 msgid ""
 "The Debian boot disks contain a kernel which is built to maximize the number "
@@ -4082,7 +4106,7 @@ msgstr ""
 "设计，这将使得 Debian 可以在尽可能多的硬件上安装。"
 
 #. Tag: para
-#: hardware.xml:2409
+#: hardware.xml:2407
 #, no-c-format
 msgid ""
 "Generally, the Debian installation system includes support for floppies, IDE "
@@ -4095,7 +4119,7 @@ msgstr ""
 "Win-32 FAT 扩展(VFAT) 和 NTFS。"
 
 #. Tag: para
-#: hardware.xml:2416
+#: hardware.xml:2414
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -4110,7 +4134,7 @@ msgstr ""
 "HOWTO</ulink> 以获得更详细信息。"
 
 #. Tag: para
-#: hardware.xml:2424
+#: hardware.xml:2422
 #, no-c-format
 msgid ""
 "Pretty much all storage systems supported by the Linux kernel are supported "
@@ -4126,7 +4150,7 @@ msgstr ""
 "支持 Atari(FAT) 文件系统。Amigas 支持 FAT 文件系统，HFS 则是受模块支持。"
 
 #. Tag: para
-#: hardware.xml:2434
+#: hardware.xml:2432
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -4148,7 +4172,7 @@ msgstr ""
 "以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
 
 #. Tag: para
-#: hardware.xml:2467
+#: hardware.xml:2465
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -4163,7 +4187,7 @@ msgstr ""
 "Jensen 启动的信息)"
 
 #. Tag: para
-#: hardware.xml:2476
+#: hardware.xml:2474
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -4174,7 +4198,7 @@ msgstr ""
 "支持 CHRP 系统上的软盘。"
 
 #. Tag: para
-#: hardware.xml:2482
+#: hardware.xml:2480
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -4185,7 +4209,7 @@ msgstr ""
 "支持软驱。"
 
 #. Tag: para
-#: hardware.xml:2488
+#: hardware.xml:2486
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -4193,7 +4217,7 @@ msgid ""
 msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
 
 #. Tag: para
-#: hardware.xml:2493
+#: hardware.xml:2491
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -4205,13 +4229,13 @@ msgstr ""
 "持。"
 
 #. Tag: title
-#: hardware.xml:2510
+#: hardware.xml:2508
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "内存与磁盘空间的需求"
 
 #. Tag: para
-#: hardware.xml:2512
+#: hardware.xml:2510
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -4224,7 +4248,7 @@ msgstr ""
 "hardware-reqts\"/>。"
 
 #. Tag: para
-#: hardware.xml:2519
+#: hardware.xml:2517
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -4241,7 +4265,7 @@ msgstr ""
 "统或许可行，但只针对有经验的用户。"
 
 #. Tag: para
-#: hardware.xml:2536
+#: hardware.xml:2534
 #, no-c-format
 msgid ""
 "On the Amiga the size of FastRAM is relevant towards the total memory "
@@ -4256,7 +4280,7 @@ msgstr ""
 "的内核可以自动禁止 16 位的 RAM。"
 
 #. Tag: para
-#: hardware.xml:2545
+#: hardware.xml:2543
 #, no-c-format
 msgid ""
 "On the Atari, both ST-RAM and Fast RAM (TT-RAM) are used by Linux. Many "
@@ -4269,7 +4293,7 @@ msgstr ""
 "MB 的 ST-RAM。您需要额外的 12 MB 或更多的 TT-RAM。"
 
 #. Tag: para
-#: hardware.xml:2553
+#: hardware.xml:2551
 #, no-c-format
 msgid ""
 "On the Macintosh, care should be taken on machines with RAM-based video "
@@ -4282,7 +4306,30 @@ msgstr ""
 "要 4 MB。"
 
 #. Tag: emphasis
-#: hardware.xml:2563
+#: hardware.xml:2561
 #, no-c-format
 msgid "FIXME: is this still true?"
 msgstr "FIXME: is this still true?"
+
+#~ msgid ""
+#~ "The X.Org X Window System is only supported on the SGI Indy and the O2. "
+#~ "The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v "
+#~ "PCI slots and support VGA emulation or Linux framebuffer on a selected "
+#~ "range of graphics cards. A <ulink url=\"&url-bcm91250a-hardware;"
+#~ "\">compatibility listing</ulink> for Broadcom evaluation boards is "
+#~ "available."
+#~ msgstr ""
+#~ "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。Broadcom BCM91250A 和 BCM91480B "
+#~ "开发板具有标准的 3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真或者 Linux "
+#~ "framebuffer。这里有一份 Broadcom 开发板的 <ulink url=\"&url-bcm91250a-"
+#~ "hardware;\">兼容列表</ulink>。"
+
+#~ msgid ""
+#~ "The Broadcom BCM91250A evaluation board offers standard 3.3v 32 bit and "
+#~ "64 bit PCI slots as well as USB connectors. The Broadcom BCM91480B "
+#~ "evaluation board features four 64 bit PCI slots. The Cobalt RaQ has no "
+#~ "support for additional devices but the Qube has one PCI slot."
+#~ msgstr ""
+#~ "Broadcom BCM91250A 开发板提供标准的 3.3v 32 位和 64 位 PCI 插槽，以及 USB "
+#~ "接口。Broadcom BCM91480B 开发板有四个 64 位 PCI 插槽。Cobalt RaQ 不支持额"
+#~ "外的设备，但 Qube 上有一个 PCI 插槽。"