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

2 files changed, 69 insertions, 87 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 49bf1eec4..1a80b4fd2 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -70,13 +70,12 @@ msgstr "支持的体系"
 #. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#| msgid ""
-#| "Debian &release; supports twelve major architectures and several "
-#| "variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "Debian &release; supports eleven major architectures and several variations "
 "of each architecture known as <quote>flavors</quote>."
-msgstr "Debian &release; 支持十一种主要的体系和一些称为 <quote>flavors</quote> 的变种。"
+msgstr ""
+"Debian &release; 支持十一种主要的体系和一些称为 <quote>flavors</quote> 的变"
+"种。"
 
 #. Tag: entry
 #: hardware.xml:53
@@ -2019,19 +2018,16 @@ msgstr "I/O 总线"
 #. Tag: para
 #: hardware.xml:918
 #, no-c-format
-#| msgid ""
-#| "The system bus is the part of the motherboard which allows the CPU to "
-#| "communicate with peripherals such as storage devices. Your computer must "
-#| "use the ISA, EISA, PCI, the Microchannel Architecture (MCA, used in IBM's "
-#| "PS/2 line), or VESA Local Bus (VLB, sometimes called the VL bus). "
-#| "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, or VESA Local Bus (VLB, sometimes called the VL "
 "bus). Essentially all personal computers sold in recent years use one of "
 "these."
-msgstr "系统总线作为主板的一部分用于 CPU 和诸如存储设备之类的周边设备通讯。您的计算机必须使用 ISA、EISA、PCI、PCIe 或者 VESA Local Bus(VLB, 有时称为 VL 总线)。近年来出售的个人电脑都会使用里面的一种。"
+msgstr ""
+"系统总线作为主板的一部分用于 CPU 和诸如存储设备之类的周边设备通讯。您的计算机"
+"必须使用 ISA、EISA、PCI、PCIe 或者 VESA Local Bus(VLB, 有时称为 VL 总线)。近"
+"年来出售的个人电脑都会使用里面的一种。"
 
 #. Tag: para
 #: hardware.xml:941
@@ -2229,7 +2225,9 @@ msgstr "Cobalt 和 Broadcom BCM91250A/BCM91480B 都使用 115200 bps。"
 msgid ""
 "For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP "
 "subarchitectures are supported."
-msgstr "对于 &debian; &release; 来说，只有 PMac (Power-Macintosh 或 PowerMac) 和 PreP 子体系获得支持。"
+msgstr ""
+"对于 &debian; &release; 来说，只有 PMac (Power-Macintosh 或 PowerMac) 和 "
+"PreP 子体系获得支持。"
 
 #. Tag: title
 #: hardware.xml:1150
@@ -2240,9 +2238,6 @@ msgstr "内核变种"
 #. Tag: para
 #: hardware.xml:1152
 #, no-c-format
-#| msgid ""
-#| "There are four flavours of the powerpc kernel in Debian, based on the CPU "
-#| "type:"
 msgid ""
 "There are two flavours of the powerpc kernel in Debian, based on the CPU "
 "type:"
@@ -2702,7 +2697,6 @@ msgstr "p640"
 #. Tag: title
 #: hardware.xml:1430
 #, no-c-format
-#| msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgid "CHRP subarchitecture (unsupported)"
 msgstr "CHRP 子体系 (不支持)"
 
@@ -2727,7 +2721,6 @@ msgstr "Pegasos I, Pegasos II"
 #. Tag: title
 #: hardware.xml:1459
 #, no-c-format
-#| msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgid "APUS subarchitecture (unsupported)"
 msgstr "APUS 子体系 (不支持)"
 
@@ -2957,18 +2950,16 @@ msgstr "便携机"
 #. Tag: para
 #: hardware.xml:1650
 #, no-c-format
-#| msgid ""
-#| "Laptops are also supported. Laptops are often specialized or contain "
-#| "proprietary hardware. To see if your particular laptop works well with "
-#| "GNU/Linux, see the <ulink url=\"&url-x86-laptop;\">Linux Laptop pages</"
-#| "ulink>"
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
 "case a laptop contains specialized or proprietary hardware, some specific "
 "functions may not be supported. To see if your particular laptop works well "
 "with GNU/Linux, see for example the <ulink url=\"&url-x86-laptop;\">Linux "
 "Laptop pages</ulink>."
-msgstr "便携机也受到支持，而且现今大多数便携机都支持。因为便携机通常使用特制或专有的硬件，因此有些特定的功能无法得到支持。要了解您的便携机是否能在 GNU/Linux 下正常工作，请参考 <ulink url=\"&url-x86-laptop;\">Linux 便携机页面</ulink>。"
+msgstr ""
+"便携机也受到支持，而且现今大多数便携机都支持。因为便携机通常使用特制或专有的"
+"硬件，因此有些特定的功能无法得到支持。要了解您的便携机是否能在 GNU/Linux 下正"
+"常工作，请参考 <ulink url=\"&url-x86-laptop;\">Linux 便携机页面</ulink>。"
 
 # index.docbook:1624, index.docbook:1649, index.docbook:1672
 #. Tag: title
@@ -2980,13 +2971,6 @@ msgstr "多处理器"
 #. Tag: para
 #: hardware.xml:1663
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image was compiled "
-#| "with SMP support. This should not prevent installation, since the SMP "
-#| "kernel should boot on non-SMP systems; the kernel will simply cause a bit "
-#| "more overhead."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -2994,7 +2978,11 @@ msgid ""
 "standard kernel is also usable on non-SMP systems, but has a slight overhead "
 "which will cause a small reduction in performance. For normal system use "
 "this will hardly be noticable."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。标准的 Debian &release; 内核映像在编译时已经加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用，只不过多些系统开销降低了一些性能。在普通系统中使用时几乎不会察觉。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。标准的 Debian &release; 内核映像在编译时已经"
+"加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用，只不过多些系统开销降低了"
+"一些性能。在普通系统中使用时几乎不会察觉。"
 
 #. Tag: para
 #: hardware.xml:1672
@@ -3015,13 +3003,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1687
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. The standard Debian &release; kernel image was compiled "
-#| "with <firstterm>SMP-alternatives</firstterm> support. This means that the "
-#| "kernel will detect the number of processors (or processor cores) and will "
-#| "automatically deactivate SMP on uniprocessor systems."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -3029,7 +3010,11 @@ msgid ""
 "alternatives</firstterm> support. This means that the kernel will detect the "
 "number of processors (or processor cores) and will automatically deactivate "
 "SMP on uniprocessor systems."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。标准的 Debian &release; 内核映像在编译时已经加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦测处理器的数量(或者处理器核心数)，并在单内核系统上自动关闭 SMP 的功能。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。标准的 Debian &release; 内核映像在编译时已经"
+"加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦测处理器"
+"的数量(或者处理器核心数)，并在单内核系统上自动关闭 SMP 的功能。"
 
 #. Tag: para
 #: hardware.xml:1696
@@ -3334,27 +3319,20 @@ msgstr "无线网卡"
 #. Tag: para
 #: hardware.xml:1910
 #, no-c-format
-#| msgid ""
-#| "Wireless NICs are in general supported as well, with one big proviso. A "
-#| "lot of wireless adapters require drivers that are either non-free or have "
-#| "not been accepted into the official Linux kernel. These NICs can "
-#| "generally be made to work under &debian;, but are not supported during "
-#| "the installation."
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
 "wireless adapters is supported by the official Linux kernel, although many "
 "of them do require firmware to be loaded. Wireless NICs that are not "
 "supported by the official Linux kernel can generally be made to work under "
 "&debian;, but are not supported during the installation."
-msgstr "无线网络也能支持得很好，虽然很多需要加载固件，正式的 Linux 内核能支持的无线网络适配器也越来越多。有些不被正式的 Linux 内核支持，然而可以在 &debian; 下工作的网卡，不能在安装系统中使用。"
+msgstr ""
+"无线网络也能支持得很好，虽然很多需要加载固件，正式的 Linux 内核能支持的无线网"
+"络适配器也越来越多。有些不被正式的 Linux 内核支持，然而可以在 &debian; 下工作"
+"的网卡，不能在安装系统中使用。"
 
 #. Tag: para
 #: hardware.xml:1918
 #, no-c-format
-#| msgid ""
-#| "If there is no other NIC you can use during the installation, it is still "
-#| "possible to install &debian; using a full CD-ROM or DVD image. Use the "
-#| "same procedure as described above for NICs that require firmware."
 msgid ""
 "The use of wireless networking during installation is still under "
 "development and whether it will work depends on the type of adaptor and the "
@@ -3364,7 +3342,11 @@ msgid ""
 "network and install using only the packages available from the CD/DVD. You "
 "can then install the driver and firmware you need after the installation is "
 "completed (after the reboot) and configure your network manually."
-msgstr "用无线网络进行安装还处于开发过程中，是否可以工作取决于适配器的类型和您无线 AP 的配置情况。如果安装时没有其他的网卡可用，您可以使用完整的 CD-ROM 或 DVD 映像来安装 &debian;。选择不配置网络选项，然后只安装存在于 CD/DVD 上的软件包。您可以在安装完成之后(重新启动)安装驱动程序和固件，手动配置网络。"
+msgstr ""
+"用无线网络进行安装还处于开发过程中，是否可以工作取决于适配器的类型和您无线 "
+"AP 的配置情况。如果安装时没有其他的网卡可用，您可以使用完整的 CD-ROM 或 DVD "
+"映像来安装 &debian;。选择不配置网络选项，然后只安装存在于 CD/DVD 上的软件包。"
+"您可以在安装完成之后(重新启动)安装驱动程序和固件，手动配置网络。"
 
 #. Tag: para
 #: hardware.xml:1930
@@ -3539,7 +3521,6 @@ msgstr ""
 #. Tag: title
 #: hardware.xml:2047
 #, no-c-format
-#| msgid "Drivers Requiring Firmware"
 msgid "Devices Requiring Firmware"
 msgstr "需要固件的设备"
 
@@ -3553,7 +3534,10 @@ msgid ""
 "common for network interface cards (especially wireless NICs), but for "
 "example some USB devices and even some hard disk controllers also require "
 "firmware."
-msgstr "除了需要设备驱动程序，有些硬件还要在使用之前加载 <firstterm>firmware</firstterm> 或 <firstterm>microcode</firstterm>。这对于网卡(特别是无线网卡)来说很常见，但有些 USB 设备甚至是硬盘控制器也需要固件(fireware)。"
+msgstr ""
+"除了需要设备驱动程序，有些硬件还要在使用之前加载 <firstterm>firmware</"
+"firstterm> 或 <firstterm>microcode</firstterm>。这对于网卡(特别是无线网卡)来"
+"说很常见，但有些 USB 设备甚至是硬盘控制器也需要固件(fireware)。"
 
 #. Tag: para
 #: hardware.xml:2056
@@ -3565,7 +3549,10 @@ msgid ""
 "distribution and if &debian; legally can distribute the firmware, it will "
 "often be available as a separate package from the non-free section of the "
 "archive."
-msgstr "根据 &debian; 项目的标准，大多数情况下这些固件属于 non-free，不能被包含在主发行版或安装系统里面。如果设备驱动程序被包含到发行版里面，并且 &debian; 可以合法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
+msgstr ""
+"根据 &debian; 项目的标准，大多数情况下这些固件属于 non-free，不能被包含在主发"
+"行版或安装系统里面。如果设备驱动程序被包含到发行版里面，并且 &debian; 可以合"
+"法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
 #: hardware.xml:2065
@@ -3577,7 +3564,11 @@ msgid ""
 "floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
 "detailed information on how to load firmware files or packages during the "
 "installation."
-msgstr "然而，这并不意味着该硬件不能在安装时使用。从 &debian; 5.0 开始，&d-i; 支持从可移动的介质，比如软盘或 USB 盘，加载固件或包含固件的软件包。参阅 <xref linkend=\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
+msgstr ""
+"然而，这并不意味着该硬件不能在安装时使用。从 &debian; 5.0 开始，&d-i; 支持从"
+"可移动的介质，比如软盘或 USB 盘，加载固件或包含固件的软件包。参阅 <xref "
+"linkend=\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信"
+"息。"
 
 #. Tag: title
 #: hardware.xml:2081
@@ -3844,7 +3835,9 @@ msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
 "howto;\">Linux CD-ROM HOWTO</ulink> contains in-depth information on using "
 "CD-ROMs with Linux."
-msgstr "SCSI、SATA 和 IDE/ATAPI CD-ROMs 都获得支持。<ulink url=\"&url-cd-howto;\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
+msgstr ""
+"SCSI、SATA 和 IDE/ATAPI CD-ROMs 都获得支持。<ulink url=\"&url-cd-howto;"
+"\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
 
 #. Tag: para
 #: hardware.xml:2252
@@ -4048,35 +4041,30 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2375
 #, no-c-format
-#| msgid ""
-#| "Generally, the Debian installation system includes support for floppies, "
-#| "IDE drives, IDE floppies, parallel port IDE devices, SCSI controllers and "
-#| "drives, USB, and FireWire. The supported file systems include FAT, Win-32 "
-#| "FAT extensions (VFAT) and NTFS."
 msgid ""
 "Generally, the Debian installation system includes support for floppies, IDE "
 "(also known as PATA) drives, IDE floppies, parallel port IDE devices, SATA "
 "and SCSI controllers and drives, USB, and FireWire. The supported file "
 "systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
-msgstr "通常，Debian 安装系统支持软盘、IDE (也称为 PATA)驱动器、IDE 软盘、并口 IDE 驱动器、SATA 和 SCSI 控制器和驱动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
+msgstr ""
+"通常，Debian 安装系统支持软盘、IDE (也称为 PATA)驱动器、IDE 软盘、并口 IDE 驱"
+"动器、SATA 和 SCSI 控制器和驱动器、USB 和 FireWire。支持的文件系统有 FAT、"
+"Win-32 FAT 扩展(VFAT) 和 NTFS。"
 
 #. Tag: para
 #: hardware.xml:2382
 #, no-c-format
-#| msgid ""
-#| "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
-#| "&mdash; often called MFM, RLL, IDE, or ATA &mdash; are supported. Very "
-#| "old 8&ndash;bit hard disk controllers used in the IBM XT computer are "
-#| "supported only as a module. SCSI disk controllers from many different "
-#| "manufacturers are supported. See the <ulink url=\"&url-hardware-howto;"
-#| "\">Linux Hardware Compatibility HOWTO</ulink> for more details."
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
 "&mdash; often called MFM, RLL, IDE, or PATA &mdash; are supported. SATA and "
 "SCSI disk controllers from many different manufacturers are supported. See "
 "the <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
 "ulink> for more details."
-msgstr "模拟 <quote>AT</quote> 硬盘接口的磁盘接口 &mdash; 称为 MFM、RLL、IDE 或 PATA &mdash; 可以得到支持。大部分厂商生产的 SATA 和 SCSI 磁盘控制器都能获得支持。请参阅 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink> 以获得更详细信息。"
+msgstr ""
+"模拟 <quote>AT</quote> 硬盘接口的磁盘接口 &mdash; 称为 MFM、RLL、IDE 或 PATA "
+"&mdash; 可以得到支持。大部分厂商生产的 SATA 和 SCSI 磁盘控制器都能获得支持。"
+"请参阅 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility "
+"HOWTO</ulink> 以获得更详细信息。"
 
 #. Tag: para
 #: hardware.xml:2390
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 22a498102..c3fc21851 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -957,31 +957,25 @@ msgstr "编写预置文件的时候要留意几条规则。"
 #. Tag: para
 #: preseed.xml:574
 #, no-c-format
-#| msgid ""
-#| "Put only a single space or tab between type and value: any additional "
-#| "whitespace will be interpreted as belonging to the value. If you specify "
-#| "an empty value you should still put a single space or tab after the type."
 msgid ""
 "Put only a single space or tab between type and value: any additional "
 "whitespace will be interpreted as belonging to the value."
-msgstr "在类型和值之间只有一个空格或者 tab：任何额外的空格将被解释为值的一部分。"
+msgstr ""
+"在类型和值之间只有一个空格或者 tab：任何额外的空格将被解释为值的一部分。"
 
 #. Tag: para
 #: preseed.xml:578
 #, no-c-format
-#| msgid ""
-#| "A line can be split into multiple lines by appending a backslash "
-#| "(<quote><literal>\\</literal></quote>) as the line continuation "
-#| "character. A good place to split a line is after the question name; a bad "
-#| "place is between type and value. Splitting a line inside the value is "
-#| "normally not supported, with the exception of partitioning recipes."
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
 "(<quote><literal>\\</literal></quote>) as the line continuation character. A "
 "good place to split a line is after the question name; a bad place is "
 "between type and value. Split lines will be joined into a single line with "
 "all leading/trailing whitespace condensed to a single space."
-msgstr "一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多行。分割一行较好的地方是在问题后面；而在类型和值之间则是糟糕的地方。分割的行把行首和行尾的空格缩减为一个空格，再连接成单独一行。"
+msgstr ""
+"一行可以通过行尾的反斜杠(<quote><literal>\\</literal></quote>)连接符分成多"
+"行。分割一行较好的地方是在问题后面；而在类型和值之间则是糟糕的地方。分割的行"
+"把行首和行尾的空格缩减为一个空格，再连接成单独一行。"
 
 #. Tag: para
 #: preseed.xml:585
@@ -1152,10 +1146,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:686
 #, no-c-format
-#| msgid ""
-#| "The locale can be used to specify both language and country. To specify "
-#| "the locale as a boot parameter, use <userinput>locale=<replaceable>en_US</"
-#| "replaceable></userinput>."
 msgid ""
 "The locale can be used to specify both language and country and can be any "
 "combination of a language supported by &d-i; and a recognized country. If "
@@ -1163,7 +1153,11 @@ msgid ""
 "automatically select a locale that is valid for the selected language. To "
 "specify the locale as a boot parameter, use "
 "<userinput>locale=<replaceable>en_US</replaceable></userinput>."
-msgstr "locale 用于指定语言和国家或者任何 &d-i; 支持的语言与地区的组合。如果组合起来的不是有效的 locale，安装程序会自动选择一个指定语言可用的 locale。要在引导参数上指定本地，使用 <userinput>locale=<replaceable>en_US</replaceable></userinput>。"
+msgstr ""
+"locale 用于指定语言和国家或者任何 &d-i; 支持的语言与地区的组合。如果组合起来"
+"的不是有效的 locale，安装程序会自动选择一个指定语言可用的 locale。要在引导参"
+"数上指定本地，使用 <userinput>locale=<replaceable>en_US</replaceable></"
+"userinput>。"
 
 #. Tag: screen
 #: preseed.xml:695