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

8 files changed, 10 insertions, 478 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index d2cc1a279..c8a507387 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -55,7 +55,6 @@ msgstr "关于如何启动图形安装程序，请参见<xref linkend=\"graphica
 #. Tag: title
 #: boot-installer.xml:39
 #, no-c-format
-#| msgid "Booting from Firmware"
 msgid "Boot image formats"
 msgstr "启动映像格式"
 
@@ -109,7 +108,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:68 boot-installer.xml:86
 #, no-c-format
-#| msgid "Boot Configuration"
 msgid "Console configuration"
 msgstr "控制台配置"
 
@@ -179,7 +177,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:108
 #, no-c-format
-#| msgid "Submitting Installation Reports"
 msgid "Juno Installation"
 msgstr "Juno 安装"
 
@@ -291,9 +288,6 @@ msgstr "从 TFTP 引导"
 #: boot-installer.xml:169 boot-installer.xml:831 boot-installer.xml:1467
 #: boot-installer.xml:1597 boot-installer.xml:1918 boot-installer.xml:2066
 #, no-c-format
-#| msgid ""
-#| "Booting from the network requires that you have a network connection and "
-#| "a TFTP network boot server (DHCP, RARP, or BOOTP)."
 msgid ""
 "Booting from the network requires that you have a network connection and a "
 "TFTP network boot server (and probably also a DHCP, RARP, or BOOTP server "
@@ -317,9 +311,6 @@ msgstr "较早的系统，如 715，也许需要使用 RBOOT 服务器替代 BOO
 #: boot-installer.xml:180 boot-installer.xml:842 boot-installer.xml:1478
 #: boot-installer.xml:1608 boot-installer.xml:1929 boot-installer.xml:2077
 #, no-c-format
-#| msgid ""
-#| "The installation method to support network booting is described in <xref "
-#| "linkend=\"install-tftp\"/>."
 msgid ""
 "The server-side setup to support network booting is described in <xref "
 "linkend=\"install-tftp\"/>."
@@ -565,21 +556,12 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:287
 #, no-c-format
-#| msgid "Booting from USB Memory Stick"
 msgid "Booting from USB Memory Stick with UEFI"
 msgstr "在 UEFI 下从 U 盘启动"
 
 #. Tag: para
 #: boot-installer.xml:293 boot-installer.xml:552
 #, no-c-format
-#| msgid ""
-#| "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
-#| "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
-#| "stick into some free USB connector and reboot the computer. The system "
-#| "should boot up, and unless you have used the flexible way to build the "
-#| "stick and not enabled it, you should be presented with the <prompt>boot:</"
-#| "prompt> prompt. Here you can enter optional boot arguments, or just hit "
-#| "&enterkey;."
 msgid ""
 "If your computer will boot from USB, this will probably be the easiest route "
 "for installation. Assuming you have prepared everything from <xref linkend="
@@ -600,7 +582,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:309
 #, no-c-format
-#| msgid "Booting from USB memory stick"
 msgid "Booting from a USB stick in U-Boot"
 msgstr "在 U-Boot 下从 U 盘启动"
 
@@ -826,12 +807,6 @@ msgstr ""
 #: boot-installer.xml:591 boot-installer.xml:1105 boot-installer.xml:1706
 #: boot-installer.xml:2124
 #, no-c-format
-#| msgid ""
-#| "Even if you cannot boot from CD-ROM, you can probably install the "
-#| "&debian; system components and any packages you want from CD-ROM. Simply "
-#| "boot using a different media, such as floppies. When it's time to install "
-#| "the operating system, base system, and any additional packages, point the "
-#| "installation system at the CD-ROM drive."
 msgid ""
 "Even if you cannot boot from CD-ROM, you can probably install the &debian; "
 "system components and any packages you want from CD-ROM. Simply boot using a "
@@ -916,7 +891,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:649
 #, no-c-format
-#| msgid "Booting from DOS"
 msgid "Booting from DOS using loadlin"
 msgstr "从 DOS 下使用 loadlin 引导"
 
@@ -1360,12 +1334,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:918
 #, no-c-format
-#| msgid ""
-#| "For a normal installation, select either the <quote>Install</quote> or "
-#| "the <quote>Graphical install</quote> entry &mdash; using either the arrow "
-#| "keys on your keyboard or by typing the first (highlighted) letter, the "
-#| "<quote>Install</quote> entry is already selected by default &mdash; and "
-#| "press &enterkey; to boot the installer."
 msgid ""
 "For a normal installation, select either the <quote>Graphical install</"
 "quote> or the <quote>Install</quote> entry &mdash; using either the arrow "
@@ -1391,13 +1359,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:932
 #, no-c-format
-#| msgid ""
-#| "If you wish or need to add any boot parameters for either the installer "
-#| "or the kernel, press &tabkey;. This will display the default boot command "
-#| "for the selected menu entry and allow to add additional options. The help "
-#| "screens (see below) list some common possible options. Press &enterkey; "
-#| "to boot the installer with your options; pressing &escapekey; will return "
-#| "you to the boot menu and undo any changes you made."
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
 "the kernel, press &tabkey; (BIOS boot), or &ekey; then &downkey; three times "
@@ -2276,11 +2237,6 @@ msgstr "s390 引导参数"
 #. Tag: para
 #: boot-installer.xml:1640
 #, no-c-format
-#| msgid ""
-#| "On S/390 you can append boot parameters in the parm file. This file can "
-#| "either be in ASCII or EBCDIC format. A sample parm file "
-#| "<filename>parmfile.debian</filename> is provided with the installation "
-#| "images."
 msgid ""
 "On S/390 you can append boot parameters in the parm file. This file can "
 "either be in ASCII or EBCDIC format. It needs to be fixed-width with 80 "
@@ -2404,10 +2360,6 @@ msgstr "boot cd install/pegasos"
 #. Tag: para
 #: boot-installer.xml:1760
 #, no-c-format
-#| msgid ""
-#| "To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> "
-#| "key immediately after pressing the power-on button, when SmartFirmware "
-#| "prompt appears, type"
 msgid ""
 "On YDL Powerstation machine, press <keycap>s</keycap> immediately after "
 "<quote>Press 's' to enter Open Firmware</quote> message, when SLOF prompt "
@@ -2826,18 +2778,6 @@ msgstr "辅助功能"
 #. Tag: para
 #: boot-installer.xml:2169
 #, no-c-format
-#| msgid ""
-#| "Some users may need specific support because of e.g. some visual "
-#| "impairment. <phrase arch=\"ia64;powerpc;ppc64el;x86\">USB braille "
-#| "displays are detected automatically (not serial displays connected via a "
-#| "serial-to-USB converter), but most other</phrase> <phrase arch=\"arm;hppa;"
-#| "mips;mipsel;sparc\">Most</phrase> accessibility features have to be "
-#| "enabled manually. <phrase arch=\"x86\">On machines that support it, the "
-#| "boot menu emits a beep when it is ready to receive keystrokes.</phrase> "
-#| "Some boot parameters can <phrase arch=\"x86\">then</phrase> be appended "
-#| "to enable accessibility features<phrase arch=\"x86\"> (see also <xref "
-#| "linkend=\"boot-screen\"/>)</phrase>. Note that on most architectures the "
-#| "boot loader interprets your keyboard as a QWERTY keyboard."
 msgid ""
 "Some users may need specific support because of e.g. some visual impairment. "
 "<phrase arch=\"ia64;powerpc;ppc64el;x86\">USB braille displays are detected "
@@ -2917,24 +2857,6 @@ msgstr "串口盲文点显器"
 #. Tag: para
 #: boot-installer.xml:2219
 #, 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-manual;"
-#| "\">BRLTTY manual</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, <userinput>ttyUSB0</"
-#| "userinput> can be typically used when using a serial-to-USB converter. "
-#| "<replaceable>table</replaceable> is the name of the braille table to be "
-#| "used (see the <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>); "
-#| "the English table is the default. Note that the table can be changed "
-#| "later by entering the preference menu. Documentation on key bindings for "
-#| "braille devices is available on the <ulink url=\"&url-brltty-driver-help;"
-#| "\"><classname>brltty</classname> website</ulink>."
 msgid ""
 "Serial braille displays cannot safely be automatically detected (since that "
 "may damage some of them). You thus need to append the "
@@ -2978,10 +2900,6 @@ msgstr "软件语音合成"
 #. Tag: para
 #: boot-installer.xml:2247
 #, no-c-format
-#| msgid ""
-#| "Support for hardware speech synthesis devices is available only alongside "
-#| "support for graphical installer. You thus need to select a "
-#| "<quote>Graphical install</quote> entry in the boot menu."
 msgid ""
 "Support for software speech synthesis is available on all installer images "
 "which have the graphical installer, i.e. all netinst, CD and DVD images, and "
@@ -2996,12 +2914,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2256
 #, no-c-format
-#| msgid ""
-#| "Support for software speech synthesis can be activated by selecting it in "
-#| "the boot menu by typing <userinput>s</userinput> &enterkey;. The first "
-#| "question (language) is spoken in english, and the remainder of "
-#| "installation is spoken in the selected language (if available in "
-#| "<classname>espeak</classname>)."
 msgid ""
 "The first question (language) is spoken in english, and the remainder of "
 "installation is spoken in the selected language (if available in "
@@ -3028,16 +2940,15 @@ msgid ""
 "prompt. To get back to the previous question, type <userinput>&lt;</"
 "userinput> at the prompt."
 msgstr ""
-"默认语速很慢。要使其更快，请按<keycombo> <keycap>CapsLock</keycap> <keycap>"
-"6</keycap></keycombo>。要使其更慢，请按<keycombo> <keycap>CapsLock</keycap> "
-"<keycap>5</keycap></keycombo>。默认音量应该是中等的。要更大声，请按"
-"<keycombo> <keycap>CapsLock</keycap> <keycap>2</keycap></keycombo>。要使其"
-"更安静，请按<keycombo> <keycap>CapsLock</keycap> <keycap>1</keycap></"
+"默认语速很慢。要使其更快，请按<keycombo> <keycap>CapsLock</keycap> "
+"<keycap>6</keycap></keycombo>。要使其更慢，请按<keycombo> <keycap>CapsLock</"
+"keycap> <keycap>5</keycap></keycombo>。默认音量应该是中等的。要更大声，请按"
+"<keycombo> <keycap>CapsLock</keycap> <keycap>2</keycap></keycombo>。要使其更"
+"安静，请按<keycombo> <keycap>CapsLock</keycap> <keycap>1</keycap></"
 "keycombo>。要获取有关浏览快捷方式的更多详细信息，请参见<ulink url=\"&url-"
 "speakup-guide;\">Speakup向导</ulink>。要接受问题的默认答案，只需在提示符下按"
-"<keycap>Enter</keycap>即可。要为问题提供空答案，请在提示符下键入"
-"<userinput>！</userinput>。要返回上一个问题，请在提示符下键入<userinput>&"
-"lt;</userinput>。"
+"<keycap>Enter</keycap>即可。要为问题提供空答案，请在提示符下键入<userinput>！"
+"</userinput>。要返回上一个问题，请在提示符下键入<userinput>&lt;</userinput>。"
 
 #. Tag: title
 #: boot-installer.xml:2290
@@ -3048,10 +2959,6 @@ msgstr "硬件语音合成"
 #. Tag: para
 #: boot-installer.xml:2291
 #, no-c-format
-#| msgid ""
-#| "Support for hardware speech synthesis devices is available only alongside "
-#| "support for graphical installer. You thus need to select a "
-#| "<quote>Graphical install</quote> entry in the boot menu."
 msgid ""
 "Support for hardware speech synthesis devices is available on all installer "
 "images which have the graphical installer, i.e. all netinst, CD and DVD "
@@ -3121,10 +3028,6 @@ msgstr "高亮主题"
 #. Tag: para
 #: boot-installer.xml:2331
 #, no-c-format
-#| msgid ""
-#| "For users with low vision, the installer can use a high-contrast theme "
-#| "that makes it more readable. To enable it, append the "
-#| "<userinput>theme=dark</userinput> boot parameter."
 msgid ""
 "For users with low vision, the installer can use a high-contrast color theme "
 "that makes it more readable. To enable it, append the <userinput>theme=dark</"
@@ -3148,8 +3051,8 @@ msgid ""
 "keycombo> and <keycombo><keycap>Control</keycap> <keycap>-</keycap></"
 "keycombo> shortcuts increase and decrease the font size."
 msgstr ""
-"对于低视力的用户，图形安装程序有非常基本的缩放支持：<keycombo> <keycap>控件"
-"</keycap> <keycap>+</keycap></keycombo>和<keycombo> <keycap>Control</keycap> "
+"对于低视力的用户，图形安装程序有非常基本的缩放支持：<keycombo> <keycap>控件</"
+"keycap> <keycap>+</keycap></keycombo>和<keycombo> <keycap>Control</keycap> "
 "<keycap>-</keycap></keycombo>快捷键，用于增减字体大小。"
 
 #. Tag: title
@@ -3185,10 +3088,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2366
 #, no-c-format
-#| msgid ""
-#| "Alternatively, &debian; can be installed completely automatically by "
-#| "using preseeding. This is documented in <xref linkend=\"appendix-preseed"
-#| "\"/>."
 msgid ""
 "The automated install choice allows to install &debian; completely "
 "automatically by using preseeding, whose source can be entered after "
@@ -3304,18 +3203,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2440
 #, no-c-format
-#| msgid ""
-#| "In order to ensure the terminal type used by the installer matches your "
-#| "terminal emulator, the parameter <userinput>TERM=<replaceable>type</"
-#| "replaceable></userinput> can be added. Note that the installer only "
-#| "supports the following terminal types: <literal>linux</literal>, "
-#| "<literal>bterm</literal>, <literal>ansi</literal>, <literal>vt102</"
-#| "literal> and <literal>dumb</literal>. The default for serial console in "
-#| "&d-i; is <userinput>vt102</userinput>. If you are using a virtualization "
-#| "tool which does not provide conversion into such terminals types itself, "
-#| "e.g. QEMU/KVM, you can start it inside a <command>screen</command> "
-#| "session. That will indeed perform translation into the <literal>screen</"
-#| "literal> terminal type, which is very close to <literal>vt102</literal>."
 msgid ""
 "In order to ensure the terminal type used by the installer matches your "
 "terminal emulator, the parameter <userinput>TERM=<replaceable>type</"
@@ -3694,11 +3581,6 @@ msgstr "netcfg/disable_autoconfig"
 #. Tag: para
 #: boot-installer.xml:2686
 #, no-c-format
-#| msgid ""
-#| "By default, the &d-i; automatically probes for network configuration via "
-#| "DHCP. If the probe succeeds, you won't have a chance to review and change "
-#| "the obtained settings. You can get to the manual network setup only in "
-#| "case the DHCP probe fails."
 msgid ""
 "By default, the &d-i; automatically probes for network configuration via "
 "IPv6 autoconfiguration and DHCP. If the probe succeeds, you won't have a "
@@ -3711,11 +3593,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2693
 #, no-c-format
-#| msgid ""
-#| "If you have a DHCP server on your local network, but want to avoid it "
-#| "because e.g. it gives wrong answers, you can use the parameter "
-#| "<userinput>netcfg/disable_autoconfig=true</userinput> to prevent "
-#| "configuring the network with DHCP and to enter the information manually."
 msgid ""
 "If you have an IPv6 router or a DHCP server on your local network, but want "
 "to avoid them because e.g. they give wrong answers, you can use the "
@@ -4071,9 +3948,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2919
 #, no-c-format
-#| msgid ""
-#| "Set to <userinput>true</userinput> if you want to disable DHCP and "
-#| "instead force static network configuration."
 msgid ""
 "Set to <userinput>true</userinput> if you want to disable IPv6 "
 "autoconfiguration and DHCP and instead force static network configuration."
@@ -4929,14 +4803,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:3542
 #, no-c-format
-#| msgid ""
-#| "If you have a working &debian; system, the easiest way to send an "
-#| "installation report is to install the <classname>installation-report</"
-#| "classname> and <classname>reportbug</classname> packages "
-#| "(<command>aptitude install installation-report reportbug</command>), "
-#| "configure <classname>reportbug</classname> as explained in <xref linkend="
-#| "\"mail-outgoing\"/>, and run the command <command>reportbug installation-"
-#| "reports</command>."
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
 "installation report is to install the <classname>installation-report</"
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index d8b645e1f..9d1e53342 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-04-15 20:29+0000\n"
+"POT-Creation-Date: 2015-05-25 11:27+0000\n"
 "PO-Revision-Date: 2017-06-11 22:10+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -418,19 +418,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:244
 #, no-c-format
-#| msgid ""
-#| "If any volume holding noncritical system files could not be mounted "
-#| "(<filename>/usr</filename> or <filename>/var</filename>), the system "
-#| "should still boot and you should be able to mount the volumes manually "
-#| "like in the previous case. However, you will also need to (re)start any "
-#| "services usually running in your default runlevel because it is very "
-#| "likely that they were not started. The easiest way to achieve this is by "
-#| "switching to the first runlevel and back by entering "
-#| "<informalexample><screen>\n"
-#| "<prompt>#</prompt> <userinput>init 1</userinput>\n"
-#| "</screen></informalexample> at the shell prompt and pressing <keycombo> "
-#| "<keycap>Control</keycap> <keycap>D</keycap> </keycombo> when asked for "
-#| "the root password."
 msgid ""
 "If any volume holding noncritical system files could not be mounted "
 "(<filename>/usr</filename> or <filename>/var</filename>), the system should "
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 9c764b9f9..173823e7c 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -76,9 +76,6 @@ msgstr "支持的体系"
 #. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#| msgid ""
-#| "&debian; GNU/Linux &release; supports eleven major architectures and "
-#| "several variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "&debian; GNU/Linux &release; supports ten major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
@@ -173,7 +170,6 @@ msgstr "armel"
 #. Tag: entry
 #: hardware.xml:79
 #, no-c-format
-#| msgid "Marvell Kirkwood"
 msgid "Marvell Kirkwood and Orion"
 msgstr "Marvell Kirkwood"
 
@@ -222,7 +218,6 @@ msgstr "arm64"
 #. Tag: entry
 #: hardware.xml:98
 #, no-c-format
-#| msgid "MIPS (big endian)"
 msgid "32bit MIPS (big-endian)"
 msgstr "MIPS（大尾端）"
 
@@ -259,7 +254,6 @@ msgstr "octeon"
 #. Tag: entry
 #: hardware.xml:108
 #, no-c-format
-#| msgid "MIPS (little endian)"
 msgid "64bit MIPS (little-endian)"
 msgstr "MIPS（小尾端）"
 
@@ -290,7 +284,6 @@ msgstr "loongson-3"
 #. Tag: entry
 #: hardware.xml:121
 #, no-c-format
-#| msgid "MIPS (little endian)"
 msgid "32bit MIPS (little-endian)"
 msgstr "MIPS（小尾端）"
 
@@ -440,10 +433,6 @@ msgstr "&debian;/arm64 适用于 64 位 ARM 处理器，其至少实现了 ARMv8
 #. Tag: para
 #: hardware.xml:268
 #, no-c-format
-#| msgid ""
-#| "Most ARM CPUs may be run in either endian mode (big or little). However, "
-#| "the majority of current system implementation uses little-endian mode. "
-#| "&debian; currently only supports little-endian ARM systems."
 msgid ""
 "Technically, all currently available ARM CPUs can be run in either endian "
 "mode (big or little), but in practice the vast majority use little-endian "
@@ -624,7 +613,6 @@ msgstr ""
 #. Tag: title
 #: hardware.xml:388
 #, no-c-format
-#| msgid "The supported platforms are:"
 msgid "Other platforms"
 msgstr "其他平台"
 
@@ -932,7 +920,6 @@ msgstr ""
 #. Tag: term
 #: hardware.xml:596
 #, no-c-format
-#| msgid "Wandboard Quad"
 msgid "Wandboard"
 msgstr "Wandboard Quad"
 
@@ -1091,14 +1078,6 @@ msgstr "Orion5x"
 #. Tag: para
 #: hardware.xml:700
 #, 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-dns323;\">D-Link DNS-323</ulink> and <ulink "
-#| "url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>."
 msgid ""
 "Orion is a system-on-chip (SoC) from Marvell that integrates an ARM CPU, "
 "Ethernet, SATA, USB, and other functionality in one chip. There are many "
@@ -1124,9 +1103,6 @@ msgstr "Versatile"
 #. Tag: para
 #: hardware.xml:716
 #, no-c-format
-#| msgid ""
-#| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
-#| "test and run &debian; on ARM if you don't have the hardware."
 msgid ""
 "The Versatile platform is emulated by QEMU and is therefore a nice way to "
 "test and run &debian; on ARM if you don't have real hardware."
@@ -1197,11 +1173,6 @@ msgstr "<title>CPU</title>"
 #. Tag: para
 #: hardware.xml:774
 #, 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. This also includes 32-bit AMD and VIA (former Cyrix) "
@@ -1241,12 +1212,6 @@ msgstr "I/O 总线"
 #. Tag: para
 #: hardware.xml:797
 #, 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 "
@@ -1295,7 +1260,6 @@ msgstr "<term>龙芯 3</term>"
 #. Tag: para
 #: hardware.xml:835
 #, no-c-format
-#| msgid "Both AMD64 and Intel 64 processors are supported."
 msgid "Devices based on the Loongson 3A and 3B processors are supported."
 msgstr "AMD64 和 Intel 64 处理器都获得支持。"
 
@@ -1308,9 +1272,6 @@ msgstr "<term>MIPS Malta</term>"
 #. Tag: para
 #: hardware.xml:845
 #, no-c-format
-#| msgid ""
-#| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
-#| "test and run &debian; on ARM if you don't have the hardware."
 msgid ""
 "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."
@@ -1344,19 +1305,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:865
 #, 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> </"
-#| "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 ""
 "Complete information regarding supported mips/mipsel/mips64el machines can "
 "be found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. "
@@ -1373,10 +1321,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:877
 #, no-c-format
-#| msgid ""
-#| "Some MIPS machines can be operated in both big and little endian mode. "
-#| "For little endian MIPS, please read the documentation for the mipsel "
-#| "architecture."
 msgid ""
 "Some MIPS machines can be operated in both big and little endian mode. "
 "<phrase arch=\"mips64el;mipsel\"> For little endian MIPS, please read the "
@@ -1492,10 +1436,6 @@ msgstr "powerpc"
 #. Tag: para
 #: hardware.xml:964
 #, no-c-format
-#| msgid ""
-#| "Most systems use this kernel flavour, which supports the PowerPC 601, "
-#| "603, 604, 740, 750, and 7400 processors. All Apple PowerMac machines up "
-#| "to and including the one marketed as G4 use one of these processors."
 msgid ""
 "This kernel flavour supports the PowerPC 601, 603, 604, 740, 750, and 7400 "
 "processors. All Apple PowerMac machines up to and including the one marketed "
@@ -1553,9 +1493,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:999
 #, no-c-format
-#| msgid ""
-#| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
-#| "POWER4 architecture, and use this kernel flavour."
 msgid ""
 "Systems using the PPC970 processor (Apple G5, YDL PowerStation, IBM "
 "Intellistation POWER 185) are also based on the POWER4 architecture, and use "
@@ -1963,7 +1900,6 @@ msgstr "p640"
 #. Tag: title
 #: hardware.xml:1248
 #, no-c-format
-#| msgid "PReP subarchitecture"
 msgid "CHRP subarchitecture"
 msgstr "PReP 子体系"
 
@@ -2096,7 +2032,6 @@ msgstr ""
 #. Tag: title
 #: hardware.xml:1378
 #, no-c-format
-#| msgid "CPU/Machine types"
 msgid "Machines"
 msgstr "CPU/机器类型"
 
@@ -2139,16 +2074,6 @@ msgstr "zSeries 和 System z 机器类型"
 #. Tag: para
 #: hardware.xml:1417
 #, 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 "
@@ -2323,15 +2248,6 @@ msgstr "多处理器"
 #. Tag: para
 #: hardware.xml:1538
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. Having multiple processors in a computer was originally "
-#| "only an issue for high-end server systems but has become quite common in "
-#| "recent years even for rather low-end desktop computers and laptops with "
-#| "the introduction of so called <quote>multi-core</quote> processors. These "
-#| "contain two or more processor units, called <quote>cores</quote>, in one "
-#| "physical chip."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. Having multiple "
@@ -2376,12 +2292,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1568
 #, no-c-format
-#| msgid ""
-#| "Having multiple processors in a computer was originally only an issue for "
-#| "high-end server systems but has become quite common in recent years even "
-#| "for rather low-end desktop computers and laptops with the introduction of "
-#| "so called <quote>multi-core</quote> processors. These contain two or more "
-#| "processor units, called <quote>cores</quote>, in one physical chip."
 msgid ""
 "Having multiple processors in a computer was originally only an issue for "
 "high-end server systems but has become common in recent years nearly "
@@ -2469,24 +2379,12 @@ msgstr ""
 #. Tag: title
 #: hardware.xml:1630
 #, no-c-format
-#| msgid "Graphics Card Support"
 msgid "Graphics Hardware Support"
 msgstr "图形卡支持"
 
 #. Tag: para
 #: hardware.xml:1631
 #, no-c-format
-#| msgid ""
-#| "&debian;'s support for graphical interfaces is determined by the "
-#| "underlying support found in X.Org's X11 system. On modern PCs, having a "
-#| "graphical display usually works out of the box. Whether advanced graphics "
-#| "card features such as 3D-hardware acceleration or hardware-accelerated "
-#| "video are available, depends on the actual graphics hardware used in the "
-#| "system and in some cases on the installation of additional "
-#| "<quote>firmware</quote> images (see <xref linkend=\"hardware-firmware\"/"
-#| ">). In very few cases there have been reports about hardware on which "
-#| "installation of additional graphics card firmware was required even for "
-#| "basic graphics support, but these have been rare exceptions."
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
 "support found in X.Org's X11 system, and the kernel. Basic framebuffer "
@@ -2543,10 +2441,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1668
 #, no-c-format
-#| msgid ""
-#| "Details on supported graphics cards and pointing devices can be found at "
-#| "<ulink url=\"&url-xorg;\"></ulink>. &debian; &release; ships with X.Org "
-#| "version &x11ver;."
 msgid ""
 "Details on supported graphics hardware and pointing devices can be found at "
 "<ulink url=\"&url-xorg;\"></ulink>. &debian; &release; ships with X.Org "
@@ -2905,10 +2799,6 @@ msgstr "外围设备与其他硬件"
 #. Tag: para
 #: hardware.xml:1922
 #, no-c-format
-#| msgid ""
-#| "&arch-kernel; supports a large variety of hardware devices such as mice, "
-#| "printers, scanners, PCMCIA and USB devices. However, most of these "
-#| "devices are not required while installing the system."
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
 "printers, scanners, PCMCIA/CardBus/ExpressCard and USB devices. However, "
@@ -3214,17 +3104,12 @@ msgstr "用于 CHRP 的软盘支持已经被停止。"
 #. Tag: title
 #: hardware.xml:2122
 #, no-c-format
-#| msgid "CD-ROM/DVD-ROM"
 msgid "CD-ROM/DVD-ROM/BD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
 #: hardware.xml:2124
 #, no-c-format
-#| msgid ""
-#| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
-#| "CD-ROMs and DVD-ROMs, because both technologies are really the same from "
-#| "the operating system's point of view."
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to all of "
 "CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies are really the "
@@ -3242,9 +3127,6 @@ msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
 #. Tag: para
 #: hardware.xml:2134
 #, no-c-format
-#| msgid ""
-#| "USB CD-ROM drives are also supported, as are FireWire devices that are "
-#| "supported by the ohci1394 and sbp2 drivers."
 msgid ""
 "On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are FireWire "
 "devices that are supported by the ohci1394 and sbp2 drivers."
@@ -3299,15 +3181,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2177
 #, no-c-format
-#| msgid ""
-#| "You can also <emphasis>boot</emphasis> the installation system over the "
-#| "network without needing any local media like CDs/DVDs or USB sticks. If "
-#| "you already have a netboot-infrastructure available (i.e. you are already "
-#| "running DHCP and TFTP services in your network), this allows an easy and "
-#| "fast deployment of a large number of machines. Setting up the necessary "
-#| "infrastructure requires a certain level of technical experience, so this "
-#| "is not recommended for novice users. <phrase arch=\"mips;mipsel\">This is "
-#| "the preferred installation technique for &arch-title;.</phrase>"
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
 "network without needing any local media like CDs/DVDs or USB sticks. If you "
@@ -3497,14 +3370,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2331
 #, no-c-format
-#| msgid ""
-#| "Installation on systems with less memory<footnote condition=\"gtk\"> "
-#| "<para> Installation images that support the graphical installer require "
-#| "more memory 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 regular 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."
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
 "Installation images that support the graphical installer require more memory "
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 07d39b2a2..726163279 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -584,13 +584,6 @@ msgstr "请给我们发一份安装报告"
 #. Tag: para
 #: installation-howto.xml:336
 #, no-c-format
-#| msgid ""
-#| "If you successfully managed an installation with &d-i;, please take time "
-#| "to provide us with a report. The simplest way to do so is to install the "
-#| "reportbug package (<command>aptitude install reportbug</command>), "
-#| "configure <classname>reportbug</classname> as explained in <xref linkend="
-#| "\"mail-outgoing\"/>, and run <command>reportbug installation-reports</"
-#| "command>."
 msgid ""
 "If you successfully managed an installation with &d-i;, please take time to "
 "provide us with a report. The simplest way to do so is to install the "
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 2cc606b16..dbfab8efc 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -47,16 +47,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:25
 #, no-c-format
-#| msgid ""
-#| "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
-#| "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase "
-#| "arch=\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</"
-#| "keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. "
-#| "A last option is to log in as root and type one of the commands "
-#| "<command>poweroff</command>, <command>halt</command> or <command>shutdown "
-#| "-h now</command> if either of the key combinations do not work or you "
-#| "prefer to type commands; use <command>reboot</command> to reboot the "
-#| "system."
 msgid ""
 "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
 "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch="
@@ -184,12 +174,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:145
 #, no-c-format
-#| msgid ""
-#| "One of the best installation methods is apt. You can use the command line "
-#| "version <command>apt-get</command> or full-screen text version "
-#| "<application>aptitude</application>. Note apt will also let you merge "
-#| "main, contrib, and non-free so you can have export-restricted packages as "
-#| "well as standard versions."
 msgid ""
 "One of the best installation methods is apt. You can use the command line "
 "version of <command>apt</command> or full-screen text version "
@@ -1045,16 +1029,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:715
 #, no-c-format
-#| msgid ""
-#| "To access rescue mode, type <userinput>rescue</userinput> at the "
-#| "<prompt>boot:</prompt> prompt, or boot with the <userinput>rescue/"
-#| "enable=true</userinput> boot parameter. You'll be shown the first few "
-#| "screens of the installer, with a note in the corner of the display to "
-#| "indicate that this is rescue mode, not a full installation. Don't worry, "
-#| "your system is not about to be overwritten! Rescue mode simply takes "
-#| "advantage of the hardware detection facilities available in the installer "
-#| "to ensure that your disks, network devices, and so on are available to "
-#| "you while repairing your system."
 msgid ""
 "To access rescue mode, select <userinput>rescue</userinput> from the boot "
 "menu, type <userinput>rescue</userinput> at the <prompt>boot:</prompt> "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 08db71613..c866f2fb0 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -1148,13 +1148,6 @@ msgstr "10 GB"
 #. Tag: para
 #: preparing.xml:785
 #, no-c-format
-#| msgid ""
-#| "The actual minimum memory requirements are a lot less than the numbers "
-#| "listed in this table. Depending on the architecture, it is possible to "
-#| "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). "
-#| "The same goes for the disk space requirements, especially if you pick and "
-#| "choose which applications to install; see <xref linkend=\"tasksel-size-"
-#| "list\"/> for additional information on disk space requirements."
 msgid ""
 "The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
@@ -1171,13 +1164,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:795
 #, no-c-format
-#| msgid ""
-#| "It is possible to run a graphical desktop environment on older or low-end "
-#| "systems, but in that case it is recommended to install a window manager "
-#| "that is less resource-hungry than those of the GNOME or KDE desktop "
-#| "environments; alternatives include <classname>xfce4</classname>, "
-#| "<classname>icewm</classname> and <classname>wmaker</classname>, but there "
-#| "are others to choose from."
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
 "systems, but in that case it is recommended to install a window manager that "
@@ -1215,16 +1201,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:817
 #, no-c-format
-#| msgid ""
-#| "Disk space required for the smooth operation of the &debian-gnu; system "
-#| "itself is taken into account in these recommended system requirements. "
-#| "Notably, the <filename>/var</filename> partition contains a lot of state "
-#| "information specific to &debian; in addition to its regular contents, "
-#| "like logfiles. The <command>dpkg</command> files (with information on all "
-#| "installed packages) can easily consume 40MB. Also, <command>apt-get</"
-#| "command> puts downloaded packages here before they are installed. You "
-#| "should usually allocate at least 200MB for <filename>/var</filename>, and "
-#| "a lot more if you install a graphical desktop environment."
 msgid ""
 "Disk space required for the smooth operation of the &debian-gnu; system "
 "itself is taken into account in these recommended system requirements. "
@@ -1277,16 +1253,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:855
 #, no-c-format
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch=\"any-"
-#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
-#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
-#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
-#| "stick &debian; on the same disk, you will need to repartition it. "
-#| "&debian; requires its own hard disk partitions. It cannot be installed on "
-#| "Windows or MacOS partitions. It may be able to share some partitions with "
-#| "other Unix systems, but that's not covered here. At the very least you "
-#| "will need a dedicated partition for the &debian; root filesystem."
 msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
@@ -1309,14 +1275,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:874
 #, no-c-format
-#| msgid ""
-#| "You can find information about your current partition setup by using a "
-#| "partitioning tool for your current operating system<phrase arch=\"any-"
-#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-#| "phrase><phrase arch=\"powerpc\">, such as Drive Setup, HD Toolkit, or "
-#| "MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
-#| "Partitioning tools always provide a way to show existing partitions "
-#| "without making changes."
 msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1431,16 +1389,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:943
 #, no-c-format
-#| msgid ""
-#| "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
-#| "parttype; partitions should appear before all other partitions on the "
-#| "disk, especially MacOS boot partitions. This should be kept in mind when "
-#| "pre-partitioning; you should create a &arch-parttype; placeholder "
-#| "partition to come <emphasis>before</emphasis> the other bootable "
-#| "partitions on the disk. (The small partitions dedicated to Apple disk "
-#| "drivers are not bootable.) You can delete the placeholder with the "
-#| "&debian; partition tools later during the actual install, and replace it "
-#| "with &arch-parttype; partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
@@ -1522,19 +1470,12 @@ msgstr ""
 #. Tag: title
 #: preparing.xml:1062
 #, no-c-format
-#| msgid "MacOS/OSX Partitioning"
 msgid "Mac OS X Partitioning"
 msgstr "在 MacOS/OSX 下分区"
 
 #. Tag: para
 #: preparing.xml:1064
 #, no-c-format
-#| msgid ""
-#| "The <application>Apple Drive Setup</application> application can be found "
-#| "in the <filename>Utilities</filename> folder on the MacOS CD. It will not "
-#| "adjust existing partitions; it is limited to partitioning the entire disk "
-#| "at once. The disk driver partitions don't show up in <application>Drive "
-#| "Setup</application>."
 msgid ""
 "The <application>Disk Utility</application> application can be found under "
 "the <filename>Utilities</filename> menu in Mac OS X Installer. It will not "
@@ -1576,13 +1517,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1086
 #, no-c-format
-#| msgid ""
-#| "GNU/Linux is unable to access information on UFS partitions, but does "
-#| "support HFS+ (aka MacOS Extended) partitions. OS X requires one of these "
-#| "two types for its boot partition. MacOS 9 can be installed on either HFS "
-#| "(aka MacOS Standard) or HFS+. To share information between the MacOS and "
-#| "GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS "
-#| "FAT partitions are supported by both MacOS and Linux."
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but can access "
 "HFS+ (aka MacOS Extended) partitions. OS X requires one of these two types "
@@ -1870,7 +1804,6 @@ msgstr "确保满足以下要求："
 #. Tag: para
 #: preparing.xml:1275
 #, no-c-format
-#| msgid "Their order on the system."
 msgid "an OS to be running on the system;"
 msgstr "系统上运行有操作系统；"
 
@@ -2355,14 +2288,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1558
 #, no-c-format
-#| msgid ""
-#| "Linux on this platform runs either natively on the bare machine, in a so-"
-#| "called LPAR (Logical Partition) or in a virtual machine supplied by the "
-#| "VM system. You can use a boot tape on all of those systems; you may use "
-#| "some other boot media, too, but those may not be generally available. For "
-#| "example, you can use the virtual card reader of a virtual machine, or "
-#| "boot from the HMC (Hardware Management Console) of an LPAR if the HMC and "
-#| "this option is available for you."
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
 "called LPAR (Logical Partition) or in a virtual machine supplied by the VM "
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index fccbfcf70..3ace2a277 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -102,7 +102,6 @@ msgstr "sda1"
 #. Tag: entry
 #: random-bits.xml:44
 #, no-c-format
-#| msgid "First partition of the first IDE hard disk"
 msgid "First partition of the first hard disk"
 msgstr "第一块硬盘上的第一个分区"
 
@@ -115,7 +114,6 @@ msgstr "sdb7"
 #. Tag: entry
 #: random-bits.xml:47
 #, no-c-format
-#| msgid "Tenth partition of the fourth SCSI hard disk"
 msgid "Seventh partition of the second hard disk"
 msgstr "第二块硬盘上的第七个分区"
 
@@ -769,12 +767,6 @@ msgstr "准备开始"
 #. Tag: para
 #: random-bits.xml:356
 #, no-c-format
-#| msgid ""
-#| "With your current *nix partitioning tools, repartition the hard drive as "
-#| "needed, creating at least one filesystem plus swap. You need around &base-"
-#| "system-size;MB of space available for a console only install, or about "
-#| "&task-desktop-lxde-inst;MB if you plan to install X (more if you intend "
-#| "to install desktop environments like GNOME or KDE)."
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
 "needed, creating at least one filesystem plus swap. You need around &base-"
@@ -951,14 +943,6 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:467
 #, no-c-format
-#| msgid ""
-#| "Substitute one of the following for <replaceable>ARCH</replaceable> in "
-#| "the <command>debootstrap</command> command: <userinput>amd64</userinput>, "
-#| "<userinput>arm64</userinput>, <userinput>armel</userinput>, "
-#| "<userinput>armhf</userinput>, <userinput>i386</userinput>, "
-#| "<userinput>mips</userinput>, <userinput>mipsel</userinput>, "
-#| "<userinput>powerpc</userinput>, <userinput>ppc64el</userinput>, or "
-#| "<userinput>s390x</userinput>."
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
 "<command>debootstrap</command> command: <userinput>amd64</userinput>, "
@@ -988,13 +972,6 @@ msgstr "基本系统的配置"
 #. Tag: para
 #: random-bits.xml:494
 #, no-c-format
-#| msgid ""
-#| "Now you've got a real &debian; system, though rather lean, on disk. "
-#| "<command>chroot</command> into it: <informalexample><screen>\n"
-#| "# LANG=C.UTF-8 chroot /mnt/debinst /bin/bash\n"
-#| "</screen></informalexample> After chrooting you may need to set the "
-#| "terminal definition to be compatible with the &debian; base system, for "
-#| "example:"
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
 "<command>chroot</command> into it: <informalexample><screen>\n"
@@ -1219,11 +1196,6 @@ msgstr "设置时区"
 #. Tag: para
 #: random-bits.xml:606
 #, no-c-format
-#| msgid ""
-#| "An option in the file <filename>/etc/default/rcS</filename> determines "
-#| "whether the system will interpret the hardware clock as being set to UTC "
-#| "or local time. The following command allows you to set that and choose "
-#| "your timezone."
 msgid ""
 "Setting the third line of the file <filename>/etc/adjtime</filename> to "
 "<quote>UTC</quote> or <quote>LOCAL</quote> determines whether the system "
@@ -1382,17 +1354,6 @@ msgstr "配置 Apt"
 #. Tag: para
 #: random-bits.xml:669
 #, no-c-format
-#| msgid ""
-#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
-#| "list</filename> that will allow installing additional packages. However, "
-#| "you may want to add some additional sources, for example for source "
-#| "packages and security updates: <informalexample><screen>\n"
-#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
-#| "\n"
-#| "deb http://security.debian.org/ &releasename;/updates main\n"
-#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
-#| "</screen></informalexample> Make sure to run <userinput>aptitude update</"
-#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1424,14 +1385,6 @@ msgstr "本地化和键盘的配置"
 #. Tag: para
 #: random-bits.xml:686
 #, no-c-format
-#| msgid ""
-#| "To configure your locale settings to use a language other than English, "
-#| "install the <classname>locales</classname> support package and configure "
-#| "it. Currently the use of UTF-8 locales is recommended. "
-#| "<informalexample><screen>\n"
-#| "# aptitude install locales\n"
-#| "# dpkg-reconfigure locales\n"
-#| "</screen></informalexample> To configure your keyboard (if needed):"
 msgid ""
 "To configure your locale settings to use a language other than English, "
 "install the <classname>locales</classname> support package and configure it. "
@@ -1508,11 +1461,6 @@ msgstr "Boot Loader 的设置"
 #. Tag: para
 #: random-bits.xml:727
 #, no-c-format
-#| msgid ""
-#| "To make your &debian-gnu; system bootable, set up your boot loader to "
-#| "load the installed kernel with your new root partition. Note that "
-#| "<command>debootstrap</command> does not install a boot loader, though you "
-#| "can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
 "the installed kernel with your new root partition. Note that "
@@ -1550,16 +1498,6 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:746
 #, no-c-format
-#| msgid ""
-#| "Installing and setting up <classname>grub2</classname> is as easy as: "
-#| "<informalexample><screen>\n"
-#| "# aptitude install grub-pc\n"
-#| "# grub-install /dev/<replaceable>sda</replaceable>\n"
-#| "# update-grub\n"
-#| "</screen></informalexample> The second command will install "
-#| "<command>grub2</command> (in this case in the MBR of <literal>sda</"
-#| "literal>). The last command will create a sane and working <filename>/"
-#| "boot/grub/grub.cfg</filename>."
 msgid ""
 "Installing and setting up <classname>grub2</classname> is as easy as: "
 "<informalexample><screen>\n"
@@ -1668,7 +1606,6 @@ msgstr ""
 #. Tag: title
 #: random-bits.xml:791
 #, no-c-format
-#| msgid "Remote access: Installing SSH and setting a password"
 msgid "Remote access: Installing SSH and setting up access"
 msgstr "远程访问：安装 SSH 并设置密码"
 
@@ -1734,14 +1671,6 @@ msgstr "最后一笔"
 #. Tag: para
 #: random-bits.xml:822
 #, no-c-format
-#| msgid ""
-#| "As mentioned earlier, the installed system will be very basic. If you "
-#| "would like to make the system a bit more mature, there is an easy method "
-#| "to install all packages with <quote>standard</quote> priority: "
-#| "<informalexample><screen>\n"
-#| "# tasksel install standard\n"
-#| "</screen></informalexample> Of course, you can also just use "
-#| "<command>aptitude</command> to install packages individually."
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
 "like to make the system a bit more mature, there is an easy method to "
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 69b904371..ae128514c 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -301,13 +301,6 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:194
 #, no-c-format
-#| msgid ""
-#| "Linus Torvalds continues to coordinate the work of several hundred "
-#| "developers with the help of a number of subsystem maintainers. There is "
-#| "an <ulink url=\"&url-kernel-org;\">official website</ulink> for the Linux "
-#| "kernel. More information about the <userinput>linux-kernel</userinput> "
-#| "mailing list can be found on the <ulink url=\"&url-linux-kernel-list-faq;"
-#| "\">linux-kernel mailing list FAQ</ulink>."
 msgid ""
 "Linus Torvalds continues to coordinate the work of several hundred "
 "developers with the help of a number of subsystem maintainers. There is an "