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

4 files changed, 93 insertions, 142 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 84737c691..840061fdc 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -1018,7 +1018,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:648
 #, no-c-format
-#| msgid "Booting the NSLU2"
 msgid "Booting the SS4000-E"
 msgstr "引导 SS4000-E"
 
@@ -1034,7 +1033,12 @@ msgid ""
 "with a male DB9 connector at one end, and a 10-pin .1\" IDC header at the "
 "other<footnote id=\"arm-s4k-rib\"> <para> This cable is often found in older "
 "desktop machines with builtin 9-pin serial ports. </para> </footnote>."
-msgstr "由于 SS4000-E 固件限制，当前除了使用串口还无法启动安装程序。为了启动安装程序，您需要一条串口 nullmodem 线； 一台带有串口的计算机<footnote id=\"arm-s4ke-port\"> <para> USB 串口转换器也可以工作。</para> </footnote>； 以及一端为公 DB9 口，另一端为 10-pin .1\" IDC 头的扁平电缆<footnote id=\"arm-s4k-rib\"> <para> 这种电缆过去常用在桌面电脑内置的 9 针串口上。</para> </footnote>。"
+msgstr ""
+"由于 SS4000-E 固件限制，当前除了使用串口还无法启动安装程序。为了启动安装程"
+"序，您需要一条串口 nullmodem 线； 一台带有串口的计算机<footnote id=\"arm-"
+"s4ke-port\"> <para> USB 串口转换器也可以工作。</para> </footnote>； 以及一端"
+"为公 DB9 口，另一端为 10-pin .1\" IDC 头的扁平电缆<footnote id=\"arm-s4k-rib"
+"\"> <para> 这种电缆过去常用在桌面电脑内置的 9 针串口上。</para> </footnote>。"
 
 #. Tag: para
 #: boot-installer.xml:670
@@ -1049,7 +1053,13 @@ msgid ""
 "Debian GNU/Linux is to use the <command>cu</command> program, in the package "
 "of the same name. Assuming the serial port on your computer is to be found "
 "on <filename>/dev/ttyS0</filename>, use the following command line:"
-msgstr "引导 SS4000-E 首先要通过 SS4000-E 的 web 界面(进入<quote>administration</quote>、然后选择 <quote>firmware</quote>，最后上传映像)加载 Debian 提供的固件映像(ss4000e.pkg)。接着、用您的串口 nullmodem 线和扁平电缆连接到 SS4000-E 的串口，然后重启机器。您需要使用串口终端程序与该机器通讯，在 Debian GNU/Linux 上可以选择使用 <command>cu</command> 程序，对应的软件包与此同名。假设您计算机上的串口为 <filename>/dev/ttyS0</filename>，那么在命令行上使用："
+msgstr ""
+"引导 SS4000-E 首先要通过 SS4000-E 的 web 界面(进入<quote>administration</"
+"quote>、然后选择 <quote>firmware</quote>，最后上传映像)加载 Debian 提供的固件"
+"映像(ss4000e.pkg)。接着、用您的串口 nullmodem 线和扁平电缆连接到 SS4000-E 的"
+"串口，然后重启机器。您需要使用串口终端程序与该机器通讯，在 Debian GNU/Linux "
+"上可以选择使用 <command>cu</command> 程序，对应的软件包与此同名。假设您计算机"
+"上的串口为 <filename>/dev/ttyS0</filename>，那么在命令行上使用："
 
 #. Tag: screen
 #: boot-installer.xml:686
@@ -1064,7 +1074,9 @@ msgid ""
 "If using Windows, you may want to consider using the program "
 "<classname>hyperterminal</classname>. Use a baud rate of 115200, 8 bits word "
 "length, no stop bits, and one parity bit."
-msgstr "如果是在 Windows 下，您可以考虑使用 <classname>hyperterminal</classname>。设置波特率为 115200、8 位字长、无停止位和一个奇偶校验位。"
+msgstr ""
+"如果是在 Windows 下，您可以考虑使用 <classname>hyperterminal</classname>。设"
+"置波特率为 115200、8 位字长、无停止位和一个奇偶校验位。"
 
 #. Tag: para
 #: boot-installer.xml:694
@@ -1094,7 +1106,10 @@ msgid ""
 "s4ke-sec\"> <para> Note that you have only one second to do so; if you miss "
 "this window, just powercycle the machine and try again. </para> </footnote>. "
 "This will give you the RedBoot prompt. Enter the following command:"
-msgstr "此时，按下 Control-C 中断 boot loader<footnote id=\"arm-s4ke-sec\"> <para> 注意，您只有一秒钟来选择；如果错过了，重新开机再试一次。</para> </footnote>。接着出现 RedBoot 提示符，键入下面命令："
+msgstr ""
+"此时，按下 Control-C 中断 boot loader<footnote id=\"arm-s4ke-sec\"> <para> 注"
+"意，您只有一秒钟来选择；如果错过了，重新开机再试一次。</para> </footnote>。接"
+"着出现 RedBoot 提示符，键入下面命令："
 
 #. Tag: screen
 #: boot-installer.xml:717
@@ -1108,7 +1123,9 @@ msgstr "fconfig boot_script_data"
 msgid ""
 "RedBoot is now waiting for you to enter the boot script. Make sure to "
 "<emphasis>exactly</emphasis> enter the following script:"
-msgstr "现在 RedBoot 等待您输入引导脚本。一定要<emphasis>正确</emphasis>输入以下脚本："
+msgstr ""
+"现在 RedBoot 等待您输入引导脚本。一定要<emphasis>正确</emphasis>输入以下脚"
+"本："
 
 #. Tag: screen
 #: boot-installer.xml:726
@@ -1121,7 +1138,8 @@ msgid ""
 msgstr ""
 "fis load ramdisk.gz\n"
 "fis load zImage\n"
-"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r 0x01800000"
+"exec -c \"console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000\" -r "
+"0x01800000"
 
 #. Tag: para
 #: boot-installer.xml:728
@@ -1132,7 +1150,11 @@ msgid ""
 "quote> to restart the system, and allow it to boot normally. The installer "
 "should now come up as normal. You can either install Debian through the "
 "serial port, or use an SSH client to connect through SSH."
-msgstr "以一个空行结束脚本，然后在提示 update the non-volatile configuration 时输入 <quote>y</quote>。最后，使用 <quote>reset</quote> 重启系统，让它按普通方式引导。安装程序这时应该能正常运行。您可以根据需要使用串口安装 Debian，或者使用 SSH 客户端登录。"
+msgstr ""
+"以一个空行结束脚本，然后在提示 update the non-volatile configuration 时输入 "
+"<quote>y</quote>。最后，使用 <quote>reset</quote> 重启系统，让它按普通方式引"
+"导。安装程序这时应该能正常运行。您可以根据需要使用串口安装 Debian，或者使用 "
+"SSH 客户端登录。"
 
 #. Tag: para
 #: boot-installer.xml:736
@@ -1142,7 +1164,9 @@ msgid ""
 "installation. The system will be configured to take the root device from "
 "system configuration, rather than from the kernel command line. It will not "
 "do any harm to do so anyway, however."
-msgstr "注意，在安装完成之后没有必要更新引导脚本。系统将会按照系统设置配置根设备，而不是内核命令行。当然，这也不会造成任何损坏。"
+msgstr ""
+"注意，在安装完成之后没有必要更新引导脚本。系统将会按照系统设置配置根设备，而"
+"不是内核命令行。当然，这也不会造成任何损坏。"
 
 # index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
 #. Tag: title
@@ -3387,7 +3411,14 @@ msgid ""
 "parameters can <phrase arch=\"x86\">then</phrase> be appended to enable "
 "accessibility features. Note that on most architectures the boot loader "
 "interprets your keyboard as a QWERTY keyboard."
-msgstr "一些用户，比如有视觉障碍的，可能需要特别的支持。<phrase arch=\"alpha;ia64;powerpc;x86\">USB 盲文点显器(braille display) 可以自动被检测到，但多数情况下其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">多数情况下</phrase> 辅助功能不得不使用手动进行设置。<phrase arch=\"x86\">在能支持的机器上，接受输入时，引导菜单会发出一声 beep。</phrase> 一些引导参数可以 <phrase arch=\"x86\">接着</phrase> 被添加到后面打开辅助功能。需要注意在大多数架构下 boot loader 将您的键盘视为 QWERTY 布局。"
+msgstr ""
+"一些用户，比如有视觉障碍的，可能需要特别的支持。<phrase arch=\"alpha;ia64;"
+"powerpc;x86\">USB 盲文点显器(braille display) 可以自动被检测到，但多数情况下"
+"其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">多数情况下</"
+"phrase> 辅助功能不得不使用手动进行设置。<phrase arch=\"x86\">在能支持的机器"
+"上，接受输入时，引导菜单会发出一声 beep。</phrase> 一些引导参数可以 <phrase "
+"arch=\"x86\">接着</phrase> 被添加到后面打开辅助功能。需要注意在大多数架构下 "
+"boot loader 将您的键盘视为 QWERTY 布局。"
 
 #. Tag: title
 #: boot-installer.xml:2765
@@ -3398,13 +3429,6 @@ msgstr "USB 盲文点显器"
 #. Tag: para
 #: boot-installer.xml:2766
 #, no-c-format
-#| msgid ""
-#| "USB braille displays should be automatically detected. A textual version "
-#| "of the installer will then be automatically selected, and support for the "
-#| "braille display will be automatically installed on the target system. You "
-#| "can thus just press &enterkey; at the boot menu. Once <classname>brltty</"
-#| "classname> is started, you can choose a braille table by entering the "
-#| "preference menu."
 msgid ""
 "USB braille displays should be automatically detected. A textual version of "
 "the installer will then be automatically selected, and support for the "
@@ -3414,7 +3438,12 @@ msgid ""
 "preference menu. Documentation on key bindings for braille devices is "
 "available on the <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</"
 "classname> website</ulink>."
-msgstr "系统应该可以自动检测到 USB 盲文点显器。然后自动选取安装程序的文本界面，该设备也会被自动安装到最终系统中。您只需要在引导菜单中按下 &enterkey; 键。一旦 <classname>brltty</classname> 启动，您就可以通过菜单选择 braille table。在 <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</classname> website</ulink> 可以找到盲文点显器的键绑定文档。"
+msgstr ""
+"系统应该可以自动检测到 USB 盲文点显器。然后自动选取安装程序的文本界面，该设备"
+"也会被自动安装到最终系统中。您只需要在引导菜单中按下 &enterkey; 键。一旦 "
+"<classname>brltty</classname> 启动，您就可以通过菜单选择 braille table。在 "
+"<ulink url=\"&url-brltty-driver-help;\"><classname>brltty</classname> "
+"website</ulink> 可以找到盲文点显器的键绑定文档。"
 
 #. Tag: title
 #: boot-installer.xml:2781
@@ -3425,21 +3454,6 @@ msgstr "串口盲文点显器"
 #. Tag: para
 #: boot-installer.xml:2782
 #, no-c-format
-#| msgid ""
-#| "Serial braille displays cannot safely be automatically detected (since "
-#| "that may damage some of them). You thus need to append the "
-#| "<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
-#| "replaceable>,<replaceable>table</replaceable></userinput> boot parameter "
-#| "to tell <classname>brltty</classname> which driver it should use. "
-#| "<replaceable>driver</replaceable> should be replaced by the two-letter "
-#| "driver code for your terminal (see the <ulink url=\"&url-brltty-driver-"
-#| "codes;\">driver code list</ulink>). <replaceable>port</replaceable> "
-#| "should be replaced by the name of the serial port the display is "
-#| "connected to, <userinput>ttyS0</userinput> is the default. "
-#| "<replaceable>table</replaceable> is the name of the braille table to be "
-#| "used (see the <ulink url=\"&url-brltty-table-codes;\">table code list</"
-#| "ulink>); the English table is the default. Note that the table can be "
-#| "changed later by entering the preference menu."
 msgid ""
 "Serial braille displays cannot safely be automatically detected (since that "
 "may damage some of them). You thus need to append the "
@@ -3457,7 +3471,19 @@ msgid ""
 "preference menu. Documentation on key bindings for braille devices is "
 "available on the <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</"
 "classname> website</ulink>."
-msgstr "系统无法安全地检测到串口盲文点显器(因为这可能会导致某些损坏)。您需要添加 <userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</replaceable>,<replaceable>table</replaceable></userinput> 引导参数说明 <classname>brltty</classname> 该使用哪个驱动程序。<replaceable>driver</replaceable> 应该替换为您终端的两个字母的驱动程序代码(参阅 <ulink url=\"&url-brltty-driver-codes;\">driver code list</ulink>)。<replaceable>port</replaceable> 应该替换为该设备连接使用的串口名，默认为 <userinput>ttyS0</userinput>。 <replaceable>table</replaceable> 是使用的 braille table 名(参阅 <ulink url=\"&url-brltty-table-codes;\">table code list</ulink>)；默认为英语。注意该表可以在后续菜单中选择修改。该设备的键绑定文档可以在 <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</classname> website</ulink> 找到。"
+msgstr ""
+"系统无法安全地检测到串口盲文点显器(因为这可能会导致某些损坏)。您需要添加 "
+"<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
+"replaceable>,<replaceable>table</replaceable></userinput> 引导参数说明 "
+"<classname>brltty</classname> 该使用哪个驱动程序。<replaceable>driver</"
+"replaceable> 应该替换为您终端的两个字母的驱动程序代码(参阅 <ulink url=\"&url-"
+"brltty-driver-codes;\">driver code list</ulink>)。<replaceable>port</"
+"replaceable> 应该替换为该设备连接使用的串口名，默认为 <userinput>ttyS0</"
+"userinput>。 <replaceable>table</replaceable> 是使用的 braille table 名(参阅 "
+"<ulink url=\"&url-brltty-table-codes;\">table code list</ulink>)；默认为英"
+"语。注意该表可以在后续菜单中选择修改。该设备的键绑定文档可以在 <ulink url="
+"\"&url-brltty-driver-help;\"><classname>brltty</classname> website</ulink> 找"
+"到。"
 
 #. Tag: title
 #: boot-installer.xml:2804
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index bf92591c1..997aacbb0 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -2045,26 +2045,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:969
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </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> SGI IP22: this platform includes the SGI machines Indy, "
@@ -2080,25 +2060,30 @@ msgid ""
 "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>."
-msgstr "&arch-title; 上的 Debian 支持以下平台：<itemizedlist> <listitem><para> SGI IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近似，在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></listitem> <listitem><para> SGI IP32：该平台常被称为 SGI O2。</para></listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设备，用它来测试 MIPS 上的 Debian 是个不错的方法。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 Debian 支持以下平台：<itemizedlist> <listitem><para> SGI "
+"IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近"
+"似，在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></"
+"listitem> <listitem><para> SGI IP32：该平台常被称为 SGI O2。</para></"
+"listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设"
+"备，用它来测试 MIPS 上的 Debian 是个不错的方法。</para></listitem> </"
+"itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-"
+"mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。"
+"如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> "
+"debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: para
 #: hardware.xml:1004
 #, no-c-format
-#| msgid ""
-#| "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 "
-#| "and R5000 processors are supported by the Debian installation system on "
-#| "big endian MIPS. On SGI IP32, currently only systems based on the R5000 "
-#| "are supported. The Broadcom BCM91250A evaluation board comes with an SB1 "
-#| "1250 chip with two cores which are supported in SMP mode by this "
-#| "installer. Similarly, the BCM91480B evaluation board contains an SB1A "
-#| "1480 chip with four cores which are supported in SMP mode."
 msgid ""
 "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
 "R5000 processors are supported by the Debian installation system on big "
 "endian MIPS. On SGI IP32, currently only systems based on the R5000 are "
 "supported."
-msgstr "Debian 安装系统支持 big endian MIPS 上的 SGI IP22、SGI Indy、Indigo 2 和具有 R4000、R4400、R4600 和 R5000 处理器的 Challenge S。对于 SGI IP32，当前只支持 R5000。"
+msgstr ""
+"Debian 安装系统支持 big endian MIPS 上的 SGI IP22、SGI Indy、Indigo 2 和具有 "
+"R4000、R4400、R4600 和 R5000 处理器的 Challenge S。对于 SGI IP32，当前只支持 "
+"R5000。"
 
 #. Tag: para
 #: hardware.xml:1010
@@ -2114,23 +2099,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1027
 #, 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 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 "
@@ -2144,7 +2112,16 @@ msgid ""
 "covered. If you are looking for support for other subarchitectures, please "
 "contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; "
 "mailing list</ulink>."
-msgstr "&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS Malta：该平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 Debian 是个不错的方法。</para></listitem> </itemizedlist> 有关支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> "
+"Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt RaQ、Qube2 "
+"和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS "
+"Malta：该平台由 QEMU 模拟，如果您没有硬件设备，使用它来测试运行在 MIPS 上的 "
+"Debian 是个不错的方法。</para></listitem> </itemizedlist> 有关支持 mips/"
+"mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</"
+"ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您寻找其它子系统的支持，"
+"请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing "
+"list</ulink>。"
 
 #. Tag: title
 #: hardware.xml:1055
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index dca23b89b..d3157a62f 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -1829,16 +1829,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1308
 #, no-c-format
-#| msgid ""
-#| "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
-#| "easy, because it treats BOOTP clients as a moderately special case of "
-#| "DHCP clients. Some architectures require a complex configuration for "
-#| "booting clients via BOOTP. If yours is one of those, read the section "
-#| "<xref linkend=\"dhcpd\"/>. In that case, you will probably be able to get "
-#| "away with simply adding the <userinput>allow bootp</userinput> directive "
-#| "to the configuration block for the subnet containing the client, and "
-#| "restart <command>dhcpd</command> with <userinput>/etc/init.d/dhcpd3-"
-#| "server restart</userinput>."
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
 "easy, because it treats BOOTP clients as a moderately special case of DHCP "
@@ -1849,7 +1839,14 @@ msgid ""
 "block for the subnet containing the client in <filename>/etc/dhcp3/dhcpd."
 "conf</filename>, and restart <command>dhcpd</command> with <userinput>/etc/"
 "init.d/dhcpd3-server restart</userinput>."
-msgstr "相反，通过 ISC <command>dhcpd</command> 设置 BOOTP 就非常容易。因为它把 BOOTP 客户程序看成一个特殊的 DHCP 客户端。部分体系结构需要经过复杂的设置才能从 BOOTP 启动客户端。如果您的机器属于这种情况，请阅读<xref linkend=\"dhcpd\"/>。否则，大概只需要将 <userinput>allow bootp</userinput> 指令添加到包含客户机的子网的配置部分 <filename>/etc/dhcp3/dhcpd.conf</filename>，并用命令 <userinput>/etc/init.d/dhcpd3-server restart</userinput> 重新启动 <command>dhcpd</command>。"
+msgstr ""
+"相反，通过 ISC <command>dhcpd</command> 设置 BOOTP 就非常容易。因为它把 "
+"BOOTP 客户程序看成一个特殊的 DHCP 客户端。部分体系结构需要经过复杂的设置才能"
+"从 BOOTP 启动客户端。如果您的机器属于这种情况，请阅读<xref linkend=\"dhcpd\"/"
+">。否则，大概只需要将 <userinput>allow bootp</userinput> 指令添加到包含客户机"
+"的子网的配置部分 <filename>/etc/dhcp3/dhcpd.conf</filename>，并用命令 "
+"<userinput>/etc/init.d/dhcpd3-server restart</userinput> 重新启动 "
+"<command>dhcpd</command>。"
 
 #. Tag: title
 #: install-methods.xml:1330
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index a123f985c..c7a81b13e 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1287,55 +1287,6 @@ msgstr "下面的 debconf 变量与网络配置相关。"
 #. Tag: screen
 #: preseed.xml:762
 #, no-c-format
-#| msgid ""
-#| "# netcfg will choose an interface that has link if possible. This makes "
-#| "it\n"
-#| "# skip displaying a list if there is more than one interface.\n"
-#| "d-i netcfg/choose_interface select auto\n"
-#| "\n"
-#| "# To pick a particular interface instead:\n"
-#| "#d-i netcfg/choose_interface select eth1\n"
-#| "\n"
-#| "# If you have a slow dhcp server and the installer times out waiting for\n"
-#| "# it, this might be useful.\n"
-#| "#d-i netcfg/dhcp_timeout string 60\n"
-#| "\n"
-#| "# If you prefer to configure the network manually, uncomment this line "
-#| "and\n"
-#| "# the static network configuration below.\n"
-#| "#d-i netcfg/disable_dhcp boolean true\n"
-#| "\n"
-#| "# If you want the preconfiguration file to work on systems both with and\n"
-#| "# without a dhcp server, uncomment these lines and the static network\n"
-#| "# configuration below.\n"
-#| "#d-i netcfg/dhcp_failed note\n"
-#| "#d-i netcfg/dhcp_options select Configure network manually\n"
-#| "\n"
-#| "# Static network configuration.\n"
-#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
-#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
-#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
-#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
-#| "#d-i netcfg/confirm_static boolean true\n"
-#| "\n"
-#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
-#| "# values set here. However, setting the values still prevents the "
-#| "questions\n"
-#| "# from being shown, even if values come from dhcp.\n"
-#| "d-i netcfg/get_hostname string unassigned-hostname\n"
-#| "d-i netcfg/get_domain string unassigned-domain\n"
-#| "\n"
-#| "# Disable that annoying WEP key dialog.\n"
-#| "d-i netcfg/wireless_wep string\n"
-#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
-#| "#d-i netcfg/dhcp_hostname string radish\n"
-#| "\n"
-#| "# If non-free firmware is needed for the network or other hardware, you "
-#| "can\n"
-#| "# configure the installer to always try to load it, without prompting. "
-#| "Or\n"
-#| "# change to false to disable asking.\n"
-#| "#d-i hw-detect/load_firmware boolean true"
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
 "# installations on non-networked devices where the network questions,\n"