Refresh PO(T) files

15 files changed, 2260 insertions, 2815 deletions

diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index b7877a68d..f674e7b53 100644
--- a/po/zh_CN/administrivia.po
+++ b/po/zh_CN/administrivia.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-26 19:59+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -26,18 +26,21 @@ msgstr "关于本文档"
 
 #. Tag: para
 #: administrivia.xml:11
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This manual was created for Sarge's debian-installer, based on the Woody "
-#| "installation manual for boot-floppies, which was based on earlier Debian "
-#| "installation manuals, and on the Progeny distribution manual which was "
-#| "released under GPL in 2003."
+#| "installation manual for boot-floppies, which was based on earlier "
+#| "&debian; installation manuals, and on the Progeny distribution manual "
+#| "which was released under GPL in 2003."
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
-"installation manual for boot-floppies, which was based on earlier &debian; "
+"installation manual for boot-floppies, which was based on earlier Debian "
 "installation manuals, and on the Progeny distribution manual which was "
 "released under GPL in 2003."
-msgstr "本手册是为 Sarge 版 debian-installer 创建，基于 Woody 版的软盘安装手册，而那份手册又是基于更早版本的 &debian; 安装手册和 2003 年 GPL 协议下的 Progeny 分发手册。"
+msgstr ""
+"本手册是为 Sarge 版 debian-installer 创建，基于 Woody 版的软盘安装手册，而那"
+"份手册又是基于更早版本的 &debian; 安装手册和 2003 年 GPL 协议下的 Progeny 分"
+"发手册。"
 
 #. Tag: para
 #: administrivia.xml:18
@@ -182,9 +185,9 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Many, many Debian users and developers contributed to this document. "
+#| "Many, many &debian; users and developers contributed to this document. "
 #| "Particular note must be made of Michael Schmitz (m68k support), Frank "
 #| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 #| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
@@ -192,14 +195,19 @@ msgstr ""
 #| "edits and text. We have to thank Pascal Le Bail for useful information "
 #| "about booting from USB memory sticks."
 msgid ""
-"Many, many &debian; users and developers contributed to this document. "
+"Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
 "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
 "(SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous "
 "edits and text. We have to thank Pascal Le Bail for useful information about "
 "booting from USB memory sticks."
-msgstr "有许许多多的 &debian; 用户和开发人员为本文档做出了贡献。特别要感谢 Michael Schmitz (m68k 支持)、Frank Neumann (<ulink url=\"&url-m68k-old-amiga-install;\">Amiga 安装手册</ulink>的最初作者)、Arto Astala、Eric Delaunay/Ben Collins (SPARC 信息)、Tapio Lehtonen 和 Stéphane Bortzmeyer 做了大量的编辑和文字处理。我们还要感谢 Pascal Le Bail 提供了从 U 盘上引导的相关信息。"
+msgstr ""
+"有许许多多的 &debian; 用户和开发人员为本文档做出了贡献。特别要感谢 Michael "
+"Schmitz (m68k 支持)、Frank Neumann (<ulink url=\"&url-m68k-old-amiga-install;"
+"\">Amiga 安装手册</ulink>的最初作者)、Arto Astala、Eric Delaunay/Ben Collins "
+"(SPARC 信息)、Tapio Lehtonen 和 Stéphane Bortzmeyer 做了大量的编辑和文字处"
+"理。我们还要感谢 Pascal Le Bail 提供了从 U 盘上引导的相关信息。"
 
 #. Tag: para
 #: administrivia.xml:124
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index 7400d4c83..ce3eb4f49 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-26 20:01+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -21,27 +21,24 @@ msgstr "&debian-gnu; 安装手册"
 #. Tag: para
 #: bookinfo.xml:8
 #, no-c-format
-#| msgid ""
-#| "This document contains installation instructions for the &debian-gnu; "
-#| "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
-#| "title; (<quote>&architecture;</quote>) architecture. It also contains "
-#| "pointers to more information and information on how to make the most of "
-#| "your new Debian system."
 msgid ""
 "This document contains installation instructions for the &debian-gnu; "
 "&release; system (codename <quote>&releasename;</quote>), for the &arch-"
 "title; (<quote>&architecture;</quote>) architecture. It also contains "
 "pointers to more information and information on how to make the most of your "
 "new &debian; system."
-msgstr "本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 &arch-title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于如何构建您的新 &debian; 系统，以及指向更多信息的链接。"
+msgstr ""
+"本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 "
+"&arch-title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于"
+"如何构建您的新 &debian; 系统，以及指向更多信息的链接。"
 
 #. Tag: para
 #: bookinfo.xml:17
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
 #| "This installation guide is based on an earlier manual written for the old "
-#| "Debian installation system (the <quote>boot-floppies</quote>), and has "
-#| "been updated to document the new Debian installer. However, for "
+#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
+#| "been updated to document the new &debian; installer. However, for "
 #| "&architecture;, the manual has not been fully updated and fact checked "
 #| "for the new installer. There may remain parts of the manual that are "
 #| "incomplete or outdated or that still document the boot-floppies "
@@ -51,15 +48,22 @@ msgstr "本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quo
 #| "translations there."
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
-"&debian; installation system (the <quote>boot-floppies</quote>), and has "
-"been updated to document the new &debian; installer. However, for "
-"&architecture;, the manual has not been fully updated and fact checked for "
-"the new installer. There may remain parts of the manual that are incomplete "
-"or outdated or that still document the boot-floppies installer. A newer "
-"version of this manual, possibly better documenting this architecture, may "
-"be found on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</"
-"ulink>. You may also be able to find additional translations there."
-msgstr "本安装指南是基于一份为旧版 &debian; 安装系统(<quote>boot-floppies</quote>) 而撰写的手册，并针对新的 &debian; 安装系统进行了增补和修订。但是，对于 &architecture; 体系结构，本手册尚未针对新版的安装程序进行完整的更新和实际检测。这使得本手册中可能会存在少量不完整或过时的、或者仍然在讲述 boot-floppies 安装程序的内容。本手册的新版本，也许会更好的用于本体系，您可以通过 Internet 在 <ulink url=\"&url-d-i;\">&d-i; 主页</ulink> 找到它。您还可以在那里找到另外一些翻译版。"
+"Debian installation system (the <quote>boot-floppies</quote>), and has been "
+"updated to document the new Debian installer. However, for &architecture;, "
+"the manual has not been fully updated and fact checked for the new "
+"installer. There may remain parts of the manual that are incomplete or "
+"outdated or that still document the boot-floppies installer. A newer version "
+"of this manual, possibly better documenting this architecture, may be found "
+"on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
+"may also be able to find additional translations there."
+msgstr ""
+"本安装指南是基于一份为旧版 &debian; 安装系统(<quote>boot-floppies</quote>) 而"
+"撰写的手册，并针对新的 &debian; 安装系统进行了增补和修订。但是，对于 "
+"&architecture; 体系结构，本手册尚未针对新版的安装程序进行完整的更新和实际检"
+"测。这使得本手册中可能会存在少量不完整或过时的、或者仍然在讲述 boot-floppies "
+"安装程序的内容。本手册的新版本，也许会更好的用于本体系，您可以通过 Internet "
+"在 <ulink url=\"&url-d-i;\">&d-i; 主页</ulink> 找到它。您还可以在那里找到另外"
+"一些翻译版。"
 
 #. Tag: para
 #: bookinfo.xml:30
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 642437156..6778ae3c4 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -97,19 +97,17 @@ msgstr "从 CD 光盘上引导"
 #: boot-installer.xml:70 boot-installer.xml:340 boot-installer.xml:811
 #: boot-installer.xml:1469 boot-installer.xml:1831
 #, no-c-format
-#| msgid ""
-#| "The easiest route for most people will be to use a set of Debian CDs. If "
-#| "you have a CD set, and if your machine supports booting directly off the "
-#| "CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
-#| "off a CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> "
-#| "insert your CD, reboot, and proceed to the next chapter."
 msgid ""
 "The easiest route for most people will be to use a set of &debian; CDs. If "
 "you have a CD set, and if your machine supports booting directly off the CD, "
 "great! Simply <phrase arch=\"x86\"> configure your system for booting off a "
 "CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> insert "
 "your CD, reboot, and proceed to the next chapter."
-msgstr "对于大多数人来说，最快的途径是使用一套 &debian; CD 光盘套件。如果您有此套件，并且如果您的机器支持直接 CD 引导，太棒了！只需要<phrase arch=\"x86\">配置您的系统可以用 CD 启动，参见 <xref linkend=\"boot-dev-select\"/>, </phrase>插入您的 CD，重启，然后继续下一章。"
+msgstr ""
+"对于大多数人来说，最快的途径是使用一套 &debian; CD 光盘套件。如果您有此套件，"
+"并且如果您的机器支持直接 CD 引导，太棒了！只需要<phrase arch=\"x86\">配置您的"
+"系统可以用 CD 启动，参见 <xref linkend=\"boot-dev-select\"/>, </phrase>插入您"
+"的 CD，重启，然后继续下一章。"
 
 # index.docbook:542, index.docbook:595, index.docbook:968, index.docbook:1787, index.docbook:2035, index.docbook:2389
 #. Tag: para
@@ -132,19 +130,16 @@ msgstr ""
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
 #, 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 "
 "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."
-msgstr "即便您不能从 CD-ROM 引导，依然可以安装 CD-ROM 上面的 &debian; 系统组件和所有软件包。这只要使用不同的媒介引导，比如软盘。当安装操作系统、基础系统和任意附加的软件包时，只需将安装系统指向 CD-ROM 驱动器即可。"
+msgstr ""
+"即便您不能从 CD-ROM 引导，依然可以安装 CD-ROM 上面的 &debian; 系统组件和所有"
+"软件包。这只要使用不同的媒介引导，比如软盘。当安装操作系统、基础系统和任意附"
+"加的软件包时，只需将安装系统指向 CD-ROM 驱动器即可。"
 
 # index.docbook:558, index.docbook:611, index.docbook:984, index.docbook:1803, index.docbook:2051, index.docbook:2405
 #. Tag: para
@@ -226,30 +221,6 @@ msgstr "通过网络使用 Linux/Unix"
 #. Tag: para
 #: boot-installer.xml:150
 #, no-c-format
-#| msgid ""
-#| "You can use <command>upslug2</command> from any Linux or Unix machine to "
-#| "upgrade the machine via the network. This software is packaged for "
-#| "Debian. First, you have to put your NSLU2 in upgrade mode: <orderedlist> "
-#| "<listitem><para> Disconnect any disks and/or devices from the USB ports. "
-#| "</para></listitem> <listitem><para> Power off the NSLU2 </para></"
-#| "listitem> <listitem><para> Press and hold the reset button (accessible "
-#| "through the small hole on the back just above the power input). </para></"
-#| "listitem> <listitem><para> Press and release the power button to power on "
-#| "the NSLU2. </para></listitem> <listitem><para> Wait for 10 seconds "
-#| "watching the ready/status LED. After 10 seconds it will change from amber "
-#| "to red. Immediately release the reset button. </para></listitem> "
-#| "<listitem><para> The NSLU2 ready/status LED will flash alternately red/"
-#| "green (there is a 1 second delay before the first green). The NSLU2 is "
-#| "now in upgrade mode. </para></listitem> </orderedlist> See the <ulink url="
-#| "\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
-#| "pages</ulink> if you have problems with this. Once your NSLU2 is in "
-#| "upgrade mode, you can flash the new image: <informalexample><screen>\n"
-#| "sudo upslug2 -i di-nslu2.bin\n"
-#| "</screen></informalexample> Note that the tool also shows the MAC address "
-#| "of your NSLU2, which may come in handy to configure your DHCP server. "
-#| "After the whole image has been written and verified, the system will "
-#| "automatically reboot. Make sure you connect your USB disk again now, "
-#| "otherwise the installer won't be able to find it."
 msgid ""
 "You can use <command>upslug2</command> from any Linux or Unix machine to "
 "upgrade the machine via the network. This software is packaged for &debian;. "
@@ -275,9 +246,23 @@ msgid ""
 "reboot. Make sure you connect your USB disk again now, otherwise the "
 "installer won't be able to find it."
 msgstr ""
-"您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络来升级机器。&debian; 下有该软件包。首先，您必须将 NSLU2 置于升级模式： <orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> <listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></listitem> <listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥珀色变成红色。立即松开复位按钮。 </para></listitem> <listitem><para> NSLU2 就绪/状态 LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延迟)。NSLU2 现在处于升级模式。</para></listitem> </orderedlist> 如果您遇到问题，请参考 <ulink url=\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux pages</ulink>。一旦 NSLU2 处于升级模式，您就可以刷人新的映像：<informalexample><screen>\n"
+"您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络来升"
+"级机器。&debian; 下有该软件包。首先，您必须将 NSLU2 置于升级模式： "
+"<orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</"
+"para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> "
+"<listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></"
+"listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></listitem> "
+"<listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥珀色变成红"
+"色。立即松开复位按钮。 </para></listitem> <listitem><para> NSLU2 就绪/状态 "
+"LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延迟)。NSLU2 现在处于升级"
+"模式。</para></listitem> </orderedlist> 如果您遇到问题，请参考 <ulink url="
+"\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary\">NSLU2-Linux "
+"pages</ulink>。一旦 NSLU2 处于升级模式，您就可以刷人新的映像："
+"<informalexample><screen>\n"
 "sudo upslug2 -i di-nslu2.bin\n"
-"</screen></informalexample> 注意，该工具还会显示 NSLU2 的 MAC 地址，它可以用来配置 DHCP 服务器。整个映像写入和检验后，系统将自动重启。确保 USB 磁盘再次连接，否则将无法找到安装程序。"
+"</screen></informalexample> 注意，该工具还会显示 NSLU2 的 MAC 地址，它可以用"
+"来配置 DHCP 服务器。整个映像写入和检验后，系统将自动重启。确保 USB 磁盘再次连"
+"接，否则将无法找到安装程序。"
 
 #. Tag: title
 #: boot-installer.xml:211
@@ -324,14 +309,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:245
 #, no-c-format
-#| msgid ""
-#| "To boot the SS4000-E, use your serial nullmodem cable and the ribbon "
-#| "cable to connect to the serial port of the SS4000-E, and reboot the "
-#| "machine. You need to use a serial terminal application to communicate "
-#| "with the machine; a good option on a 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:"
 msgid ""
 "To boot the SS4000-E, use your serial nullmodem cable and the ribbon cable "
 "to connect to the serial port of the SS4000-E, and reboot the machine. You "
@@ -340,7 +317,11 @@ msgid ""
 "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，请使用您的串行 nullmodem 线和 ribbon 线连接到 SS4000-E 的串口，然后重新启动机器。您需要用一个串行终端程序与此机器通讯； &debian; GNU/Linux 上可以使用 <command>cu</command> 程序，软件包和该程序同名。假设您计算机上的串口是 <filename>/dev/ttyS0</filename>，请使用下列命令行："
+msgstr ""
+"要启动 SS4000-E，请使用您的串行 nullmodem 线和 ribbon 线连接到 SS4000-E 的串"
+"口，然后重新启动机器。您需要用一个串行终端程序与此机器通讯； &debian; GNU/"
+"Linux 上可以使用 <command>cu</command> 程序，软件包和该程序同名。假设您计算机"
+"上的串口是 <filename>/dev/ttyS0</filename>，请使用下列命令行："
 
 #. Tag: screen
 #: boot-installer.xml:257
@@ -541,7 +522,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:465
 #, no-c-format
-#| msgid "Booting from CD-ROM"
 msgid "Booting from DOS"
 msgstr "从 DOS 引导"
 
@@ -564,9 +544,11 @@ msgid ""
 "disk as explained in <xref linkend=\"files-loadlin\"/>, and change the "
 "current drive to it if needed."
 msgstr ""
-"如果您可以使用安装 CD, 请切换到 CD-ROM 驱动器，例如. <informalexample><screen>\n"
+"如果您可以使用安装 CD, 请切换到 CD-ROM 驱动器，例如. "
+"<informalexample><screen>\n"
 "d:\n"
-"</screen></informalexample> ，或者确认您已依照 <xref linkend=\"files-loadlin\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
+"</screen></informalexample> ，或者确认您已依照 <xref linkend=\"files-loadlin"
+"\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
 
 #. Tag: para
 #: boot-installer.xml:481
@@ -583,9 +565,11 @@ msgid ""
 msgstr ""
 "进入您选择的 flavor 子目录，如, <informalexample><screen>\n"
 "cd \\&x86-install-dir;\n"
-"</screen></informalexample> 如果您希望使用图形安装程序，请进入 <filename>gtk</filename> 子目录。<informalexample><screen>\n"
+"</screen></informalexample> 如果您希望使用图形安装程序，请进入 "
+"<filename>gtk</filename> 子目录。<informalexample><screen>\n"
 "cd gtk\n"
-"</screen></informalexample> 然后，执行 <command>install.bat</command>。内核将会加载并运行安装程序。"
+"</screen></informalexample> 然后，执行 <command>install.bat</command>。内核将"
+"会加载并运行安装程序。"
 
 #. Tag: title
 #: boot-installer.xml:499
@@ -922,20 +906,6 @@ msgstr "引导界面"
 #. Tag: para
 #: boot-installer.xml:715
 #, no-c-format
-#| msgid ""
-#| "When the installer boots, you should be presented with a friendly "
-#| "graphical screen showing the Debian logo and a menu: "
-#| "<informalexample><screen>\n"
-#| "Installer boot menu\n"
-#| "\n"
-#| "Install\n"
-#| "Graphical install\n"
-#| "Advanced options       >\n"
-#| "Help\n"
-#| "\n"
-#| "Press ENTER to boot or TAB to edit a menu entry\n"
-#| "</screen></informalexample> Depending on the installation method you are "
-#| "using, the <quote>Graphical install</quote> option may not be available."
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
 "screen showing the &debian; logo and a menu: <informalexample><screen>\n"
@@ -950,7 +920,8 @@ msgid ""
 "</screen></informalexample> Depending on the installation method you are "
 "using, the <quote>Graphical install</quote> option may not be available."
 msgstr ""
-"安装程序引导后，您应该看到友好的图形界面显示出 &debian; 图标和一个菜单：<informalexample><screen>\n"
+"安装程序引导后，您应该看到友好的图形界面显示出 &debian; 图标和一个菜单："
+"<informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -959,7 +930,8 @@ msgstr ""
 "Help\n"
 "\n"
 "Press ENTER to boot or TAB to edit a menu entry\n"
-"</screen></informalexample> 由于您采用的安装方式不同，<quote>Graphical install</quote> 选项可能不会出现。"
+"</screen></informalexample> 由于您采用的安装方式不同，<quote>Graphical "
+"install</quote> 选项可能不会出现。"
 
 #. Tag: para
 #: boot-installer.xml:725
@@ -1093,17 +1065,6 @@ msgstr "CD 的内容"
 #. Tag: para
 #: boot-installer.xml:848
 #, no-c-format
-#| msgid ""
-#| "There are three basic variations of Debian Install CDs. The "
-#| "<emphasis>Business Card</emphasis> CD has a minimal installation that "
-#| "will fit on the small form factor CD media. It requires a network "
-#| "connection in order to install the rest of the base installation and make "
-#| "a usable system. The <emphasis>Network Install</emphasis> CD has all of "
-#| "the packages for a base install but requires a network connection to a "
-#| "Debian mirror site in order to install the extra packages one would want "
-#| "for a complete system . The set of Debian CDs can install a complete "
-#| "system from the wide range of packages without needing access to the "
-#| "network."
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
 "<emphasis>Business Card</emphasis> CD has a minimal installation that will "
@@ -1114,7 +1075,13 @@ msgid ""
 "order to install the extra packages one would want for a complete system . "
 "The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
-msgstr "有三种基本的 &debian; 安装光盘 CD 衍生品：<emphasis>名片式(Business Card)</emphasis> CD 有一个微型的安装程序，并且可以储存在一小张 CD 介质上。它需要借助网络连接来安装基本系统的其他部分，才能建立起一个可用的系统。<emphasis>网络安装(Network Install)</emphasis> CD 光盘具有基本系统需的所有包，但是它还是需要网络连接到 &debian; 的镜像，安装其他的软件包建立一个完整的系统。&debian; CD 光盘套件，则可以不使用网络就能安装大量软件包，建立完整的系统。"
+msgstr ""
+"有三种基本的 &debian; 安装光盘 CD 衍生品：<emphasis>名片式(Business Card)</"
+"emphasis> CD 有一个微型的安装程序，并且可以储存在一小张 CD 介质上。它需要借助"
+"网络连接来安装基本系统的其他部分，才能建立起一个可用的系统。<emphasis>网络安"
+"装(Network Install)</emphasis> CD 光盘具有基本系统需的所有包，但是它还是需要"
+"网络连接到 &debian; 的镜像，安装其他的软件包建立一个完整的系统。&debian; CD "
+"光盘套件，则可以不使用网络就能安装大量软件包，建立完整的系统。"
 
 #. Tag: para
 #: boot-installer.xml:864
@@ -1130,25 +1097,29 @@ msgid ""
 "means that the system disk on an IA-64 system has an additional disk "
 "partition dedicated to EFI instead of the simple MBR or boot block on more "
 "conventional systems."
-msgstr "IA-64 使用 Intel 最新的可拓展固件界面(Extensible Firmware Interface (EFI))。与传统的 x86 BIOS 只了解分区表和主引导记录(MBR)而不知道其他引导设备的特点不同，EFI 可以对 FAT16 和 FAT32 格式的硬盘分区进行读写操作。这个特点简化了通常很难以理解的系统启动过程。系统 boot loader 以及 EFI 固件支持一个完全的文件系统，来保存引导一个机器所需要得所有文件。这意味着在一个 IA-64 系统上的系统磁盘，具有一个附加的专门为 EFI 服务的磁盘分区，而不是像传统系统上只是简单的 MBR 或者引导块记录。"
+msgstr ""
+"IA-64 使用 Intel 最新的可拓展固件界面(Extensible Firmware Interface (EFI))。"
+"与传统的 x86 BIOS 只了解分区表和主引导记录(MBR)而不知道其他引导设备的特点不"
+"同，EFI 可以对 FAT16 和 FAT32 格式的硬盘分区进行读写操作。这个特点简化了通常"
+"很难以理解的系统启动过程。系统 boot loader 以及 EFI 固件支持一个完全的文件系"
+"统，来保存引导一个机器所需要得所有文件。这意味着在一个 IA-64 系统上的系统磁"
+"盘，具有一个附加的专门为 EFI 服务的磁盘分区，而不是像传统系统上只是简单的 "
+"MBR 或者引导块记录。"
 
 #. Tag: para
 #: boot-installer.xml:880
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer CD contains a small EFI partition where the "
-#| "<command>ELILO</command> bootloader, its configuration file, the "
-#| "installer's kernel, and initial filesystem (initrd) are located. The "
-#| "running system also contains an EFI partition where the necessary files "
-#| "for booting the system reside. These files are readable from the EFI "
-#| "Shell as described below."
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
 "<command>ELILO</command> bootloader, its configuration file, the installer's "
 "kernel, and initial filesystem (initrd) are located. The running system also "
 "contains an EFI partition where the necessary files for booting the system "
 "reside. These files are readable from the EFI Shell as described below."
-msgstr "&debian; CD 包含了一个小型版本的 EFI 分区来放置 <command>ELILO</command>，它的配置文件，安装程序内核以及初始的文件系统(initrd)。运行的系统同时也包含了一个 EFI 分区用于放置引导系统所需要的必要文件。这些文件可以从 EFI Shell 读出，说明如下。"
+msgstr ""
+"&debian; CD 包含了一个小型版本的 EFI 分区来放置 <command>ELILO</command>，它"
+"的配置文件，安装程序内核以及初始的文件系统(initrd)。运行的系统同时也包含了一"
+"个 EFI 分区用于放置引导系统所需要的必要文件。这些文件可以从 EFI Shell 读出，"
+"说明如下。"
 
 #. Tag: para
 #: boot-installer.xml:889
@@ -1288,15 +1259,13 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:986
 #, no-c-format
-#| msgid ""
-#| "These steps start the Debian boot loader which will display a menu page "
-#| "for you to select a boot kernel and options. Proceed to selecting the "
-#| "boot kernel and options."
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
 "for you to select a boot kernel and options. Proceed to selecting the boot "
 "kernel and options."
-msgstr "这些步骤启动的 &debian; boot loader 会显示一个菜单页用于选择启动内核和选项。进入选择启动内核和选项。"
+msgstr ""
+"这些步骤启动的 &debian; boot loader 会显示一个菜单页用于选择启动内核和选项。"
+"进入选择启动内核和选项。"
 
 #. Tag: title
 #: boot-installer.xml:996
@@ -1307,17 +1276,15 @@ msgstr "选项 2: 从 EFI Shell 启动"
 #. Tag: para
 #: boot-installer.xml:997
 #, no-c-format
-#| msgid ""
-#| "If, for some reason, option 1 is not successful, reboot the machine and "
-#| "when the EFI Boot Manager screen appears there should be one option "
-#| "called <command>EFI Shell [Built-in]</command>. Boot the Debian Installer "
-#| "CD with the following steps:"
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
 "the EFI Boot Manager screen appears there should be one option called "
 "<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
-msgstr "某些情况下，选项 1 无法成功，重新启动机器然后在 EFI Boot Manager 画面出现的时候会有一个选项称为 <command>EFI Shell [Built-in]</command>。可以通过如下步骤来引导 &debian; 安装程序 CD :"
+msgstr ""
+"某些情况下，选项 1 无法成功，重新启动机器然后在 EFI Boot Manager 画面出现的时"
+"候会有一个选项称为 <command>EFI Shell [Built-in]</command>。可以通过如下步骤"
+"来引导 &debian; 安装程序 CD :"
 
 #. Tag: para
 #: boot-installer.xml:1008
@@ -1387,19 +1354,16 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1049
 #, no-c-format
-#| msgid ""
-#| "As with option 1, these steps start the Debian boot loader which will "
-#| "display a menu page for you to select a boot kernel and options. You can "
-#| "also enter the shorter <command>fs<replaceable>n</replaceable>:elilo</"
-#| "command> command at the shell prompt. Proceed to selecting the boot "
-#| "kernel and options."
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
 "display a menu page for you to select a boot kernel and options. You can "
 "also enter the shorter <command>fs<replaceable>n</replaceable>:elilo</"
 "command> command at the shell prompt. Proceed to selecting the boot kernel "
 "and options."
-msgstr "与选项 1 相同，这些步骤也会启动 &debian; boot loader，显示一个菜单页供选择启动内核和参数。您可在 shell 提示符下输入 <command>fs<replaceable>n</replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
+msgstr ""
+"与选项 1 相同，这些步骤也会启动 &debian; boot loader，显示一个菜单页供选择启"
+"动内核和参数。您可在 shell 提示符下输入 <command>fs<replaceable>n</"
+"replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
 
 #. Tag: title
 #: boot-installer.xml:1063
@@ -1544,15 +1508,13 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1156
 #, no-c-format
-#| msgid ""
-#| "Press <command>ENTER</command>. This will load and start the kernel. The "
-#| "kernel will display its usual initialization messages followed by the "
-#| "first screen of the Debian Installer."
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
 "kernel will display its usual initialization messages followed by the first "
 "screen of the &debian; Installer."
-msgstr "按下 <command>ENTER</command>。会加载并启动内核。内核在 &ebian; 安装程序的第一个屏幕显示常规的初始化信息。"
+msgstr ""
+"按下 <command>ENTER</command>。会加载并启动内核。内核在 &ebian; 安装程序的第"
+"一个屏幕显示常规的初始化信息。"
 
 #. Tag: para
 #: boot-installer.xml:1165 boot-installer.xml:1301
@@ -1710,19 +1672,16 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1292
 #, no-c-format
-#| msgid ""
-#| "The boot loader will display its prompt after it has downloaded and "
-#| "processed its configuration file. At this point, the installation "
-#| "proceeds with the same steps as a CD install. Select a boot option as in "
-#| "above and when the kernel has completed installing itself from the "
-#| "network, it will start the Debian Installer."
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
 "processed its configuration file. At this point, the installation proceeds "
 "with the same steps as a CD install. Select a boot option as in above and "
 "when the kernel has completed installing itself from the network, it will "
 "start the &debian; Installer."
-msgstr "在下载并且处理配置文件后，boot loader 将显示它的提示符。从这里开始，安装过程将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到的引导选项，它将开始 &debian; 安装程序。"
+msgstr ""
+"在下载并且处理配置文件后，boot loader 将显示它的提示符。从这里开始，安装过程"
+"将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到"
+"的引导选项，它将开始 &debian; 安装程序。"
 
 # index.docbook:1899, index.docbook:1946
 #. Tag: title
@@ -1734,15 +1693,6 @@ msgstr "SGI TFTP 引导"
 #. Tag: para
 #: boot-installer.xml:1319
 #, no-c-format
-#| msgid ""
-#| "After entering the command monitor use <informalexample><screen>\n"
-#| "bootp():\n"
-#| "</screen></informalexample> on SGI machines to boot linux and to begin "
-#| "installation of the Debian Software. In order to make this work you may "
-#| "have to unset the <envar>netaddr</envar> environment variable. Type "
-#| "<informalexample><screen>\n"
-#| "unsetenv netaddr\n"
-#| "</screen></informalexample> in the command monitor to do this."
 msgid ""
 "After entering the command monitor use <informalexample><screen>\n"
 "bootp():\n"
@@ -1755,7 +1705,9 @@ msgid ""
 msgstr ""
 "SGI 上引导 linux 要在进入命令监视器后使用 <informalexample><screen>\n"
 "bootp():\n"
-"</screen></informalexample> 来开始 &debian; 软件的安装。为了让它运行，您可能必须取消 <envar>netaddr</envar> 环境变量的设置。通过命令监视器上输入 <informalexample><screen>\n"
+"</screen></informalexample> 来开始 &debian; 软件的安装。为了让它运行，您可能"
+"必须取消 <envar>netaddr</envar> 环境变量的设置。通过命令监视器上输入 "
+"<informalexample><screen>\n"
 "unsetenv netaddr\n"
 "</screen></informalexample> 可以达到此目的。"
 
@@ -1921,19 +1873,17 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:1512
 #, no-c-format
-#| msgid ""
-#| "OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
-#| "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
-#| "software version of this driver is not available. All OldWorld systems "
-#| "have floppy drives, so use the floppy drive to launch the installer, and "
-#| "then point the installer to the CD for the needed files."
 msgid ""
 "OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
 "relied on a Mac OS ROM CD boot driver to be present on the CD, and a free-"
 "software version of this driver is not available. All OldWorld systems have "
 "floppy drives, so use the floppy drive to launch the installer, and then "
 "point the installer to the CD for the needed files."
-msgstr "OldWorld Powermacs 不能从一张 &debian; CD 上引导，因为 OldWorld 计算机需要在 CD 上安装一个 MacOSROM CD 引导驱动程序但是目前还没有自由的版本。所有的 OldWorld 系统具有软盘驱动程序，因此可以使用软盘驱动程序来启动安装程序，然后让安装程序 从 CD 上选择所需要的文件。"
+msgstr ""
+"OldWorld Powermacs 不能从一张 &debian; CD 上引导，因为 OldWorld 计算机需要在 "
+"CD 上安装一个 MacOSROM CD 引导驱动程序但是目前还没有自由的版本。所有的 "
+"OldWorld 系统具有软盘驱动程序，因此可以使用软盘驱动程序来启动安装程序，然后让"
+"安装程序 从 CD 上选择所需要的文件。"
 
 #. Tag: para
 #: boot-installer.xml:1521
@@ -2021,27 +1971,6 @@ msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 #. Tag: para
 #: boot-installer.xml:1588
 #, no-c-format
-#| msgid ""
-#| "You will have already placed the <filename>vmlinux</filename>, "
-#| "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
-#| "<filename>yaboot.conf</filename> files at the root level of your HFS "
-#| "partition in <xref linkend=\"files-newworld\"/>. You will now have to "
-#| "boot into OpenFirmware (see <xref linkend=\"invoking-openfirmware\"/>). "
-#| "At the prompt, type <informalexample><screen>\n"
-#| "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-#| "</screen></informalexample> replacing <replaceable>x</replaceable> with "
-#| "the partition number of the HFS partition where the kernel and yaboot "
-#| "files were placed, followed by a &enterkey;. On some machines, you may "
-#| "need to use <userinput>ide0:</userinput> instead of <userinput>hd:</"
-#| "userinput>. In a few more seconds you will see a yaboot prompt "
-#| "<informalexample><screen>\n"
-#| "boot:\n"
-#| "</screen></informalexample> At yaboot's <prompt>boot:</prompt> prompt, "
-#| "type either <userinput>install</userinput> or <userinput>install "
-#| "video=ofonly</userinput> followed by a &enterkey;. The "
-#| "<userinput>video=ofonly</userinput> argument is for maximum "
-#| "compatibility; you can try it if <userinput>install</userinput> doesn't "
-#| "work. The Debian installation program should start."
 msgid ""
 "You will have already placed the <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, and "
@@ -2062,11 +1991,22 @@ msgid ""
 "argument is for maximum compatibility; you can try it if <userinput>install</"
 "userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
-"您应该已经将 <filename>vmlinux</filename>、 <filename>initrd.gz</filename>、 <filename>yaboot</filename> 和 <filename>yaboot.conf</filename> 文件在 HFS 分区的根层次放置好了 <xref linkend=\"files-newworld\"/>。现在必须引导进入 Open Firmware (参阅 <xref linkend=\"invoking-openfirmware\"/>)。在提示符下，输入： <informalexample><screen>\n"
+"您应该已经将 <filename>vmlinux</filename>、 <filename>initrd.gz</filename>、 "
+"<filename>yaboot</filename> 和 <filename>yaboot.conf</filename> 文件在 HFS 分"
+"区的根层次放置好了 <xref linkend=\"files-newworld\"/>。现在必须引导进入 Open "
+"Firmware (参阅 <xref linkend=\"invoking-openfirmware\"/>)。在提示符下，输"
+"入： <informalexample><screen>\n"
 "0 &gt; boot hd:<replaceable>x</replaceable>,yaboot\n"
-"</screen></informalexample> 用放置内核和 yaboot 文件的 HFS 分区号来替换 <replaceable>x</replaceable>, 然后按下 &enterkey;。在某些机器上，您也许需要时用 <userinput>ide0:</userinput> 来替换 <userinput>hd:</userinput>，在接下来的几秒钟内，将会看到一个提示符 <informalexample><screen>\n"
+"</screen></informalexample> 用放置内核和 yaboot 文件的 HFS 分区号来替换 "
+"<replaceable>x</replaceable>, 然后按下 &enterkey;。在某些机器上，您也许需要时"
+"用 <userinput>ide0:</userinput> 来替换 <userinput>hd:</userinput>，在接下来的"
+"几秒钟内，将会看到一个提示符 <informalexample><screen>\n"
 "boot:\n"
-"</screen></informalexample> 在 yaboot 的 <prompt>boot:</prompt> 提示符下，输入 <userinput>install</userinput> 或者 <userinput>install video=ofonly</userinput> 然后按下 &enterkey;。<userinput>video=ofonly</userinput> 参数是用于最大可能性的兼容性；您可以在 <userinput>install</userinput> 不工作的情况下尝试使用它。&debian; 安装程序将会启动。"
+"</screen></informalexample> 在 yaboot 的 <prompt>boot:</prompt> 提示符下，输"
+"入 <userinput>install</userinput> 或者 <userinput>install video=ofonly</"
+"userinput> 然后按下 &enterkey;。<userinput>video=ofonly</userinput> 参数是用"
+"于最大可能性的兼容性；您可以在 <userinput>install</userinput> 不工作的情况下"
+"尝试使用它。&debian; 安装程序将会启动。"
 
 # index.docbook:700, index.docbook:2176
 #. Tag: title
@@ -2611,7 +2551,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:2082
 #, no-c-format
-#| msgid "Debian Installer Parameters"
 msgid "&debian; Installer Parameters"
 msgstr "&debian; 安装程序的参数"
 
@@ -2800,15 +2739,13 @@ msgstr "INSTALL_MEDIA_DEV"
 #. Tag: para
 #: boot-installer.xml:2205
 #, no-c-format
-#| msgid ""
-#| "The value of the parameter is the path to the device to load the Debian "
-#| "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
-#| "userinput>"
 msgid ""
 "The value of the parameter is the path to the device to load the &debian; "
 "installer from. For example, <userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</"
 "userinput>"
-msgstr "参数的值是装入 &debian; 安装程序的设备路径，例如：<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
+msgstr ""
+"参数的值是装入 &debian; 安装程序的设备路径，例如："
+"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
 
 #. Tag: para
 #: boot-installer.xml:2211
@@ -2974,18 +2911,16 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 #. Tag: para
 #: boot-installer.xml:2314
 #, no-c-format
-#| msgid ""
-#| "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
-#| "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. "
-#| "Note that this support is currently experimental. Additional information "
-#| "can be found on the <ulink url=\"&url-d-i-wiki;\">Debian Installer Wiki</"
-#| "ulink>."
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
 "(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer. Note "
 "that this support is currently experimental. Additional information can be "
 "found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
-msgstr "设为 <userinput>true</userinput> 可以打开安装程序中对 Serial ATA RAID (也称为 ATA RAID、BIOS RAID 或 fake RAID)磁盘的支持。注意，这种支持当前是实验性的。更多的信息可以在 <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink> 找到。"
+msgstr ""
+"设为 <userinput>true</userinput> 可以打开安装程序中对 Serial ATA RAID (也称"
+"为 ATA RAID、BIOS RAID 或 fake RAID)磁盘的支持。注意，这种支持当前是实验性"
+"的。更多的信息可以在 <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</"
+"ulink> 找到。"
 
 #. Tag: term
 #: boot-installer.xml:2325
@@ -3310,13 +3245,6 @@ msgstr "mirror/protocol (protocol)"
 #. Tag: para
 #: boot-installer.xml:2525
 #, no-c-format
-#| msgid ""
-#| "By default the installer will use the http protocol to download files "
-#| "from Debian mirrors and changing that to ftp is not possible during "
-#| "installations at normal priority. By setting this parameter to "
-#| "<userinput>ftp</userinput>, you can force the installer to use that "
-#| "protocol instead. Note that you cannot select an ftp mirror from a list, "
-#| "you have to enter the hostname manually."
 msgid ""
 "By default the installer will use the http protocol to download files from "
 "&debian; mirrors and changing that to ftp is not possible during "
@@ -3324,7 +3252,10 @@ msgid ""
 "<userinput>ftp</userinput>, you can force the installer to use that protocol "
 "instead. Note that you cannot select an ftp mirror from a list, you have to "
 "enter the hostname manually."
-msgstr "默认情况下，安装程序会使用 http 协议从 &debian; 镜像下载文件，在普通优先级下不能修改协议为 ftp。设置该参数为 <userinput>ftp</userinput>，您可以强制安装程序使用该协议。注意，必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
+msgstr ""
+"默认情况下，安装程序会使用 http 协议从 &debian; 镜像下载文件，在普通优先级下"
+"不能修改协议为 ftp。设置该参数为 <userinput>ftp</userinput>，您可以强制安装程"
+"序使用该协议。注意，必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
 
 #. Tag: term
 #: boot-installer.xml:2538
@@ -3770,13 +3701,11 @@ msgstr "软盘的可靠性"
 #. Tag: para
 #: boot-installer.xml:2819
 #, no-c-format
-#| msgid ""
-#| "The biggest problem for people using floppy disks to install Debian seems "
-#| "to be floppy disk reliability."
 msgid ""
 "The biggest problem for people using floppy disks to install &debian; seems "
 "to be floppy disk reliability."
-msgstr "对于用软盘安装 &debian; 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
+msgstr ""
+"对于用软盘安装 &debian; 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
 #. Tag: para
 #: boot-installer.xml:2824
@@ -4227,14 +4156,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:3104
 #, 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</"
@@ -4243,7 +4164,13 @@ msgid ""
 "<classname>reportbug</classname> as explained in <xref linkend=\"mail-"
 "outgoing\"/>, and run the command <command>reportbug installation-reports</"
 "command>."
-msgstr "如果您有一个可以运转的 &debian; 系统，发送安装报告最简单的方法是安装 <classname>installation-report</classname> 和 <classname>reportbug</classname> 软件包(<command>aptitude install installation-report reportbug</command>)，配置 <classname>reportbug</classname> 的说明参阅 <xref linkend=\"mail-outgoing\"/>，然后执行 <command>reportbug installation-reports</command> 命令。"
+msgstr ""
+"如果您有一个可以运转的 &debian; 系统，发送安装报告最简单的方法是安装 "
+"<classname>installation-report</classname> 和 <classname>reportbug</"
+"classname> 软件包(<command>aptitude install installation-report reportbug</"
+"command>)，配置 <classname>reportbug</classname> 的说明参阅 <xref linkend="
+"\"mail-outgoing\"/>，然后执行 <command>reportbug installation-reports</"
+"command> 命令。"
 
 #. Tag: para
 #: boot-installer.xml:3114
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index aa5b7d933..6a29d91cf 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -15,7 +15,6 @@ msgstr ""
 #. Tag: title
 #: boot-new.xml:5
 #, no-c-format
-#| msgid "Booting Into Your New Debian System"
 msgid "Booting Into Your New &debian; System"
 msgstr "启动进入新的 &debian; 系统"
 
@@ -38,13 +37,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:13
 #, no-c-format
-#| msgid ""
-#| "If you did a default installation, the first thing you should see when "
-#| "you boot the system is the menu of the <classname>grub</classname> or "
-#| "possibly the <classname>lilo</classname> bootloader. The first choices in "
-#| "the menu will be for your new Debian system. If you had any other "
-#| "operating systems on your computer (like Windows) that were detected by "
-#| "the installation system, those will be listed lower down in the menu."
 msgid ""
 "If you did a default installation, the first thing you should see when you "
 "boot the system is the menu of the <classname>grub</classname><phrase arch="
@@ -53,18 +45,15 @@ msgid ""
 "had any other operating systems on your computer (like Windows) that were "
 "detected by the installation system, those will be listed lower down in the "
 "menu."
-msgstr "如果您使用了默认安装，引导系统后首先看到的是 <classname>grub</classname> <phrase arch=\"x86\">或者是 <classname>lilo</classname> bootloader</phrase>菜单。菜单中的首选项将是新的 &debian; 系统。假如您的计算机上有其他的操作系统(如 Windows)，它们将被安装系统检测到，并列入菜单的下方。"
+msgstr ""
+"如果您使用了默认安装，引导系统后首先看到的是 <classname>grub</classname> "
+"<phrase arch=\"x86\">或者是 <classname>lilo</classname> bootloader</phrase>菜"
+"单。菜单中的首选项将是新的 &debian; 系统。假如您的计算机上有其他的操作系统"
+"(如 Windows)，它们将被安装系统检测到，并列入菜单的下方。"
 
 #. Tag: para
 #: boot-new.xml:23
 #, no-c-format
-#| msgid ""
-#| "If the system fails to start up correctly, don't panic. If the "
-#| "installation was successful, chances are good that there is only a "
-#| "relatively minor problem that is preventing the system from booting "
-#| "Debian. In most cases such problems can be fixed without having to repeat "
-#| "the installation. One available option to fix boot problems is to use the "
-#| "installer's built-in rescue mode (see <xref linkend=\"rescue\"/>)."
 msgid ""
 "If the system fails to start up correctly, don't panic. If the installation "
 "was successful, chances are good that there is only a relatively minor "
@@ -72,23 +61,14 @@ msgid ""
 "such problems can be fixed without having to repeat the installation. One "
 "available option to fix boot problems is to use the installer's built-in "
 "rescue mode (see <xref linkend=\"rescue\"/>)."
-msgstr "如果系统无法正确启动，请勿惊慌。如果安装成功，还不错，只是出了一点儿小问题没法让系统引导 &debian;。多数情况下不需重新安装就能修复。修复引导问题的一种方法是使用安装程序内置的 rescue 模式(参阅 <xref linkend=\"rescue\"/>)。"
+msgstr ""
+"如果系统无法正确启动，请勿惊慌。如果安装成功，还不错，只是出了一点儿小问题没"
+"法让系统引导 &debian;。多数情况下不需重新安装就能修复。修复引导问题的一种方法"
+"是使用安装程序内置的 rescue 模式(参阅 <xref linkend=\"rescue\"/>)。"
 
 #. Tag: para
 #: boot-new.xml:32
 #, no-c-format
-#| msgid ""
-#| "If you are new to Debian and &arch-kernel;, you may need some help from "
-#| "more experienced users. <phrase arch=\"x86\">For direct on-line help you "
-#| "can try the IRC channels #debian or #debian-boot on the OFTC network. "
-#| "Alternatively you can contact the <ulink url=\"&url-list-subscribe;"
-#| "\">debian-user mailing list</ulink>.</phrase> <phrase arch=\"not-"
-#| "x86\">For less common architectures like &arch-title;, your best option "
-#| "is to ask on the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
-#| "listname; mailing list</ulink>.</phrase> You can also file an "
-#| "installation report as described in <xref linkend=\"submit-bug\"/>. "
-#| "Please make sure that you describe your problem clearly and include any "
-#| "messages that are displayed and may help others to diagnose the issue."
 msgid ""
 "If you are new to &debian; and &arch-kernel;, you may need some help from "
 "more experienced users. <phrase arch=\"x86\">For direct on-line help you can "
@@ -101,7 +81,15 @@ msgid ""
 "linkend=\"submit-bug\"/>. Please make sure that you describe your problem "
 "clearly and include any messages that are displayed and may help others to "
 "diagnose the issue."
-msgstr "假如您刚接触 &debian; 和 &arch-kernel;，可能需要从有经验的用户那里得到一些帮助。<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian 或 #debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于不常见的体系，比如 &arch-title;，最适合的方式是在 <ulink url=\"&url-list-subscribe;\">debian-&arch-listname; mailing list</ulink> 上请教。</phrase> 您也可以写下安装报告，详情参见 <xref linkend=\"submit-bug\"/>。请确保问题描述清楚，并包括显示的任何信息，以助于分析问题。"
+msgstr ""
+"假如您刚接触 &debian; 和 &arch-kernel;，可能需要从有经验的用户那里得到一些帮"
+"助。<phrase arch=\"x86\">直接的在线帮助，可以通过 OFTC network 上的 #debian "
+"或 #debian-boot IRC 频道。另一种选择是 <ulink url=\"&url-list-subscribe;"
+"\">debian-user mailing list</ulink>。</phrase> <phrase arch=\"not-x86\">对于"
+"不常见的体系，比如 &arch-title;，最适合的方式是在 <ulink url=\"&url-list-"
+"subscribe;\">debian-&arch-listname; mailing list</ulink> 上请教。</phrase> 您"
+"也可以写下安装报告，详情参见 <xref linkend=\"submit-bug\"/>。请确保问题描述清"
+"楚，并包括显示的任何信息，以助于分析问题。"
 
 #. Tag: para
 #: boot-new.xml:48
@@ -529,15 +517,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:321
 #, no-c-format
-#| msgid ""
-#| "Documentation accompanying programs you have installed can be found in "
-#| "<filename>/usr/share/doc/</filename>, under a subdirectory named after "
-#| "the program (or, more precise, the Debian package that contains the "
-#| "program). However, more extensive documentation is often packaged "
-#| "separately in special documentation packages that are mostly not "
-#| "installed by default. For example, documentation about the package "
-#| "management tool <command>apt</command> can be found in the packages "
-#| "<classname>apt-doc</classname> or <classname>apt-howto</classname>."
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
 "<filename>/usr/share/doc/</filename>, under a subdirectory named after the "
@@ -547,7 +526,12 @@ msgid ""
 "example, documentation about the package management tool <command>apt</"
 "command> can be found in the packages <classname>apt-doc</classname> or "
 "<classname>apt-howto</classname>."
-msgstr "已安装程序相关的文档可以在 <filename>/usr/share/doc/</filename> 里找到，位于该程序名的子目录下(或者，更准确地说，包含该程序的 &debian; 软件包名)。但范围更广的文档会单独放在一个特殊的文档软件包内，默认并不安装。例如，关于软件包管理工具 <command>apt</command> 的文档放在 <classname>apt-doc</classname> 或 <classname>apt-howto</classname> 软件包内。"
+msgstr ""
+"已安装程序相关的文档可以在 <filename>/usr/share/doc/</filename> 里找到，位于"
+"该程序名的子目录下(或者，更准确地说，包含该程序的 &debian; 软件包名)。但范围"
+"更广的文档会单独放在一个特殊的文档软件包内，默认并不安装。例如，关于软件包管"
+"理工具 <command>apt</command> 的文档放在 <classname>apt-doc</classname> 或 "
+"<classname>apt-howto</classname> 软件包内。"
 
 #. Tag: para
 #: boot-new.xml:332
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 45f570d00..c67f8a70c 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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 22:10+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -21,15 +21,13 @@ msgstr "系统需求"
 #. Tag: para
 #: hardware.xml:7
 #, no-c-format
-#| msgid ""
-#| "This section contains information about what hardware you need to get "
-#| "started with Debian. You will also find links to further information "
-#| "about hardware supported by GNU and &arch-kernel;."
 msgid ""
 "This section contains information about what hardware you need to get "
 "started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
-msgstr "本章包括运行 &debian; 所需硬件的信息。您还能找到更多有关 GNU 和 &arch-kernel; 所支持硬件的信息的链接。"
+msgstr ""
+"本章包括运行 &debian; 所需硬件的信息。您还能找到更多有关 GNU 和 &arch-"
+"kernel; 所支持硬件的信息的链接。"
 
 #. Tag: title
 #: hardware.xml:20
@@ -40,14 +38,6 @@ msgstr "支持的硬件"
 #. Tag: para
 #: hardware.xml:21
 #, no-c-format
-#| msgid ""
-#| "Debian does not impose hardware requirements beyond the requirements of "
-#| "the Linux kernel and the GNU tool-sets. Therefore, any architecture or "
-#| "platform to which the Linux kernel, libc, <command>gcc</command>, etc. "
-#| "have been ported, and for which a Debian port exists, can run Debian. "
-#| "Please refer to the Ports pages at <ulink url=\"&url-ports;\"></ulink> "
-#| "for more details on &arch-title; architecture systems which have been "
-#| "tested with &debian-gnu;."
 msgid ""
 "&debian; does not impose hardware requirements beyond the requirements of "
 "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
@@ -56,7 +46,11 @@ msgid ""
 "exists, can run &debian;. Please refer to the Ports pages at <ulink url="
 "\"&url-ports;\"></ulink> for more details on &arch-title; architecture "
 "systems which have been tested with &debian-gnu;."
-msgstr "&debian; 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移植了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 &debian; 移植版的硬件体系或平台都可以运行 &debian;。请参考移植页面 <ulink url=\"&url-ports;\"></ulink> 以了解更多已被 &debian-gnu; 测试过的 &arch-title; 体系。"
+msgstr ""
+"&debian; 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移"
+"植了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 &debian; 移植"
+"版的硬件体系或平台都可以运行 &debian;。请参考移植页面 <ulink url=\"&url-"
+"ports;\"></ulink> 以了解更多已被 &debian-gnu; 测试过的 &arch-title; 体系。"
 
 #. Tag: para
 #: hardware.xml:32
@@ -78,13 +72,12 @@ 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 eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
-msgstr "&debian; GNU/Linux &release; 支持十一种主要的体系和一些称为 <quote>flavors</quote> 的衍生品种。"
+msgstr ""
+"&debian; GNU/Linux &release; 支持十一种主要的体系和一些称为 <quote>flavors</"
+"quote> 的衍生品种。"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
@@ -95,7 +88,6 @@ msgstr "体系"
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
 #, no-c-format
-#| msgid "Debian Designation"
 msgid "&debian; Designation"
 msgstr "&debian; 命名"
 
@@ -462,18 +454,16 @@ msgstr "kfreebsd-amd64"
 #. Tag: para
 #: hardware.xml:196
 #, no-c-format
-#| msgid ""
-#| "This document covers installation for the <emphasis>&arch-title;</"
-#| "emphasis> architecture. If you are looking for information on any of the "
-#| "other Debian-supported architectures take a look at the <ulink url="
-#| "\"http://www.debian.org/ports/\">Debian-Ports</ulink> pages."
 msgid ""
 "This document covers installation for the <emphasis>&arch-title;</emphasis> "
 "architecture using the <emphasis>&arch-kernel;</emphasis> kernel. If you are "
 "looking for information on any of the other &debian;-supported architectures "
 "take a look at the <ulink url=\"http://www.debian.org/ports/\">&debian;-"
 "Ports</ulink> pages."
-msgstr "本文档主要讲述的是 <emphasis>&arch-title;</emphasis> 体系下的安装。如果您在寻找其他 &debian; 所支持的体系的信息，请访问 <ulink url=\"http://www.debian.org/ports/\">&debian;-Ports</ulink> 网页。"
+msgstr ""
+"本文档主要讲述的是 <emphasis>&arch-title;</emphasis> 体系下的安装。如果您在寻"
+"找其他 &debian; 所支持的体系的信息，请访问 <ulink url=\"http://www.debian."
+"org/ports/\">&debian;-Ports</ulink> 网页。"
 
 #. Tag: para
 #: hardware.xml:206
@@ -493,15 +483,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:216
 #, no-c-format
-#| msgid ""
-#| "This is the first official release of &debian-gnu; for the &arch-title; "
-#| "architecture. We feel that it has proven itself sufficiently to be "
-#| "released. However, because it has not had the exposure (and hence testing "
-#| "by users) that some other architectures have had, you may encounter a few "
-#| "bugs. Use our <ulink url=\"&url-bts;\">Bug Tracking System</ulink> to "
-#| "report any problems; make sure to mention the fact that the bug is on the "
-#| "&arch-title; platform. It can be necessary to use the <ulink url=\"&url-"
-#| "list-subscribe;\">debian-&arch-listname; mailing list</ulink> as well."
 msgid ""
 "This is the first official release of &debian-gnu; for the &arch-title; "
 "architecture. We feel that it has proven itself sufficiently to be released. "
@@ -512,7 +493,13 @@ msgid ""
 "platform using the <emphasis>&arch-kernel;</emphasis> kernel. It can be "
 "necessary to use the <ulink url=\"&url-list-subscribe;\">debian-&arch-"
 "listname; mailing list</ulink> as well."
-msgstr "此为第一个 &arch-title; 体系的 &debian-gnu; 正式发布版。我们认为它已经达到了可发布的质量要求。但是，由于它没有像其他体系那样得到足够的曝光(经过用户测试)，您可能会遇到一些 bug。请使用我们的 <ulink url=\"&url-bts;\">Bug 跟踪系统</ulink> 来报告问题，并注明该 bug 是在 &arch-title; 平台上使用 <emphasis>&arch-kernel;</emphasis> 内核产生的。当然，您也可以用 <ulink url=\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
+msgstr ""
+"此为第一个 &arch-title; 体系的 &debian-gnu; 正式发布版。我们认为它已经达到了"
+"可发布的质量要求。但是，由于它没有像其他体系那样得到足够的曝光(经过用户测"
+"试)，您可能会遇到一些 bug。请使用我们的 <ulink url=\"&url-bts;\">Bug 跟踪系统"
+"</ulink> 来报告问题，并注明该 bug 是在 &arch-title; 平台上使用 "
+"<emphasis>&arch-kernel;</emphasis> 内核产生的。当然，您也可以用 <ulink url="
+"\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
@@ -549,30 +536,27 @@ msgstr "AMD64 和 Intel EM64T 处理器都获得支持。"
 #. Tag: para
 #: hardware.xml:277
 #, no-c-format
-#| msgid ""
-#| "Each distinct ARM architecture requires its own kernel. Because of this "
-#| "the standard Debian distribution only supports installation on a number "
-#| "of the most common platforms. The Debian userland however may be used by "
-#| "<emphasis>any</emphasis> ARM CPU."
 msgid ""
 "Each distinct ARM architecture requires its own kernel. Because of this the "
 "standard &debian; distribution only supports installation on a number of the "
 "most common platforms. The &debian; userland however may be used by "
 "<emphasis>any</emphasis> ARM CPU."
-msgstr "每种 ARM 体系要求使用各自的内核，正因为如此，&debian; 标准发布版只支持安装到一些最常见的系统上。但 &debian; userland 仍然可以用在<emphasis>任何</emphasis> ARM CPU 上。"
+msgstr ""
+"每种 ARM 体系要求使用各自的内核，正因为如此，&debian; 标准发布版只支持安装到"
+"一些最常见的系统上。但 &debian; userland 仍然可以用在<emphasis>任何</"
+"emphasis> ARM CPU 上。"
 
 #. Tag: para
 #: hardware.xml:286
 #, 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 ""
 "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."
-msgstr "大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多少系统的实现都是使用 little-endian 模式。&debian; 现在也仅支持 little-endian ARM 系统。"
+msgstr ""
+"大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多"
+"少系统的实现都是使用 little-endian 模式。&debian; 现在也仅支持 little-endian "
+"ARM 系统。"
 
 #. Tag: para
 #: hardware.xml:294
@@ -589,14 +573,6 @@ msgstr "IOP32x"
 #. Tag: para
 #: hardware.xml:302
 #, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing. Debian currently supports the IOP32x "
-#| "platform, featuring the IOP 80219 and 32x chips commonly found in Network "
-#| "Attached Storage (NAS) devices. Debian explicitly supports two such "
-#| "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> "
-#| "from IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</"
-#| "ulink>."
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing. &debian; currently supports the IOP32x "
@@ -604,7 +580,12 @@ msgid ""
 "Attached Storage (NAS) devices. &debian; explicitly supports two such "
 "devices: the <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> from "
 "IO-Data and the <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>."
-msgstr "Intel I/O Processor (IOP) 产品线可以在一些数据存储和处理的产品中找到。&debian; 当前支持 IOP32x 平台，IOP 80219 和 32x 芯片通常在 Network Attached Storage (NAS) 设备上找到。&debian; 明确支持两种设备：IO-Data 的 <ulink url=\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> 和 <ulink url=\"&url-arm-cyrius-n2100;\">Thecus N2100</ulink>。"
+msgstr ""
+"Intel I/O Processor (IOP) 产品线可以在一些数据存储和处理的产品中找到。"
+"&debian; 当前支持 IOP32x 平台，IOP 80219 和 32x 芯片通常在 Network Attached "
+"Storage (NAS) 设备上找到。&debian; 明确支持两种设备：IO-Data 的 <ulink url="
+"\"&url-arm-cyrius-glantank;\">GLAN Tank</ulink> 和 <ulink url=\"&url-arm-"
+"cyrius-n2100;\">Thecus N2100</ulink>。"
 
 #. Tag: term
 #: hardware.xml:315
@@ -689,13 +670,12 @@ msgstr "<term>Versatile</term>"
 #. Tag: para
 #: hardware.xml:363
 #, 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 the hardware."
-msgstr "Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 &debian; 是一个不错的方法。"
+msgstr ""
+"Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 "
+"&debian; 是一个不错的方法。"
 
 #. Tag: para
 #: hardware.xml:382
@@ -729,24 +709,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:417
 #, no-c-format
-#| msgid ""
-#| "However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run "
-#| "on 386 or earlier processors. Despite the architecture name \"i386\", "
-#| "support for actual 80386 processors (and their clones) was dropped with "
-#| "the Sarge (r3.1) release of Debian<footnote> <para> We have long tried to "
-#| "avoid this, but in the end it was necessary due a unfortunate series of "
-#| "issues with the compiler and the kernel, starting with an bug in the C++ "
-#| "ABI provided by GCC. You should still be able to run Debian GNU/Linux on "
-#| "actual 80386 processors if you compile your own kernel and compile all "
-#| "packages from source, but that is beyond the scope of this manual. </"
-#| "para> </footnote>. (No version of Linux has ever supported the 286 or "
-#| "earlier chips in the series.) All i486 and later processors are still "
-#| "supported<footnote> <para> Many Debian packages will actually run "
-#| "slightly faster on modern computers as a positive side effect of dropping "
-#| "support for these old chips. The i486, introduced in 1989, has three "
-#| "opcodes (bswap, cmpxchg, and xadd) which the i386, introduced in 1986, "
-#| "did not have. Previously, these could not be easily used by most Debian "
-#| "packages; now they can. </para> </footnote>."
 msgid ""
 "However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
 "on 386 or earlier processors. Despite the architecture name \"i386\", "
@@ -765,7 +727,19 @@ msgid ""
 "which the i386, introduced in 1986, did not have. Previously, these could "
 "not be easily used by most &debian; packages; now they can. </para> </"
 "footnote>."
-msgstr "然而，&debian; GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 或更早的处理器上。尽管体系命名为 \"i386\"，&debian; 的 Sarge (r3.1) 版已经<emphasis>放弃</emphasis>对真正的 80386 处理器(以及它们的克隆)的支持<footnote> <para> 我们已经尽力避免，但由于编译器和内核的一系列因素，起因是 GCC 提供的 C++ ABI 的 bug，最终只能如此。如果您自己动手从源码编译内核和所有的软件包，仍然可以将 &debian; GNU/Linux 运行在真正的 80386 处理器上，这部分内容超出了本手册的范畴。</para> </footnote>。(Linux 从来没有任何版本支持 286 或更早的芯片。) 所有的 i486 和后续的处理器仍然支持<footnote> <para> 许多 &debian; 软件包在新的计算机上可以运行地稍微快一点，但另一方面却舍弃了对旧芯片的支持。1989 年发布的 i486 有三个 opcode (bswap、cmpxchg 和 xadd)，然而 1986 年发布的 i386 却没有。过去多数 &debian; 软件包不能使用它们，现在没有这个问题了。</para> </footnote>。"
+msgstr ""
+"然而，&debian; GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 "
+"或更早的处理器上。尽管体系命名为 \"i386\"，&debian; 的 Sarge (r3.1) 版已经"
+"<emphasis>放弃</emphasis>对真正的 80386 处理器(以及它们的克隆)的支持"
+"<footnote> <para> 我们已经尽力避免，但由于编译器和内核的一系列因素，起因是 "
+"GCC 提供的 C++ ABI 的 bug，最终只能如此。如果您自己动手从源码编译内核和所有的"
+"软件包，仍然可以将 &debian; GNU/Linux 运行在真正的 80386 处理器上，这部分内容"
+"超出了本手册的范畴。</para> </footnote>。(Linux 从来没有任何版本支持 286 或更"
+"早的芯片。) 所有的 i486 和后续的处理器仍然支持<footnote> <para> 许多 "
+"&debian; 软件包在新的计算机上可以运行地稍微快一点，但另一方面却舍弃了对旧芯片"
+"的支持。1989 年发布的 i486 有三个 opcode (bswap、cmpxchg 和 xadd)，然而 1986 "
+"年发布的 i386 却没有。过去多数 &debian; 软件包不能使用它们，现在没有这个问题"
+"了。</para> </footnote>。"
 
 #. Tag: para
 #: hardware.xml:450
@@ -790,32 +764,17 @@ msgstr "I/O 总线"
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
 "communicate with peripherals such as storage devices. Your computer must use "
-"the ISA, EISA, PCI, PCIe, PCI-X, or VESA Local Bus (VLB, sometimes called the VL "
-"bus). Essentially all personal computers sold in recent years use one of "
-"these."
+"the 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."
 msgstr ""
 "系统总线作为主板的一部分用于 CPU 和诸如存储设备之类的周边设备通讯。您的计算机"
-"必须使用 ISA、EISA、PCI、PCIe、PCI-X 或者 VESA Local Bus(VLB, 有时称为 VL 总线)。近"
-"年来出售的个人电脑都会使用里面的一种。"
+"必须使用 ISA、EISA、PCI、PCIe、PCI-X 或者 VESA Local Bus(VLB, 有时称为 VL 总"
+"线)。近年来出售的个人电脑都会使用里面的一种。"
 
 #. Tag: para
 #: hardware.xml:484
 #, 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> </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, "
@@ -831,22 +790,30 @@ msgid ""
 "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>."
-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:519
 #, 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."
 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:525
@@ -862,19 +829,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:542
 #, 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 ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -888,7 +842,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:570
@@ -935,9 +898,6 @@ msgstr "内核变种"
 #. Tag: para
 #: hardware.xml:618
 #, no-c-format
-#| msgid ""
-#| "There are two 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:"
@@ -1012,17 +972,15 @@ msgstr "Power Macintosh (pmac) 子体系"
 #. Tag: para
 #: hardware.xml:688
 #, no-c-format
-#| msgid ""
-#| "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
-#| "example) made a series of Macintosh computers based on the PowerPC "
-#| "processor. For purposes of architecture support, they are categorized as "
-#| "NuBus (not supported by Debian), OldWorld, and NewWorld."
 msgid ""
 "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
 "example) made a series of Macintosh computers based on the PowerPC "
 "processor. For purposes of architecture support, they are categorized as "
 "NuBus (not supported by &debian;), OldWorld, and NewWorld."
-msgstr "Apple (以及其它一些制造商 &mdash; 比如 Power Computing) 生产了一系列基于 PowerPC 处理器 的 Macintosh 计算机。为体系支持的目的，它们被划分为 NuBus(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
+msgstr ""
+"Apple (以及其它一些制造商 &mdash; 比如 Power Computing) 生产了一系列基于 "
+"PowerPC 处理器 的 Macintosh 计算机。为体系支持的目的，它们被划分为 NuBus"
+"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
 
 #. Tag: para
 #: hardware.xml:695
@@ -1447,17 +1405,6 @@ msgstr "Nubus PowerMac 子体系 (不支持)"
 #. Tag: para
 #: hardware.xml:952
 #, no-c-format
-#| msgid ""
-#| "NuBus systems are not currently supported by Debian/powerpc. The "
-#| "monolithic Linux/PPC kernel architecture does not have support for these "
-#| "machines; instead, one must use the MkLinux Mach microkernel, which "
-#| "Debian does not yet support. These include the following: <itemizedlist> "
-#| "<listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> "
-#| "<listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-#| "<listitem><para> Powerbook 1400, 2300, and 5300 </para></listitem> "
-#| "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
-#| "itemizedlist> A linux kernel for these machines and limited support is "
-#| "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
 msgid ""
 "NuBus systems are not currently supported by &debian;/powerpc. The "
 "monolithic Linux/PPC kernel architecture does not have support for these "
@@ -1469,7 +1416,15 @@ msgid ""
 "<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
 "itemizedlist> A linux kernel for these machines and limited support is "
 "available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
-msgstr "NuBus 系统现在还不被 &debian;/powerpc 支持。单内核的 Linux/PPC 内核体系不支持这些机器；而必须使用 MkLinux Mach 微内核，而它未被 &debian; 支持。它们包括： <itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> <listitem><para> Powerbook 1400, 2300 和 5300 </para></listitem> <listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </itemizedlist> 对这些机器提供有限支持的 linux 内核位于 <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>"
+msgstr ""
+"NuBus 系统现在还不被 &debian;/powerpc 支持。单内核的 Linux/PPC 内核体系不支持"
+"这些机器；而必须使用 MkLinux Mach 微内核，而它未被 &debian; 支持。它们包括： "
+"<itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></"
+"listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
+"<listitem><para> Powerbook 1400, 2300 和 5300 </para></listitem> "
+"<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
+"itemizedlist> 对这些机器提供有限支持的 linux 内核位于 <ulink url=\"http://"
+"nubus-pmac.sourceforge.net/\"></ulink>"
 
 #. Tag: title
 #: hardware.xml:989
@@ -1529,32 +1484,26 @@ msgstr "S/390 与 zSeries 机器类型"
 #: hardware.xml:1025
 #, no-c-format
 msgid ""
-"Complete information regarding supported S/390 and zSeries machines can be "
-"found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/pdfs/"
-"redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
-"Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://www-128."
-"ibm.com/developerworks/linux/linux390/index.html\">zSeries page at the "
-"developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all zSeries "
-"are fully supported; Multiprise 2000, G3 and G4 machines are supported with "
-"IEEE floating point emulation and thus degraded performance."
+"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
+"Your machine needs to support for at least the z/Architecture, Architecture "
+"Level Set 2. The userland is still compiled for ESA/390, though. All zSeries "
+"hardware is fully supported. &arch-title; support software is included from "
+"the kernel 2.6.32 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>."
 msgstr ""
-"有关 S/390 和 zSeries 机器支持的完整信息参见 IBM 的 Redbook <ulink url="
-"\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux for "
-"IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章节，或者 "
-"<ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/index.html"
-"\">developerWorks 网站上的 zSeries 页面</ulink>。简而言之，G5、Multiprise "
-"3000、G6 以及所有的 zSeries 都可以得到完整的支持；Multiprise 2000、G3 和 G4 "
-"机器使用 IEEE 浮点模拟来支持，因此会降低性能。"
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
-#: hardware.xml:1047
+#: hardware.xml:1048
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU 和主板支持"
 
 #. Tag: para
-#: hardware.xml:1048
+#: hardware.xml:1049
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1566,13 +1515,13 @@ msgstr ""
 "sun4m、sun4u 或 sun4v。下面说明包括哪些机器，以及每个获得支持的级别。"
 
 #. Tag: term
-#: hardware.xml:1059
+#: hardware.xml:1060
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1061
+#: hardware.xml:1062
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1585,26 +1534,24 @@ msgstr ""
 "SPARCstation page</ulink>。"
 
 #. Tag: para
-#: hardware.xml:1068
+#: hardware.xml:1069
 #, no-c-format
-#| msgid ""
-#| "The last Debian release to support sparc32 was Etch, but even then only "
-#| "for sun4m systems. Support for the other 32-bits subarchitectures had "
-#| "already been discontinued after earlier releases."
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
 "for sun4m systems. Support for the other 32-bits subarchitectures had "
 "already been discontinued after earlier releases."
-msgstr "支持 sparc32 的最新 &debian; 发布版本是 Etch，但也仅针对 sun4m 系统。其它的 32 位子体系在上一版本后已经停止支持。"
+msgstr ""
+"支持 sparc32 的最新 &debian; 发布版本是 Etch，但也仅针对 sun4m 系统。其它的 "
+"32 位子体系在上一版本后已经停止支持。"
 
 #. Tag: term
-#: hardware.xml:1078
+#: hardware.xml:1079
 #, no-c-format
 msgid "<term>sun4u</term>"
 msgstr "<term>sun4u</term>"
 
 #. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1081
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1620,13 +1567,13 @@ msgstr ""
 "到 UP 和 SMP 配置中。"
 
 #. Tag: term
-#: hardware.xml:1093
+#: hardware.xml:1094
 #, no-c-format
 msgid "<term>sun4v</term>"
 msgstr "<term>sun4v</term>"
 
 #. Tag: para
-#: hardware.xml:1095
+#: hardware.xml:1096
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1639,7 +1586,7 @@ msgstr ""
 "smp 内核。"
 
 #. Tag: para
-#: hardware.xml:1106
+#: hardware.xml:1107
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1649,13 +1596,13 @@ msgstr ""
 "持而得不到支持。"
 
 #. Tag: title
-#: hardware.xml:1115
+#: hardware.xml:1116
 #, no-c-format
 msgid "Laptops"
 msgstr "便携机"
 
 #. Tag: para
-#: hardware.xml:1116
+#: hardware.xml:1117
 #, no-c-format
 msgid ""
 "Laptops are also supported and nowadays most laptops work out of the box. In "
@@ -1670,21 +1617,14 @@ msgstr ""
 
 # index.docbook:1624, index.docbook:1649, index.docbook:1672
 #. Tag: title
-#: hardware.xml:1128 hardware.xml:1151 hardware.xml:1171 hardware.xml:1194
+#: hardware.xml:1129 hardware.xml:1152 hardware.xml:1172 hardware.xml:1195
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "多处理器"
 
 #. Tag: para
-#: hardware.xml:1129
+#: hardware.xml:1130
 #, 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 has been "
-#| "compiled with SMP support. The 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."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1692,18 +1632,15 @@ 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:1138
+#: hardware.xml:1139
 #, no-c-format
-#| msgid ""
-#| "In order to optimize the kernel for single CPU systems, you'll have to "
-#| "replace the standard Debian kernel. <phrase arch=\"linux-any\">You can "
-#| "find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. "
-#| "At this time (kernel version &kernelversion;) the way you disable SMP is "
-#| "to deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
 msgid ""
 "In order to optimize the kernel for single CPU systems, you'll have to "
 "replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can "
@@ -1711,18 +1648,16 @@ msgid ""
 "this time (kernel version &kernelversion;) the way you disable SMP is to "
 "deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
 "section;</quote> section of the kernel config.</phrase>"
-msgstr "为了给单 CPU 系统优化内核，您需要替换标准的 &debian; 内核。<phrase arch=\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)，禁止 SMP 选项的方法是在内核配置的 <quote>&smp-config-section;</quote> 中取消选择 <quote>&smp-config-option;</quote>。</phrase>"
+msgstr ""
+"为了给单 CPU 系统优化内核，您需要替换标准的 &debian; 内核。<phrase arch="
+"\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前"
+"(内核版本 &kernelversion;)，禁止 SMP 选项的方法是在内核配置的 <quote>&smp-"
+"config-section;</quote> 中取消选择 <quote>&smp-config-option;</quote>。</"
+"phrase>"
 
 #. Tag: para
-#: hardware.xml:1153
+#: hardware.xml:1154
 #, 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 has been "
-#| "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 "
@@ -1730,47 +1665,38 @@ 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:1162
+#: hardware.xml:1163
 #, no-c-format
-#| msgid ""
-#| "The 486 flavour of the Debian kernel image packages for &arch-title; is "
-#| "not compiled with SMP support."
 msgid ""
 "The 486 flavour of the &debian; kernel image packages for &arch-title; is "
 "not compiled with SMP support."
 msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
 
 #. Tag: para
-#: hardware.xml:1172
+#: hardware.xml:1173
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture. However, the standard Debian &release; kernel image does "
-#| "not support SMP. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture. However, the "
 "standard &debian; &release; kernel image does not support SMP. This should "
 "not prevent installation, since the standard, non-SMP kernel should boot on "
 "SMP systems; the kernel will simply use the first CPU."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。但是，标准的 &debian; &release; 内核映像并不支持 SMP。这不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。但是，标准的 &debian; &release; 内核映像并不"
+"支持 SMP。这不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内"
+"核只使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1181
+#: hardware.xml:1182
 #, no-c-format
-#| msgid ""
-#| "In order to take advantage of multiple processors, you'll have to replace "
-#| "the standard Debian kernel. <phrase arch=\"linux-any\">You can find a "
-#| "discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At "
-#| "this time (kernel version &kernelversion;) the way you enable SMP is to "
-#| "select <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-#| "section;</quote> section of the kernel config.</phrase>"
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
 "the standard &debian; kernel.<phrase arch=\"linux-any\"> You can find a "
@@ -1778,19 +1704,15 @@ msgid ""
 "time (kernel version &kernelversion;) the way you enable SMP is to select "
 "<quote>&smp-config-option;</quote> in the <quote>&smp-config-section;</"
 "quote> section of the kernel config.</phrase>"
-msgstr "为了使用多 CPU 的优势，您必须替换标准的 &debian; 内核。<phrase arch=\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)启用 SMP 的方法是在内核配置的 <quote>&smp-config-section;</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
+msgstr ""
+"为了使用多 CPU 的优势，您必须替换标准的 &debian; 内核。<phrase arch=\"linux-"
+"any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版"
+"本 &kernelversion;)启用 SMP 的方法是在内核配置的 <quote>&smp-config-section;"
+"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1195
+#: hardware.xml:1196
 #, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</quote> or SMP &mdash; is available for this "
-#| "architecture, and is supported by a precompiled Debian kernel image. "
-#| "Depending on your install media, this SMP-capable kernel may or may not "
-#| "be installed by default. This should not prevent installation, since the "
-#| "standard, non-SMP kernel should boot on SMP systems; the kernel will "
-#| "simply use the first CPU."
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
 "quote> or SMP &mdash; is available for this architecture, and is supported "
@@ -1798,10 +1720,14 @@ msgid ""
 "this SMP-capable kernel may or may not be installed by default. This should "
 "not prevent installation, since the standard, non-SMP kernel should boot on "
 "SMP systems; the kernel will simply use the first CPU."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用，并且有一个预编译的 &debian; 内核映象已经开启这项功能。支持 SMP 的内核默认是否被安装，取决于您的安装介质。这并不会影响安装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用，并且有一个预编译的 &debian; 内核映象已经开启"
+"这项功能。支持 SMP 的内核默认是否被安装，取决于您的安装介质。这并不会影响安"
+"装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1205
+#: hardware.xml:1206
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -1812,68 +1738,70 @@ msgstr ""
 "一个合适的内核软件包。"
 
 #. Tag: para
-#: hardware.xml:1211
+#: hardware.xml:1212
 #, no-c-format
-#| msgid ""
-#| "You can also build your own customized kernel to support SMP. <phrase "
-#| "arch=\"linux-any\">You can find a discussion of how to do this in <xref "
-#| "linkend=\"kernel-baking\"/>. At this time (kernel version "
-#| "&kernelversion;) the way you enable SMP is to select <quote>&smp-config-"
-#| "option;</quote> in the <quote>&smp-config-section;</quote> section of the "
-#| "kernel config.</phrase>"
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
 "\"linux-any\"> You can find a discussion of how to do this in <xref linkend="
 "\"kernel-baking\"/>. At this time (kernel version &kernelversion;) the way "
 "you enable SMP is to select <quote>&smp-config-option;</quote> in the "
 "<quote>&smp-config-section;</quote> section of the kernel config.</phrase>"
-msgstr "您可以自己定制内核来支持 SMP。<phrase arch=\"linux-any\">可以在 <xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)启用 SMP 的方法是在内核配置的 <quote>&smp-config-section;</quote> 中选择 <quote>&smp-config-option;</quote>。</phrase>"
+msgstr ""
+"您可以自己定制内核来支持 SMP。<phrase arch=\"linux-any\">可以在 <xref "
+"linkend=\"kernel-baking\"/> 找到相关的讨论。当前(内核版本 &kernelversion;)启"
+"用 SMP 的方法是在内核配置的 <quote>&smp-config-section;</quote> 中选择 "
+"<quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1222
+#: hardware.xml:1223
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "图形卡支持"
 
 #. Tag: para
-#: hardware.xml:1223
-#, no-c-format
+#: hardware.xml:1224
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You should be using a VGA-compatible display interface for the console "
+#| "terminal. Nearly every modern display card is compatible with VGA. "
+#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#| "not require X11 support. Note that X11 is not used during the "
+#| "installation process described in this document."
 msgid ""
 "You should be using a VGA-compatible display interface for the console "
 "terminal. Nearly every modern display card is compatible with VGA. Ancient "
 "standards such CGA, MDA, or HGA should also work, assuming you do not "
 "require X11 support. Note that X11 is not used during the installation "
-"process described in this document."
+"process described in this document unless the graphical installer was "
+"explicitly selected."
 msgstr ""
 "您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使"
 "用 X11 支持的情况下，您也可以用古老的 CGA、MDA 或 HGA 工作。注意，在本文所述"
 "的安装过程中并不会使用 X11 图形界面。"
 
 #. Tag: para
-#: hardware.xml:1231
+#: hardware.xml:1233
 #, no-c-format
-#| msgid ""
-#| "Debian's support for graphical interfaces is determined by the underlying "
-#| "support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards "
-#| "work under X.Org. Details on supported graphics buses, cards, monitors, "
-#| "and pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-#| "Debian &release; ships with X.Org version &x11ver;."
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video cards work "
-"under X.Org. Details on supported graphics buses, cards, monitors, and "
-"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
-"&debian; &release; ships with X.Org version &x11ver;."
-msgstr "&debian; 对显卡的支持决定于 X.Org 的 X11 系统。大多数 AGP、PCI、PCIe 和 PCI-X 视频卡都能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持情况，见 <ulink url=\"&url-xorg;\"></ulink>。&debian; &release; 包含 X.Org &x11ver; 版。"
+"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
+"cards work under X.Org. Details on supported graphics buses, cards, "
+"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
+"ulink>. &debian; &release; ships with X.Org version &x11ver;."
+msgstr ""
+"&debian; 对显卡的支持决定于 X.Org 的 X11 系统。大多数 AGP、PCI、PCIe 和 PCI-"
+"X 视频卡都能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持"
+"情况，见 <ulink url=\"&url-xorg;\"></ulink>。&debian; &release; 包含 X.Org "
+"&x11ver; 版。"
 
 #. Tag: para
-#: hardware.xml:1240
+#: hardware.xml:1242
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
 
 #. Tag: para
-#: hardware.xml:1245
+#: hardware.xml:1247
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1892,7 +1820,7 @@ msgstr ""
 "卡。"
 
 #. Tag: para
-#: hardware.xml:1255
+#: hardware.xml:1257
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1915,13 +1843,13 @@ msgstr ""
 "自动激活串口控制台。"
 
 #. Tag: title
-#: hardware.xml:1277
+#: hardware.xml:1279
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "网络连接硬件"
 
 #. Tag: para
-#: hardware.xml:1278
+#: hardware.xml:1280
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -1935,7 +1863,7 @@ msgstr ""
 "phrase> <phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1287
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1943,61 +1871,61 @@ msgid ""
 msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡："
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1295
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1298
+#: hardware.xml:1300
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1303
+#: hardware.xml:1305
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1308
+#: hardware.xml:1310
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1315
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1322
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "支持的网络设备有："
 
 #. Tag: para
-#: hardware.xml:1325
+#: hardware.xml:1327
 #, 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:1330
+#: hardware.xml:1332
 #, 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:1335
+#: hardware.xml:1337
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO 模式的 OSA-Express，HiperSockets 和 Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1346
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2015,19 +1943,19 @@ msgstr ""
 "址获得。"
 
 #. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1356
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN 虽也获得支持，不过不能在安装阶段使用。"
 
 #. Tag: title
-#: hardware.xml:1361
+#: hardware.xml:1363
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "无线网卡"
 
 #. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1364
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2042,7 +1970,7 @@ msgstr ""
 "linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件的更多信息。"
 
 #. Tag: para
-#: hardware.xml:1370
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2053,7 +1981,7 @@ msgstr ""
 "作，但是却不能在安装过程中使用。"
 
 #. Tag: para
-#: hardware.xml:1375
+#: hardware.xml:1377
 #, no-c-format
 msgid ""
 "Support for encrypted wireless during installation is currently limited to "
@@ -2064,7 +1992,7 @@ msgstr ""
 "健壮的加密方法，在安装时就无法使用。"
 
 #. Tag: para
-#: hardware.xml:1381
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2080,15 +2008,8 @@ msgstr ""
 "件，并手动配置网络。"
 
 #. Tag: para
-#: hardware.xml:1391
+#: hardware.xml:1393
 #, no-c-format
-#| msgid ""
-#| "In some cases the driver you need may not be available as a Debian "
-#| "package. You will then have to look if there is source code available in "
-#| "the internet and compile the driver yourself. How to do this is outside "
-#| "the scope of this manual. <phrase arch=\"x86\">If no Linux driver is "
-#| "available, your last resort is to use the <classname>ndiswrapper</"
-#| "classname> package, which allows you to use a Windows driver.</phrase>"
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
 "package. You will then have to look if there is source code available in the "
@@ -2096,16 +2017,20 @@ msgid ""
 "scope of this manual. <phrase arch=\"x86\">If no Linux driver is available, "
 "your last resort is to use the <classname>ndiswrapper</classname> package, "
 "which allows you to use a Windows driver.</phrase>"
-msgstr "有些情况下，您需要的驱动程序不包含在 &debian; 软件包里面。必须在互联网上寻找它们的源码，并自己动手编译驱动程序。该如何做已经超出了本手册的范围。<phrase arch=\"x86\">如果没有 Linux 驱动程序，最后的手段是用 <classname>ndiswrapper</classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
+msgstr ""
+"有些情况下，您需要的驱动程序不包含在 &debian; 软件包里面。必须在互联网上寻找"
+"它们的源码，并自己动手编译驱动程序。该如何做已经超出了本手册的范围。<phrase "
+"arch=\"x86\">如果没有 Linux 驱动程序，最后的手段是用 <classname>ndiswrapper</"
+"classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1405
+#: hardware.xml:1407
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; 的一些已知问题"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1408
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2113,13 +2038,13 @@ msgid ""
 msgstr "有些特定的网卡事项需要在此提及。"
 
 #. Tag: title
-#: hardware.xml:1413
+#: hardware.xml:1415
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip 和 dfme 驱动程序之间的冲突"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1417
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2135,7 +2060,7 @@ msgstr ""
 "如果使用不正确的驱动程序，网卡可能不工作，或者工作不正常。"
 
 #. Tag: para
-#: hardware.xml:1425
+#: hardware.xml:1427
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2148,7 +2073,7 @@ msgstr ""
 "\"module-blacklist\"/> 将错误的驱动模块加入黑名单，以阻止这种情况发生。"
 
 #. Tag: para
-#: hardware.xml:1433
+#: hardware.xml:1435
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2165,13 +2090,13 @@ msgstr ""
 "之后错误的模块可能还会加载。"
 
 #. Tag: title
-#: hardware.xml:1446
+#: hardware.xml:1448
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1448
+#: hardware.xml:1450
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2180,13 +2105,13 @@ msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
 
 #. Tag: title
-#: hardware.xml:1463
+#: hardware.xml:1465
 #, no-c-format
 msgid "Braille Displays"
 msgstr "盲文点触设备(Braille Display)"
 
 #. Tag: para
-#: hardware.xml:1464
+#: hardware.xml:1466
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2203,13 +2128,13 @@ msgstr ""
 "的 <classname>brltty</classname> 版本是 &brlttyver; 。"
 
 #. Tag: title
-#: hardware.xml:1478
+#: hardware.xml:1480
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "硬件语音合成(Hardware Speech Synthesis)"
 
 #. Tag: para
-#: hardware.xml:1479
+#: hardware.xml:1481
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2228,13 +2153,13 @@ msgstr ""
 "gnu; &release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
 
 #. Tag: title
-#: hardware.xml:1499
+#: hardware.xml:1501
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "外围设备与其他硬件"
 
 #. Tag: para
-#: hardware.xml:1500
+#: hardware.xml:1502
 #, no-c-format
 msgid ""
 "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2245,7 +2170,7 @@ msgstr ""
 "设备。然而，在安装系统的时候，并不需要其中的大部分设备。"
 
 #. Tag: para
-#: hardware.xml:1506
+#: hardware.xml:1508
 #, no-c-format
 msgid ""
 "USB hardware generally works fine, only some USB keyboards may require "
@@ -2255,7 +2180,7 @@ msgstr ""
 "\"hardware-issues\"/>)。"
 
 #. Tag: para
-#: hardware.xml:1512
+#: hardware.xml:1514
 #, no-c-format
 msgid ""
 "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
@@ -2266,7 +2191,7 @@ msgstr ""
 "Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
 
 #. Tag: para
-#: hardware.xml:1518
+#: hardware.xml:1520
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2277,7 +2202,7 @@ msgstr ""
 "通过 NFS、HTTP、FTP 从网络上取得。"
 
 #. Tag: para
-#: hardware.xml:1524
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2285,13 +2210,13 @@ msgid ""
 msgstr "Cobalt RaQ 不支持外加设备，但 Qube 有一个 PCI 插槽。"
 
 #. Tag: title
-#: hardware.xml:1536
+#: hardware.xml:1538
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "需要固件的设备"
 
 #. Tag: para
-#: hardware.xml:1537
+#: hardware.xml:1539
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2306,7 +2231,7 @@ msgstr ""
 "说很常见，但有些 USB 设备甚至是硬盘控制器也需要加载固件(firmware)。"
 
 #. Tag: para
-#: hardware.xml:1545
+#: hardware.xml:1547
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2321,7 +2246,7 @@ msgstr ""
 "gnu; 可以合法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
-#: hardware.xml:1554
+#: hardware.xml:1556
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2337,30 +2262,27 @@ msgstr ""
 "息。"
 
 #. Tag: title
-#: hardware.xml:1570
+#: hardware.xml:1572
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
-#: hardware.xml:1572
+#: hardware.xml:1574
 #, no-c-format
-#| msgid ""
-#| "There are several vendors, who ship systems with Debian or other "
-#| "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-"
-#| "installed</ulink>. You might pay more for the privilege, but it does buy "
-#| "a level of peace of mind, since you can be sure that the hardware is well-"
-#| "supported by GNU/Linux."
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
 "distributions of GNU/Linux <ulink url=\"&url-pre-installed;\">pre-installed</"
 "ulink>. You might pay more for the privilege, but it does buy a level of "
 "peace of mind, since you can be sure that the hardware is well-supported by "
 "GNU/Linux."
-msgstr "现在有一些经销商，他们出售的系统是<ulink url=\"&url-pre-installed;\">预装</ulink> &debian; 或者是其他的 GNU/Linux。您或许会多花一些钱，但是买来一份安心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
+msgstr ""
+"现在有一些经销商，他们出售的系统是<ulink url=\"&url-pre-installed;\">预装</"
+"ulink> &debian; 或者是其他的 GNU/Linux。您或许会多花一些钱，但是买来一份安"
+"心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1582
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2374,7 +2296,7 @@ msgstr ""
 "<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
 
 #. Tag: para
-#: hardware.xml:1588
+#: hardware.xml:1590
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2390,13 +2312,13 @@ msgstr ""
 "&arch-kernel; 友好的硬件销售商。"
 
 #. Tag: title
-#: hardware.xml:1599
+#: hardware.xml:1601
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1602
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2408,7 +2330,7 @@ msgstr ""
 "不公开的契约才能接触文档，以阻止我们发布 &arch-kernel; 驱动程序源代码。"
 
 #. Tag: para
-#: hardware.xml:1607
+#: hardware.xml:1609
 #, no-c-format
 msgid ""
 "Since we haven't been granted access to the documentation on these devices, "
@@ -2422,13 +2344,13 @@ msgstr ""
 "识到自由软件社区也是一个重要的市场。"
 
 #. Tag: title
-#: hardware.xml:1619
+#: hardware.xml:1621
 #, no-c-format
 msgid "Windows-specific Hardware"
 msgstr "Windows 专用硬件"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1622
 #, no-c-format
 msgid ""
 "A disturbing trend is the proliferation of Windows-specific modems and "
@@ -2450,7 +2372,7 @@ msgstr ""
 "等功能的保留内嵌处理器的设备昂贵。"
 
 #. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1635
 #, no-c-format
 msgid ""
 "You should avoid Windows-specific hardware for two reasons. The first is "
@@ -2482,14 +2404,8 @@ msgstr ""
 "能下降。"
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1656
 #, no-c-format
-#| msgid ""
-#| "You can help improve this situation by encouraging these manufacturers to "
-#| "release the documentation and other resources necessary for us to program "
-#| "their hardware, but the best strategy is simply to avoid this sort of "
-#| "hardware until it is listed as working in the <ulink url=\"&url-hardware-"
-#| "howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 msgid ""
 "You can help improve this situation by encouraging these manufacturers to "
 "release the documentation and other resources necessary for us to program "
@@ -2497,24 +2413,21 @@ msgid ""
 "hardware<phrase arch=\"linux-any\"> until it is listed as working in the "
 "<ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
 "ulink></phrase>."
-msgstr "您可以帮助改变这种状况，要求制造商发布相应的文档和资料，让我们可以编写他们硬件的程序，但最好还是避免使用这些硬件<phrase arch=\"linux-any\">，直到它们被列入 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink></phrase>。"
+msgstr ""
+"您可以帮助改变这种状况，要求制造商发布相应的文档和资料，让我们可以编写他们硬"
+"件的程序，但最好还是避免使用这些硬件<phrase arch=\"linux-any\">，直到它们被列"
+"入 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
+"ulink></phrase>。"
 
 #. Tag: title
-#: hardware.xml:1672
+#: hardware.xml:1674
 #, no-c-format
 msgid "Installation Media"
 msgstr "安装介质"
 
 #. Tag: para
-#: hardware.xml:1674
+#: hardware.xml:1676
 #, no-c-format
-#| msgid ""
-#| "This section will help you determine which different media types you can "
-#| "use to install Debian. For example, if you have a floppy disk drive on "
-#| "your machine, it can be used to install Debian. There is a whole chapter "
-#| "devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
-#| "advantages and disadvantages of each media type. You may want to refer "
-#| "back to this page once you reach that section."
 msgid ""
 "This section will help you determine which different media types you can use "
 "to install &debian;. For example, if you have a floppy disk drive on your "
@@ -2522,16 +2435,20 @@ msgid ""
 "devoted to media, <xref linkend=\"install-methods\"/>, which lists the "
 "advantages and disadvantages of each media type. You may want to refer back "
 "to this page once you reach that section."
-msgstr "本章将助您选则安装 &debian; 所采用的介质。例如，您的电脑上有一个软驱，它就可以用来安装 &debian;。有一整章专门用于说明介质：<xref linkend=\"install-methods\"/>，里面列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回参考本页。"
+msgstr ""
+"本章将助您选则安装 &debian; 所采用的介质。例如，您的电脑上有一个软驱，它就可"
+"以用来安装 &debian;。有一整章专门用于说明介质：<xref linkend=\"install-"
+"methods\"/>，里面列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回参考"
+"本页。"
 
 #. Tag: title
-#: hardware.xml:1685
+#: hardware.xml:1687
 #, no-c-format
 msgid "Floppies"
 msgstr "软盘"
 
 #. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1688
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2542,19 +2459,19 @@ msgstr ""
 "(1440 千字节)软驱。"
 
 #. Tag: para
-#: hardware.xml:1692
+#: hardware.xml:1694
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "用于 CHRP 的软盘支持已经被停止。"
 
 #. Tag: title
-#: hardware.xml:1699
+#: hardware.xml:1701
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1701
+#: hardware.xml:1703
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2567,7 +2484,7 @@ msgstr ""
 "IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1710
 #, no-c-format
 msgid ""
 "CD-ROM based installation is supported for some architectures. On machines "
@@ -2585,7 +2502,7 @@ msgstr ""
 "installer\"/>。"
 
 #. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1722
 #, no-c-format
 msgid ""
 "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
@@ -2596,7 +2513,7 @@ msgstr ""
 "\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
 
 #. Tag: para
-#: hardware.xml:1726
+#: hardware.xml:1728
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2606,13 +2523,13 @@ msgstr ""
 "获得支持。"
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1733
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2630,13 +2547,13 @@ msgstr ""
 "固件上选择 <quote>System installation</quote> 项。"
 
 #. Tag: title
-#: hardware.xml:1749
+#: hardware.xml:1751
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. Tag: para
-#: hardware.xml:1751
+#: hardware.xml:1753
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2647,7 +2564,7 @@ msgstr ""
 "安装程序。"
 
 #. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1759
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2657,21 +2574,14 @@ msgstr ""
 "(UFS slices)进行安装。"
 
 #. Tag: title
-#: hardware.xml:1765
+#: hardware.xml:1767
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "U 盘"
 
 #. Tag: para
-#: hardware.xml:1767
+#: hardware.xml:1769
 #, no-c-format
-#| msgid ""
-#| "Many Debian boxes need their floppy and/or CD-ROM drives only for setting "
-#| "up the system and for rescue purposes. If you operate some servers, you "
-#| "will probably already have thought about omitting those drives and using "
-#| "an USB memory stick for installing and (when necessary) for recovering "
-#| "the system. This is also useful for small systems which have no room for "
-#| "unnecessary drives."
 msgid ""
 "Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
 "up the system and for rescue purposes. If you operate some servers, you will "
@@ -2679,16 +2589,19 @@ msgid ""
 "memory stick for installing and (when necessary) for recovering the system. "
 "This is also useful for small systems which have no room for unnecessary "
 "drives."
-msgstr "许多 &debian; 机器只在设置系统和急救用途时才需要软盘和 CD-ROM 驱动器。如果使用过服务器，您也许已经想过怎么样省掉这些驱动器，而用 U 盘来安装和(在必需时)恢复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
+msgstr ""
+"许多 &debian; 机器只在设置系统和急救用途时才需要软盘和 CD-ROM 驱动器。如果使"
+"用过服务器，您也许已经想过怎么样省掉这些驱动器，而用 U 盘来安装和(在必需时)恢"
+"复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
 
 #. Tag: title
-#: hardware.xml:1779
+#: hardware.xml:1781
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. Tag: para
-#: hardware.xml:1781
+#: hardware.xml:1783
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2705,7 +2618,7 @@ msgstr ""
 "用 ISDN 和 PPP。"
 
 #. Tag: para
-#: hardware.xml:1791
+#: hardware.xml:1793
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2716,7 +2629,7 @@ msgstr ""
 "\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1797
+#: hardware.xml:1799
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2726,13 +2639,13 @@ msgstr ""
 "择。"
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1807
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1809
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2747,22 +2660,14 @@ msgstr ""
 ">。"
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1821
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "受支持的存储系统"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1823
 #, no-c-format
-#| msgid ""
-#| "The Debian boot disks contain a kernel which is built to maximize the "
-#| "number of systems it runs on. Unfortunately, this makes for a larger "
-#| "kernel, which includes many drivers that won't be used for your "
-#| "machine<phrase arch=\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> "
-#| "to learn how to build your own kernel)</phrase>. Support for the widest "
-#| "possible range of devices is desirable in general, to ensure that Debian "
-#| "can be installed on the widest array of hardware."
 msgid ""
 "The &debian; boot disks contain a kernel which is built to maximize the "
 "number of systems it runs on. Unfortunately, this makes for a larger kernel, "
@@ -2771,25 +2676,28 @@ msgid ""
 "your own kernel)</phrase>. Support for the widest possible range of devices "
 "is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
-msgstr "&debian; 启动盘包括一个用于最大可能数量系统的内核。不幸的是，这将产生一个大内核，其中包括许多您的机器并不需要的驱动程序<phrase arch=\"linux-any\">(参考<xref linkend=\"kernel-baking\"/>学习如何创建自己的内核)</phrase>。在通常情况下，支持最大范围内的设备是一种较合适的设计，这将使得 &debian; 可以在尽可能多的硬件上安装。"
+msgstr ""
+"&debian; 启动盘包括一个用于最大可能数量系统的内核。不幸的是，这将产生一个大内"
+"核，其中包括许多您的机器并不需要的驱动程序<phrase arch=\"linux-any\">(参考"
+"<xref linkend=\"kernel-baking\"/>学习如何创建自己的内核)</phrase>。在通常情况"
+"下，支持最大范围内的设备是一种较合适的设计，这将使得 &debian; 可以在尽可能多"
+"的硬件上安装。"
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1833
 #, no-c-format
-#| 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."
 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:1838
+#: hardware.xml:1840
 #, no-c-format
 msgid ""
 "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
@@ -2804,7 +2712,7 @@ msgstr ""
 "HOWTO</ulink> 以获得更详细信息。"
 
 #. Tag: para
-#: hardware.xml:1846
+#: hardware.xml:1848
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2826,7 +2734,7 @@ msgstr ""
 "以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
 
 #. Tag: para
-#: hardware.xml:1879
+#: hardware.xml:1881
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2837,7 +2745,7 @@ msgstr ""
 "支持 CHRP 系统上的软盘。"
 
 #. Tag: para
-#: hardware.xml:1885
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2848,7 +2756,7 @@ msgstr ""
 "支持软驱。"
 
 #. Tag: para
-#: hardware.xml:1891
+#: hardware.xml:1893
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2856,7 +2764,7 @@ msgid ""
 msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
 
 #. Tag: para
-#: hardware.xml:1896
+#: hardware.xml:1898
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2868,13 +2776,13 @@ msgstr ""
 "持。"
 
 #. Tag: title
-#: hardware.xml:1913
+#: hardware.xml:1915
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "内存与磁盘空间的需求"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1917
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2887,7 +2795,7 @@ msgstr ""
 "hardware-reqts\"/>。"
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1924
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2902,3 +2810,22 @@ msgstr ""
 "本界面需要更多的内存，并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
 "形界面两种方式之间选择，应选择普通方式。</para> </footnote>或磁盘空间上安装系"
 "统或许可行，但只针对有经验的用户。"
+
+#~ msgid ""
+#~ "Complete information regarding supported S/390 and zSeries machines can "
+#~ "be found in IBM's Redbook <ulink url=\"http://www.redbooks.ibm.com/pubs/"
+#~ "pdfs/redbooks/sg246264.pdf\"> Linux for IBM eServer zSeries and S/390: "
+#~ "Distributions</ulink> in chapter 2.1 or at the <ulink url=\"http://"
+#~ "www-128.ibm.com/developerworks/linux/linux390/index.html\">zSeries page "
+#~ "at the developerWorks</ulink>. In short, G5, Multiprise 3000, G6 and all "
+#~ "zSeries are fully supported; Multiprise 2000, G3 and G4 machines are "
+#~ "supported with IEEE floating point emulation and thus degraded "
+#~ "performance."
+#~ msgstr ""
+#~ "有关 S/390 和 zSeries 机器支持的完整信息参见 IBM 的 Redbook <ulink url="
+#~ "\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux "
+#~ "for IBM eServer zSeries and S/390: Distributions</ulink> 第 2.1 章节，或"
+#~ "者 <ulink url=\"http://www-128.ibm.com/developerworks/linux/linux390/"
+#~ "index.html\">developerWorks 网站上的 zSeries 页面</ulink>。简而言之，G5、"
+#~ "Multiprise 3000、G6 以及所有的 zSeries 都可以得到完整的支持；Multiprise "
+#~ "2000、G3 和 G4 机器使用 IEEE 浮点模拟来支持，因此会降低性能。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c022f10f6..c1b30c3d2 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:00+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -27,20 +27,6 @@ msgstr "官方的 &debian-gnu; 光盘套装"
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official Debian "
-#| "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-#| "debian-cd-vendors;\">CD vendors page</ulink>). You may also download the "
-#| "CD-ROM images from a Debian mirror and make your own set, if you have a "
-#| "fast network connection and a CD burner (see the <ulink url=\"&url-debian-"
-#| "cd;\">Debian CD page</ulink> for detailed instructions). If you have a "
-#| "Debian CD set and CDs are bootable on your machine, you can skip right to "
-#| "<xref linkend=\"boot-installer\"/>; much effort has been expended to "
-#| "ensure the files most people need are there on the CD. Although a full "
-#| "set of binary packages requires several CDs, it is unlikely you will need "
-#| "packages on the third CD and above. You may also consider using the DVD "
-#| "version, which saves a lot of space on your shelf and you avoid the CD "
-#| "shuffling marathon."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
 "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -54,23 +40,20 @@ msgid ""
 "packages requires several CDs, it is unlikely you will need packages on the "
 "third CD and above. You may also consider using the DVD version, which saves "
 "a lot of space on your shelf and you avoid the CD shuffling marathon."
-msgstr "目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。如果您有快速的网络连接和光盘刻录机的话，也可以从 &debian; 镜像站点下载 CD-ROM 映像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</ulink>)。如果您有一套 &debian; 的 CD 套件并且能在机器上引导这些 CD 盘，可以直接跳至 <xref linkend=\"boot-installer\"/>。我们已经做了很多努力来确保 CD 中已经包含了大多数人所需要的文件。尽管一整套预编译的二进制软件包需要好几张 CD 盘，但是您可能不会用到第三张 CD 盘以后的内容。也可以考虑使用 DVD 版本，这将为您的书架节约很多光盘存放空间，并且可以避免马拉松式地切换 CD。"
+msgstr ""
+"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从"
+"一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
+"ulink>)。如果您有快速的网络连接和光盘刻录机的话，也可以从 &debian; 镜像站点下"
+"载 CD-ROM 映像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;"
+"\">Debian CD 页</ulink>)。如果您有一套 &debian; 的 CD 套件并且能在机器上引导"
+"这些 CD 盘，可以直接跳至 <xref linkend=\"boot-installer\"/>。我们已经做了很多"
+"努力来确保 CD 中已经包含了大多数人所需要的文件。尽管一整套预编译的二进制软件"
+"包需要好几张 CD 盘，但是您可能不会用到第三张 CD 盘以后的内容。也可以考虑使用 "
+"DVD 版本，这将为您的书架节约很多光盘存放空间，并且可以避免马拉松式地切换 CD。"
 
 #. Tag: para
 #: install-methods.xml:30
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the Debian network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
 msgid ""
 "If your machine doesn't support CD booting, but you do have a CD set, you "
 "can use an alternative strategy such as <phrase condition=\"supports-floppy-"
@@ -83,7 +66,15 @@ msgid ""
 "organization are identical. So when archive file paths are given below for "
 "particular files you need for booting, look for those files in the same "
 "directories and subdirectories on your CD."
-msgstr "如果您的机器不支持 CD 盘引导，但是您有一套 CD 光盘套件，可以使用其他的方法比如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、磁带仿真、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp\">网络引导，</phrase> 或者从 CD 中手工装载内核来初始化系统安装程序。CD 已经包含了通过其他方法引导所需要的文件; &debian; 的网络存档和 CD 的文件夹组织方式是一致的。因此如果后面有给出的用于引导的特定存档文件路径时，请在 CD 中同样的文件目录和子目录下查找它们。"
+msgstr ""
+"如果您的机器不支持 CD 盘引导，但是您有一套 CD 光盘套件，可以使用其他的方法比"
+"如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch="
+"\"s390\">磁带、磁带仿真、</phrase> <phrase condition=\"bootable-disk\">硬盘、"
+"</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase "
+"condition=\"supports-tftp\">网络引导，</phrase> 或者从 CD 中手工装载内核来初"
+"始化系统安装程序。CD 已经包含了通过其他方法引导所需要的文件; &debian; 的网络"
+"存档和 CD 的文件夹组织方式是一致的。因此如果后面有给出的用于引导的特定存档文"
+"件路径时，请在 CD 中同样的文件目录和子目录下查找它们。"
 
 #. Tag: para
 #: install-methods.xml:52
@@ -113,32 +104,28 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:83
 #, no-c-format
-#| msgid "Downloading Files from Debian Mirrors"
 msgid "Downloading Files from &debian; Mirrors"
 msgstr "从 &debian; 镜像服务器下载文件"
 
 #. Tag: para
 #: install-methods.xml:85
 #, no-c-format
-#| msgid ""
-#| "To find the nearest (and thus probably the fastest) mirror, see the "
-#| "<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink>."
 msgid ""
 "To find the nearest (and thus probably the fastest) mirror, see the <ulink "
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
-msgstr "选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-debian-mirrors;\">&debian; 镜像列表</ulink>。"
+msgstr ""
+"选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-"
+"debian-mirrors;\">&debian; 镜像列表</ulink>。"
 
 #. Tag: para
 #: install-methods.xml:90
 #, no-c-format
-#| msgid ""
-#| "When downloading files from a Debian mirror using FTP, be sure to "
-#| "download the files in <emphasis>binary</emphasis> mode, not text or "
-#| "automatic mode."
 msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
-msgstr "当使用 FTP 从 &debian; 镜像服务器下载文件的时候，请确认下载的文件是处于<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
+msgstr ""
+"当使用 FTP 从 &debian; 镜像服务器下载文件的时候，请确认下载的文件是处于"
+"<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
 
 #. Tag: title
 #: install-methods.xml:98
@@ -149,19 +136,17 @@ msgstr "在哪里能找到安装映像"
 #. Tag: para
 #: install-methods.xml:100
 #, no-c-format
-#| msgid ""
-#| "The installation images are located on each Debian mirror in the "
-#| "directory <ulink url=\"&url-debian-installer;images\">debian/dists/"
-#| "&releasename;/main/installer-&architecture;/current/images/</ulink> "
-#| "&mdash; the <ulink url=\"&url-debian-installer;images/MANIFEST"
-#| "\">MANIFEST</ulink> lists each image and its purpose."
 msgid ""
 "The installation images are located on each &debian; mirror in the directory "
 "<ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/"
 "installer-&architecture;/current/images/</ulink> &mdash; the <ulink url="
 "\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> lists each image "
 "and its purpose."
-msgstr "安装映像位于每一个 &debian; 镜像的 <ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink> &mdash; <ulink url=\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
+msgstr ""
+"安装映像位于每一个 &debian; 镜像的 <ulink url=\"&url-debian-installer;images"
+"\">debian/dists/&releasename;/main/installer-&architecture;/current/images/</"
+"ulink> &mdash; <ulink url=\"&url-debian-installer;images/MANIFEST"
+"\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
 
 #. Tag: title
 #: install-methods.xml:113
@@ -210,15 +195,13 @@ msgstr "GLAN Tank 安装文件"
 #. Tag: para
 #: install-methods.xml:139
 #, no-c-format
-#| msgid ""
-#| "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &glantank-firmware-img;."
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
 "on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
-msgstr "GLAN Tank 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这些映象可以从 &glantank-firmware-img; 获得。"
+msgstr ""
+"GLAN Tank 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这"
+"些映象可以从 &glantank-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:149
@@ -229,15 +212,13 @@ msgstr "Kurobox Pro 安装文件"
 #. Tag: para
 #: install-methods.xml:150
 #, no-c-format
-#| msgid ""
-#| "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &kuroboxpro-firmware-img;."
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
 "disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
-msgstr "Kurobox Pro 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这些映象可以从 &kuroboxpro-firmware-img; 获得。"
+msgstr ""
+"Kurobox Pro 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。"
+"这些映象可以从 &kuroboxpro-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:160
@@ -360,7 +341,12 @@ msgid ""
 "mode. This is required because these images are raw representations of the "
 "disk; it is required to do a <emphasis>sector copy</emphasis> of the data "
 "from the file onto the floppy."
-msgstr "软盘映像是一些包含完整的 <emphasis>raw</emphasis> 格式软盘内容的文件。类似 <filename>boot.img</filename> 这样的软盘映像不能直接复制到软盘中。有一个特殊的程序可以将它们按 <emphasis>raw</emphasis> 模式写入软盘。这是一个必须的步骤，因为这些映像文件是一些原始的磁盘保存方式。所以需要把文件的数据<emphasis>按扇区复制</emphasis>到软盘中。"
+msgstr ""
+"软盘映像是一些包含完整的 <emphasis>raw</emphasis> 格式软盘内容的文件。类似 "
+"<filename>boot.img</filename> 这样的软盘映像不能直接复制到软盘中。有一个特殊"
+"的程序可以将它们按 <emphasis>raw</emphasis> 模式写入软盘。这是一个必须的步"
+"骤，因为这些映像文件是一些原始的磁盘保存方式。所以需要把文件的数据<emphasis>"
+"按扇区复制</emphasis>到软盘中。"
 
 #. Tag: para
 #: install-methods.xml:285
@@ -376,19 +362,16 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:291
 #, no-c-format
-#| msgid ""
-#| "Before you can create the floppies, you will first need to download them "
-#| "from one of the Debian mirrors, as explained in <xref linkend="
-#| "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
-#| "installation CD-ROM or DVD, the floppy images may also be included on the "
-#| "CD/DVD.</phrase>"
 msgid ""
 "Before you can create the floppies, you will first need to download them "
 "from one of the &debian; mirrors, as explained in <xref linkend="
 "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
 "installation CD-ROM or DVD, the floppy images may also be included on the CD/"
 "DVD.</phrase>"
-msgstr "制作软盘之前，您首先需要从 &debian; 镜像下载这些文件，见 <xref linkend=\"downloading-files\"/>。<phrase arch=\"i386\">如果您已经有了安装 CD-ROM 或 DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
+msgstr ""
+"制作软盘之前，您首先需要从 &debian; 镜像下载这些文件，见 <xref linkend="
+"\"downloading-files\"/>。<phrase arch=\"i386\">如果您已经有了安装 CD-ROM 或 "
+"DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:299
@@ -492,7 +475,8 @@ msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
 "following programs to copy images to floppies."
-msgstr "如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
+msgstr ""
+"如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
 
 #. Tag: para
 #: install-methods.xml:375
@@ -522,13 +506,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:389
 #, no-c-format
-#| msgid ""
-#| "These tools can be found on the Official Debian CD-ROMs under the "
-#| "<filename>/tools</filename> directory."
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
 "<filename>/tools</filename> directory."
-msgstr "这些工具可以在官方 &debian; 光盘中找到，位于 <filename>/tools</filename> 目录下。"
+msgstr ""
+"这些工具可以在官方 &debian; 光盘中找到，位于 <filename>/tools</filename> 目录"
+"下。"
 
 #. Tag: title
 #: install-methods.xml:402
@@ -539,15 +522,6 @@ msgstr "在 MacOS 上写磁盘映像"
 #. Tag: para
 #: install-methods.xml:403
 #, no-c-format
-#| msgid ""
-#| "An AppleScript, <application>Make Debian Floppy</application>, is "
-#| "available for burning floppies from the provided disk image files. It can "
-#| "be downloaded from <ulink url=\"ftp://ftp2.sourceforge.net/pub/"
-#| "sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink>. To use it, "
-#| "just unstuff it on your desktop, and then drag any floppy image file to "
-#| "it. You must have Applescript installed and enabled in your extensions "
-#| "manager. Disk Copy will ask you to confirm that you wish to erase the "
-#| "floppy and proceed to write the file image to it."
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
 "available for burning floppies from the provided disk image files. It can be "
@@ -557,7 +531,13 @@ msgid ""
 "Applescript installed and enabled in your extensions manager. Disk Copy will "
 "ask you to confirm that you wish to erase the floppy and proceed to write "
 "the file image to it."
-msgstr "这里有一个名为 <application>Make &debian; Floppy</application> 的 AppleSrcipt 可以用来从所提供的磁盘映像制作软盘。它可以从 <ulink url=\"ftp://ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink> 处下载。使用时只需要解压文件至桌面，然后向其拖入想刻录的映像文件。您必须已经安装了 Applescript 并在您的扩展管理器中开启它。Disk Copy 会要求您确认的确想要清空磁盘并写入磁盘映像。"
+msgstr ""
+"这里有一个名为 <application>Make &debian; Floppy</application> 的 "
+"AppleSrcipt 可以用来从所提供的磁盘映像制作软盘。它可以从 <ulink url=\"ftp://"
+"ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit"
+"\"></ulink> 处下载。使用时只需要解压文件至桌面，然后向其拖入想刻录的映像文"
+"件。您必须已经安装了 Applescript 并在您的扩展管理器中开启它。Disk Copy 会要求"
+"您确认的确想要清空磁盘并写入磁盘映像。"
 
 #. Tag: para
 #: install-methods.xml:414
@@ -581,17 +561,15 @@ msgstr "写磁盘映像：使用<command>Disk Copy</command>"
 #. Tag: para
 #: install-methods.xml:426
 #, no-c-format
-#| msgid ""
-#| "If you are creating the floppy image from files which were originally on "
-#| "the official &debian-gnu; CD, then the Type and Creator are already set "
-#| "correctly. The following <command>Creator-Changer</command> steps are "
-#| "only necessary if you downloaded the image files from a Debian mirror."
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
 "official &debian-gnu; CD, then the Type and Creator are already set "
 "correctly. The following <command>Creator-Changer</command> steps are only "
 "necessary if you downloaded the image files from a &debian; mirror."
-msgstr "假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 &debian; 镜像下载映像文件的情况。"
+msgstr ""
+"假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经"
+"设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 &debian; 镜像"
+"下载映像文件的情况。"
 
 #. Tag: para
 #: install-methods.xml:435
@@ -722,19 +700,15 @@ msgstr "为从 U 盘引导准备文件"
 #. Tag: para
 #: install-methods.xml:532
 #, no-c-format
-#| msgid ""
-#| "There are two installation methods possible when booting from USB stick. "
-#| "The first is to install completely from the network. The second is to "
-#| "also copy a CD image onto the USB stick and use that as a source for "
-#| "packages, possibly in combination with a mirror. This second method is "
-#| "the more common."
 msgid ""
 "There are two installation methods possible when booting from USB stick. The "
 "first is to only use the USB stick to boot the installer, and then install "
 "completely from the network. The second is to also copy a CD image onto the "
 "USB stick and use that as a source for packages, possibly in combination "
 "with a mirror."
-msgstr "从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过网络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜像。"
+msgstr ""
+"从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过网"
+"络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜像。"
 
 #. Tag: para
 #: install-methods.xml:540
@@ -772,11 +746,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:560
 #, no-c-format
-#| msgid ""
-#| "For the first installation method you'll need to download an installer "
-#| "image from the <filename>netboot</filename> directory (at the location "
-#| "mentioned in <xref linkend=\"where-files\"/>) and use the <quote>flexible "
-#| "way</quote> explained below to copy the files to the USB stick."
 msgid ""
 "To prepare a USB stick that only boots the installer, which then proceeds to "
 "install entirely from the network, you'll need to download the "
@@ -785,7 +754,11 @@ msgid ""
 "and write this file directly to the USB stick, overwriting its current "
 "contents. This method will work with very small USB sticks, only a few "
 "megabytes in size."
-msgstr "要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 <filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖里面的内容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
+msgstr ""
+"要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 "
+"<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位"
+"于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖里面的内"
+"容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
 
 #. Tag: para
 #: install-methods.xml:570
@@ -802,10 +775,14 @@ msgid ""
 "two partitions should now be visible on it. You should mount the second of "
 "the two partitions, and unpack the firmware onto it."
 msgstr ""
-"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件可以写如到一个 U 盘里面: <informalexample><screen>\n"
+"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
+"可以写如到一个 U 盘里面: <informalexample><screen>\n"
 "# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
 "# sync\n"
-"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上面。"
+"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件"
+"文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
+"U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上"
+"面。"
 
 #. Tag: screen
 #: install-methods.xml:582
@@ -826,18 +803,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:584
 #, no-c-format
-#| msgid ""
-#| "Installation images for the second installation method can be found in "
-#| "the <filename>hd-media</filename> directory and either the <quote>easy "
-#| "way</quote> or the <quote>flexible way</quote> can be used to copy the "
-#| "image to the USB stick. For this installation method you will also need "
-#| "to download a CD image. The installation image and the CD image must be "
-#| "based on the same release of &d-i;. If they do not match you are likely "
-#| "to get errors<footnote> <para> The error message that is most likely to "
-#| "be displayed is that no kernel modules can be found. This means that the "
-#| "version of the kernel module udebs included on the CD image is different "
-#| "from the version of the running kernel. </para> </footnote> during the "
-#| "installation."
 msgid ""
 "To prepare a USB stick that installs packages from a CD image included on "
 "the stick, use the installer images found in the <filename>hd-media</"
@@ -850,7 +815,13 @@ msgid ""
 "can be found. This means that the version of the kernel module udebs "
 "included on the CD image is different from the version of the running "
 "kernel. </para> </footnote> during the installation."
-msgstr "制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
+msgstr ""
+"制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</"
+"filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它"
+"复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该"
+"是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息"
+"大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与"
+"正在运行的内核不符。</para> </footnote>。"
 
 #. Tag: para
 #: install-methods.xml:604
@@ -871,19 +842,17 @@ msgstr "复制文件 &mdash; 轻松的途径"
 #. Tag: para
 #: install-methods.xml:613
 #, no-c-format
-#| msgid ""
-#| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
-#| "which contains all the installer files (including the kernel) <phrase "
-#| "arch=\"x86\">as well as <classname>syslinux</classname> and its "
-#| "configuration file.</phrase> <phrase arch=\"powerpc\">as well as "
-#| "<classname>yaboot</classname> and its configuration file.</phrase>"
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
 "contains all the installer files (including the kernel) <phrase arch="
 "\"x86\">as well as <classname>syslinux</classname> and its configuration "
 "file</phrase> <phrase arch=\"powerpc\">as well as <classname>yaboot</"
 "classname> and its configuration file</phrase>."
-msgstr "有一个文件合集 <filename>hd-media/boot.img.gz</filename> 包含所有的安装程序文件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应的配置文件</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</classname> 和对应的配置文件</phrase>。"
+msgstr ""
+"有一个文件合集 <filename>hd-media/boot.img.gz</filename> 包含所有的安装程序文"
+"件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应"
+"的配置文件</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</"
+"classname> 和对应的配置文件</phrase>。"
 
 #. Tag: para
 #: install-methods.xml:622
@@ -934,15 +903,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 #. Tag: para
 #: install-methods.xml:646
 #, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
-#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
-#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a Debian netinst "
-#| "or businesscard ISO image to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -952,7 +912,14 @@ msgid ""
 "filesystem</phrase> on it, and copy a &debian; netinst or businesscard ISO "
 "image to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
 "are done."
-msgstr "然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>)，</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>)，</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，复制 &debian; netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
+msgstr ""
+"然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
+"<replaceable>sdX</replaceable> /mnt</userinput>)，</phrase> <phrase arch="
+"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
+"userinput>)，</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
+"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，复制 &debian; "
+"netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</"
+"userinput>) 就完成了。"
 
 #. Tag: title
 #: install-methods.xml:663
@@ -990,18 +957,6 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 #. Tag: para
 #: install-methods.xml:685
 #, no-c-format
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> Debian package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -1014,9 +969,14 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> &debian; package."
 msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
+"化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
+"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
+"标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</classname> 软件包中。"
+"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。"
+"<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</"
+"classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:704
@@ -1107,20 +1067,12 @@ msgstr ""
 "<quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序，您需要添加 "
-"<userinput>vga=788</userinput> 到第二行尾部。"
+"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</"
+"userinput> 到第二行尾部。"
 
 #. Tag: para
 #: install-methods.xml:768
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image<footnote> <para> You can use either a businesscard, a "
-#| "netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1129,24 +1081,16 @@ msgid ""
 "filename></quote> image is not usable for this purpose. </para> </footnote> "
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> 到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
+"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
+"<xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"<filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> "
+"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:792
 #, no-c-format
-#| msgid ""
-#| "Most USB sticks do not come pre-configured in such a way that Open "
-#| "Firmware can boot from them, so you will need to repartition the stick. "
-#| "On Mac systems, run <userinput>mac-fdisk /dev/<replaceable>sdX</"
-#| "replaceable></userinput>, initialise a new partition map using the "
-#| "<userinput>i</userinput> command, and create a new partition of type "
-#| "Apple_Bootstrap using the <userinput>C</userinput> command. (Note that "
-#| "the first \"partition\" will always be the partition map itself.) Then "
-#| "type <informalexample><screen>\n"
-#| "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>hformat</command> command is "
-#| "contained in the <classname>hfsutils</classname> Debian package."
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
 "can boot from them, so you will need to repartition the stick. On Mac "
@@ -1161,9 +1105,15 @@ msgid ""
 "for your USB stick. The <command>hformat</command> command is contained in "
 "the <classname>hfsutils</classname> &debian; package."
 msgstr ""
-"绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>，用 <userinput>i</userinput> 命令初始化新的分区映射，然后使用 <userinput>C</userinput> 命令创建一个新的类型为 Apple_Bootstrap 的分区。(要注意的是第一个\"分区\"总是分区映射本身。) 然后键入 <informalexample><screen>\n"
+"绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘"
+"重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</"
+"replaceable></userinput>，用 <userinput>i</userinput> 命令初始化新的分区映"
+"射，然后使用 <userinput>C</userinput> 命令创建一个新的类型为 Apple_Bootstrap "
+"的分区。(要注意的是第一个\"分区\"总是分区映射本身。) 然后键入 "
+"<informalexample><screen>\n"
 "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-"</screen></informalexample> 注意使用正确的 U 盘设备名称。<command>hformat</command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
+"</screen></informalexample> 注意使用正确的 U 盘设备名称。<command>hformat</"
+"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:809
@@ -1287,17 +1237,15 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:878
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image (businesscard, netinst or full CD image; be sure to "
-#| "select one that fits) onto the stick. When you are done, unmount the USB "
-#| "memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
 "select one that fits) onto the stick. When you are done, unmount the USB "
 "memory stick (<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
+"(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸"
+"载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: title
 #: install-methods.xml:893
@@ -1417,15 +1365,13 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:960
 #, no-c-format
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
 "on your hard drive (note that LILO can not boot from files on an NTFS file "
 "system), for instance to <filename>/boot/newinstall/</filename>."
-msgstr "将以下文件从 &debian; 存档中复制到硬盘中比较方便的地方，比如 <filename>/boot/newinstall/</filename>。"
+msgstr ""
+"将以下文件从 &debian; 存档中复制到硬盘中比较方便的地方，比如 <filename>/boot/"
+"newinstall/</filename>。"
 
 #. Tag: para
 #: install-methods.xml:968
@@ -1450,40 +1396,32 @@ msgstr "最后，要配置 bootloader，请进入 <xref linkend=\"boot-initrd\"/
 #. Tag: title
 #: install-methods.xml:990
 #, no-c-format
-#| msgid ""
-#| "Hard disk installer booting using <command>LILO</command> or "
-#| "<command>GRUB</command>"
 msgid "Hard disk installer booting using <command>loadlin</command>"
 msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
 
 #. Tag: para
 #: install-methods.xml:991
 #, no-c-format
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
 "installer from DOS using <command>loadlin</command>."
-msgstr "本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
+msgstr ""
+"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
 
 #. Tag: para
 #: install-methods.xml:996
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr "从 &debian; CD 映象复制下列文件到 <filename>c:\\</filename>。"
 
 #. Tag: para
 #: install-methods.xml:1001
 #, no-c-format
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
@@ -1491,7 +1429,6 @@ msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
 #. Tag: para
 #: install-methods.xml:1006
 #, no-c-format
-#| msgid "<filename>boot.msg</filename> (optional boot message)"
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin 工具)"
 
@@ -1504,16 +1441,6 @@ msgstr "在 OldWorld Macs 上引导硬盘安装程序"
 #. Tag: para
 #: install-methods.xml:1020
 #, no-c-format
-#| msgid ""
-#| "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
-#| "application> to launch Linux installation, but <application>miBoot</"
-#| "application> cannot easily be used for hard disk booting. "
-#| "<application>BootX</application>, launched from MacOS, supports booting "
-#| "from files placed on the hard disk. <application>BootX</application> can "
-#| "also be used to dual-boot MacOS and Linux after your Debian installation "
-#| "is complete. For the Performa 6360, it appears that <command>quik</"
-#| "command> cannot make the hard disk bootable. So <application>BootX</"
-#| "application> is required on that model."
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
 "application> to launch Linux installation, but <application>miBoot</"
@@ -1524,23 +1451,18 @@ msgid ""
 "complete. For the Performa 6360, it appears that <command>quik</command> "
 "cannot make the hard disk bootable. So <application>BootX</application> is "
 "required on that model."
-msgstr "<filename>boot-floppy-hfs</filename> 软盘使用 <application>miBoot</application> 来启动 Linux 安装，但是 <application>miBoot</application> 不易用于从硬盘引导。运行于 MacOS 的 <application>BootX</application> 支持从硬盘上的文件进行引导。<application>BootX</application> 也能在安装完 &debian; 后用于 MacOS 和 Linux 的双重引导。对于 Performa 6360 来说，<command>quik</command> 看上去不能让硬盘可引导。因此 <application>BootX</application> 对于该型号来说是必须的。"
+msgstr ""
+"<filename>boot-floppy-hfs</filename> 软盘使用 <application>miBoot</"
+"application> 来启动 Linux 安装，但是 <application>miBoot</application> 不易用"
+"于从硬盘引导。运行于 MacOS 的 <application>BootX</application> 支持从硬盘上的"
+"文件进行引导。<application>BootX</application> 也能在安装完 &debian; 后用于 "
+"MacOS 和 Linux 的双重引导。对于 Performa 6360 来说，<command>quik</command> "
+"看上去不能让硬盘可引导。因此 <application>BootX</application> 对于该型号来说"
+"是必须的。"
 
 #. Tag: para
 #: install-methods.xml:1033
 #, no-c-format
-#| msgid ""
-#| "Download and unstuff the <application>BootX</application> distribution, "
-#| "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
-#| "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-#| "directory on Debian http/ftp mirrors and official Debian CDs. Use "
-#| "<application>Stuffit Expander</application> to extract it from its "
-#| "archive. Within the package, there is an empty folder called "
-#| "<filename>Linux Kernels</filename>. Download <filename>linux.bin</"
-#| "filename> and <filename>ramdisk.image.gz</filename> from the "
-#| "<filename>disks-powerpc/current/powermac</filename> folder, and place "
-#| "them in the <filename>Linux Kernels</filename> folder. Then place the "
-#| "<filename>Linux Kernels</filename> folder in the active System Folder."
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
 "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
@@ -1553,7 +1475,17 @@ msgid ""
 "filename> folder, and place them in the <filename>Linux Kernels</filename> "
 "folder. Then place the <filename>Linux Kernels</filename> folder in the "
 "active System Folder."
-msgstr "请下载并且解压 <application>BootX</application> 发布版本。它可以从 <ulink url=\"&url-powerpc-bootx;\"></ulink>，或者 &debian; http/ftp 镜像以及官方 &debian; 光盘的 <filename>dists/woody/main/disks-powerpc/current/powermac</filename> 目录下得到。可以用 <application>Stuffit Expander</application> 来把它从打包档案中解开。在这个包中，有一个名为 <filename>Linux Kernels</filename> 的空文件夹。请下载 <filename>linux.bin</filename> 和 <filename>ramdisk.image.gz</filename> (位于 <filename>disks-powerpc/current/powermac</filename> 文件夹)，然后把他们放到 <filename>Linux Kernels</filename> 文件夹中，然后把 <filename>Linux Kernels</filename> 文件夹放到活动的系统文件夹中。"
+msgstr ""
+"请下载并且解压 <application>BootX</application> 发布版本。它可以从 <ulink "
+"url=\"&url-powerpc-bootx;\"></ulink>，或者 &debian; http/ftp 镜像以及官方 "
+"&debian; 光盘的 <filename>dists/woody/main/disks-powerpc/current/powermac</"
+"filename> 目录下得到。可以用 <application>Stuffit Expander</application> 来把"
+"它从打包档案中解开。在这个包中，有一个名为 <filename>Linux Kernels</"
+"filename> 的空文件夹。请下载 <filename>linux.bin</filename> 和 "
+"<filename>ramdisk.image.gz</filename> (位于 <filename>disks-powerpc/current/"
+"powermac</filename> 文件夹)，然后把他们放到 <filename>Linux Kernels</"
+"filename> 文件夹中，然后把 <filename>Linux Kernels</filename> 文件夹放到活动"
+"的系统文件夹中。"
 
 #. Tag: title
 #: install-methods.xml:1053
@@ -1582,17 +1514,15 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1065
 #, no-c-format
-#| msgid ""
-#| "<emphasis>Copy</emphasis> (not move) the following four files which you "
-#| "downloaded earlier from the Debian archives, onto the root level of your "
-#| "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
-#| "each file to the hard drive icon)."
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
 "downloaded earlier from the &debian; archives, onto the root level of your "
 "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
 "each file to the hard drive icon)."
-msgstr "<emphasis>复制</emphasis>(而非移动)您早先从 &debian; 存档下载的下列四个文件到您硬盘的根目录上(这个可以用按住 <keycap>option</keycap> 键然后拖动每个文件到硬盘图标的方法来完成)。"
+msgstr ""
+"<emphasis>复制</emphasis>(而非移动)您早先从 &debian; 存档下载的下列四个文件到"
+"您硬盘的根目录上(这个可以用按住 <keycap>option</keycap> 键然后拖动每个文件到"
+"硬盘图标的方法来完成)。"
 
 #. Tag: filename
 #: install-methods.xml:1075 install-methods.xml:1401
@@ -1703,13 +1633,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1152
 #, no-c-format
-#| msgid ""
-#| "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. "
-#| "There is an <classname>rbootd</classname> package available in Debian."
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
 "is an <classname>rbootd</classname> package available in &debian;."
-msgstr "一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。&debian; 里面有一个 <classname>rbootd</classname> 软件包。"
+msgstr ""
+"一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。&debian; 里面有一"
+"个 <classname>rbootd</classname> 软件包。"
 
 #. Tag: para
 #: install-methods.xml:1157
@@ -1974,37 +1903,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1273
 #, no-c-format
-#| msgid ""
-#| "To use CMU <command>bootpd</command>, you must first uncomment (or add) "
-#| "the relevant line in <filename>/etc/inetd.conf</filename>. On &debian-"
-#| "gnu;, you can run <userinput>update-inetd --enable bootps</userinput>, "
-#| "then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in "
-#| "case your BOOTP server does not run Debian, the line in question should "
-#| "look like: <informalexample><screen>\n"
-#| "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-#| "</screen></informalexample> Now, you must create an <filename>/etc/"
-#| "bootptab</filename> file. This has the same sort of familiar and cryptic "
-#| "format as the good old BSD <filename>printcap</filename>, "
-#| "<filename>termcap</filename>, and <filename>disktab</filename> files. See "
-#| "the <filename>bootptab</filename> manual page for more information. For "
-#| "CMU <command>bootpd</command>, you will need to know the hardware (MAC) "
-#| "address of the client. Here is an example <filename>/etc/bootptab</"
-#| "filename>: <informalexample><screen>\n"
-#| "client:\\\n"
-#| "  hd=/tftpboot:\\\n"
-#| "  bf=tftpboot.img:\\\n"
-#| "  ip=192.168.1.90:\\\n"
-#| "  sm=255.255.255.0:\\\n"
-#| "  sa=192.168.1.1:\\\n"
-#| "  ha=0123456789AB:\n"
-#| "</screen></informalexample> You will need to change at least the "
-#| "<quote>ha</quote> option, which specifies the hardware address of the "
-#| "client. The <quote>bf</quote> option specifies the file a client should "
-#| "retrieve via TFTP; see <xref linkend=\"tftp-images\"/> for more details. "
-#| "<phrase arch=\"mips\"> On SGI machines you can just enter the command "
-#| "monitor and type <userinput>printenv</userinput>. The value of the "
-#| "<userinput>eaddr</userinput> variable is the machine's MAC address. </"
-#| "phrase>"
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you "
@@ -2036,9 +1934,20 @@ msgid ""
 "<userinput>printenv</userinput>. The value of the <userinput>eaddr</"
 "userinput> variable is the machine's MAC address. </phrase>"
 msgstr ""
-"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd.conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 <userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP 服务器不是运行在 &debian; 上，这行看起来应该像这样： <informalexample><screen>\n"
+"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd."
+"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，"
+"您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 "
+"<userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP "
+"服务器不是运行在 &debian; 上，这行看起来应该像这样： "
+"<informalexample><screen>\n"
 "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 <filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)地址。这里有一个示例 <filename>/etc/bootptab</filename>： <informalexample><screen>\n"
+"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</"
+"filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些"
+"文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 "
+"<filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获"
+"得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)"
+"地址。这里有一个示例 <filename>/etc/bootptab</filename>： "
+"<informalexample><screen>\n"
 "client:\\\n"
 "  hd=/tftpboot:\\\n"
 "  bf=tftpboot.img:\\\n"
@@ -2046,7 +1955,12 @@ msgstr ""
 "  sm=255.255.255.0:\\\n"
 "  sa=192.168.1.1:\\\n"
 "  ha=0123456789AB:\n"
-"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 <userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 MAC 地址。</phrase>"
+"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客"
+"户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的"
+"文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase "
+"arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 "
+"<userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 "
+"MAC 地址。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:1306
@@ -2119,36 +2033,20 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1350
 #, no-c-format
-#| msgid ""
-#| "All <command>in.tftpd</command> alternatives available in Debian should "
-#| "log TFTP requests to the system logs by default. Some of them support a "
-#| "<userinput>-v</userinput> argument to increase verbosity. It is "
-#| "recommended to check these log messages in case of boot problems as they "
-#| "are a good starting point for diagnosing the cause of errors."
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
 "log TFTP requests to the system logs by default. Some of them support a "
 "<userinput>-v</userinput> argument to increase verbosity. It is recommended "
 "to check these log messages in case of boot problems as they are a good "
 "starting point for diagnosing the cause of errors."
-msgstr "&debian; 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
+msgstr ""
+"&debian; 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系"
+"统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导"
+"问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
 #: install-methods.xml:1358
 #, no-c-format
-#| msgid ""
-#| "If you intend to install Debian on an SGI machine and your TFTP server is "
-#| "a GNU/Linux box running Linux 2.4, you'll need to set the following on "
-#| "your server: <informalexample><screen>\n"
-#| "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-#| "</screen></informalexample> to turn off Path MTU discovery, otherwise the "
-#| "SGI's PROM can't download the kernel. Furthermore, make sure TFTP packets "
-#| "are sent from a source port no greater than 32767, or the download will "
-#| "stall after the first packet. Again, it's Linux 2.4.X tripping this bug "
-#| "in the PROM, and you can avoid it by setting <informalexample><screen>\n"
-#| "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-#| "</screen></informalexample> to adjust the range of source ports the Linux "
-#| "TFTP server uses."
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
 "a GNU/Linux box running Linux 2.4, you'll need to set the following on your "
@@ -2163,11 +2061,16 @@ msgid ""
 "</screen></informalexample> to adjust the range of source ports the Linux "
 "TFTP server uses."
 msgstr ""
-"如果您想要在一台 SGI 上安装 &debian; 并且您的 TFTP 服务器是一台运行 Linux 2.4 的 GNU/Linux 机器，需要对服务器进行如下设置： <informalexample><screen>\n"
+"如果您想要在一台 SGI 上安装 &debian; 并且您的 TFTP 服务器是一台运行 Linux "
+"2.4 的 GNU/Linux 机器，需要对服务器进行如下设置： <informalexample><screen>\n"
 "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-"</screen></informalexample> 来关闭 Path MTU 查询，否则 SGI 的 PROM 不能下载内核。而且，您还要确保 TFTP 数据包是从一个不大于 32767 的端口送出，否则在第一包之后，下载将停止。重申一下，这是由于 Linux 2.4.X 触发了 PROM 里的一个 bug。您可以通过如下设置： <informalexample><screen>\n"
+"</screen></informalexample> 来关闭 Path MTU 查询，否则 SGI 的 PROM 不能下载内"
+"核。而且，您还要确保 TFTP 数据包是从一个不大于 32767 的端口送出，否则在第一包"
+"之后，下载将停止。重申一下，这是由于 Linux 2.4.X 触发了 PROM 里的一个 bug。您"
+"可以通过如下设置： <informalexample><screen>\n"
 "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-"</screen></informalexample> 调整 Linux TFTP 服务器使用的源端口范围以避开这个错误。"
+"</screen></informalexample> 调整 Linux TFTP 服务器使用的源端口范围以避开这个"
+"错误。"
 
 #. Tag: title
 #: install-methods.xml:1380
@@ -2329,41 +2232,35 @@ msgstr "自动化安装"
 #. Tag: para
 #: install-methods.xml:1591
 #, no-c-format
-#| msgid ""
-#| "For installing on multiple computers it's possible to do fully automatic "
-#| "installations. Debian packages intended for this include <classname>fai</"
-#| "classname> (which uses an install server), <classname>replicator</"
-#| "classname>, <classname>systemimager</classname>, <classname>autoinstall</"
-#| "classname>, and the Debian Installer itself."
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
 "installations. &debian; packages intended for this include <classname>fai-"
 "quickstart</classname> (which can use an install server) and the &debian; "
 "Installer itself. Have a look at the <ulink url=\"http://fai-project.org"
 "\">FAI home page</ulink> for detailed information."
-msgstr "要同时安装多台计算机，可以使用完全自动方式安装。这方面的 &debian; 软件包包括 <classname>fai-quickstart</classname> (可以用来安装服务器) 和 &debian; 安装程序自己。参阅 <ulink url=\"http://fai-project.org\">FAI home page</ulink> 了解更多细节。"
+msgstr ""
+"要同时安装多台计算机，可以使用完全自动方式安装。这方面的 &debian; 软件包包括 "
+"<classname>fai-quickstart</classname> (可以用来安装服务器) 和 &debian; 安装程"
+"序自己。参阅 <ulink url=\"http://fai-project.org\">FAI home page</ulink> 了解"
+"更多细节。"
 
 #. Tag: title
 #: install-methods.xml:1603
 #, no-c-format
-#| msgid "Automatic Installation Using the Debian Installer"
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序进行自动安装"
 
 #. Tag: para
 #: install-methods.xml:1604
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer supports automating installs via preconfiguration "
-#| "files. A preconfiguration file can be loaded from the network or from "
-#| "removable media, and used to fill in answers to questions asked during "
-#| "the installation process."
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
 "files. A preconfiguration file can be loaded from the network or from "
 "removable media, and used to fill in answers to questions asked during the "
 "installation process."
-msgstr "&debian; 安装程序支持使用预先配置的文件进行自动安装。预置文件可以从网络或移动介质上加载，并自动回答安装过程中的问题。"
+msgstr ""
+"&debian; 安装程序支持使用预先配置的文件进行自动安装。预置文件可以从网络或移动"
+"介质上加载，并自动回答安装过程中的问题。"
 
 #. Tag: para
 #: install-methods.xml:1611
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index a3042aff4..243f5add2 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -82,17 +82,16 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:47
 #, no-c-format
-#| msgid ""
-#| "Some installation methods require other images than CD images. <phrase "
-#| "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-#| "page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
-#| "files\"/> explains how to find images on Debian mirrors."
 msgid ""
 "Some installation methods require other images than CD images. <phrase "
 "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
 "page</ulink> has links to other images. </phrase> <xref linkend=\"where-files"
 "\"/> explains how to find images on &debian; mirrors."
-msgstr "有些安装方法需要其它种类的映像而非 CD 的映像。<phrase condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">&d-i; 的主页</ulink> 上有到其它种类的映像的链接。</phrase> <xref linkend=\"where-files\"/> 会告诉您如何在 &debian; 的映像站点找到那些映像文件。"
+msgstr ""
+"有些安装方法需要其它种类的映像而非 CD 的映像。<phrase condition=\"unofficial-"
+"build\"> <ulink url=\"&url-d-i;\">&d-i; 的主页</ulink> 上有到其它种类的映像的"
+"链接。</phrase> <xref linkend=\"where-files\"/> 会告诉您如何在 &debian; 的映"
+"像站点找到那些映像文件。"
 
 #. Tag: para
 #: installation-howto.xml:57
@@ -154,15 +153,14 @@ msgstr "软盘"
 #. Tag: para
 #: installation-howto.xml:93
 #, no-c-format
-#| msgid ""
-#| "If you can't boot from CD, you can download floppy images to install "
-#| "Debian. You need the <filename>floppy/boot.img</filename>, the "
-#| "<filename>floppy/root.img</filename> and one or more of the driver disks."
 msgid ""
 "If you can't boot from CD, you can download floppy images to install "
 "&debian;. You need the <filename>floppy/boot.img</filename>, the "
 "<filename>floppy/root.img</filename> and one or more of the driver disks."
-msgstr "如果无法从 CD 启动，可以下载软盘映像文件，来安装 &debian;。这时，您需要 <filename>floppy/boot.img</filename> 和 <filename>floppy/root.img</filename>，也许还要一个或多个驱动盘。"
+msgstr ""
+"如果无法从 CD 启动，可以下载软盘映像文件，来安装 &debian;。这时，您需要 "
+"<filename>floppy/boot.img</filename> 和 <filename>floppy/root.img</"
+"filename>，也许还要一个或多个驱动盘。"
 
 #. Tag: para
 #: installation-howto.xml:99
@@ -226,28 +224,17 @@ msgstr "U 盘"
 #. Tag: para
 #: installation-howto.xml:132
 #, no-c-format
-#| msgid ""
-#| "It's also possible to install from removable USB storage devices. For "
-#| "example a USB keychain can make a handy Debian install medium that you "
-#| "can take with you anywhere."
 msgid ""
 "It's also possible to install from removable USB storage devices. For "
 "example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
-msgstr "我们也可以从移动 USB 存储设备来安装系统。比如说您带着一个 USB 的钥匙链走遍天涯海角的同时，它还可以成为方便趁手的 &debian; 安装介质。"
+msgstr ""
+"我们也可以从移动 USB 存储设备来安装系统。比如说您带着一个 USB 的钥匙链走遍天"
+"涯海角的同时，它还可以成为方便趁手的 &debian; 安装介质。"
 
 #. Tag: para
 #: installation-howto.xml:138
 #, no-c-format
-#| msgid ""
-#| "The easiest way to prepare your USB memory stick is to download "
-#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
-#| "256 MB image from that file. Write this image directly to your memory "
-#| "stick, which must be at least 256 mb in size. Of course this will destroy "
-#| "anything already on the memory stick. Then mount the memory stick, which "
-#| "will now have a FAT filesystem on it. Next, download a Debian netinst CD "
-#| "image, and copy that file to the memory stick; any filename is ok as long "
-#| "as it ends in <literal>.iso</literal>."
 msgid ""
 "The easiest way to prepare your USB memory stick is to download <filename>hd-"
 "media/boot.img.gz</filename>, and use gunzip to extract the 256 MB image "
@@ -257,7 +244,14 @@ msgid ""
 "filesystem on it. Next, download a &debian; netinst CD image, and copy that "
 "file to the memory stick; any filename is ok as long as it ends in <literal>."
 "iso</literal>."
-msgstr "要把您的 U 盘做成安装盘，最简单的办法就是下载 <filename>hd-media/boot.img.gz</filename>，然后用 gunzip 把这个文件解压，生成 256 MB 的映像文件。再把生成的映像文件直接写到 U盘。对了，这个 U 盘的容量至少要有 256 mb。当然了，上面所说的操作会把 U 盘里的原有数据全部毁掉。以后再挂载这个 U 盘的话，它上面就不再是 FAT 文件系统了。写完 U 盘后，接着要下载一个 &debian; netinst CD 映像文件，再把这个映像复制到 U 盘里。哪个映像文件都可以用，只要它的文件名是 <literal>.iso</literal> 结尾的就行。"
+msgstr ""
+"要把您的 U 盘做成安装盘，最简单的办法就是下载 <filename>hd-media/boot.img."
+"gz</filename>，然后用 gunzip 把这个文件解压，生成 256 MB 的映像文件。再把生成"
+"的映像文件直接写到 U盘。对了，这个 U 盘的容量至少要有 256 mb。当然了，上面所"
+"说的操作会把 U 盘里的原有数据全部毁掉。以后再挂载这个 U 盘的话，它上面就不再"
+"是 FAT 文件系统了。写完 U 盘后，接着要下载一个 &debian; netinst CD 映像文件，"
+"再把这个映像复制到 U 盘里。哪个映像文件都可以用，只要它的文件名是 <literal>."
+"iso</literal> 结尾的就行。"
 
 #. Tag: para
 #: installation-howto.xml:149
@@ -339,15 +333,6 @@ msgstr "从硬盘启动"
 #. Tag: para
 #: installation-howto.xml:193
 #, no-c-format
-#| msgid ""
-#| "It's possible to boot the installer using no removable media, but just an "
-#| "existing hard disk, which can have a different OS on it. Download "
-#| "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-#| "filename>, and a Debian CD image to the top-level directory of the hard "
-#| "disk. Make sure that the CD image has a filename ending in <literal>.iso</"
-#| "literal>. Now it's just a matter of booting linux with the initrd. "
-#| "<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to "
-#| "do it. </phrase>"
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
@@ -357,7 +342,13 @@ msgid ""
 "literal>. Now it's just a matter of booting linux with the initrd. <phrase "
 "arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
 "phrase>"
-msgstr "除了从移动介质启动安装套件，其实从手中现有的安装了其它操作系統的硬盘启动也是可行的。把 <filename>hd-media/initrd.gz</filename>、<filename>hd-media/vmlinuz</filename> 和一个 &debian; CD 映像文件下载到硬盘最顶层的目录里。请确保这个 CD 映像文件的文件名是以 <literal>.iso</literal> 结尾的。接下来的问题就是用 initrd 启动 linux 了。<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> 说明了如何做这件事。</phrase>"
+msgstr ""
+"除了从移动介质启动安装套件，其实从手中现有的安装了其它操作系統的硬盘启动也是"
+"可行的。把 <filename>hd-media/initrd.gz</filename>、<filename>hd-media/"
+"vmlinuz</filename> 和一个 &debian; CD 映像文件下载到硬盘最顶层的目录里。请确"
+"保这个 CD 映像文件的文件名是以 <literal>.iso</literal> 结尾的。接下来的问题就"
+"是用 initrd 启动 linux 了。<phrase arch=\"x86\"> <xref linkend=\"boot-initrd"
+"\"/> 说明了如何做这件事。</phrase>"
 
 #. Tag: title
 #: installation-howto.xml:210
@@ -453,19 +444,16 @@ msgstr ""
 #. Tag: para
 #: installation-howto.xml:256
 #, no-c-format
-#| msgid ""
-#| "If you have an existing DOS or Windows partition that you want to "
-#| "preserve, be very careful with automatic partitioning. If you choose "
-#| "manual partitioning, you can use the installer to resize existing FAT or "
-#| "NTFS partitions to create room for the Debian install: simply select the "
-#| "partition and specify its new size."
 msgid ""
 "If you have an existing DOS or Windows partition that you want to preserve, "
 "be very careful with automatic partitioning. If you choose manual "
 "partitioning, you can use the installer to resize existing FAT or NTFS "
 "partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
-msgstr "如果您有一个 DOS 或 Windows 分区并想保留它，要小心使用自动分区。如果选择手动分区，可以使用安装程序重新设置 FAT 或 NTFS 分区的大小，分给 &debian; 更多的安装空间：只需选择该分区，并指定它的新尺寸。"
+msgstr ""
+"如果您有一个 DOS 或 Windows 分区并想保留它，要小心使用自动分区。如果选择手动"
+"分区，可以使用安装程序重新设置 FAT 或 NTFS 分区的大小，分给 &debian; 更多的安"
+"装空间：只需选择该分区，并指定它的新尺寸。"
 
 #. Tag: para
 #: installation-howto.xml:263
@@ -613,10 +601,9 @@ msgstr "末了&hellip;"
 #. Tag: para
 #: installation-howto.xml:350
 #, no-c-format
-#| msgid ""
-#| "We hope that your Debian installation is pleasant and that you find "
-#| "Debian useful. You might want to read <xref linkend=\"post-install\"/>."
 msgid ""
 "We hope that your &debian; installation is pleasant and that you find "
 "&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
-msgstr "我们祝愿您安装 &debian 顺利愉快，并希望您能发现 &debian; 的用武之地。还有您也许可以读一下 <xref linkend=\"post-install\"/>。"
+msgstr ""
+"我们祝愿您安装 &debian 顺利愉快，并希望您能发现 &debian; 的用武之地。还有您也"
+"许可以读一下 <xref linkend=\"post-install\"/>。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index a4e768467..1800f794c 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -15,14 +15,12 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:5
 #, no-c-format
-#| msgid "Partitioning for Debian"
 msgid "Partitioning for &debian;"
 msgstr "为 &debian; 准备分区"
 
 #. Tag: title
 #: partitioning.xml:13
 #, no-c-format
-#| msgid "Deciding on Debian Partitions and Sizes"
 msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "决定 &debian; 分区以及大小"
 
@@ -111,13 +109,6 @@ msgstr "目录树"
 #. Tag: para
 #: partitioning.xml:68
 #, no-c-format
-#| msgid ""
-#| "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
-#| "Hierarchy Standard</ulink> for directory and file naming. This standard "
-#| "allows users and software programs to predict the location of files and "
-#| "directories. The root level directory is represented simply by the slash "
-#| "<filename>/</filename>. At the root level, all Debian systems include "
-#| "these directories:"
 msgid ""
 "&debian-gnu; adheres to the <ulink url=\"&url-fhs-home;\">Filesystem "
 "Hierarchy Standard</ulink> for directory and file naming. This standard "
@@ -125,7 +116,11 @@ msgid ""
 "directories. The root level directory is represented simply by the slash "
 "<filename>/</filename>. At the root level, all &debian; systems include "
 "these directories:"
-msgstr "&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知文件以及目录的位置。根目录只是简单表现为 <filename>/</filename>。在根层次，所有的 &debian; 系统包括这些目录："
+msgstr ""
+"&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem "
+"Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知"
+"文件以及目录的位置。根目录只是简单表现为 <filename>/</filename>。在根层次，所"
+"有的 &debian; 系统包括这些目录："
 
 #. Tag: entry
 #: partitioning.xml:82
@@ -391,19 +386,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:174
 #, no-c-format
-#| msgid ""
-#| "<filename>/var</filename>: variable data like news articles, e-mails, web "
-#| "sites, databases, the packaging system cache, etc. will be placed under "
-#| "this directory. The size of this directory depends greatly on the usage "
-#| "of your system, but for most people will be dictated by the package "
-#| "management tool's overhead. If you are going to do a full installation of "
-#| "just about everything Debian has to offer, all in one session, setting "
-#| "aside 2 or 3 GB of space for <filename>/var</filename> should be "
-#| "sufficient. If you are going to install in pieces (that is to say, "
-#| "install services and utilities, followed by text stuff, then X, ...), you "
-#| "can get away with 300&ndash;500 MB. If hard drive space is at a premium "
-#| "and you don't plan on doing major system updates, you can get by with as "
-#| "little as 30 or 40 MB."
 msgid ""
 "<filename>/var</filename>: variable data like news articles, e-mails, web "
 "sites, databases, the packaging system cache, etc. will be placed under this "
@@ -416,7 +398,14 @@ msgid ""
 "followed by text stuff, then X, ...), you can get away with 300&ndash;500 "
 "MB. If hard drive space is at a premium and you don't plan on doing major "
 "system updates, you can get by with as little as 30 or 40 MB."
-msgstr "<filename>/var</filename>：所有的可变数据，如新闻组文章、电子邮件、网站、数据库、软件包系统的缓存等等，将被放入这个目录。这个目录的大小取决于您计算机的用途，但是对大多数人来说，将主要用于软件包系统的管理工具。如果您准备一次性地做一个全面的安装，包含 &debian; 提供的所有程序，<filename>/var</filename> 下面 2 或 3GB 的空间应该够用。如果您准备逐个安装(也就是说，安装服务程序和工具，然后是文本处理工具，然后是 X，...)，您准备 300&ndash;500 MB 就行。要是硬盘空间很紧张，并且不准备做主版本的系统升级，可以为其准备 30 或 40MB 大小。"
+msgstr ""
+"<filename>/var</filename>：所有的可变数据，如新闻组文章、电子邮件、网站、数据"
+"库、软件包系统的缓存等等，将被放入这个目录。这个目录的大小取决于您计算机的用"
+"途，但是对大多数人来说，将主要用于软件包系统的管理工具。如果您准备一次性地做"
+"一个全面的安装，包含 &debian; 提供的所有程序，<filename>/var</filename> 下面 "
+"2 或 3GB 的空间应该够用。如果您准备逐个安装(也就是说，安装服务程序和工具，然"
+"后是文本处理工具，然后是 X，...)，您准备 300&ndash;500 MB 就行。要是硬盘空间"
+"很紧张，并且不准备做主版本的系统升级，可以为其准备 30 或 40MB 大小。"
 
 #. Tag: para
 #: partitioning.xml:190
@@ -460,13 +449,6 @@ msgstr "推荐的分区方案"
 #. Tag: para
 #: partitioning.xml:223
 #, no-c-format
-#| msgid ""
-#| "For new users, personal Debian boxes, home systems, and other single-user "
-#| "setups, a single <filename>/</filename> partition (plus swap) is probably "
-#| "the easiest, simplest way to go. However, if your partition is larger "
-#| "than around 6GB, choose ext3 as your partition type. Ext2 partitions need "
-#| "periodic file system integrity checking, and this can cause delays during "
-#| "booting when the partition is large."
 msgid ""
 "For new users, personal &debian; boxes, home systems, and other single-user "
 "setups, a single <filename>/</filename> partition (plus swap) is probably "
@@ -474,7 +456,11 @@ msgid ""
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
 "periodic file system integrity checking, and this can cause delays during "
 "booting when the partition is large."
-msgstr "对于新用户，个人 &debian; 系统、家庭系统以及其它单用户配置来说，一个单一 <filename>/</filename> 分区(加上交换分区)可能是最容易的方案。但是如果您的分区大于6GB，请选择 ext3 作为您的分区类型。ext2 分区需要定期的系统完整性检查，当分区很大的时候，这将导致引导期间的延迟。"
+msgstr ""
+"对于新用户，个人 &debian; 系统、家庭系统以及其它单用户配置来说，一个单一 "
+"<filename>/</filename> 分区(加上交换分区)可能是最容易的方案。但是如果您的分区"
+"大于6GB，请选择 ext3 作为您的分区类型。ext2 分区需要定期的系统完整性检查，当"
+"分区很大的时候，这将导致引导期间的延迟。"
 
 #. Tag: para
 #: partitioning.xml:232
@@ -492,16 +478,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:240
 #, no-c-format
-#| msgid ""
-#| "You might need a separate <filename>/usr/local</filename> partition if "
-#| "you plan to install many programs that are not part of the Debian "
-#| "distribution. If your machine will be a mail server, you might need to "
-#| "make <filename>/var/mail</filename> a separate partition. Often, putting "
-#| "<filename>/tmp</filename> on its own partition, for instance "
-#| "20&ndash;50MB, is a good idea. If you are setting up a server with lots "
-#| "of user accounts, it's generally good to have a separate, large "
-#| "<filename>/home</filename> partition. In general, the partitioning "
-#| "situation varies from computer to computer depending on its uses."
 msgid ""
 "You might need a separate <filename>/usr/local</filename> partition if you "
 "plan to install many programs that are not part of the &debian; "
@@ -512,7 +488,13 @@ msgid ""
 "it's generally good to have a separate, large <filename>/home</filename> "
 "partition. In general, the partitioning situation varies from computer to "
 "computer depending on its uses."
-msgstr "如果您计划安装 &debian; 发布版以外的程序，也许需要一个独立的 <filename>/usr/local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/var/mail</filename> 建立一个独立的分区。通常情况下，将 <filename>/tmp</filename> 放在它自己独立的分区，比如 20&ndash;50MB 是一个好主意。如果您要创建一个有很多用户的服务器，一个独立的、大的 <filename>/home</filename> 分区比较好。一般来说，分区状况在每台计算机都不同，这取决于它们的用途。"
+msgstr ""
+"如果您计划安装 &debian; 发布版以外的程序，也许需要一个独立的 <filename>/usr/"
+"local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/"
+"var/mail</filename> 建立一个独立的分区。通常情况下，将 <filename>/tmp</"
+"filename> 放在它自己独立的分区，比如 20&ndash;50MB 是一个好主意。如果您要创建"
+"一个有很多用户的服务器，一个独立的、大的 <filename>/home</filename> 分区比较"
+"好。一般来说，分区状况在每台计算机都不同，这取决于它们的用途。"
 
 #. Tag: para
 #: partitioning.xml:252
@@ -778,24 +760,20 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:435
 #, no-c-format
-#| msgid "Debian Partitioning Programs"
 msgid "&debian; Partitioning Programs"
 msgstr "&debian; 分区程序"
 
 #. Tag: para
 #: partitioning.xml:436
 #, no-c-format
-#| msgid ""
-#| "Several varieties of partitioning programs have been adapted by Debian "
-#| "developers to work on various types of hard disks and computer "
-#| "architectures. Following is a list of the program(s) applicable for your "
-#| "architecture."
 msgid ""
 "Several varieties of partitioning programs have been adapted by &debian; "
 "developers to work on various types of hard disks and computer "
 "architectures. Following is a list of the program(s) applicable for your "
 "architecture."
-msgstr "&debian; 开发人员选用了几种在不同硬盘和不同体系结构上的分区程序。下面是一个适合您的体系的程序列表。"
+msgstr ""
+"&debian; 开发人员选用了几种在不同硬盘和不同体系结构上的分区程序。下面是一个适"
+"合您的体系的程序列表。"
 
 #. Tag: command
 #: partitioning.xml:448
@@ -806,17 +784,15 @@ msgstr "partman"
 #. Tag: para
 #: partitioning.xml:449
 #, no-c-format
-#| msgid ""
-#| "Recommended partitioning tool in Debian. This Swiss army knife can also "
-#| "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
-#| "(<quote>format</quote> in Windows speak)</phrase> and assign them to the "
-#| "mountpoints."
 msgid ""
 "Recommended partitioning tool in &debian;. This Swiss army knife can also "
 "resize partitions, create filesystems <phrase arch=\"any-x86\"> "
 "(<quote>format</quote> in Windows speak)</phrase> and assign them to the "
 "mountpoints."
-msgstr "推荐的 &debian; 分区工具。这把瑞士军刀可以修改分区大小，创建文件系统<phrase arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分区至挂接点。"
+msgstr ""
+"推荐的 &debian; 分区工具。这把瑞士军刀可以修改分区大小，创建文件系统<phrase "
+"arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分"
+"区至挂接点。"
 
 #. Tag: command
 #: partitioning.xml:460
@@ -1011,14 +987,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:591
 #, no-c-format
-#| msgid ""
-#| "If you have an existing other operating system such as DOS or Windows and "
-#| "you want to preserve that operating system while installing Debian, you "
-#| "may need to resize its partition to free up space for the Debian "
-#| "installation. The installer supports resizing of both FAT and NTFS "
-#| "filesystems; when you get to the installer's partitioning step, select "
-#| "the option <guimenuitem>Manual</guimenuitem> and then simply select an "
-#| "existing partition and change its size."
 msgid ""
 "If you have an existing other operating system such as DOS or Windows and "
 "you want to preserve that operating system while installing &debian;, you "
@@ -1027,7 +995,11 @@ msgid ""
 "filesystems; when you get to the installer's partitioning step, select the "
 "option <guimenuitem>Manual</guimenuitem> and then simply select an existing "
 "partition and change its size."
-msgstr "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 &debian; 时保留它们，应该重新设置分区大小，释放空间给 &debian; 安装程序。安装程序支持修改 FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 <guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，更改其尺寸。"
+msgstr ""
+"如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 &debian; 时保"
+"留它们，应该重新设置分区大小，释放空间给 &debian; 安装程序。安装程序支持修改 "
+"FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 "
+"<guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，更改其尺寸。"
 
 #. Tag: para
 #: partitioning.xml:601
@@ -1100,18 +1072,6 @@ msgstr ""
 #. Tag: para
 #: partitioning.xml:641
 #, no-c-format
-#| msgid ""
-#| "This restriction doesn't apply if you have a BIOS newer than around "
-#| "1995&ndash;98 (depending on the manufacturer) that supports the "
-#| "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-#| "Linux loader, and Debian's alternative <command>mbr</command> must use "
-#| "the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 "
-#| "large disk access extensions are found to be present, they will be "
-#| "utilized. Otherwise, the legacy disk access interface is used as a fall-"
-#| "back, and it cannot be used to address any location on the disk higher "
-#| "than the 1023rd cylinder. Once &arch-kernel; is booted, no matter what "
-#| "BIOS your computer has, these restrictions no longer apply, since &arch-"
-#| "kernel; does not use the BIOS for disk access."
 msgid ""
 "This restriction doesn't apply if you have a BIOS newer than around "
 "1995&ndash;98 (depending on the manufacturer) that supports the "
@@ -1124,7 +1084,14 @@ msgid ""
 "cylinder. Once &arch-kernel; is booted, no matter what BIOS your computer "
 "has, these restrictions no longer apply, since &arch-kernel; does not use "
 "the BIOS for disk access."
-msgstr "如果您的 BIOS 在 1995&ndash;98 年之后出现(取决于制造商)，并且支持 <quote>Enhanced Disk Drive Support Specification</quote>，就没有这个限制。Linux 的引导程序 Lilo 和 &debian; 的 <command>mbr</command> 都必须使用 BIOS 来从磁盘读取内核至内存。如果 BIOS int 0x13 大硬盘访问拓展被打开，则将被使用。否则会使用旧的传统磁盘访问接口，而且不能找到任何大于 1023 的柱面。一旦 &arch-kernel; 引导后，不管您的计算机 BIOS 是什么，这些限制都不再起任何作用，因为 &arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
+msgstr ""
+"如果您的 BIOS 在 1995&ndash;98 年之后出现(取决于制造商)，并且支持 "
+"<quote>Enhanced Disk Drive Support Specification</quote>，就没有这个限制。"
+"Linux 的引导程序 Lilo 和 &debian; 的 <command>mbr</command> 都必须使用 BIOS "
+"来从磁盘读取内核至内存。如果 BIOS int 0x13 大硬盘访问拓展被打开，则将被使用。"
+"否则会使用旧的传统磁盘访问接口，而且不能找到任何大于 1023 的柱面。一旦 &arch-"
+"kernel; 引导后，不管您的计算机 BIOS 是什么，这些限制都不再起任何作用，因为 "
+"&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
 
 #. Tag: para
 #: partitioning.xml:655
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index ec08ee56a..dbf169f6d 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -85,15 +85,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:55
 #, no-c-format
-#| msgid ""
-#| "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
-#| "Documentation Project (LDP)</ulink> collects a number of HOWTOs and "
-#| "online books relating to Linux. Most of these documents can be installed "
-#| "locally; just install the <classname>doc-linux-html</classname> package "
-#| "(HTML versions) or the <classname>doc-linux-text</classname> package "
-#| "(ASCII versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
-#| "International versions of the LDP HOWTOs are also available as Debian "
-#| "packages."
 msgid ""
 "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
 "Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
@@ -103,25 +94,23 @@ msgid ""
 "versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
 "International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
-msgstr "Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</ulink> 收集了大量的 HOWTO 和 Linux 在线书籍。这些文档绝大部分可以在本地安装；只须安装 <classname>doc-linux-html</classname> 包(HTML 版本)，或者 <classname>doc-linux-text</classname>包(ASCII 版本)，然后在 <filename>/usr/share/doc/HOWTO</filename> 里面就能找到。在 &debian; 软件包里面也提供 LDP HOWTO 的国际化版本。"
+msgstr ""
+"Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</"
+"ulink> 收集了大量的 HOWTO 和 Linux 在线书籍。这些文档绝大部分可以在本地安装；"
+"只须安装 <classname>doc-linux-html</classname> 包(HTML 版本)，或者 "
+"<classname>doc-linux-text</classname>包(ASCII 版本)，然后在 <filename>/usr/"
+"share/doc/HOWTO</filename> 里面就能找到。在 &debian; 软件包里面也提供 LDP "
+"HOWTO 的国际化版本。"
 
 #. Tag: title
 #: post-install.xml:76
 #, no-c-format
-#| msgid "Orienting Yourself to Debian"
 msgid "Orienting Yourself to &debian;"
 msgstr "让自己适应 &debian;"
 
 #. Tag: para
 #: post-install.xml:77
 #, no-c-format
-#| msgid ""
-#| "Debian is a little different from other distributions. Even if you're "
-#| "familiar with Linux in other distributions, there are things you should "
-#| "know about Debian to help you to keep your system in a good, clean state. "
-#| "This chapter contains material to help you get oriented; it is not "
-#| "intended to be a tutorial for how to use Debian, but just a very brief "
-#| "glimpse of the system for the very rushed."
 msgid ""
 "&debian; is a little different from other distributions. Even if you're "
 "familiar with Linux in other distributions, there are things you should know "
@@ -129,33 +118,21 @@ msgid ""
 "chapter contains material to help you get oriented; it is not intended to be "
 "a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
-msgstr "&debian; 和其它的发行版有些不同。即使您熟悉其它发行版的 Linux，您也应该了解 &debian; 的一些东西，以便保持您的系统处在良好整洁的状态。本章包的材料可以帮助您适应；但这并不是一个如何使用 &debian; 的入门指南，而仅仅是对整个系统的一个粗略的介绍。"
+msgstr ""
+"&debian; 和其它的发行版有些不同。即使您熟悉其它发行版的 Linux，您也应该了解 "
+"&debian; 的一些东西，以便保持您的系统处在良好整洁的状态。本章包的材料可以帮助"
+"您适应；但这并不是一个如何使用 &debian; 的入门指南，而仅仅是对整个系统的一个"
+"粗略的介绍。"
 
 #. Tag: title
 #: post-install.xml:88
 #, no-c-format
-#| msgid "Debian Packaging System"
 msgid "&debian; Packaging System"
 msgstr "&debian; 软件包系统"
 
 #. Tag: para
 #: post-install.xml:89
 #, no-c-format
-#| msgid ""
-#| "The most important concept to grasp is the Debian packaging system. In "
-#| "essence, large parts of your system should be considered under the "
-#| "control of the packaging system. These include: <itemizedlist> "
-#| "<listitem><para> <filename>/usr</filename> (excluding <filename>/usr/"
-#| "local</filename>) </para></listitem> <listitem><para> <filename>/var</"
-#| "filename> (you could make <filename>/var/local</filename> and be safe in "
-#| "there) </para></listitem> <listitem><para> <filename>/bin</filename> </"
-#| "para></listitem> <listitem><para> <filename>/sbin</filename> </para></"
-#| "listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </"
-#| "itemizedlist> For instance, if you replace <filename>/usr/bin/perl</"
-#| "filename>, that will work, but then if you upgrade your <classname>perl</"
-#| "classname> package, the file you put there will be replaced. Experts can "
-#| "get around this by putting packages on <quote>hold</quote> in "
-#| "<command>aptitude</command>."
 msgid ""
 "The most important concept to grasp is the &debian; packaging system. In "
 "essence, large parts of your system should be considered under the control "
@@ -171,7 +148,18 @@ msgid ""
 "classname> package, the file you put there will be replaced. Experts can get "
 "around this by putting packages on <quote>hold</quote> in <command>aptitude</"
 "command>."
-msgstr "要掌握的最重要概念是 &debian; 的软件包系统。事实上，您系统的绝大部分都应该由软件包系统来控制。包括：<itemizedlist> <listitem><para> <filename>/usr</filename> (除了 <filename>/usr/local</filename>) </para></listitem> <listitem><para> <filename>/var</filename> (您可以创建 <filename>/var/local</filename>，在那里面进行安全的操作) </para></listitem> <listitem><para> <filename>/bin</filename> </para></listitem> <listitem><para> <filename>/sbin</filename> </para></listitem> <listitem><para> <filename>/lib</filename> </para></listitem> </itemizedlist> 例如，假设您替换了 <filename>/usr/bin/perl</filename>，它可以正常工作，但以后升级您的 <classname>perl</classname> 软件包，那里的文件将被替换。有经验的用户可以在 <command>aptitude</command> 里面将软件包设置为 <quote>hold</quote>状态，以避免这种情况。"
+msgstr ""
+"要掌握的最重要概念是 &debian; 的软件包系统。事实上，您系统的绝大部分都应该由"
+"软件包系统来控制。包括：<itemizedlist> <listitem><para> <filename>/usr</"
+"filename> (除了 <filename>/usr/local</filename>) </para></listitem> "
+"<listitem><para> <filename>/var</filename> (您可以创建 <filename>/var/local</"
+"filename>，在那里面进行安全的操作) </para></listitem> <listitem><para> "
+"<filename>/bin</filename> </para></listitem> <listitem><para> <filename>/"
+"sbin</filename> </para></listitem> <listitem><para> <filename>/lib</"
+"filename> </para></listitem> </itemizedlist> 例如，假设您替换了 <filename>/"
+"usr/bin/perl</filename>，它可以正常工作，但以后升级您的 <classname>perl</"
+"classname> 软件包，那里的文件将被替换。有经验的用户可以在 <command>aptitude</"
+"command> 里面将软件包设置为 <quote>hold</quote>状态，以避免这种情况。"
 
 #. Tag: para
 #: post-install.xml:130
@@ -277,14 +265,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:193
 #, no-c-format
-#| msgid ""
-#| "There is lots of useful documentation in <filename>/usr/share/doc</"
-#| "filename> as well. In particular, <filename>/usr/share/doc/HOWTO</"
-#| "filename> and <filename>/usr/share/doc/FAQ</filename> contain lots of "
-#| "interesting information. To submit bugs, look at <filename>/usr/share/doc/"
-#| "debian/bug*</filename>. To read about Debian-specific issues for "
-#| "particular programs, look at <filename>/usr/share/doc/(package name)/"
-#| "README.Debian</filename>."
 msgid ""
 "There is lots of useful documentation in <filename>/usr/share/doc</filename> "
 "as well. In particular, <filename>/usr/share/doc/HOWTO</filename> and "
@@ -292,24 +272,17 @@ msgid ""
 "information. To submit bugs, look at <filename>/usr/share/doc/debian/bug*</"
 "filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
-msgstr "在 <filename>/usr/share/doc</filename> 目录里有很多有用的文档，特别是 <filename>/usr/share/doc/HOWTO</filename> 和 <filename>/usr/share/doc/FAQ</filename> 里有很多值得一读的文章。如果您想提交错误报告，请先查阅这些文件：<filename>/usr/share/doc/debian/bug*</filename>。针对某个程序 &debian; 规格的内容可以查阅文件： <filename>/usr/share/doc/(package name)/README.Debian</filename>。"
+msgstr ""
+"在 <filename>/usr/share/doc</filename> 目录里有很多有用的文档，特别是 "
+"<filename>/usr/share/doc/HOWTO</filename> 和 <filename>/usr/share/doc/FAQ</"
+"filename> 里有很多值得一读的文章。如果您想提交错误报告，请先查阅这些文件："
+"<filename>/usr/share/doc/debian/bug*</filename>。针对某个程序 &debian; 规格的"
+"内容可以查阅文件： <filename>/usr/share/doc/(package name)/README.Debian</"
+"filename>。"
 
 #. Tag: para
 #: post-install.xml:204
 #, no-c-format
-#| msgid ""
-#| "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> "
-#| "contains a large quantity of documentation about Debian. In particular, "
-#| "see the <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux "
-#| "FAQ</ulink> and the <ulink url=\"http://www.debian.org/doc/user-"
-#| "manuals#quick-reference\">Debian Reference</ulink>. An index of more "
-#| "Debian documentation is available from the <ulink url=\"http://www.debian."
-#| "org/doc/ddp\">Debian Documentation Project</ulink>. The Debian community "
-#| "is self-supporting; to subscribe to one or more of the Debian mailing "
-#| "lists, see the <ulink url=\"http://www.debian.org/MailingLists/subscribe"
-#| "\"> Mail List Subscription</ulink> page. Last, but not least, the <ulink "
-#| "url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> "
-#| "contain a wealth of information on Debian."
 msgid ""
 "The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
 "large quantity of documentation about &debian;. In particular, see the "
@@ -323,7 +296,17 @@ msgid ""
 "ulink> page. Last, but not least, the <ulink url=\"http://lists.debian.org/"
 "\">Debian Mailing List Archives</ulink> contain a wealth of information on "
 "&debian;."
-msgstr "在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 &debian; 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> 和 <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference\">Debian Reference</ulink>。更多的 &debian; 文档位于 <ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation Project</ulink>。&debian; 社区是靠用户自己的力量支撑起来的；如果您想要订阅 Debian 的邮件列表，请访问 <ulink url=\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</ulink> 页面。最后，相当重要的，<ulink url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> 包含了 &debian; 丰富的信息。"
+msgstr ""
+"在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 "
+"&debian; 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/"
+"\">Debian GNU/Linux FAQ</ulink> 和 <ulink url=\"http://www.debian.org/doc/"
+"user-manuals#quick-reference\">Debian Reference</ulink>。更多的 &debian; 文档"
+"位于 <ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation "
+"Project</ulink>。&debian; 社区是靠用户自己的力量支撑起来的；如果您想要订阅 "
+"Debian 的邮件列表，请访问 <ulink url=\"http://www.debian.org/MailingLists/"
+"subscribe\"> Mail List Subscription</ulink> 页面。最后，相当重要的，<ulink "
+"url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> 包含了 "
+"&debian; 丰富的信息。"
 
 #. Tag: para
 #: post-install.xml:222
@@ -347,17 +330,14 @@ msgstr "让您的系统使用 E-Mail"
 #. Tag: para
 #: post-install.xml:239
 #, no-c-format
-#| msgid ""
-#| "Today, email is an important part of many people's life. As there are "
-#| "many options as to how to set it up, and as having it set up correctly is "
-#| "important for some Debian utilities, we will try to cover the basics in "
-#| "this section."
 msgid ""
 "Today, email is an important part of many people's life. As there are many "
 "options as to how to set it up, and as having it set up correctly is "
 "important for some &debian; utilities, we will try to cover the basics in "
 "this section."
-msgstr "今天，email 是许多人生活中一个重要的组成部分。建立它有很多种选择，并且对于很多 &debian; 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
+msgstr ""
+"今天，email 是许多人生活中一个重要的组成部分。建立它有很多种选择，并且对于很"
+"多 &debian; 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
 
 #. Tag: para
 #: post-install.xml:246
@@ -405,17 +385,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:269
 #, no-c-format
-#| msgid ""
-#| "With the increasing popularity of graphical desktop systems, the use of "
-#| "graphical e-mail programs like GNOME's <command>evolution</command>, "
-#| "KDE's <command>kmail</command> or Mozilla's <command>thunderbird</"
-#| "command> (in Debian available as <command>icedove</command><footnote> "
-#| "<para> The reason that <command>thunderbird</command> has been renamed to "
-#| "<command>icedove</command> in Debian has to do with licensing issues. "
-#| "Details are outside the scope of this manual. </para> </footnote>) is "
-#| "becoming more popular. These programs combine the function of a MUA, MTA "
-#| "and MDA, but can &mdash; and often are &mdash; also be used in "
-#| "combination with the traditional Linux tools."
 msgid ""
 "With the increasing popularity of graphical desktop systems, the use of "
 "graphical e-mail programs like GNOME's <command>evolution</command>, KDE's "
@@ -427,7 +396,14 @@ msgid ""
 "These programs combine the function of a MUA, MTA and MDA, but can &mdash; "
 "and often are &mdash; also be used in combination with the traditional Linux "
 "tools."
-msgstr "配合逐步流行的图形桌面系统，使用图形 e-mail 程序，像 GNOME 的 <command>evolution</command>、KDE 的 <command>kmail</command> 或 Mozilla 的 <command>thunderbird</command> (在 &debian; 中是 <command>icedove</command><footnote> <para> &debian; 中 <command>thunderbird</command> 改名为 <command>icedove</command> 的原因是许可证的问题。具体内容超出了本手册的范围。</para> </footnote>) 越来越流行。这些程序综合了 MUA、MTA 和 MDA 的功能，但也能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
+msgstr ""
+"配合逐步流行的图形桌面系统，使用图形 e-mail 程序，像 GNOME 的 "
+"<command>evolution</command>、KDE 的 <command>kmail</command> 或 Mozilla 的 "
+"<command>thunderbird</command> (在 &debian; 中是 <command>icedove</"
+"command><footnote> <para> &debian; 中 <command>thunderbird</command> 改名为 "
+"<command>icedove</command> 的原因是许可证的问题。具体内容超出了本手册的范围。"
+"</para> </footnote>) 越来越流行。这些程序综合了 MUA、MTA 和 MDA 的功能，但也"
+"能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
 
 #. Tag: title
 #: post-install.xml:289
@@ -498,15 +474,13 @@ msgstr "发送邮件到系统之外"
 #. Tag: para
 #: post-install.xml:335
 #, no-c-format
-#| msgid ""
-#| "As mentioned earlier, the installed Debian system is only set up to "
-#| "handle e-mail local to the system, not for sending mail to others nor for "
-#| "receiving mail from others."
 msgid ""
 "As mentioned earlier, the installed &debian; system is only set up to handle "
 "e-mail local to the system, not for sending mail to others nor for receiving "
 "mail from others."
-msgstr "前面提到，安装的 &debian; 系统只架设了处理本地系统的邮件，而不是用于发送或接收其他系统的邮件。"
+msgstr ""
+"前面提到，安装的 &debian; 系统只架设了处理本地系统的邮件，而不是用于发送或接"
+"收其他系统的邮件。"
 
 #. Tag: para
 #: post-install.xml:341
@@ -537,19 +511,16 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:356
 #, no-c-format
-#| msgid ""
-#| "However, in that case you may need to configure individual utilities to "
-#| "correctly send e-mails. One such utility is <command>reportbug</command>, "
-#| "a program that facilitates submitting bug reports against Debian "
-#| "packages. By default it expects to be able to use <classname>exim4</"
-#| "classname> to submit bug reports."
 msgid ""
 "However, in that case you may need to configure individual utilities to "
 "correctly send e-mails. One such utility is <command>reportbug</command>, a "
 "program that facilitates submitting bug reports against &debian; packages. "
 "By default it expects to be able to use <classname>exim4</classname> to "
 "submit bug reports."
-msgstr "但是，这种情况下您可能还是要配置一些独立的工具来正确发送 e-mails。其中一个这样的工具是 <command>reportbug</command>，该程序的功能是提交 &debian; 软件包对应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
+msgstr ""
+"但是，这种情况下您可能还是要配置一些独立的工具来正确发送 e-mails。其中一个这"
+"样的工具是 <command>reportbug</command>，该程序的功能是提交 &debian; 软件包对"
+"应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
 
 #. Tag: para
 #: post-install.xml:364
@@ -752,13 +723,6 @@ msgstr "编译新内核"
 #. Tag: para
 #: post-install.xml:501
 #, no-c-format
-#| msgid ""
-#| "Why would someone want to compile a new kernel? It is often not necessary "
-#| "since the default kernel shipped with Debian handles most configurations. "
-#| "Also, Debian often offers several alternative kernels. So you may want to "
-#| "check first if there is an alternative kernel image package that better "
-#| "corresponds to your hardware. However, it can be useful to compile a new "
-#| "kernel in order to:"
 msgid ""
 "Why would someone want to compile a new kernel? It is often not necessary "
 "since the default kernel shipped with &debian; handles most configurations. "
@@ -766,7 +730,11 @@ msgid ""
 "check first if there is an alternative kernel image package that better "
 "corresponds to your hardware. However, it can be useful to compile a new "
 "kernel in order to:"
-msgstr "为什么有些人想要编译新内核? &debian; 自带的默认内核已经包含了绝大部分配置，所以编译新内核并不是必需的。并且，&debian; 提供了多个内核供选择。所以您应该先确认一下，有没有适合您硬件的内核映像软件包存在。然而，基于下列理由，编译新内核还是很有用的："
+msgstr ""
+"为什么有些人想要编译新内核? &debian; 自带的默认内核已经包含了绝大部分配置，所"
+"以编译新内核并不是必需的。并且，&debian; 提供了多个内核供选择。所以您应该先确"
+"认一下，有没有适合您硬件的内核映像软件包存在。然而，基于下列理由，编译新内核"
+"还是很有用的："
 
 #. Tag: para
 #: post-install.xml:511
@@ -823,19 +791,17 @@ msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
 #. Tag: para
 #: post-install.xml:552
 #, no-c-format
-#| msgid ""
-#| "To compile a kernel the Debian way, you need some packages: "
-#| "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
-#| "<classname>linux-source-2.6</classname> and a few others which are "
-#| "probably already installed (see <filename>/usr/share/doc/kernel-package/"
-#| "README.gz</filename> for the complete list)."
 msgid ""
 "To compile a kernel the &debian; way, you need some packages: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
 "<classname>linux-source-2.6</classname> and a few others which are probably "
 "already installed (see <filename>/usr/share/doc/kernel-package/README.gz</"
 "filename> for the complete list)."
-msgstr "为了以 &debian; 的方式编译内核，您需要一些软件包： <classname>fakeroot</classname>，<classname>kernel-package</classname>，<classname>linux-source-2.6</classname> 以及其它一些可能已经安装过的软件包(完整的列表请参阅 <filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
+msgstr ""
+"为了以 &debian; 的方式编译内核，您需要一些软件包： <classname>fakeroot</"
+"classname>，<classname>kernel-package</classname>，<classname>linux-"
+"source-2.6</classname> 以及其它一些可能已经安装过的软件包(完整的列表请参阅 "
+"<filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
 
 #. Tag: para
 #: post-install.xml:561
@@ -853,13 +819,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:569
 #, no-c-format
-#| msgid ""
-#| "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
-#| "<quote>Debian way</quote>; but we find that using the packaging system to "
-#| "manage your kernel is actually safer and easier. In fact, you can get "
-#| "your kernel sources right from Linus instead of <classname>linux-"
-#| "source-2.6</classname>, yet still use the <classname>kernel-package</"
-#| "classname> compilation method."
 msgid ""
 "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
 "<quote>&debian; way</quote>; but we find that using the packaging system to "
@@ -867,7 +826,11 @@ msgid ""
 "kernel sources right from Linus instead of <classname>linux-source-2.6</"
 "classname>, yet still use the <classname>kernel-package</classname> "
 "compilation method."
-msgstr "注意，您不一定<emphasis>要</emphasis>以 <quote>&debian; 方式</quote>编译内核；但我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，您可以直接从 Linus 那里而非 <classname>linux-source-2.6</classname> 得到内核源码，并仍使用 <classname>kernel-package</classname> 的编译方法。"
+msgstr ""
+"注意，您不一定<emphasis>要</emphasis>以 <quote>&debian; 方式</quote>编译内"
+"核；但我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，"
+"您可以直接从 Linus 那里而非 <classname>linux-source-2.6</classname> 得到内核"
+"源码，并仍使用 <classname>kernel-package</classname> 的编译方法。"
 
 #. Tag: para
 #: post-install.xml:578
@@ -906,19 +869,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:605
 #, no-c-format
-#| msgid ""
-#| "Now, you can configure your kernel. Run <userinput>make xconfig</"
-#| "userinput> if X11 is installed, configured and being run; run "
-#| "<userinput>make menuconfig</userinput> otherwise (you'll need "
-#| "<classname>libncurses5-dev</classname> installed). Take the time to read "
-#| "the online help and choose carefully. When in doubt, it is typically "
-#| "better to include the device driver (the software which manages hardware "
-#| "peripherals, such as Ethernet cards, SCSI controllers, and so on) you are "
-#| "unsure about. Be careful: other options, not related to a specific "
-#| "hardware, should be left at the default value if you do not understand "
-#| "them. Do not forget to select <quote>Kernel module loader</quote> in "
-#| "<quote>Loadable module support</quote> (it is not selected by default). "
-#| "If not included, your Debian installation will experience problems."
 msgid ""
 "Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
 "if X11 is installed, configured and being run; run <userinput>make "
@@ -932,7 +882,15 @@ msgid ""
 "module loader</quote> in <quote>Loadable module support</quote> (it is not "
 "selected by default). If not included, your &debian; installation will "
 "experience problems."
-msgstr "现在，可以开始配置您的内核了。如果您已经安装配置好，并正在运行 X11，请执行 <userinput>make xconfig</userinput>；否则请执行 <userinput>make menuconfig</userinput>(必须已经安装好 <classname>libncurses5-dev</classname>)。请花点时间阅读在线帮助并仔细地作选择。如果有疑问，通常来说包含您所不确定的设备驱动程序(用来管理硬件外设的软件，例如以太网卡、SCSI 控制器等)会比较好一点。注意：对于与特殊硬件无关的其它选项，如果您不了解它们，最好保持默认值。不要忘记选择 <quote>Kernel module loader</quote> 中的 <quote>Loadable module support</quote> (它们默认并没有被选择)。否则，您的 &debian; 安装将会遇到问题。"
+msgstr ""
+"现在，可以开始配置您的内核了。如果您已经安装配置好，并正在运行 X11，请执行 "
+"<userinput>make xconfig</userinput>；否则请执行 <userinput>make menuconfig</"
+"userinput>(必须已经安装好 <classname>libncurses5-dev</classname>)。请花点时间"
+"阅读在线帮助并仔细地作选择。如果有疑问，通常来说包含您所不确定的设备驱动程序"
+"(用来管理硬件外设的软件，例如以太网卡、SCSI 控制器等)会比较好一点。注意：对于"
+"与特殊硬件无关的其它选项，如果您不了解它们，最好保持默认值。不要忘记选择 "
+"<quote>Kernel module loader</quote> 中的 <quote>Loadable module support</"
+"quote> (它们默认并没有被选择)。否则，您的 &debian; 安装将会遇到问题。"
 
 #. Tag: para
 #: post-install.xml:620
@@ -1004,18 +962,16 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:660
 #, no-c-format
-#| msgid ""
-#| "For more information on Debian kernels and kernel compilation, see the "
-#| "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</"
-#| "ulink>. For more information on <classname>kernel-package</classname>, "
-#| "read the fine documentation in <filename>/usr/share/doc/kernel-package</"
-#| "filename>."
 msgid ""
 "For more information on &debian; kernels and kernel compilation, see the "
 "<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>. "
 "For more information on <classname>kernel-package</classname>, read the fine "
 "documentation in <filename>/usr/share/doc/kernel-package</filename>."
-msgstr "要了解 &debian; 内核与编译内核的更多信息，清参阅 <ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink>。欲获得关于 <classname>kernel-package</classname> 的更多信息，有一份很好的文档 <filename>/usr/share/doc/kernel-package</filename>。"
+msgstr ""
+"要了解 &debian; 内核与编译内核的更多信息，清参阅 <ulink url=\"&url-kernel-"
+"handbook;\">Debian Linux Kernel Handbook</ulink>。欲获得关于 "
+"<classname>kernel-package</classname> 的更多信息，有一份很好的文档 "
+"<filename>/usr/share/doc/kernel-package</filename>。"
 
 #. Tag: title
 #: post-install.xml:676
@@ -1077,13 +1033,6 @@ msgstr ""
 #. Tag: para
 #: post-install.xml:710
 #, no-c-format
-#| msgid ""
-#| "If possible, the installer will now present you with a shell prompt in "
-#| "the file system you selected, which you can use to perform any necessary "
-#| "repairs. <phrase arch=\"x86\"> For example, if you need to reinstall the "
-#| "GRUB boot loader into the master boot record of the first hard disk, you "
-#| "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
-#| "so. </phrase>"
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
 "file system you selected, which you can use to perform any necessary "
@@ -1091,7 +1040,11 @@ msgid ""
 "GRUB boot loader into the master boot record of the first hard disk, you "
 "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
 "so. </phrase>"
-msgstr "如可能，安装程序将在您选择的文件系统上给出一个 shell 提示符，通过它可以执行一些必要的修复操作。<phrase arch=\"x86\">例如，您需要在第一个硬盘的主引导区重装 GRUB 引导程序，可以通过输入这个命令 <userinput>grub-install '(hd0)'</userinput> 完成。</phrase>"
+msgstr ""
+"如可能，安装程序将在您选择的文件系统上给出一个 shell 提示符，通过它可以执行一"
+"些必要的修复操作。<phrase arch=\"x86\">例如，您需要在第一个硬盘的主引导区重"
+"装 GRUB 引导程序，可以通过输入这个命令 <userinput>grub-install '(hd0)'</"
+"userinput> 完成。</phrase>"
 
 #. Tag: para
 #: post-install.xml:722
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index ccdd4dc2e..91bcd8931 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -21,31 +21,21 @@ msgstr "在 &architecture; 上安装 &debian-gnu; &release;"
 #. Tag: para
 #: preface.xml:6
 #, no-c-format
-#| msgid ""
-#| "We are delighted that you have decided to try Debian, and are sure that "
-#| "you will find that Debian's GNU/&arch-kernel; distribution is unique. "
-#| "&debian-gnu; brings together high-quality free software from around the "
-#| "world, integrating it into a coherent whole. We believe that you will "
-#| "find that the result is truly more than the sum of the parts."
 msgid ""
 "We are delighted that you have decided to try &debian;, and are sure that "
 "you will find that &debian;'s GNU/&arch-kernel; distribution is unique. "
 "&debian-gnu; brings together high-quality free software from around the "
 "world, integrating it into a coherent whole. We believe that you will find "
 "that the result is truly more than the sum of the parts."
-msgstr "我们非常高兴地看到您决定试试 &debian;，并确信您将发现 &debian; 的 GNU/&arch-kernel; 发行版是独一无二的。&debian-gnu; 将带给您来自世界各地的高质量的自由软件，并将它们整合成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单地相加。"
+msgstr ""
+"我们非常高兴地看到您决定试试 &debian;，并确信您将发现 &debian; 的 GNU/&arch-"
+"kernel; 发行版是独一无二的。&debian-gnu; 将带给您来自世界各地的高质量的自由软"
+"件，并将它们整合成一个紧密的整体。您会发现整合后的结果一定会大于将各部分简单"
+"地相加。"
 
 #. Tag: para
 #: preface.xml:15
 #, no-c-format
-#| msgid ""
-#| "We understand that many of you want to install Debian without reading "
-#| "this manual, and the Debian installer is designed to make this possible. "
-#| "If you don't have time to read the whole Installation Guide right now, we "
-#| "recommend that you read the Installation Howto, which will walk you "
-#| "through the basic installation process, and links to the manual for more "
-#| "advanced topics or for when things go wrong. The Installation Howto can "
-#| "be found in <xref linkend=\"installation-howto\"/>."
 msgid ""
 "We understand that many of you want to install &debian; without reading this "
 "manual, and the &debian; installer is designed to make this possible. If you "
@@ -54,7 +44,12 @@ msgid ""
 "installation process, and links to the manual for more advanced topics or "
 "for when things go wrong. The Installation Howto can be found in <xref "
 "linkend=\"installation-howto\"/>."
-msgstr "我们也知道大多数用户都希望能够不用阅读本手册而直接安装 &debian;。&debian; 安装程序的设计意图也就是尽力实现这个想法。如果您现在的确没有时间来阅读整个安装手册，我们推荐您看看安装指南一文。该文包含了基本安装过程的简要介绍，以及当处理运行错误或需要较专业内容时查询本手册的链接。您可以在 <xref linkend=\"installation-howto\"/> 阅读此文。"
+msgstr ""
+"我们也知道大多数用户都希望能够不用阅读本手册而直接安装 &debian;。&debian; 安"
+"装程序的设计意图也就是尽力实现这个想法。如果您现在的确没有时间来阅读整个安装"
+"手册，我们推荐您看看安装指南一文。该文包含了基本安装过程的简要介绍，以及当处"
+"理运行错误或需要较专业内容时查询本手册的链接。您可以在 <xref linkend="
+"\"installation-howto\"/> 阅读此文。"
 
 #. Tag: para
 #: preface.xml:25
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 973844181..a462ddc82 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:40+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -21,15 +21,13 @@ msgstr "开始安装 &debian-gnu; 之前"
 #. Tag: para
 #: preparing.xml:6
 #, no-c-format
-#| msgid ""
-#| "This chapter deals with the preparation for installing Debian before you "
-#| "even boot the installer. This includes backing up your data, gathering "
-#| "information about your hardware, and locating any necessary information."
 msgid ""
 "This chapter deals with the preparation for installing &debian; before you "
 "even boot the installer. This includes backing up your data, gathering "
 "information about your hardware, and locating any necessary information."
-msgstr "本章涉及在启动安装程序安装 &debian; 之前的准备工作。这包括备份您的数据、搜集您硬件的信息，以及获取其他一些必要的信息。"
+msgstr ""
+"本章涉及在启动安装程序安装 &debian; 之前的准备工作。这包括备份您的数据、搜集"
+"您硬件的信息，以及获取其他一些必要的信息。"
 
 #. Tag: title
 #: preparing.xml:19
@@ -40,15 +38,13 @@ msgstr "安装概述"
 #. Tag: para
 #: preparing.xml:20
 #, no-c-format
-#| msgid ""
-#| "First, just a note about re-installations. With Debian, a circumstance "
-#| "that will require a complete re-installation of your system is very rare; "
-#| "perhaps mechanical failure of the hard disk would be the most common case."
 msgid ""
 "First, just a note about re-installations. With &debian;, a circumstance "
 "that will require a complete re-installation of your system is very rare; "
 "perhaps mechanical failure of the hard disk would be the most common case."
-msgstr "先说一下有关重新安装的事情。使用 &debian; 时，极少出现必须进行完全重新安装的情况，导致这种情况的可能大多是硬盘的物理故障。"
+msgstr ""
+"先说一下有关重新安装的事情。使用 &debian; 时，极少出现必须进行完全重新安装的"
+"情况，导致这种情况的可能大多是硬盘的物理故障。"
 
 #. Tag: para
 #: preparing.xml:27
@@ -66,17 +62,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:35
 #, no-c-format
-#| msgid ""
-#| "Under &debian-gnu;, it is much more likely that your OS can be repaired "
-#| "rather than replaced if things go wrong. Upgrades never require a "
-#| "wholesale installation; you can always upgrade in-place. And the programs "
-#| "are almost always compatible with successive OS releases. If a new "
-#| "program version requires newer supporting software, the Debian packaging "
-#| "system ensures that all the necessary software is automatically "
-#| "identified and installed. The point is, much effort has been put into "
-#| "avoiding the need for re-installation, so think of it as your very last "
-#| "option. The installer is <emphasis>not</emphasis> designed to re-install "
-#| "over an existing system."
 msgid ""
 "Under &debian-gnu;, it is much more likely that your OS can be repaired "
 "rather than replaced if things go wrong. Upgrades never require a wholesale "
@@ -87,7 +72,13 @@ msgid ""
 "The point is, much effort has been put into avoiding the need for re-"
 "installation, so think of it as your very last option. The installer is "
 "<emphasis>not</emphasis> designed to re-install over an existing system."
-msgstr "在 &debian-gnu; 里，如果操作系统遇到出错的情况，您大多时候都能把它修复而不用重新安装。升级不再需要进行大规模的安装操作，您可以就地升级它，而这些程序也总能和新版的操作系统和平共处。如果一个程序的新版本需要其他程序的更新版本来支持它，&debian; 软件包管理系统会自动帮您确定所有必须的软件，并把它们安装上。关键是，&debian; 为了避免重新安装而做了大量努力，所以您尽可以不用去烦心这些问题了。安装程序<emphasis>不是</emphasis>设计用来重装您的系统的。"
+msgstr ""
+"在 &debian-gnu; 里，如果操作系统遇到出错的情况，您大多时候都能把它修复而不用"
+"重新安装。升级不再需要进行大规模的安装操作，您可以就地升级它，而这些程序也总"
+"能和新版的操作系统和平共处。如果一个程序的新版本需要其他程序的更新版本来支持"
+"它，&debian; 软件包管理系统会自动帮您确定所有必须的软件，并把它们安装上。关键"
+"是，&debian; 为了避免重新安装而做了大量努力，所以您尽可以不用去烦心这些问题"
+"了。安装程序<emphasis>不是</emphasis>设计用来重装您的系统的。"
 
 #. Tag: para
 #: preparing.xml:48
@@ -116,31 +107,28 @@ msgstr "在开始整个安装过程之前，收集您的计算机的硬件信息
 #. Tag: para
 #: preparing.xml:68
 #, no-c-format
-#| msgid "Create partitionable space for Debian on your hard disk."
 msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "在硬盘上为 &debian; 留出可以用来创建分区的空间；"
 
 #. Tag: para
 #: preparing.xml:73
 #, no-c-format
-#| msgid ""
-#| "Locate and/or download the installer software and any specialized driver "
-#| "files your machine requires (except Debian CD users)."
 msgid ""
 "Locate and/or download the installer software and any specialized driver "
 "files your machine requires (except &debian; CD users)."
-msgstr "如果您不是使用 &debian; CD，请寻找和(或)下载安装程序软件，还有用于您电脑上的特殊硬件的驱动程序。"
+msgstr ""
+"如果您不是使用 &debian; CD，请寻找和(或)下载安装程序软件，还有用于您电脑上的"
+"特殊硬件的驱动程序。"
 
 #. Tag: para
 #: preparing.xml:79
 #, no-c-format
-#| msgid ""
-#| "Set up boot tapes/floppies/USB sticks, or place boot files (most Debian "
-#| "CD users can boot from one of the CDs)."
 msgid ""
 "Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
-msgstr "设置从磁带/软盘/USB 盘，或者其它存有系统启动文件的设备上启动(对于大多数 &debian; CD 使用者来说，可以直接用一个 CD 启动)；"
+msgstr ""
+"设置从磁带/软盘/USB 盘，或者其它存有系统启动文件的设备上启动(对于大多数 "
+"&debian; CD 使用者来说，可以直接用一个 CD 启动)；"
 
 #. Tag: para
 #: preparing.xml:85
@@ -182,7 +170,6 @@ msgstr "加上一个或多个直接存取设备(DASD)；"
 #. Tag: para
 #: preparing.xml:117
 #, no-c-format
-#| msgid "Create and mount the partitions on which Debian will be installed."
 msgid "Create and mount the partitions on which &debian; will be installed."
 msgstr "创建并挂载用来安装 &debian; 的分区；"
 
@@ -213,17 +200,15 @@ msgstr "第一次加载新安装的系统；"
 #. Tag: para
 #: preparing.xml:141
 #, no-c-format
-#| msgid ""
-#| "For &arch-title; you have the option of using <phrase arch=\"x86\">a</"
-#| "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical "
-#| "version of the installation system. For more information about this "
-#| "graphical installer, see <xref linkend=\"graphical\"/>."
 msgid ""
 "For &arch-title; you have the option of using <phrase arch=\"any-x86\">a</"
 "phrase> <phrase arch=\"powerpc\">an experimental</phrase> graphical version "
 "of the installation system. For more information about this graphical "
 "installer, see <xref linkend=\"graphical\"/>."
-msgstr "对于 &arch-title;，您可以选择使用<phrase arch=\"any-x86\">一个</phrase><phrase arch=\"powerpc\">一个实验性的</phrase>图形界面的安装系统。有关图形安装程序的更多信息，请参阅 <xref linkend=\"graphical\"/>。"
+msgstr ""
+"对于 &arch-title;，您可以选择使用<phrase arch=\"any-x86\">一个</"
+"phrase><phrase arch=\"powerpc\">一个实验性的</phrase>图形界面的安装系统。有关"
+"图形安装程序的更多信息，请参阅 <xref linkend=\"graphical\"/>。"
 
 #. Tag: para
 #: preparing.xml:149
@@ -374,30 +359,26 @@ msgstr "&list-install-manual-files;"
 #. Tag: para
 #: preparing.xml:252
 #, no-c-format
-#| msgid ""
-#| "The document you are now reading, which is the official version of the "
-#| "Installation Guide for the &releasename; release of Debian; available in "
-#| "<ulink url=\"&url-release-area;/installmanual\">various formats and "
-#| "translations</ulink>."
 msgid ""
 "The document you are now reading, which is the official version of the "
 "Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
-msgstr "您正在阅读的文档，是 &debian; &releasename; 发行版安装指南的正式版本; 还有<ulink url=\"&url-release-area;/installmanual\">各种文件格式和不同语种的翻译</ulink>。"
+msgstr ""
+"您正在阅读的文档，是 &debian; &releasename; 发行版安装指南的正式版本; 还有"
+"<ulink url=\"&url-release-area;/installmanual\">各种文件格式和不同语种的翻译"
+"</ulink>。"
 
 #. Tag: para
 #: preparing.xml:261
 #, no-c-format
-#| msgid ""
-#| "The document you are now reading, which is a development version of the "
-#| "Installation Guide for the next release of Debian; available in <ulink "
-#| "url=\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgid ""
 "The document you are now reading, which is a development version of the "
 "Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
-msgstr "您正在阅读的文档，是 &ebian; 下一个发行版安装指南的开发版本；有<ulink url=\"&url-d-i-alioth-manual;\">各种文件格式和不同语种的翻译</ulink>。"
+msgstr ""
+"您正在阅读的文档，是 &ebian; 下一个发行版安装指南的开发版本；有<ulink url="
+"\"&url-d-i-alioth-manual;\">各种文件格式和不同语种的翻译</ulink>。"
 
 #. Tag: title
 #: preparing.xml:273
@@ -440,20 +421,18 @@ msgstr "&arch-title; Hardware References"
 #: preparing.xml:307
 #, no-c-format
 msgid ""
-"Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
-"z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+"Documentation of &arch-title;-specific boot sequence, commands and device "
+"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
 msgstr ""
-"在 &arch-title; 上 Linux 2.4 版内核的安装指引和设备驱动程序 (DASD, XPRAM, "
-"Console, tape, z90 crypto, chandev, network)"
 
 #. Tag: ulink
-#: preparing.xml:319
+#: preparing.xml:318
 #, no-c-format
-msgid "Device Drivers and Installation Commands"
-msgstr "设备驱动程序与安装命令"
+msgid "Device Drivers, Features, and Commands (Linux Kernel 2.6.32)"
+msgstr ""
 
 #. Tag: para
-#: preparing.xml:324
+#: preparing.xml:323
 #, no-c-format
 msgid ""
 "IBM Redbook describing how Linux can be combined with z/VM on zSeries and "
@@ -462,38 +441,36 @@ msgstr ""
 "IBM Redbook 讲述了如何将 Linux 与 zSeries 的 z/VM 和 &arch-title; 硬件组合。"
 
 #. Tag: ulink
-#: preparing.xml:334
+#: preparing.xml:333
 #, no-c-format
 msgid "Linux for &arch-title;"
 msgstr "用于 &arch-title; 的 Linux"
 
 #. Tag: para
-#: preparing.xml:340
+#: preparing.xml:339
 #, no-c-format
-#| msgid ""
-#| "IBM Redbook describing the Linux distributions available for the "
-#| "mainframe. It has no chapter about Debian but the basic installation "
-#| "concepts are the same across all &arch-title; distributions."
 msgid ""
 "IBM Redbook describing the Linux distributions available for the mainframe. "
 "It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
-msgstr "IBM Redbook 介绍了可用于 mainframe 的 Linux 发行版。其中没有关于 &debian; 的章节，但对于所有的 &arch-title; 发行版，基本的安装概念是相同的。"
+msgstr ""
+"IBM Redbook 介绍了可用于 mainframe 的 Linux 发行版。其中没有关于 &debian; 的"
+"章节，但对于所有的 &arch-title; 发行版，基本的安装概念是相同的。"
 
 #. Tag: ulink
-#: preparing.xml:351
+#: preparing.xml:350
 #, no-c-format
 msgid "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 msgstr "Linux for IBM eServer zSeries and &arch-title;: Distributions"
 
 #. Tag: title
-#: preparing.xml:361
+#: preparing.xml:360
 #, no-c-format
 msgid "Finding Sources of Hardware Information"
 msgstr "提供硬件信息的资源"
 
 #. Tag: para
-#: preparing.xml:362
+#: preparing.xml:361
 #, no-c-format
 msgid ""
 "In many cases, the installer will be able to automatically detect your "
@@ -504,19 +481,19 @@ msgstr ""
 "熟悉一下您的硬件比较好。"
 
 #. Tag: para
-#: preparing.xml:368
+#: preparing.xml:367
 #, no-c-format
 msgid "Hardware information can be gathered from:"
 msgstr "获取硬件信息的途径有："
 
 #. Tag: para
-#: preparing.xml:375
+#: preparing.xml:374
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
 msgstr "每个硬件附带的手册。"
 
 #. Tag: para
-#: preparing.xml:380
+#: preparing.xml:379
 #, no-c-format
 msgid ""
 "The BIOS setup screens of your computer. You can view these screens when you "
@@ -527,19 +504,19 @@ msgstr ""
 "您的手册确认组合键。通常，它是 <keycap>Delete</keycap> 键。"
 
 #. Tag: para
-#: preparing.xml:387
+#: preparing.xml:386
 #, no-c-format
 msgid "The cases and boxes for each piece of hardware."
 msgstr "每个硬件的包装盒。"
 
 #. Tag: para
-#: preparing.xml:393
+#: preparing.xml:392
 #, no-c-format
 msgid "The System window in the Windows Control Panel."
 msgstr "Windows 控制面板里面的系统窗口。"
 
 #. Tag: para
-#: preparing.xml:399
+#: preparing.xml:398
 #, no-c-format
 msgid ""
 "System commands or tools in another operating system, including file manager "
@@ -550,7 +527,7 @@ msgstr ""
 "盘特别有用。"
 
 #. Tag: para
-#: preparing.xml:406
+#: preparing.xml:405
 #, no-c-format
 msgid ""
 "Your system administrator or Internet Service Provider. These sources can "
@@ -560,179 +537,179 @@ msgstr ""
 "息。"
 
 #. Tag: title
-#: preparing.xml:418
+#: preparing.xml:417
 #, no-c-format
 msgid "Hardware Information Needed for an Install"
 msgstr "安装所需的硬件信息"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Hardware"
 msgstr "硬件"
 
 #. Tag: entry
-#: preparing.xml:422
+#: preparing.xml:421
 #, no-c-format
 msgid "Information You Might Need"
 msgstr "您需要了解的信息"
 
 #. Tag: entry
-#: preparing.xml:428
+#: preparing.xml:427
 #, no-c-format
 msgid "Hard Drives"
 msgstr "硬盘"
 
 #. Tag: entry
-#: preparing.xml:429
+#: preparing.xml:428
 #, no-c-format
 msgid "How many you have."
 msgstr "拥有的容量。"
 
 #. Tag: entry
-#: preparing.xml:431
+#: preparing.xml:430
 #, no-c-format
 msgid "Their order on the system."
 msgstr "它们在系统上的次序。"
 
 #. Tag: entry
-#: preparing.xml:433
+#: preparing.xml:432
 #, no-c-format
 msgid "Whether IDE (also known as PATA), SATA or SCSI."
 msgstr "是 IDE (也称为 PATA)、SATA 或 SCSI。"
 
 # index.docbook:445, index.docbook:497
 #. Tag: entry
-#: preparing.xml:435 preparing.xml:487
+#: preparing.xml:434 preparing.xml:486
 #, no-c-format
 msgid "Available free space."
 msgstr "可用空间。"
 
 #. Tag: entry
-#: preparing.xml:436
+#: preparing.xml:435
 #, no-c-format
 msgid "Partitions."
 msgstr "分区。"
 
 #. Tag: entry
-#: preparing.xml:438
+#: preparing.xml:437
 #, no-c-format
 msgid "Partitions where other operating systems are installed."
 msgstr "安装有其他操作系统的分区。"
 
 #. Tag: entry
-#: preparing.xml:442
+#: preparing.xml:441
 #, no-c-format
 msgid "Monitor"
 msgstr "显示器"
 
 # index.docbook:453, index.docbook:473, index.docbook:479, index.docbook:485
 #. Tag: entry
-#: preparing.xml:443 preparing.xml:463 preparing.xml:469 preparing.xml:475
+#: preparing.xml:442 preparing.xml:462 preparing.xml:468 preparing.xml:474
 #, no-c-format
 msgid "Model and manufacturer."
 msgstr "型号与制造商。"
 
 #. Tag: entry
-#: preparing.xml:445
+#: preparing.xml:444
 #, no-c-format
 msgid "Resolutions supported."
 msgstr "支持的分辨率。"
 
 #. Tag: entry
-#: preparing.xml:446
+#: preparing.xml:445
 #, no-c-format
 msgid "Horizontal refresh rate."
 msgstr "水平扫描频率。"
 
 #. Tag: entry
-#: preparing.xml:447
+#: preparing.xml:446
 #, no-c-format
 msgid "Vertical refresh rate."
 msgstr "垂直扫描频率。"
 
 #. Tag: entry
-#: preparing.xml:449
+#: preparing.xml:448
 #, no-c-format
 msgid "Color depth (number of colors) supported."
 msgstr "支持的颜色深度(颜色数)。"
 
 #. Tag: entry
-#: preparing.xml:451
+#: preparing.xml:450
 #, no-c-format
 msgid "Screen size."
 msgstr "屏幕尺寸。"
 
 #. Tag: entry
-#: preparing.xml:454
+#: preparing.xml:453
 #, no-c-format
 msgid "Mouse"
 msgstr "鼠标"
 
 #. Tag: entry
-#: preparing.xml:455
+#: preparing.xml:454
 #, no-c-format
 msgid "Type: serial, PS/2, or USB."
 msgstr "类型：串口、PS/2 或 USB。"
 
 #. Tag: entry
-#: preparing.xml:457
+#: preparing.xml:456
 #, no-c-format
 msgid "Port."
 msgstr "端口。"
 
 #. Tag: entry
-#: preparing.xml:458
+#: preparing.xml:457
 #, no-c-format
 msgid "Manufacturer."
 msgstr "制造商。"
 
 #. Tag: entry
-#: preparing.xml:459
+#: preparing.xml:458
 #, no-c-format
 msgid "Number of buttons."
 msgstr "按键数。"
 
 # index.docbook:472, index.docbook:500
 #. Tag: entry
-#: preparing.xml:462 preparing.xml:490
+#: preparing.xml:461 preparing.xml:489
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 # index.docbook:475, index.docbook:501
 #. Tag: entry
-#: preparing.xml:465 preparing.xml:491
+#: preparing.xml:464 preparing.xml:490
 #, no-c-format
 msgid "Type of adapter."
 msgstr "适配器类型。"
 
 #. Tag: entry
-#: preparing.xml:468
+#: preparing.xml:467
 #, no-c-format
 msgid "Printer"
 msgstr "打印机"
 
 #. Tag: entry
-#: preparing.xml:471
+#: preparing.xml:470
 #, no-c-format
 msgid "Printing resolutions supported."
 msgstr "支持的打印分辨率。"
 
 #. Tag: entry
-#: preparing.xml:474
+#: preparing.xml:473
 #, no-c-format
 msgid "Video Card"
 msgstr "视频卡"
 
 #. Tag: entry
-#: preparing.xml:477
+#: preparing.xml:476
 #, no-c-format
 msgid "Video RAM available."
 msgstr "可用显存。"
 
 #. Tag: entry
-#: preparing.xml:479
+#: preparing.xml:478
 #, no-c-format
 msgid ""
 "Resolutions and color depths supported (these should be checked against your "
@@ -740,37 +717,37 @@ msgid ""
 msgstr "支持的分辨率和颜色数(还需检验您显示器的能力)。"
 
 #. Tag: entry
-#: preparing.xml:484
+#: preparing.xml:483
 #, no-c-format
 msgid "DASD"
 msgstr "DASD"
 
 #. Tag: entry
-#: preparing.xml:485
+#: preparing.xml:484
 #, no-c-format
 msgid "Device number(s)."
 msgstr "设备数。"
 
 #. Tag: entry
-#: preparing.xml:493
+#: preparing.xml:492
 #, no-c-format
 msgid "Device numbers."
 msgstr "设备数。"
 
 #. Tag: entry
-#: preparing.xml:494
+#: preparing.xml:493
 #, no-c-format
 msgid "Relative adapter number for OSA cards."
 msgstr "OSA 卡的相对适配器号。"
 
 #. Tag: title
-#: preparing.xml:502
+#: preparing.xml:501
 #, no-c-format
 msgid "Hardware Compatibility"
 msgstr "硬件兼容性"
 
 #. Tag: para
-#: preparing.xml:504
+#: preparing.xml:503
 #, no-c-format
 msgid ""
 "Many brand name products work without trouble on &arch-kernel;. Moreover, "
@@ -783,7 +760,7 @@ msgstr ""
 "不同的硬件上运行。"
 
 #. Tag: para
-#: preparing.xml:510
+#: preparing.xml:509
 #, no-c-format
 msgid ""
 "In particular, &arch-kernel; usually cannot run hardware that requires a "
@@ -792,7 +769,7 @@ msgstr ""
 "特别是，&arch-kernel; 通常不能驱动那些需要某些版本 Windows 才运行的硬件上。"
 
 #. Tag: para
-#: preparing.xml:515
+#: preparing.xml:514
 #, no-c-format
 msgid ""
 "Although some Windows-specific hardware can be made to run on Linux, doing "
@@ -805,7 +782,7 @@ msgstr ""
 "上。因此，它们很快就会被废弃。"
 
 #. Tag: para
-#: preparing.xml:522
+#: preparing.xml:521
 #, no-c-format
 msgid ""
 "So called win-modems are the most common type of this hardware. However, "
@@ -815,19 +792,19 @@ msgstr ""
 "格的。"
 
 #. Tag: para
-#: preparing.xml:527
+#: preparing.xml:526
 #, no-c-format
 msgid "You can check hardware compatibility by:"
 msgstr "您可以通过以下方式检验硬件兼容性："
 
 #. Tag: para
-#: preparing.xml:532
+#: preparing.xml:531
 #, no-c-format
 msgid "Checking manufacturers' web sites for new drivers."
 msgstr "检查制造商的网站来得到新的驱动程序。"
 
 #. Tag: para
-#: preparing.xml:537
+#: preparing.xml:536
 #, no-c-format
 msgid ""
 "Looking at web sites or manuals for information about emulation. Lesser "
@@ -837,7 +814,7 @@ msgstr ""
 "驱动程序或者设置。"
 
 #. Tag: para
-#: preparing.xml:544
+#: preparing.xml:543
 #, no-c-format
 msgid ""
 "Checking hardware compatibility lists for &arch-kernel; on web sites "
@@ -845,19 +822,19 @@ msgid ""
 msgstr "检查您计算机体系的 &arch-kernel; 兼容性列表网站。"
 
 #. Tag: para
-#: preparing.xml:550
+#: preparing.xml:549
 #, no-c-format
 msgid "Searching the Internet for other users' experiences."
 msgstr "搜索互联网查找其他用户的经验。"
 
 #. Tag: title
-#: preparing.xml:561
+#: preparing.xml:560
 #, no-c-format
 msgid "Network Settings"
 msgstr "网络设置"
 
 #. Tag: para
-#: preparing.xml:563
+#: preparing.xml:562
 #, no-c-format
 msgid ""
 "If your computer is connected to a network 24 hours a day (i.e., an Ethernet "
@@ -868,31 +845,31 @@ msgstr ""
 "号连接)，您需要向您的网络系统管理员咨询这项信息。"
 
 #. Tag: para
-#: preparing.xml:570
+#: preparing.xml:569
 #, no-c-format
 msgid "Your host name (you may be able to decide this on your own)."
 msgstr "您的主机名(您也许可以自己决定)。"
 
 #. Tag: para
-#: preparing.xml:575
+#: preparing.xml:574
 #, no-c-format
 msgid "Your domain name."
 msgstr "您的域名。"
 
 #. Tag: para
-#: preparing.xml:580
+#: preparing.xml:579
 #, no-c-format
 msgid "Your computer's IP address."
 msgstr "您的计算机 IP 地址。"
 
 #. Tag: para
-#: preparing.xml:585
+#: preparing.xml:584
 #, no-c-format
 msgid "The netmask to use with your network."
 msgstr "您网络的网络掩码。"
 
 #. Tag: para
-#: preparing.xml:590
+#: preparing.xml:589
 #, no-c-format
 msgid ""
 "The IP address of the default gateway system you should route to, if your "
@@ -901,7 +878,7 @@ msgstr ""
 "路由经过的默认网关的 IP 地址，如果您的网络<emphasis>有</emphasis>网关的话。"
 
 #. Tag: para
-#: preparing.xml:596
+#: preparing.xml:595
 #, no-c-format
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
@@ -909,7 +886,7 @@ msgid ""
 msgstr "您的网络中作为 DNS(域名服务) 服务器的系统。"
 
 #. Tag: para
-#: preparing.xml:604
+#: preparing.xml:603
 #, no-c-format
 msgid ""
 "On the other hand, if your administrator tells you that a DHCP server is "
@@ -921,31 +898,31 @@ msgstr ""
 "需了解这项信息，因为 DHCP 服务器会在安装过程中直接提供。"
 
 #. Tag: para
-#: preparing.xml:611
+#: preparing.xml:610
 #, no-c-format
 msgid "If you use a wireless network, you should also find out:"
 msgstr "如果您有一个无线网络，您应该找出："
 
 #. Tag: para
-#: preparing.xml:616
+#: preparing.xml:615
 #, no-c-format
 msgid "ESSID of your wireless network."
 msgstr "您的无线网络的 ESSID。"
 
 #. Tag: para
-#: preparing.xml:621
+#: preparing.xml:620
 #, no-c-format
 msgid "WEP security key (if applicable)."
 msgstr "WEP 安全密钥(如果可用)。"
 
 #. Tag: title
-#: preparing.xml:638
+#: preparing.xml:637
 #, no-c-format
 msgid "Meeting Minimum Hardware Requirements"
 msgstr "满足最低的硬件要求"
 
 #. Tag: para
-#: preparing.xml:639
+#: preparing.xml:638
 #, no-c-format
 msgid ""
 "Once you have gathered information about your computer's hardware, check "
@@ -956,7 +933,7 @@ msgstr ""
 "偿，安装上系统。"
 
 #. Tag: para
-#: preparing.xml:645
+#: preparing.xml:644
 #, no-c-format
 msgid ""
 "Depending on your needs, you might manage with less than some of the "
@@ -967,112 +944,115 @@ msgstr ""
 "议的话，多数用户会安装失败。"
 
 #. Tag: para
-#: preparing.xml:651
+#: preparing.xml:650
 #, no-c-format
 msgid ""
 "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr "Pentium 4、1GHz 的系统是桌面系统的最低推荐配置。"
 
 #. Tag: para
-#: preparing.xml:656
+#: preparing.xml:655
 #, no-c-format
 msgid "Any OldWorld or NewWorld PowerPC can serve well as a desktop system."
 msgstr "任何一台 OldWorld 或 NewWorld PowerPC 都可以用作一个不错的桌面系统。"
 
 #. Tag: title
-#: preparing.xml:663
+#: preparing.xml:662
 #, no-c-format
 msgid "Recommended Minimum System Requirements"
 msgstr "推荐的最低系统配置"
 
 #. Tag: entry
-#: preparing.xml:667
+#: preparing.xml:666
 #, no-c-format
 msgid "Install Type"
 msgstr "安装类别"
 
 #. Tag: entry
-#: preparing.xml:668
+#: preparing.xml:667
 #, no-c-format
 msgid "RAM (minimal)"
 msgstr "RAM (最低要求)"
 
 #. Tag: entry
-#: preparing.xml:669
+#: preparing.xml:668
 #, no-c-format
 msgid "RAM (recommended)"
 msgstr "RAM (推荐配置)"
 
 #. Tag: entry
-#: preparing.xml:670
+#: preparing.xml:669
 #, no-c-format
 msgid "Hard Drive"
 msgstr "硬盘"
 
 #. Tag: entry
-#: preparing.xml:676
+#: preparing.xml:675
 #, no-c-format
 msgid "No desktop"
 msgstr "无桌面的系统"
 
 #. Tag: entry
-#: preparing.xml:677 preparing.xml:682
+#: preparing.xml:676
 #, no-c-format
 msgid "64 megabytes"
 msgstr "64 MB"
 
 #. Tag: entry
-#: preparing.xml:678
+#: preparing.xml:677
 #, no-c-format
 msgid "256 megabytes"
 msgstr "256 MB"
 
 #. Tag: entry
-#: preparing.xml:679
+#: preparing.xml:678
 #, no-c-format
 msgid "1 gigabyte"
 msgstr "1 GB"
 
 #. Tag: entry
-#: preparing.xml:681
+#: preparing.xml:680
 #, no-c-format
 msgid "With Desktop"
 msgstr "桌面系统"
 
 #. Tag: entry
-#: preparing.xml:683
+#: preparing.xml:681
+#, fuzzy, no-c-format
+#| msgid "512 megabytes"
+msgid "128 megabytes"
+msgstr "512 MB"
+
+#. Tag: entry
+#: preparing.xml:682
 #, no-c-format
 msgid "512 megabytes"
 msgstr "512 MB"
 
 #. Tag: entry
-#: preparing.xml:684
+#: preparing.xml:683
 #, no-c-format
 msgid "5 gigabytes"
 msgstr "5 GB"
 
 #. Tag: para
-#: preparing.xml:689
+#: preparing.xml:688
 #, no-c-format
-#| msgid ""
-#| "The actual minimum memory requirements are a lot less then 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 then 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."
-msgstr "实际的内存最低要求会略低于表中的数字。根据各自的体系，&debian; 可以在 20MB (s390) 到 60MB (amd64) 这样少的内存上安装。同样，对磁盘空间也是如此，取决于您选择安装的应用软件。参阅 <xref linkend=\"tasksel-size-list\"/> 了解磁盘空间需求的内容。"
+"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."
+msgstr ""
+"实际的内存最低要求会略低于表中的数字。根据各自的体系，&debian; 可以在 20MB "
+"(s390) 到 60MB (amd64) 这样少的内存上安装。同样，对磁盘空间也是如此，取决于您"
+"选择安装的应用软件。参阅 <xref linkend=\"tasksel-size-list\"/> 了解磁盘空间需"
+"求的内容。"
 
 #. Tag: para
-#: preparing.xml:699
+#: preparing.xml:698
 #, no-c-format
 msgid ""
 "It is possible to run a graphical desktop environment on older or low-end "
@@ -1088,7 +1068,7 @@ msgstr ""
 "择。"
 
 #. Tag: para
-#: preparing.xml:708
+#: preparing.xml:707
 #, no-c-format
 msgid ""
 "It is practically impossible to give general memory or disk space "
@@ -1098,7 +1078,7 @@ msgstr ""
 "很难说清楚服务器安装该需要多少内存和磁盘空间，这完全取决于服务器的用途。"
 
 #. Tag: para
-#: preparing.xml:714
+#: preparing.xml:713
 #, no-c-format
 msgid ""
 "Remember that these sizes don't include all the other materials which are "
@@ -1109,18 +1089,8 @@ msgstr ""
 "含用户的文件、信件或者数据。在考虑您自己的文件和数据空间时，越慷慨越好。"
 
 #. Tag: para
-#: preparing.xml:721
+#: preparing.xml:720
 #, 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. "
@@ -1131,16 +1101,22 @@ msgid ""
 "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."
-msgstr "在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 <filename>/var</filename> 分区里装有许多 &debian; 的特定状态信息和类似日志文件这样的常规内容。<command>dpkg</command> 所用的文件(含有所有已安装软件包的信息)很容易就会消耗掉 40MB。另外，<command>apt-get</command> 会在安装前将下载的软件包放在这里。您应当最少分配 200MB 的空间给 <filename>/var</filename>，如果您安装了图形桌面系统，还要更多空间。"
+msgstr ""
+"在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 "
+"<filename>/var</filename> 分区里装有许多 &debian; 的特定状态信息和类似日志文"
+"件这样的常规内容。<command>dpkg</command> 所用的文件(含有所有已安装软件包的信"
+"息)很容易就会消耗掉 40MB。另外，<command>apt-get</command> 会在安装前将下载的"
+"软件包放在这里。您应当最少分配 200MB 的空间给 <filename>/var</filename>，如果"
+"您安装了图形桌面系统，还要更多空间。"
 
 #. Tag: title
-#: preparing.xml:745
+#: preparing.xml:744
 #, no-c-format
 msgid "Pre-Partitioning for Multi-Boot Systems"
 msgstr "为多重启动系统事先分区"
 
 #. Tag: para
-#: preparing.xml:746
+#: preparing.xml:745
 #, no-c-format
 msgid ""
 "Partitioning your disk simply refers to the act of breaking up your disk "
@@ -1153,7 +1129,7 @@ msgstr ""
 "间里安置家具，那么这不会对其它房间有任何影响。"
 
 #. Tag: para
-#: preparing.xml:753
+#: preparing.xml:752
 #, no-c-format
 msgid ""
 "Whenever this section talks about <quote>disks</quote> you should translate "
@@ -1165,39 +1141,30 @@ msgstr ""
 "机。"
 
 #. Tag: para
-#: preparing.xml:759
+#: preparing.xml:758
 #, no-c-format
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch="
-#| "\"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> and want to stick Linux on the same disk, you will need to "
-#| "repartition the disk. 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 Linux systems, but that's not covered "
-#| "here. At the very least you will need a dedicated partition for the "
-#| "Debian root."
 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> and want to stick &debian; on the same disk, you will need to "
-"repartition the disk. &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."
-msgstr "如果您已经在您的机器中安装有操作系统<phrase arch=\"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>，同时也希望把 Linux 装在同一块硬盘上，那么您就必须重新对硬盘分区。&debian; 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 Linux 系统共享一些分区，但是我们在这里不会对此进行说明。最起码，您要为 &debian; 的根目录准备一个专用的分区。"
+"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> and want to stick &debian; on the same disk, you will "
+"need to repartition the disk. &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."
+msgstr ""
+"如果您已经在您的机器中安装有操作系统<phrase arch=\"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>，同时也"
+"希望把 Linux 装在同一块硬盘上，那么您就必须重新对硬盘分区。&debian; 需要它自"
+"己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 "
+"Linux 系统共享一些分区，但是我们在这里不会对此进行说明。最起码，您要为 "
+"&debian; 的根目录准备一个专用的分区。"
 
 #. Tag: para
-#: preparing.xml:778
+#: preparing.xml:777
 #, 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=\"x86\">, "
-#| "such as fdisk or PartitionMagic</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-"
@@ -1205,10 +1172,15 @@ msgid ""
 "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."
-msgstr "通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"any-x86\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM diskmap</phrase>。分区工具总会提供一种办法让您查看现有的分区情况，而不作任何改动。"
+msgstr ""
+"通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"any-"
+"x86\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 "
+"Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM "
+"diskmap</phrase>。分区工具总会提供一种办法让您查看现有的分区情况，而不作任何"
+"改动。"
 
 #. Tag: para
-#: preparing.xml:787
+#: preparing.xml:786
 #, no-c-format
 msgid ""
 "In general, changing a partition with a file system already on it will "
@@ -1222,28 +1194,26 @@ msgstr ""
 "最好在把挡路的家具都移开，否则就要冒家具被毁坏的危险。"
 
 #. Tag: emphasis
-#: preparing.xml:797
+#: preparing.xml:796
 #, no-c-format
 msgid "FIXME: write about HP-UX disks?"
 msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
-#: preparing.xml:799
+#: preparing.xml:798
 #, no-c-format
-#| msgid ""
-#| "If your computer has more than one hard disk, you may want to dedicate "
-#| "one of the hard disks completely to Debian. If so, you don't need to "
-#| "partition that disk before booting the installation system; the "
-#| "installer's included partitioning program can handle the job nicely."
 msgid ""
 "If your computer has more than one hard disk, you may want to dedicate one "
 "of the hard disks completely to &debian;. If so, you don't need to partition "
 "that disk before booting the installation system; the installer's included "
 "partitioning program can handle the job nicely."
-msgstr "如果您的计算机配有不只一块硬盘，您或许可以考虑把其中一块硬盘专门分配给 &debian; 使用。这样的话，您就不用在启动安装系统前再对那块硬盘进行分区了，安装程序自带的分区程序会漂亮地完成这个任务。"
+msgstr ""
+"如果您的计算机配有不只一块硬盘，您或许可以考虑把其中一块硬盘专门分配给 "
+"&debian; 使用。这样的话，您就不用在启动安装系统前再对那块硬盘进行分区了，安装"
+"程序自带的分区程序会漂亮地完成这个任务。"
 
 #. Tag: para
-#: preparing.xml:806
+#: preparing.xml:805
 #, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
@@ -1267,15 +1237,8 @@ msgstr ""
 "常，至少您还可以有几个办法可选，比如原先系统的安装磁带或 CD。"
 
 #. Tag: para
-#: preparing.xml:821
+#: preparing.xml:820
 #, no-c-format
-#| msgid ""
-#| "If your machine already has multiple partitions, and enough space can be "
-#| "provided by deleting and replacing one or more of them, then you too can "
-#| "wait and use the Debian installer's partitioning program. You should "
-#| "still read through the material below, because there may be special "
-#| "circumstances like the order of the existing partitions within the "
-#| "partition map, that force you to partition before installing anyway."
 msgid ""
 "If your machine already has multiple partitions, and enough space can be "
 "provided by deleting and replacing one or more of them, then you too can "
@@ -1283,33 +1246,27 @@ msgid ""
 "read through the material below, because there may be special circumstances "
 "like the order of the existing partitions within the partition map, that "
 "force you to partition before installing anyway."
-msgstr "倘若您的机器已经有多个分区，并且通过删除或替换它们中的一个或多个就能为安装提供足够的空间，那么您一样也可以把分区操作延后，到安装时再使用 &debian; 安装程序自带的分区工具。不过，您还是应当继续读完下面的文档，因为可能会存在一些特殊的情形。比如，分区表中现有分区的顺序问题，这也许会令您不得不在安装前先分好区。"
+msgstr ""
+"倘若您的机器已经有多个分区，并且通过删除或替换它们中的一个或多个就能为安装提"
+"供足够的空间，那么您一样也可以把分区操作延后，到安装时再使用 &debian; 安装程"
+"序自带的分区工具。不过，您还是应当继续读完下面的文档，因为可能会存在一些特殊"
+"的情形。比如，分区表中现有分区的顺序问题，这也许会令您不得不在安装前先分好"
+"区。"
 
 #. Tag: para
-#: preparing.xml:831
+#: preparing.xml:830
 #, no-c-format
-#| msgid ""
-#| "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
-#| "you can wait and use Debian installer's partitioning program to resize "
-#| "the filesystem."
 msgid ""
 "If your machine has a FAT or NTFS filesystem, as used by DOS and Windows, "
 "you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
-msgstr "如果您的计算机上有 FAT 或 NTFS 文件系统，它被 DOS 和 Windows 使用，您可以等到用 &debian; 安装程序中的分区工具来重新调整文件系统的大小。"
+msgstr ""
+"如果您的计算机上有 FAT 或 NTFS 文件系统，它被 DOS 和 Windows 使用，您可以等到"
+"用 &debian; 安装程序中的分区工具来重新调整文件系统的大小。"
 
 #. Tag: para
-#: preparing.xml:837
+#: preparing.xml:836
 #, no-c-format
-#| msgid ""
-#| "If none of the above apply, you'll need to partition your hard disk "
-#| "before starting the installation to create partitionable space for "
-#| "Debian. If some of the partitions will be owned by other operating "
-#| "systems, you should create those partitions using native operating system "
-#| "partitioning programs. We recommend that you do <emphasis>not</emphasis> "
-#| "attempt to create partitions for &debian-gnu; using another operating "
-#| "system's tools. Instead, you should just create the native operating "
-#| "system's partitions you will want to retain."
 msgid ""
 "If none of the above apply, you'll need to partition your hard disk before "
 "starting the installation to create partitionable space for &debian;. If "
@@ -1319,27 +1276,29 @@ msgid ""
 "partitions for &debian-gnu; using another operating system's tools. Instead, "
 "you should just create the native operating system's partitions you will "
 "want to retain."
-msgstr "如果您的情况不属于上面任何一种，那么需要在开始安装之前，事先为 &debian; 腾出可用于分区的空间。要是有分区是为其它操作系统准备的，最好用该操作系统自己的分区软件来新建这些分区。我们建议您<emphasis>不要</emphasis>用其它操作系统里的工具为 &debian-gnu; 创建 Linux 分区。也就是说，应当仅仅创建要保留的操作系统自身的分区。"
+msgstr ""
+"如果您的情况不属于上面任何一种，那么需要在开始安装之前，事先为 &debian; 腾出"
+"可用于分区的空间。要是有分区是为其它操作系统准备的，最好用该操作系统自己的分"
+"区软件来新建这些分区。我们建议您<emphasis>不要</emphasis>用其它操作系统里的工"
+"具为 &debian-gnu; 创建 Linux 分区。也就是说，应当仅仅创建要保留的操作系统自身"
+"的分区。"
 
 #. Tag: para
-#: preparing.xml:849
+#: preparing.xml:848
 #, no-c-format
-#| msgid ""
-#| "If you are going to install more than one operating system on the same "
-#| "machine, you should install all other system(s) before proceeding with "
-#| "Debian installation. Windows and other OS installations may destroy your "
-#| "ability to start Debian, or encourage you to reformat non-native "
-#| "partitions."
 msgid ""
 "If you are going to install more than one operating system on the same "
 "machine, you should install all other system(s) before proceeding with "
 "&debian; installation. Windows and other OS installations may destroy your "
 "ability to start &debian;, or encourage you to reformat non-native "
 "partitions."
-msgstr "倘若您打算在同一台机器上安装多个操作系统的话，应当在安装 &debian; 之前，先把所有其它系统都装好。Windows 和其它操作系统的安装过程可能会让您无法启动 &debian;，也可能会怂恿您重新格式化不属于它们自己的分区。"
+msgstr ""
+"倘若您打算在同一台机器上安装多个操作系统的话，应当在安装 &debian; 之前，先把"
+"所有其它系统都装好。Windows 和其它操作系统的安装过程可能会让您无法启动 "
+"&debian;，也可能会怂恿您重新格式化不属于它们自己的分区。"
 
 #. Tag: para
-#: preparing.xml:857
+#: preparing.xml:856
 #, no-c-format
 msgid ""
 "You can recover from these actions or avoid them, but installing the native "
@@ -1349,17 +1308,8 @@ msgstr ""
 "能够帮您免除这些烦恼。"
 
 #. Tag: para
-#: preparing.xml:862
+#: preparing.xml:861
 #, no-c-format
-#| msgid ""
-#| "In order for OpenFirmware to automatically boot &debian-gnu; the Linux "
-#| "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 Linux 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 Linux partition tools later "
-#| "during the actual install, and replace it with Linux partitions."
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the &arch-"
 "parttype; partitions should appear before all other partitions on the disk, "
@@ -1369,29 +1319,33 @@ msgid ""
 "(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."
-msgstr "为了能让 OpemFirmware 自动启动 &debian-gnu; &arch-parttype; 分区必须被安置在其它分区之前，特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。即，您必须在其它可引导分区<emphasis>之前</emphasis>为 &arch-parttype; 预留一个分区。(专门留给 Apple 的硬盘驱动程序的那些小分区并不是可引导的。) 您可以在真正安装时，用 &debian; 的分区工具来删除当初预留的分区，再用 &arch-parttype; 的分区取而代之。"
+msgstr ""
+"为了能让 OpemFirmware 自动启动 &debian-gnu; &arch-parttype; 分区必须被安置在"
+"其它分区之前，特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。"
+"即，您必须在其它可引导分区<emphasis>之前</emphasis>为 &arch-parttype; 预留一"
+"个分区。(专门留给 Apple 的硬盘驱动程序的那些小分区并不是可引导的。) 您可以在"
+"真正安装时，用 &debian; 的分区工具来删除当初预留的分区，再用 &arch-parttype; "
+"的分区取而代之。"
 
 #. Tag: para
-#: preparing.xml:874
+#: preparing.xml:873
 #, no-c-format
-#| msgid ""
-#| "If you currently have one hard disk with one partition (a common setup "
-#| "for desktop computers), and you want to multi-boot the native operating "
-#| "system and Debian, you will need to:"
 msgid ""
 "If you currently have one hard disk with one partition (a common setup for "
 "desktop computers), and you want to multi-boot the native operating system "
 "and &debian;, you will need to:"
-msgstr "如果您现在有一块硬盘，这块硬盘上仅有一个分区(这是桌面电脑的通常设置)，同时希望能多重启动原有的操作系统和 &debian;，那么您将需要："
+msgstr ""
+"如果您现在有一块硬盘，这块硬盘上仅有一个分区(这是桌面电脑的通常设置)，同时希"
+"望能多重启动原有的操作系统和 &debian;，那么您将需要："
 
 #. Tag: para
-#: preparing.xml:881
+#: preparing.xml:880
 #, no-c-format
 msgid "Back up everything on the computer."
 msgstr "备份计算机里所有的数据。"
 
 #. Tag: para
-#: preparing.xml:886
+#: preparing.xml:885
 #, no-c-format
 msgid ""
 "Boot from the native operating system installer media such as CD-ROM or "
@@ -1404,7 +1358,7 @@ msgstr ""
 "的 MacOS 系统。</phrase>"
 
 #. Tag: para
-#: preparing.xml:896
+#: preparing.xml:895
 #, no-c-format
 msgid ""
 "Use the native partitioning tools to create native system partition(s). "
@@ -1414,61 +1368,48 @@ msgstr ""
 "个分区，或者腾出一块空闲空间。"
 
 #. Tag: para
-#: preparing.xml:903
+#: preparing.xml:902
 #, no-c-format
 msgid "Install the native operating system on its new partition."
 msgstr "把原有的操作系统安装到属于它的新分区上。"
 
 #. Tag: para
-#: preparing.xml:908
+#: preparing.xml:907
 #, no-c-format
-#| msgid ""
-#| "Boot back into the native system to verify everything's OK, and to "
-#| "download the Debian installer boot files."
 msgid ""
 "Boot back into the native system to verify everything's OK, and to download "
 "the &debian; installer boot files."
-msgstr "启动到原有的操作系统，以确保一切正常，再下载 &debian; 安装程序的启动文件。"
+msgstr ""
+"启动到原有的操作系统，以确保一切正常，再下载 &debian; 安装程序的启动文件。"
 
 #. Tag: para
-#: preparing.xml:914
+#: preparing.xml:913
 #, no-c-format
-#| msgid "Boot the Debian installer to continue installing Debian."
 msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "启动 &debian; 安装程序，并继续安装 &debian;。"
 
 #. Tag: title
-#: preparing.xml:928
+#: preparing.xml:927
 #, no-c-format
 msgid "Partitioning From DOS or Windows"
 msgstr "从 DOS 或 Windows 分区"
 
 #. Tag: para
-#: preparing.xml:929
+#: preparing.xml:928
 #, no-c-format
-#| msgid ""
-#| "If you are manipulating existing FAT or NTFS partitions, it is "
-#| "recommended that you either use the scheme below or native Windows or DOS "
-#| "tools. Otherwise, it is not really necessary to partition from DOS or "
-#| "Windows; the Debian partitioning tools will generally do a better job."
 msgid ""
 "If you are manipulating existing FAT or NTFS partitions, it is recommended "
 "that you either use the scheme below or native Windows or DOS tools. "
 "Otherwise, it is not really necessary to partition from DOS or Windows; the "
 "&debian; partitioning tools will generally do a better job."
-msgstr "如果您想在已有的 FAT 或 NTFS 分区上动手，那么建议您或者按照下面介绍的方案操作，或者使用 Windows 或者 DOS 自己的工具软件。否则的话，真的没必要从 DOS 或者 Windows 分区，一般来说，&debian; 的分区软件会做得更好。"
+msgstr ""
+"如果您想在已有的 FAT 或 NTFS 分区上动手，那么建议您或者按照下面介绍的方案操"
+"作，或者使用 Windows 或者 DOS 自己的工具软件。否则的话，真的没必要从 DOS 或"
+"者 Windows 分区，一般来说，&debian; 的分区软件会做得更好。"
 
 #. Tag: para
-#: preparing.xml:937
+#: preparing.xml:936
 #, no-c-format
-#| msgid ""
-#| "But if you have a large IDE disk, and are not using LBA addressing, "
-#| "overlay drivers (sometimes provided by hard disk manufacturers), or a new "
-#| "(post 1998) BIOS that supports large disk access extensions, then you "
-#| "must locate your Debian boot partition carefully. In this case, you will "
-#| "have to put the boot partition into the first 1024 cylinders of your hard "
-#| "disk (usually around 524 megabytes, without BIOS translation). This may "
-#| "require that you move an existing FAT or NTFS partition."
 msgid ""
 "But if you have a large IDE disk, and are not using LBA addressing, overlay "
 "drivers (sometimes provided by hard disk manufacturers), or a new (post "
@@ -1477,50 +1418,43 @@ msgid ""
 "the boot partition into the first 1024 cylinders of your hard disk (usually "
 "around 524 megabytes, without BIOS translation). This may require that you "
 "move an existing FAT or NTFS partition."
-msgstr "但是，如果您有一块 IDE 接口的大硬盘，而且使用的既不是 LBA 寻址或 overlay 驱动(有时候硬盘厂商会提供这种驱动)，也没用支持大硬盘访问扩展的新款(1998 年以后) BIOS，那么必须小心地划分 &debian; 的引导分区。在这种情形下，一定要把引导分区分在硬盘开始的 1024 柱面之内(BIOS 不换算的话，大约 524 MB)。为此，您可能需要移动已存在的 FAT 或 NTFS 分区。"
+msgstr ""
+"但是，如果您有一块 IDE 接口的大硬盘，而且使用的既不是 LBA 寻址或 overlay 驱动"
+"(有时候硬盘厂商会提供这种驱动)，也没用支持大硬盘访问扩展的新款(1998 年以后) "
+"BIOS，那么必须小心地划分 &debian; 的引导分区。在这种情形下，一定要把引导分区"
+"分在硬盘开始的 1024 柱面之内(BIOS 不换算的话，大约 524 MB)。为此，您可能需要"
+"移动已存在的 FAT 或 NTFS 分区。"
 
 #. Tag: title
-#: preparing.xml:951
+#: preparing.xml:950
 #, no-c-format
 msgid "Lossless Repartitioning When Starting From DOS, Win-32 or OS/2"
 msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
 
 #. Tag: para
-#: preparing.xml:954
+#: preparing.xml:953
 #, no-c-format
-#| msgid ""
-#| "One of the most common installations is onto a system that already "
-#| "contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, "
-#| "NT, 2000, XP, 2003, Vista, 7), or OS/2, and it is desired to put Debian onto the same "
-#| "disk without destroying the previous system. Note that the installer "
-#| "supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
-#| "Simply start the installer and when you get to the partitioning step, "
-#| "select the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </"
-#| "menuchoice> partitioning, select the partition to resize, and specify its "
-#| "new size. So in most cases you should not need to use the method "
-#| "described below."
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
-"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the same disk without "
-"destroying the previous system. Note that the installer supports resizing of "
-"FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer and when you get to the partitioning step, select the option for "
-"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
-"select the partition to resize, and specify its new size. So in most cases "
-"you should not need to use the method described below."
-msgstr "在常见的安装中，有一种是希望在已装有 DOS(含 Windows 3.1)、Win32(如 Windows 95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系统上安装 &debian; 到同一块硬盘，并保留原有系统。注意，安装程序支持改变 DOS 和 Windows 所使用的 FAT 和 NTFS 文件系统的容量。只需启动安装程序，选择 <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> 选项，并选择需要调整大小的分区，指定新的尺寸。在多数情况下您并不需要使用下面的方法。"
+"XP, 2003, Vista, 7), or OS/2, and it is desired to put &debian; onto the "
+"same disk without destroying the previous system. Note that the installer "
+"supports resizing of FAT and NTFS filesystems as used by DOS and Windows. "
+"Simply start the installer and when you get to the partitioning step, select "
+"the option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> "
+"partitioning, select the partition to resize, and specify its new size. So "
+"in most cases you should not need to use the method described below."
+msgstr ""
+"在常见的安装中，有一种是希望在已装有 DOS(含 Windows 3.1)、Win32(如 Windows "
+"95、98、Me、NT、2000、XP、2003、Vista、7) 或者 OS/2 的系统上安装 &debian; 到"
+"同一块硬盘，并保留原有系统。注意，安装程序支持改变 DOS 和 Windows 所使用的 "
+"FAT 和 NTFS 文件系统的容量。只需启动安装程序，选择 <menuchoice> "
+"<guimenuitem>Manual</guimenuitem> </menuchoice> 选项，并选择需要调整大小的分"
+"区，指定新的尺寸。在多数情况下您并不需要使用下面的方法。"
 
 #. Tag: para
-#: preparing.xml:966
+#: preparing.xml:965
 #, no-c-format
-#| msgid ""
-#| "Before going any further, you should have decided how you will be "
-#| "dividing up the disk. The method in this section will only split a "
-#| "partition into two pieces. One will contain the original OS and the other "
-#| "will be used for Debian. During the installation of Debian, you will be "
-#| "given the opportunity to use the Debian portion of the disk as you see "
-#| "fit, i.e., as swap or as a file system."
 msgid ""
 "Before going any further, you should have decided how you will be dividing "
 "up the disk. The method in this section will only split a partition into two "
@@ -1528,10 +1462,14 @@ msgid ""
 "&debian;. During the installation of &debian;, you will be given the "
 "opportunity to use the &debian; portion of the disk as you see fit, i.e., as "
 "swap or as a file system."
-msgstr "在操作前，应该先想好如何分割硬盘。本节所述的方法只会把一个分区一分为二。分出来的其中一片放原来的操作系统，而另一片则归 &debian; 使用。在 &debian; 的安装过程中，您会有机会把您认为合适的那部分硬盘划归 &debian; 使用。比如说，用作交换分区或者放置文件系统。"
+msgstr ""
+"在操作前，应该先想好如何分割硬盘。本节所述的方法只会把一个分区一分为二。分出"
+"来的其中一片放原来的操作系统，而另一片则归 &debian; 使用。在 &debian; 的安装"
+"过程中，您会有机会把您认为合适的那部分硬盘划归 &debian; 使用。比如说，用作交"
+"换分区或者放置文件系统。"
 
 #. Tag: para
-#: preparing.xml:975
+#: preparing.xml:974
 #, no-c-format
 msgid ""
 "The idea is to move all the data on the partition to the beginning, before "
@@ -1546,12 +1484,12 @@ msgstr ""
 "内，尽量不要往分区的后部写数据。否则就会减少从能该分区分出去的空间大小。"
 
 #. Tag: para
-#: preparing.xml:984
-#, no-c-format
+#: preparing.xml:983
+#, fuzzy, no-c-format
 #| msgid ""
 #| "The first thing needed is a copy of <command>fips</command> which is "
 #| "available in the <filename>tools/</filename> directory on your nearest "
-#| "Debian mirror. Unzip the archive and copy the files <filename>RESTORRB."
+#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
 #| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
 #| "filename> to a bootable floppy. A bootable floppy can be created using "
 #| "the command <filename>sys a:</filename> under DOS. <command>fips</"
@@ -1560,20 +1498,26 @@ msgstr ""
 #| "compression driver or a disk manager. Create the disk and read the "
 #| "documentation <emphasis>before</emphasis> you defragment the disk."
 msgid ""
-"The first thing needed is a copy of <command>fips</command> which is "
-"available in the <filename>tools/</filename> directory on your nearest "
-"&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-"EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-"filename> to a bootable floppy. A bootable floppy can be created using the "
-"command <filename>sys a:</filename> under DOS. <command>fips</command> comes "
-"with very good documentation which you may want to read. You will definitely "
-"need to read the documentation if you use a disk compression driver or a "
-"disk manager. Create the disk and read the documentation <emphasis>before</"
-"emphasis> you defragment the disk."
-msgstr "第一件需要的东西是一份 <command>fips</command> 的拷贝。您可以从离您最近的 &debian; 镜像里的 <filename>tools/</filename> 目录下载它。解开这个 zip 压缩文件，把 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 <filename>ERRORS.TXT</filename> 复制到一张启动软盘里。您可以在 DOS 下面用 <filename>sys a:</filename> 来制作启动盘。<command>fips</command> 带有相当不错的文档，您也许会想看看的。倘若您正在用磁盘压缩驱动程序或者磁盘管理器，那么您绝对有必要读一下那个文档。在为这块硬盘清理磁盘碎片<emphasis>之前</emphasis>，请先做一张启动盘并好好阅读那份文档。"
+"The first thing needed is a copy of <command>fips</command>. Unzip the "
+"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
+"EXE</filename> and <filename>ERRORS.TXT</filename> to a bootable floppy. A "
+"bootable floppy can be created using the command <filename>sys a:</filename> "
+"under DOS. <command>fips</command> comes with very good documentation which "
+"you may want to read. You will definitely need to read the documentation if "
+"you use a disk compression driver or a disk manager. Create the disk and "
+"read the documentation <emphasis>before</emphasis> you defragment the disk."
+msgstr ""
+"第一件需要的东西是一份 <command>fips</command> 的拷贝。您可以从离您最近的 "
+"&debian; 镜像里的 <filename>tools/</filename> 目录下载它。解开这个 zip 压缩文"
+"件，把 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 "
+"<filename>ERRORS.TXT</filename> 复制到一张启动软盘里。您可以在 DOS 下面用 "
+"<filename>sys a:</filename> 来制作启动盘。<command>fips</command> 带有相当不"
+"错的文档，您也许会想看看的。倘若您正在用磁盘压缩驱动程序或者磁盘管理器，那么"
+"您绝对有必要读一下那个文档。在为这块硬盘清理磁盘碎片<emphasis>之前</"
+"emphasis>，请先做一张启动盘并好好阅读那份文档。"
 
 #. Tag: para
-#: preparing.xml:997
+#: preparing.xml:995
 #, no-c-format
 msgid ""
 "The next thing needed is to move all the data to the beginning of the "
@@ -1592,7 +1536,7 @@ msgstr ""
 "VFAT 分区。"
 
 #. Tag: para
-#: preparing.xml:1007
+#: preparing.xml:1005
 #, no-c-format
 msgid ""
 "After running the defragmenter (which can take a while on a large disk), "
@@ -1604,7 +1548,7 @@ msgstr ""
 "<filename>a:\\fips</filename>，然后按照提示操作。"
 
 #. Tag: para
-#: preparing.xml:1013
+#: preparing.xml:1011
 #, no-c-format
 msgid ""
 "Note that there are many other partition managers out there, in case "
@@ -1614,65 +1558,55 @@ msgstr ""
 "可供差遣。"
 
 #. Tag: title
-#: preparing.xml:1021
+#: preparing.xml:1019
 #, no-c-format
 msgid "Partitioning for DOS"
 msgstr "为 DOS 分区"
 
 #. Tag: para
-#: preparing.xml:1023
+#: preparing.xml:1021
 #, no-c-format
-#| msgid ""
-#| "If you are partitioning for DOS drives, or changing the size of DOS "
-#| "partitions, using Debian tools, many people experience problems working "
-#| "with the resulting FAT partitions. For instance, some have reported slow "
-#| "performance, consistent problems with <command>scandisk</command>, or "
-#| "other weird errors in DOS or Windows."
 msgid ""
 "If you are partitioning for DOS drives, or changing the size of DOS "
 "partitions, using &debian; tools, many people experience problems working "
 "with the resulting FAT partitions. For instance, some have reported slow "
 "performance, consistent problems with <command>scandisk</command>, or other "
 "weird errors in DOS or Windows."
-msgstr "如果您用 &debian; 的工具软件来为 DOS 硬盘分区，或者改动 DOS 分区的大小的话，请注意，有许多人在这样做了以后，在使用新分出来的或者大小被改变的 FAT 分区的过程中发现存在着各种各样的问题。举例来说，有些人回报说发现性能下降，有的人则在使用 <command>scandisk</command> 时发现有一致性(consistent)的问题，还有其它在 DOS 或 Windows 中发现的各种古怪的错误。"
+msgstr ""
+"如果您用 &debian; 的工具软件来为 DOS 硬盘分区，或者改动 DOS 分区的大小的话，"
+"请注意，有许多人在这样做了以后，在使用新分出来的或者大小被改变的 FAT 分区的过"
+"程中发现存在着各种各样的问题。举例来说，有些人回报说发现性能下降，有的人则在"
+"使用 <command>scandisk</command> 时发现有一致性(consistent)的问题，还有其它"
+"在 DOS 或 Windows 中发现的各种古怪的错误。"
 
 #. Tag: para
-#: preparing.xml:1031
+#: preparing.xml:1029
 #, no-c-format
-#| msgid ""
-#| "Apparently, whenever you create or resize a partition for DOS use, it's a "
-#| "good idea to fill the first few sectors with zeros. You should do this "
-#| "prior to running DOS's <command>format</command> command by executing the "
-#| "following command from Debian:"
 msgid ""
 "Apparently, whenever you create or resize a partition for DOS use, it's a "
 "good idea to fill the first few sectors with zeros. You should do this prior "
 "to running DOS's <command>format</command> command by executing the "
 "following command from &debian;:"
-msgstr "显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面几个扇区全部清零。您应该在运行 DOS 的 <command>format</command> 命令之前，到 &debian; 系统中，执行："
+msgstr ""
+"显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面几个扇区全部清零。您应"
+"该在运行 DOS 的 <command>format</command> 命令之前，到 &debian; 系统中，执"
+"行："
 
 #. Tag: screen
-#: preparing.xml:1038
+#: preparing.xml:1036
 #, no-c-format
 msgid "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 msgstr "# dd if=/dev/zero of=/dev/hdXX bs=512 count=4"
 
 #. Tag: title
-#: preparing.xml:1049
+#: preparing.xml:1047
 #, no-c-format
 msgid "Partitioning from SunOS"
 msgstr "在 SunOS 下分区"
 
 #. Tag: para
-#: preparing.xml:1051
+#: preparing.xml:1049
 #, no-c-format
-#| msgid ""
-#| "It's perfectly fine to partition from SunOS; in fact, if you intend to "
-#| "run both SunOS and Debian on the same machine, it is recommended that you "
-#| "partition using SunOS prior to installing Debian. The Linux kernel "
-#| "understands Sun disk labels, so there are no problems there. SILO "
-#| "supports booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), "
-#| "romfs or iso9660 (CDROM) partitions."
 msgid ""
 "It's perfectly fine to partition from SunOS; in fact, if you intend to run "
 "both SunOS and &debian; on the same machine, it is recommended that you "
@@ -1680,16 +1614,20 @@ msgid ""
 "understands Sun disk labels, so there are no problems there. SILO supports "
 "booting Linux and SunOS from any of EXT2 (Linux), UFS (SunOS), romfs or "
 "iso9660 (CDROM) partitions."
-msgstr "从 SunOS 分区非常完美。事实上，如果您倾向在同一台计算机上使用 SunOS 和 &debian;，建议在安装 &debian; 之前使用 SunOS 进行分区。Linux 内核可以识别 Sun 的磁盘标签，因此不会有任何问题。SILO 支持从 EXT2 (Linux)、UFS (SunOS)、romfs 和 iso9660 (CDROM)分区启动 Linux 和 SunOS。"
+msgstr ""
+"从 SunOS 分区非常完美。事实上，如果您倾向在同一台计算机上使用 SunOS 和 "
+"&debian;，建议在安装 &debian; 之前使用 SunOS 进行分区。Linux 内核可以识别 "
+"Sun 的磁盘标签，因此不会有任何问题。SILO 支持从 EXT2 (Linux)、UFS (SunOS)、"
+"romfs 和 iso9660 (CDROM)分区启动 Linux 和 SunOS。"
 
 #. Tag: title
-#: preparing.xml:1063
+#: preparing.xml:1061
 #, no-c-format
 msgid "Partitioning from Linux or another OS"
 msgstr "从 Linux 或其他 OS 分区"
 
 #. Tag: para
-#: preparing.xml:1065
+#: preparing.xml:1063
 #, no-c-format
 msgid ""
 "Whatever system you are using to partition, make sure you create a "
@@ -1709,7 +1647,7 @@ msgstr ""
 "系)格式化过的磁盘，您必须创建新的磁盘标签，不然会有磁盘排列问题出现。"
 
 #. Tag: para
-#: preparing.xml:1077
+#: preparing.xml:1075
 #, no-c-format
 msgid ""
 "You will probably be using <command>SILO</command> as your boot loader (the "
@@ -1722,13 +1660,13 @@ msgstr ""
 "linkend=\"partitioning\"/>。"
 
 #. Tag: title
-#: preparing.xml:1092
+#: preparing.xml:1090
 #, no-c-format
 msgid "MacOS/OSX Partitioning"
 msgstr "在 MacOS/OSX 下分区"
 
 #. Tag: para
-#: preparing.xml:1094
+#: preparing.xml:1092
 #, no-c-format
 msgid ""
 "The <application>Apple Drive Setup</application> application can be found in "
@@ -1743,7 +1681,7 @@ msgstr ""
 "Setup</application> 中。"
 
 #. Tag: para
-#: preparing.xml:1101
+#: preparing.xml:1099
 #, no-c-format
 msgid ""
 "Remember to create a placeholder partition for GNU/Linux, preferably "
@@ -1754,7 +1692,7 @@ msgstr ""
 "无关紧要，在后面的 &debian-gnu; 安装程序中，它会被删除并替换。"
 
 #. Tag: para
-#: preparing.xml:1107
+#: preparing.xml:1105
 #, no-c-format
 msgid ""
 "If you are planning to install both MacOS 9 and OS X, it is best to create "
@@ -1778,7 +1716,7 @@ msgstr ""
 "问。"
 
 #. Tag: para
-#: preparing.xml:1120
+#: preparing.xml:1118
 #, no-c-format
 msgid ""
 "GNU/Linux is unable to access information on UFS partitions, but does "
@@ -1794,22 +1732,14 @@ msgstr ""
 "系统间共享信息。HFS，HFS+ 和 MS-DOS FAT 分区都能被 MacOS 和 Linux 支持。"
 
 #. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
 msgstr "安装前的硬件和操作系统的相关设置"
 
 #. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
 #, no-c-format
-#| msgid ""
-#| "This section will walk you through pre-installation hardware setup, if "
-#| "any, that you will need to do prior to installing Debian. Generally, this "
-#| "involves checking and possibly changing firmware settings for your "
-#| "system. The <quote>firmware</quote> is the core software used by the "
-#| "hardware; it is most critically invoked during the bootstrap process "
-#| "(after power-up). Known hardware issues affecting the reliability of "
-#| "&debian-gnu; on your system are also highlighted."
 msgid ""
 "This section will walk you through pre-installation hardware setup, if any, "
 "that you will need to do prior to installing &debian;. Generally, this "
@@ -1818,24 +1748,23 @@ msgid ""
 "most critically invoked during the bootstrap process (after power-up). Known "
 "hardware issues affecting the reliability of &debian-gnu; on your system are "
 "also highlighted."
-msgstr "在本节中，我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的话，您就需要在安装 &debian; 前先做一些准备工作了。一般来说，准备工作包括：检查或者修改为您的系统中固件(firmware)的设定。所谓<quote>固件</quote>就是硬件运行所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。我们同时也会着重提出一些硬件问题，您系统上这些硬件问题在将会影响到 &debian-gnu; 的可靠性。"
+msgstr ""
+"在本节中，我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的"
+"话，您就需要在安装 &debian; 前先做一些准备工作了。一般来说，准备工作包括：检"
+"查或者修改为您的系统中固件(firmware)的设定。所谓<quote>固件</quote>就是硬件运"
+"行所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。我们同"
+"时也会着重提出一些硬件问题，您系统上这些硬件问题在将会影响到 &debian-gnu; 的"
+"可靠性。"
 
 #. Tag: title
-#: preparing.xml:1163
+#: preparing.xml:1161
 #, no-c-format
 msgid "Invoking the BIOS Set-Up Menu"
 msgstr "BIOS 设置菜单的使用"
 
 #. Tag: para
-#: preparing.xml:1165
+#: preparing.xml:1163
 #, no-c-format
-#| msgid ""
-#| "BIOS provides the basic functions needed to boot your machine to allow "
-#| "your operating system to access your hardware. Your system probably "
-#| "provides a BIOS setup menu, which is used to configure the BIOS. Before "
-#| "installing, you <emphasis>must</emphasis> ensure that your BIOS is set up "
-#| "correctly; not doing so can lead to intermittent crashes or an inability "
-#| "to install Debian."
 msgid ""
 "BIOS provides the basic functions needed to boot your machine to allow your "
 "operating system to access your hardware. Your system probably provides a "
@@ -1843,10 +1772,14 @@ msgid ""
 "<emphasis>must</emphasis> ensure that your BIOS is set up correctly; not "
 "doing so can lead to intermittent crashes or an inability to install "
 "&debian;."
-msgstr "BIOS 为引导您的机器提供了基本的帮助，进而能让操作系统能访问您的硬件。您的系统应该会有 BIOS 的设置菜单，通过它，我们就能配置 BIOS。在进行安装前，您<emphasis>一定要</emphasis>确保 BIOS 的设置是正确无误的。否则，可能会导致经常性的系统崩溃或者根本无法安装 &debian;。"
+msgstr ""
+"BIOS 为引导您的机器提供了基本的帮助，进而能让操作系统能访问您的硬件。您的系统"
+"应该会有 BIOS 的设置菜单，通过它，我们就能配置 BIOS。在进行安装前，您"
+"<emphasis>一定要</emphasis>确保 BIOS 的设置是正确无误的。否则，可能会导致经常"
+"性的系统崩溃或者根本无法安装 &debian;。"
 
 #. Tag: para
-#: preparing.xml:1174
+#: preparing.xml:1172
 #, no-c-format
 msgid ""
 "The rest of this section is lifted from the <ulink url=\"&url-pc-hw-faq;\"></"
@@ -1859,25 +1792,25 @@ msgstr ""
 "quote>) 设置菜单取决于 BIOS 软件的作者是谁："
 
 #. Tag: term
-#: preparing.xml:1188
+#: preparing.xml:1186
 #, no-c-format
 msgid "AMI BIOS"
 msgstr "AMI BIOS"
 
 #. Tag: para
-#: preparing.xml:1189
+#: preparing.xml:1187
 #, no-c-format
 msgid "<keycap>Delete</keycap> key during the POST (power on self test)"
 msgstr "<keycap>Delete</keycap> 键，在 POST(power on self test) 过程中"
 
 #. Tag: term
-#: preparing.xml:1197
+#: preparing.xml:1195
 #, no-c-format
 msgid "Award BIOS"
 msgstr "Award BIOS"
 
 #. Tag: para
-#: preparing.xml:1198
+#: preparing.xml:1196
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1887,25 +1820,25 @@ msgstr ""
 "keycombo>，或 <keycap>Delete</keycap> 键，在 POST 过程中"
 
 #. Tag: term
-#: preparing.xml:1207
+#: preparing.xml:1205
 #, no-c-format
 msgid "DTK BIOS"
 msgstr "DTK BIOS"
 
 #. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
 #, no-c-format
 msgid "<keycap>Esc</keycap> key during the POST"
 msgstr "<keycap>Esc</keycap> 键，在 POST 过程中"
 
 #. Tag: term
-#: preparing.xml:1215
+#: preparing.xml:1213
 #, no-c-format
 msgid "IBM PS/2 BIOS"
 msgstr "IBM PS/2 BIOS"
 
 #. Tag: para
-#: preparing.xml:1216
+#: preparing.xml:1214
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Insert</keycap> "
@@ -1917,13 +1850,13 @@ msgstr ""
 "keycap><keycap>Alt</keycap><keycap>Delete</keycap> </keycombo>"
 
 #. Tag: term
-#: preparing.xml:1230
+#: preparing.xml:1228
 #, no-c-format
 msgid "Phoenix BIOS"
 msgstr "Phoenix BIOS"
 
 #. Tag: para
-#: preparing.xml:1231
+#: preparing.xml:1229
 #, no-c-format
 msgid ""
 "<keycombo> <keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap> </"
@@ -1935,7 +1868,7 @@ msgstr ""
 "keycap> </keycombo> 或 <keycap>F1</keycap>"
 
 #. Tag: para
-#: preparing.xml:1247
+#: preparing.xml:1245
 #, no-c-format
 msgid ""
 "Information on invoking other BIOS routines can be found in <ulink url="
@@ -1945,7 +1878,7 @@ msgstr ""
 "invoking-bios-info;\"></ulink>。"
 
 #. Tag: para
-#: preparing.xml:1252
+#: preparing.xml:1250
 #, no-c-format
 msgid ""
 "Some &arch-title; machines don't have a CMOS configuration menu in the BIOS. "
@@ -1961,23 +1894,14 @@ msgstr ""
 
 # index.docbook:1522, index.docbook:1865
 #. Tag: title
-#: preparing.xml:1263 preparing.xml:1581
+#: preparing.xml:1261 preparing.xml:1579
 #, no-c-format
 msgid "Boot Device Selection"
 msgstr "选择引导设备"
 
 #. Tag: para
-#: preparing.xml:1265
+#: preparing.xml:1263
 #, no-c-format
-#| msgid ""
-#| "Many BIOS setup menus allow you to select the devices that will be used "
-#| "to bootstrap the system. Set this to look for a bootable operating system "
-#| "on <filename>A:</filename> (the first floppy disk), then optionally the "
-#| "first CD-ROM device (possibly appearing as <filename>D:</filename> or "
-#| "<filename>E:</filename>), and then from <filename>C:</filename> (the "
-#| "first hard disk). This setting enables you to boot from either a floppy "
-#| "disk or a CD-ROM, which are the two most common boot devices used to "
-#| "install Debian."
 msgid ""
 "Many BIOS setup menus allow you to select the devices that will be used to "
 "bootstrap the system. Set this to look for a bootable operating system on "
@@ -1986,10 +1910,16 @@ msgid ""
 "</filename>), and then from <filename>C:</filename> (the first hard disk). "
 "This setting enables you to boot from either a floppy disk or a CD-ROM, "
 "which are the two most common boot devices used to install &debian;."
-msgstr "许多 BIOS 的设置菜单都能让您选择用来引导系统的设备。我们来设置一下，让它先在 <filename>A:</filename> (第一个软驱)中找寻可引导的操作系统，不行的话，再在第一个 CD-ROM 设备(有可能就是 <filename>D:</filename> 或 <filename>E:</filename>)中找，然后接着在 <filename>C:</filename>(第一块硬盘)找。照这样设定的话，就能让您从软盘或者 CD-ROM 引导。这是安装 &debian; 最常用的两个引导设备。"
+msgstr ""
+"许多 BIOS 的设置菜单都能让您选择用来引导系统的设备。我们来设置一下，让它先在 "
+"<filename>A:</filename> (第一个软驱)中找寻可引导的操作系统，不行的话，再在第"
+"一个 CD-ROM 设备(有可能就是 <filename>D:</filename> 或 <filename>E:</"
+"filename>)中找，然后接着在 <filename>C:</filename>(第一块硬盘)找。照这样设定"
+"的话，就能让您从软盘或者 CD-ROM 引导。这是安装 &debian; 最常用的两个引导设"
+"备。"
 
 #. Tag: para
-#: preparing.xml:1276
+#: preparing.xml:1274
 #, no-c-format
 msgid ""
 "If you have a newer SCSI controller and you have a CD-ROM device attached to "
@@ -2001,7 +1931,7 @@ msgstr ""
 "CD-ROM 引导系统。"
 
 #. Tag: para
-#: preparing.xml:1283
+#: preparing.xml:1281
 #, no-c-format
 msgid ""
 "Another popular option is to boot from a USB storage device (also called a "
@@ -2016,7 +1946,7 @@ msgstr ""
 "<quote>USB-ZIP</quote> 引导。"
 
 #. Tag: para
-#: preparing.xml:1291
+#: preparing.xml:1289
 #, no-c-format
 msgid ""
 "Here are some details about how to set the boot order. Remember to reset the "
@@ -2027,13 +1957,13 @@ msgstr ""
 "要恢复原来的启动顺序，这样，您就能像以前一样从硬盘启动了。"
 
 #. Tag: title
-#: preparing.xml:1300
+#: preparing.xml:1298
 #, no-c-format
 msgid "Changing the Boot Order on IDE Computers"
 msgstr "修改 IDE 接口计算机的引导顺序"
 
 #. Tag: para
-#: preparing.xml:1303
+#: preparing.xml:1301
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the BIOS utility. Often, it "
@@ -2045,7 +1975,7 @@ msgstr ""
 "关文档。"
 
 #. Tag: para
-#: preparing.xml:1310
+#: preparing.xml:1308
 #, no-c-format
 msgid ""
 "Find the boot sequence in the setup utility. Its location depends on your "
@@ -2055,19 +1985,19 @@ msgstr ""
 "有关。不管如何，您要找的是列有驱动器名的栏位。"
 
 #. Tag: para
-#: preparing.xml:1315
+#: preparing.xml:1313
 #, no-c-format
 msgid "Common entries on IDE machines are C, A, cdrom or A, C, cdrom."
 msgstr "对 IDE 机器而言，列表里常见的表项是 C、A、cdrom 或者 A、C、cdrom。"
 
 #. Tag: para
-#: preparing.xml:1320
+#: preparing.xml:1318
 #, no-c-format
 msgid "C is the hard drive, and A is the floppy drive."
 msgstr "C 就是硬盘，而 A 则是软驱。"
 
 #. Tag: para
-#: preparing.xml:1326
+#: preparing.xml:1324
 #, no-c-format
 msgid ""
 "Change the boot sequence setting so that the CD-ROM or the floppy is first. "
@@ -2078,7 +2008,7 @@ msgstr ""
 "keycap> 或者 <keycap>Page Down</keycap> 键能够循环地选中可能的选项。"
 
 #. Tag: para
-#: preparing.xml:1334
+#: preparing.xml:1332
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2087,20 +2017,20 @@ msgstr ""
 "然后，保存您对设置的修改。屏幕上的提示会告诉您如何才能保存修改过的到计算机。"
 
 #. Tag: title
-#: preparing.xml:1344
+#: preparing.xml:1342
 #, no-c-format
 msgid "Changing the Boot Order on SCSI Computers"
 msgstr "修改 SCSI 接口计算机的引导顺序"
 
 #. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
 #, no-c-format
 msgid ""
 "As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr "当您的计算机启动时，可以按下某些键进入 SCSI 的设置软件。"
 
 #. Tag: para
-#: preparing.xml:1353
+#: preparing.xml:1351
 #, no-c-format
 msgid ""
 "You can start the SCSI setup utility after the memory check and the message "
@@ -2110,7 +2040,7 @@ msgstr ""
 "提示的时候，启动 SCSI 设置软件。"
 
 #. Tag: para
-#: preparing.xml:1359
+#: preparing.xml:1357
 #, no-c-format
 msgid ""
 "The keystrokes you need depend on the utility. Often, it is "
@@ -2122,20 +2052,20 @@ msgstr ""
 "的相关文档。"
 
 #. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1365
 #, no-c-format
 msgid "Find the utility for changing the boot order."
 msgstr "找到用来修改引导顺序的工具软件。"
 
 #. Tag: para
-#: preparing.xml:1372
+#: preparing.xml:1370
 #, no-c-format
 msgid ""
 "Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr "通过这个工具软件修改设置，让光盘驱动器的 SCSI ID 排在列表的首位。"
 
 #. Tag: para
-#: preparing.xml:1378
+#: preparing.xml:1376
 #, no-c-format
 msgid ""
 "Save your changes. Instructions on the screen tell you how to save the "
@@ -2145,19 +2075,19 @@ msgstr ""
 "需要按下 <keycap>F10</keycap>。"
 
 #. Tag: title
-#: preparing.xml:1392
+#: preparing.xml:1390
 #, no-c-format
 msgid "Miscellaneous BIOS Settings"
 msgstr "BIOS 设置的其余项目"
 
 #. Tag: title
-#: preparing.xml:1394
+#: preparing.xml:1392
 #, no-c-format
 msgid "CD-ROM Settings"
 msgstr "CD-ROM 的设置"
 
 #. Tag: para
-#: preparing.xml:1395
+#: preparing.xml:1393
 #, no-c-format
 msgid ""
 "Some BIOS systems (such as Award BIOS) allow you to automatically set the CD "
@@ -2170,13 +2100,13 @@ msgstr ""
 "userinput> 的错误提示，那么就有可能是您的设置问题了。"
 
 #. Tag: title
-#: preparing.xml:1405
+#: preparing.xml:1403
 #, no-c-format
 msgid "Extended vs. Expanded Memory"
 msgstr "扩展内存与扩充内存"
 
 #. Tag: para
-#: preparing.xml:1406
+#: preparing.xml:1404
 #, no-c-format
 msgid ""
 "If your system provides both ex<emphasis>ten</emphasis>ded and "
@@ -2189,13 +2119,13 @@ msgstr ""
 "得尽量小。&arch-kernel; 需要使用扩展内存，但无法利用扩充内存。"
 
 #. Tag: title
-#: preparing.xml:1416
+#: preparing.xml:1414
 #, no-c-format
 msgid "Virus Protection"
 msgstr "病毒保护"
 
 #. Tag: para
-#: preparing.xml:1417
+#: preparing.xml:1415
 #, no-c-format
 msgid ""
 "Disable any virus-warning features your BIOS may provide. If you have a "
@@ -2218,13 +2148,13 @@ msgstr ""
 "装并设置好之后，就不再需要更动主引导扇区(MBR)了。</para> </footnote>。"
 
 #. Tag: title
-#: preparing.xml:1438
+#: preparing.xml:1436
 #, no-c-format
 msgid "Shadow RAM"
 msgstr "影像(shadow)内存"
 
 #. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1437
 #, no-c-format
 msgid ""
 "Your motherboard may provide <emphasis>shadow RAM</emphasis> or BIOS "
@@ -2248,13 +2178,13 @@ msgstr ""
 "kernel; 存取硬件设备。"
 
 #. Tag: title
-#: preparing.xml:1456
+#: preparing.xml:1454
 #, no-c-format
 msgid "Memory Hole"
 msgstr "内存空洞"
 
 #. Tag: para
-#: preparing.xml:1457
+#: preparing.xml:1455
 #, no-c-format
 msgid ""
 "If your BIOS offers something like <quote>15&ndash;16 MB Memory Hole</"
@@ -2265,7 +2195,7 @@ msgstr ""
 "它。如果您有那么多内存的话，&arch-kernel; 就会认为在那儿应该能找到内存块。"
 
 #. Tag: para
-#: preparing.xml:1463
+#: preparing.xml:1461
 #, no-c-format
 msgid ""
 "We have a report of an Intel Endeavor motherboard on which there is an "
@@ -2284,13 +2214,13 @@ msgstr ""
 "常，否则的话就不行。"
 
 #. Tag: title
-#: preparing.xml:1479
+#: preparing.xml:1477
 #, no-c-format
 msgid "Advanced Power Management"
 msgstr "高级电源管理"
 
 #. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1478
 #, no-c-format
 msgid ""
 "If your motherboard provides Advanced Power Management (APM), configure it "
@@ -2305,13 +2235,13 @@ msgstr ""
 "更好。"
 
 #. Tag: title
-#: preparing.xml:1498
+#: preparing.xml:1496
 #, no-c-format
 msgid "Invoking OpenFirmware"
 msgstr "使用 OpenFireware"
 
 #. Tag: para
-#: preparing.xml:1499
+#: preparing.xml:1497
 #, no-c-format
 msgid ""
 "There is normally no need to set up the BIOS (called OpenFirmware) on &arch-"
@@ -2325,7 +2255,7 @@ msgstr ""
 "关的硬件文档。"
 
 #. Tag: para
-#: preparing.xml:1507
+#: preparing.xml:1505
 #, no-c-format
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
@@ -2342,7 +2272,7 @@ msgstr ""
 "阅 <ulink url=\"&url-netbsd-powerpc-faq;\"></ulink> 了解更多提示。"
 
 #. Tag: para
-#: preparing.xml:1515
+#: preparing.xml:1513
 #, no-c-format
 msgid ""
 "The OpenFirmware prompt looks like this: <informalexample><screen>\n"
@@ -2364,7 +2294,7 @@ msgstr ""
 "调制解调器端口连接到另外一台电脑上的终端程序来与 OpenFirmware 交互。"
 
 #. Tag: para
-#: preparing.xml:1528
+#: preparing.xml:1526
 #, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
@@ -2384,13 +2314,13 @@ msgstr ""
 "<guibutton>Save</guibutton> 按钮使固件补丁安装到 nvram。"
 
 #. Tag: title
-#: preparing.xml:1548
+#: preparing.xml:1546
 #, no-c-format
 msgid "Invoking OpenBoot"
 msgstr "使用 OpenBoot"
 
 #. Tag: para
-#: preparing.xml:1550
+#: preparing.xml:1548
 #, no-c-format
 msgid ""
 "OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -2404,7 +2334,7 @@ msgstr ""
 "机做很多事情，如诊断和简单脚本。"
 
 #. Tag: para
-#: preparing.xml:1558
+#: preparing.xml:1556
 #, no-c-format
 msgid ""
 "To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -2423,7 +2353,7 @@ msgstr ""
 "<keycap>n</keycap> 键得到新风格的提示符。"
 
 #. Tag: para
-#: preparing.xml:1570
+#: preparing.xml:1568
 #, no-c-format
 msgid ""
 "If you are using a serial console, send a break to the machine. With "
@@ -2437,7 +2367,7 @@ msgstr ""
 "档。"
 
 #. Tag: para
-#: preparing.xml:1583
+#: preparing.xml:1581
 #, no-c-format
 msgid ""
 "You can use OpenBoot to boot from specific devices, and also to change your "
@@ -2455,7 +2385,7 @@ msgstr ""
 "Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1593
+#: preparing.xml:1591
 #, no-c-format
 msgid ""
 "Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -2494,7 +2424,7 @@ msgstr ""
 "<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
 
 #. Tag: para
-#: preparing.xml:1616
+#: preparing.xml:1614
 #, no-c-format
 msgid ""
 "To boot from a specific device, use the command <userinput>boot "
@@ -2523,19 +2453,19 @@ msgstr ""
 "</screen></informalexample> 或在 Solaris下执行："
 
 #. Tag: screen
-#: preparing.xml:1635
+#: preparing.xml:1633
 #, no-c-format
 msgid "eeprom boot-device=disk1:1"
 msgstr "eeprom boot-device=disk1:1"
 
 #. Tag: title
-#: preparing.xml:1645
+#: preparing.xml:1643
 #, no-c-format
 msgid "BIOS Setup"
 msgstr "BIOS 设置"
 
 #. Tag: para
-#: preparing.xml:1646
+#: preparing.xml:1644
 #, no-c-format
 msgid ""
 "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -2555,7 +2485,7 @@ msgstr ""
 "通过远程方式使用。这归因于该系统上的 3215/3270 控制台是线型，而不是字符型的。"
 
 #. Tag: para
-#: preparing.xml:1658
+#: preparing.xml:1656
 #, no-c-format
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -2573,19 +2503,8 @@ msgstr ""
 "上的 HMC 启动。"
 
 #. Tag: para
-#: preparing.xml:1668
+#: preparing.xml:1666
 #, no-c-format
-#| msgid ""
-#| "Before you actually perform an installation, you have to go over some "
-#| "design and preparation steps. IBM has made documentation available about "
-#| "the whole process, e.g. how to prepare an installation medium and how "
-#| "actually to boot from that medium. Duplicating that information here is "
-#| "neither possible nor necessary. However, we will describe here which kind "
-#| "of Debian-specific data is needed and where to find it. Using both "
-#| "sources of information, you have to prepare your machine and the "
-#| "installation medium before you can perform a boot from it. When you see "
-#| "the welcome message in your client session, return to this document to go "
-#| "through the Debian-specific installation steps."
 msgid ""
 "Before you actually perform an installation, you have to go over some design "
 "and preparation steps. IBM has made documentation available about the whole "
@@ -2597,16 +2516,21 @@ msgid ""
 "perform a boot from it. When you see the welcome message in your client "
 "session, return to this document to go through the &debian;-specific "
 "installation steps."
-msgstr "在实际安装之前，您必须仔细检查一些规划和准备步骤。IBM 有关于整个过程的文档，如，怎样准备安装介质和如何从该介质启动。这里毋需复制那些信息。但是，我们会在此说明需要哪些 &debian; 规格的数据，以及在哪里能找到它们。使用这些信息资源，在引导之前您必须准备好计算机和安装介质。当您在客户端会话中看到欢迎画面，再返回到本文档查看 &debian; 规格的安装步骤。"
+msgstr ""
+"在实际安装之前，您必须仔细检查一些规划和准备步骤。IBM 有关于整个过程的文档，"
+"如，怎样准备安装介质和如何从该介质启动。这里毋需复制那些信息。但是，我们会在"
+"此说明需要哪些 &debian; 规格的数据，以及在哪里能找到它们。使用这些信息资源，"
+"在引导之前您必须准备好计算机和安装介质。当您在客户端会话中看到欢迎画面，再返"
+"回到本文档查看 &debian; 规格的安装步骤。"
 
 #. Tag: title
-#: preparing.xml:1685
+#: preparing.xml:1683
 #, no-c-format
 msgid "Native and LPAR installations"
 msgstr "本地化(Native)和 LPAR 安装"
 
 #. Tag: para
-#: preparing.xml:1686
+#: preparing.xml:1684
 #, no-c-format
 msgid ""
 "Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2622,13 +2546,13 @@ msgstr ""
 "如何为 Linux 建立 LPAR 的部分。"
 
 #. Tag: title
-#: preparing.xml:1700
+#: preparing.xml:1698
 #, no-c-format
 msgid "Installation as a VM guest"
 msgstr "作为一个 VM guest 安装"
 
 #. Tag: para
-#: preparing.xml:1702
+#: preparing.xml:1700
 #, no-c-format
 msgid ""
 "Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2644,26 +2568,34 @@ msgstr ""
 "如何为运行 Linux 建立 VM guest 的部分。"
 
 #. Tag: para
-#: preparing.xml:1712
-#, no-c-format
+#: preparing.xml:1710
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You need to copy all the files from the <filename>generic</filename> sub-"
+#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
+#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
+#| "fixed record length of 80 characters."
 msgid ""
 "You need to copy all the files from the <filename>generic</filename> sub-"
 "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
 "filename> and <filename>initrd.debian</filename> in binary mode with a fixed "
-"record length of 80 characters."
+"record length of 80 characters. <filename>parmfile.debian</filename> can be "
+"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
+"script, which will punch the files in the proper order, is included with the "
+"images."
 msgstr ""
 "您需要从 <filename>generic</filename> 子目录复制所有的文件到您的 CMS 磁盘。确"
 "保 <filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> "
 "是以固定 80 字符记录长度的二近制形式进行传输。"
 
 #. Tag: title
-#: preparing.xml:1724
+#: preparing.xml:1726
 #, no-c-format
 msgid "Setting up an installation server"
 msgstr "建立安装服务器"
 
 #. Tag: para
-#: preparing.xml:1726
+#: preparing.xml:1728
 #, no-c-format
 msgid ""
 "If you don't have a connection to the Internet (either directly or via a web "
@@ -2676,7 +2608,7 @@ msgstr ""
 "HTTP 或 FTP 访问。"
 
 #. Tag: para
-#: preparing.xml:1734
+#: preparing.xml:1736
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
@@ -2688,25 +2620,25 @@ msgstr ""
 "些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
 
 #. Tag: emphasis
-#: preparing.xml:1743
+#: preparing.xml:1745
 #, no-c-format
 msgid "FIXME: more information needed &mdash; from a Redbook?"
 msgstr "FIXME: more information needed &mdash; from a Redbook?"
 
 #. Tag: title
-#: preparing.xml:1750
+#: preparing.xml:1752
 #, no-c-format
 msgid "Hardware Issues to Watch Out For"
 msgstr "需要留心的硬件问题"
 
 #. Tag: title
-#: preparing.xml:1753
+#: preparing.xml:1755
 #, no-c-format
 msgid "USB BIOS support and keyboards"
 msgstr "USB BIOS 支持与键盘"
 
 #. Tag: para
-#: preparing.xml:1754
+#: preparing.xml:1756
 #, no-c-format
 msgid ""
 "If you have no AT-style keyboard and only a USB model, you may need to "
@@ -2724,13 +2656,13 @@ msgstr ""
 "keyboard support</quote>选项。"
 
 #. Tag: title
-#: preparing.xml:1768
+#: preparing.xml:1770
 #, no-c-format
 msgid "Display-visibility on OldWorld Powermacs"
 msgstr "在 OldWorld Powermac 上正常显示"
 
 #. Tag: para
-#: preparing.xml:1770
+#: preparing.xml:1772
 #, no-c-format
 msgid ""
 "Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
@@ -2747,3 +2679,13 @@ msgstr ""
 "碰到这种问题(有时可以看到显示器上的数据，有时却什么都没有)，或者引导安装程序"
 "以后黑屏，而不是显示用户界面，请试着在 MacOS 下修改显示设置为 256 色，替代 "
 "<quote>thousands</quote> 或 <quote>millions</quote>。"
+
+#~ msgid ""
+#~ "Installation instructions and device drivers (DASD, XPRAM, Console, tape, "
+#~ "z90 crypto, chandev, network) for Linux on &arch-title; using kernel 2.4"
+#~ msgstr ""
+#~ "在 &arch-title; 上 Linux 2.4 版内核的安装指引和设备驱动程序 (DASD, XPRAM, "
+#~ "Console, tape, z90 crypto, chandev, network)"
+
+#~ msgid "Device Drivers and Installation Commands"
+#~ msgstr "设备驱动程序与安装命令"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 6ddab53af..c77878006 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:49+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -299,12 +299,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:252
 #, no-c-format
-#| msgid ""
-#| "For the other preseeding methods you need to tell the installer what file "
-#| "to use when you boot it. This is normally done by passing the kernel a "
-#| "boot parameter, either manually at boot time or by editing the bootloader "
-#| "configuration file (e.g. <filename>syslinux.cfg</filename>) and adding "
-#| "the parameter to the end of the append line(s) for the kernel."
 msgid ""
 "For the other preseeding methods you need to tell the installer what file to "
 "use when you boot it. This is normally done by passing the kernel a boot "
@@ -316,16 +310,18 @@ msgid ""
 "the kernel.</phrase><phrase arch=\"hurd-any\">(e.g. <filename>grub.cfg</"
 "filename>) and adding the parameter to the end of the <filename>gnumach.gz</"
 "filename> line.</phrase>"
-msgstr "其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件<phrase arch=\"linux-any\">(如: <filename>syslinux.cfg</filename>)，并在内核的附加行后面添加参数。</phrase></phrase><phrase arch=\"kfreebsd-any\">(如: <filename>grub.cfg</filename>)，并为内核添加一个新<literal>设置</literal>行。</phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>)，并在 <filename>gnumach.gz</filename> 行后添加参数。</phrase>"
+msgstr ""
+"其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递"
+"引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件<phrase "
+"arch=\"linux-any\">(如: <filename>syslinux.cfg</filename>)，并在内核的附加行"
+"后面添加参数。</phrase></phrase><phrase arch=\"kfreebsd-any\">(如: "
+"<filename>grub.cfg</filename>)，并为内核添加一个新<literal>设置</literal>行。"
+"</phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>)，并在 "
+"<filename>gnumach.gz</filename> 行后添加参数。</phrase>"
 
 #. Tag: para
 #: preseed.xml:265
 #, no-c-format
-#| msgid ""
-#| "If you do specify the preconfiguration file in the bootloader "
-#| "configuration, you might change the configuration so you don't need to "
-#| "hit enter to boot the installer. For syslinux this means setting the "
-#| "timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>."
 msgid ""
 "If you do specify the preconfiguration file in the bootloader configuration, "
 "you might change the configuration so you don't need to hit enter to boot "
@@ -333,7 +329,12 @@ msgid ""
 "the timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>.</"
 "phrase><phrase arch=\"kfrebsd-any;hurd-any\">For grub this means setting the "
 "timeout to <literal>0</literal> in <filename>grub.cfg</filename>.</phrase>"
-msgstr "如果在 bootloader 设置里指定预置文件，可以修改配置让您不再需要键入回车启动安装程序。<phrase arch=\"linux-any\">对于 syslinux，这意味着在 <filename>syslinux.cfg</filename> 里面设置 timeout 为 <literal>1</literal>。</phrase><phrase arch=\"kfrebsd-any;hurd-any\">对于 grub 则设置 timeout 为 <literal>0</literal> 到 <filename>grub.cfg</filename> 文件。</phrase>"
+msgstr ""
+"如果在 bootloader 设置里指定预置文件，可以修改配置让您不再需要键入回车启动安"
+"装程序。<phrase arch=\"linux-any\">对于 syslinux，这意味着在 "
+"<filename>syslinux.cfg</filename> 里面设置 timeout 为 <literal>1</literal>。"
+"</phrase><phrase arch=\"kfrebsd-any;hurd-any\">对于 grub 则设置 timeout 为 "
+"<literal>0</literal> 到 <filename>grub.cfg</filename> 文件。</phrase>"
 
 #. Tag: para
 #: preseed.xml:274
@@ -535,20 +536,6 @@ msgstr "auto 模式"
 #. Tag: para
 #: preseed.xml:381
 #, no-c-format
-#| msgid ""
-#| "There are several features of Debian Installer that combine to allow "
-#| "fairly simple command lines at the boot prompt to result in arbitrarily "
-#| "complex customized automatic installs. To illustrate this, here are some "
-#| "examples that can be used at the boot prompt: <informalexample><screen>\n"
-#| "auto url=autoserver\n"
-#| "</screen></informalexample> This relies on there being a DHCP server that "
-#| "will get the machine to the point where <literal>autoserver</literal> can "
-#| "be resolved by DNS, perhaps after adding the local domain if that was "
-#| "provided by DHCP. If this was done at a site where the domain is "
-#| "<literal>example.com</literal>, and they have a reasonably sane DHCP "
-#| "setup, it would result in the preseed file being retrieved from "
-#| "<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
-#| "literal>."
 msgid ""
 "There are several features of &debian; Installer that combine to allow "
 "fairly simple command lines at the boot prompt to result in arbitrarily "
@@ -563,9 +550,15 @@ msgid ""
 "in the preseed file being retrieved from <literal>http://autoserver.example."
 "com/d-i/&releasename;/./preseed.cfg</literal>."
 msgstr ""
-"&debian; 安装程序提供了一些特性，可以组合引导提示符后面的简单命令行，达到复杂的自动安装效果。为了表达清楚，这里有一些例子，可以用在引导提示符后面：<informalexample><screen>\n"
+"&debian; 安装程序提供了一些特性，可以组合引导提示符后面的简单命令行，达到复杂"
+"的自动安装效果。为了表达清楚，这里有一些例子，可以用在引导提示符后面："
+"<informalexample><screen>\n"
 "auto url=autoserver\n"
-"</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 <literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 <literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 <literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</literal> 获得。"
+"</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 "
+"<literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 "
+"<literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 "
+"<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
+"literal> 获得。"
 
 #. Tag: para
 #: preseed.xml:398
@@ -922,14 +915,6 @@ msgstr "使用 DHCP 服务器指定预置文件"
 #. Tag: para
 #: preseed.xml:537
 #, no-c-format
-#| msgid ""
-#| "It's also possible to use DHCP to specify a preconfiguration file to "
-#| "download from the network. DHCP allows specifying a filename. Normally "
-#| "this is a file to netboot, but if it appears to be an URL then "
-#| "installation media that support network preseeding will download the file "
-#| "from the URL and use it as a preconfiguration file. Here is an example of "
-#| "how to set it up in the dhcpd.conf for version 3 of the ISC DHCP server "
-#| "(the dhcp3-server Debian package)."
 msgid ""
 "It's also possible to use DHCP to specify a preconfiguration file to "
 "download from the network. DHCP allows specifying a filename. Normally this "
@@ -938,7 +923,11 @@ msgid ""
 "it as a preconfiguration file. Here is an example of how to set it up in the "
 "dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
-msgstr "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
+msgstr ""
+"还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
+"netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下"
+"载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服"
+"务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
 
 #. Tag: screen
 #: preseed.xml:548
@@ -968,19 +957,16 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:557
 #, no-c-format
-#| msgid ""
-#| "A good way to use the DHCP preseeding is to only preseed values specific "
-#| "to your network, such as the Debian mirror to use. This way installs on "
-#| "your network will automatically get a good mirror selected, but the rest "
-#| "of the installation can be performed interactively. Using DHCP preseeding "
-#| "to fully automate Debian installs should only be done with care."
 msgid ""
 "A good way to use the DHCP preseeding is to only preseed values specific to "
 "your network, such as the &debian; mirror to use. This way installs on your "
 "network will automatically get a good mirror selected, but the rest of the "
 "installation can be performed interactively. Using DHCP preseeding to fully "
 "automate &debian; installs should only be done with care."
-msgstr "使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 &debian; 镜像。这种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
+msgstr ""
+"使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 &debian; 镜像。"
+"这种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互"
+"进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
 
 #. Tag: title
 #: preseed.xml:571
@@ -1843,20 +1829,41 @@ msgstr "使用 RAID 分区"
 
 #. Tag: para
 #: preseed.xml:892
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
 "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-"specifying spare devices. If you are using RAID 1, you can preseed grub to "
-"install to all devices used in the array; see <xref linkend=\"preseed-"
-"bootloader\"/>."
+"specifying spare devices."
+msgstr ""
+"您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10，建立降级阵"
+"列(degraded arrays)和指定额外设备。如果使用了 RAID 1，您可以预置 grub 来安装"
+"阵列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
+
+#. Tag: para
+#: preseed.xml:898
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can also use preseeding to set up partitions on software RAID arrays. "
+#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
+#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
+#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
+#| "bootloader\"/>."
+msgid ""
+"If you are using RAID 1, you can preseed grub to install to all devices used "
+"in the array; see <xref linkend=\"preseed-bootloader\"/>."
 msgstr ""
 "您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10，建立降级阵"
 "列(degraded arrays)和指定额外设备。如果使用了 RAID 1，您可以预置 grub 来安装"
 "阵列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:902
+#: preseed.xml:905
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -1870,7 +1877,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>。"
 
 #. Tag: screen
-#: preseed.xml:912
+#: preseed.xml:915
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -1974,13 +1981,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:917
+#: preseed.xml:920
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "分区挂载控制"
 
 #. Tag: para
-#: preseed.xml:918
+#: preseed.xml:921
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -1996,7 +2003,7 @@ msgstr ""
 "系统仍然使用 UUID 方式挂载。"
 
 #. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2006,7 +2013,7 @@ msgstr ""
 "挂载。"
 
 #. Tag: para
-#: preseed.xml:934
+#: preseed.xml:937
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2020,7 +2027,7 @@ msgstr ""
 "后会出现一些随机的情况。"
 
 #. Tag: screen
-#: preseed.xml:944
+#: preseed.xml:947
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2038,13 +2045,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:951
+#: preseed.xml:954
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2053,7 +2060,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:958
+#: preseed.xml:961
 #, no-c-format
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2085,13 +2092,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:963
+#: preseed.xml:966
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:964
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -2102,7 +2109,7 @@ msgstr ""
 "或 MD5 <emphasis>哈希</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:971
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2115,7 +2122,7 @@ msgstr ""
 "MD5 哈希值相对安全一些，但也会造成安全的假象，MD5 哈希值也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:981
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -2173,7 +2180,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:983
+#: preseed.xml:986
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -2190,26 +2197,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:993
+#: preseed.xml:996
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "下面的命令可用于生成密码的 MD5 值。"
 
 #. Tag: screen
-#: preseed.xml:997
+#: preseed.xml:1000
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1006
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1007
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2222,7 +2229,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2280,13 +2287,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1020
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1021
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2294,73 +2301,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括："
 
 #. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1030
 #, no-c-format
 msgid "standard"
 msgstr "standard"
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1033
 #, no-c-format
 msgid "desktop"
 msgstr "desktop"
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1036
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1039
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop"
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1042
 #, no-c-format
 msgid "web-server"
 msgstr "web-server"
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1045
 #, no-c-format
 msgid "print-server"
 msgstr "print-server"
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1048
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server"
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1051
 #, no-c-format
 msgid "file-server"
 msgstr "file-server"
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1054
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server"
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1057
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database"
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1060
 #, no-c-format
 msgid "laptop"
 msgstr "laptop"
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1064
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2371,7 +2378,7 @@ msgstr ""
 "<userinput>standard</userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1070
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2385,7 +2392,7 @@ msgstr ""
 "命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1080
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2423,22 +2430,26 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1085
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装 bootloader"
 
 #. Tag: screen
-#: preseed.xml:1084
-#, no-c-format
+#: preseed.xml:1087
+#, fuzzy, no-c-format
 #| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
 #| "#d-i grub-installer/skip boolean true\n"
 #| "# To also skip installing lilo, and install no bootloader, uncomment "
 #| "this\n"
 #| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
 #| "\n"
 #| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
 #| "the\n"
@@ -2509,6 +2520,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0)\n"
 "# To install grub to multiple disks:\n"
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+"# To install to a particular device:\n"
+"#d-i grub-installer/bootdev  string /dev/sda\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -2521,13 +2534,15 @@ msgid ""
 "# Note: options passed to the installer will be added automatically.\n"
 "#d-i debian-installer/add-kernel-opts string nousb"
 msgstr ""
-"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
+"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
+"you want lilo installed\n"
 "# instead, uncomment this:\n"
 "#d-i grub-installer/skip boolean true\n"
 "# To also skip installing lilo, and install no bootloader, uncomment this\n"
 "# too:\n"
 "#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
+"this\n"
 "#d-i grub-installer/skip boolean true</phrase>\n"
 "\n"
 "# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
@@ -2535,11 +2550,13 @@ msgstr ""
 "# uncomment this:\n"
 "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
 "\n"
-"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the "
+"MBR\n"
 "# if no other operating system is detected on the machine.\n"
 "d-i grub-installer/only_debian boolean true\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some other\n"
+"# This one makes grub-installer install to the MBR if it also finds some "
+"other\n"
 "# OS, which is less safe as it might not be able to boot that other OS.\n"
 "d-i grub-installer/with_other_os boolean true\n"
 "\n"
@@ -2563,7 +2580,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1089
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2575,13 +2592,13 @@ msgstr ""
 "令。"
 
 #. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1099
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "完成安装"
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1101
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2621,13 +2638,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1106
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2647,19 +2664,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1115
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1118
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "安装过程中运行用户命令"
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1119
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2669,7 +2686,7 @@ msgstr ""
 "本。"
 
 #. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1127
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2717,13 +2734,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1132
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr "使用预置修改默认值"
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1133
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2747,7 +2764,7 @@ msgstr ""
 "这对于测试和调试您的预置文件很有帮助。"
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2760,7 +2777,7 @@ msgstr ""
 "\"preseed-bootparms\"/> 的脚注。"
 
 #. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1154
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2781,13 +2798,13 @@ msgstr ""
 "在安装时显示出来的问题对应的参数，而不是<quote>内部的</quote>参数。"
 
 #. Tag: title
-#: preseed.xml:1165
+#: preseed.xml:1168
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:1166
+#: preseed.xml:1169
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -2801,7 +2818,7 @@ msgstr ""
 "外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:1176
+#: preseed.xml:1179
 #, no-c-format
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
@@ -2851,7 +2868,7 @@ msgstr ""
 "#d-i preseed/run string foo.sh"
 
 #. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
 #, no-c-format
 msgid ""
 "It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 601b5ed75..edfb41e0e 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-26 19:11+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -800,8 +800,36 @@ msgstr "&task-sql-dl;"
 msgid "&task-sql-tot;"
 msgstr "&task-sql-tot;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:341
+#, fuzzy, no-c-format
+#| msgid "DNS server"
+msgid "SSH server"
+msgstr "DNS 服务器"
+
+#. Tag: entry
+#: random-bits.xml:342
+#, fuzzy, no-c-format
+#| msgid "&task-sql-inst;"
+msgid "&task-ssh-inst;"
+msgstr "&task-sql-inst;"
+
+#. Tag: entry
 #: random-bits.xml:343
+#, fuzzy, no-c-format
+#| msgid "&task-sql-dl;"
+msgid "&task-ssh-dl;"
+msgstr "&task-sql-dl;"
+
+#. Tag: entry
+#: random-bits.xml:344
+#, fuzzy, no-c-format
+#| msgid "&task-sql-tot;"
+msgid "&task-ssh-tot;"
+msgstr "&task-sql-tot;"
+
+#. Tag: para
+#: random-bits.xml:350
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -814,23 +842,14 @@ msgstr ""
 "同；您应该留有 350MB 以上的空间用来下载和安装。"
 
 #. Tag: title
-#: random-bits.xml:358
+#: random-bits.xml:365
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:360
+#: random-bits.xml:367
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; from an existing Unix "
-#| "or Linux system, without using the menu-driven installer as explained in "
-#| "the rest of the manual. This <quote>cross-install</quote> HOWTO has been "
-#| "requested by users switching to &debian-gnu; from Red Hat, Mandriva, and "
-#| "SUSE. In this section some familiarity with entering *nix commands and "
-#| "navigating the file system is assumed. In this section, <prompt>$</"
-#| "prompt> symbolizes a command to be entered in the user's current system, "
-#| "while <prompt>#</prompt> refers to a command entered in the Debian chroot."
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
 "Linux system, without using the menu-driven installer as explained in the "
@@ -840,37 +859,33 @@ msgid ""
 "navigating the file system is assumed. In this section, <prompt>$</prompt> "
 "symbolizes a command to be entered in the user's current system, while "
 "<prompt>#</prompt> refers to a command entered in the &debian; chroot."
-msgstr "本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册其余部分谈到的由菜单驱动的安装程序。这篇<quote>交叉安装(cross-install)</quote> HOWTO 是应那些原来使用 Redhat、Mandriva 和 SUSE，现转到 &debian-gnu; 的用户撰写的。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭移动并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当前使用的系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 &debian; chroot 环境中输入的。"
+msgstr ""
+"本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册"
+"其余部分谈到的由菜单驱动的安装程序。这篇<quote>交叉安装(cross-install)</"
+"quote> HOWTO 是应那些原来使用 Redhat、Mandriva 和 SUSE，现转到 &debian-gnu; "
+"的用户撰写的。在本节中，我们假设您对于输入 *nix 命令以及在文件系统中穿梭移动"
+"并不生疏。同时，在本节中，<prompt>$</prompt> 标志着这个命令是在用户当前使用的"
+"系统中输入的，而 <prompt>#</prompt> 则表示这个命令是在 &debian; chroot 环境中"
+"输入的。"
 
 #. Tag: para
-#: random-bits.xml:372
+#: random-bits.xml:379
 #, no-c-format
-#| msgid ""
-#| "Once you've got the new Debian system configured to your preference, you "
-#| "can migrate your existing user data (if any) to it, and keep on rolling. "
-#| "This is therefore a <quote>zero downtime</quote> &debian-gnu; install. "
-#| "It's also a clever way for dealing with hardware that otherwise doesn't "
-#| "play friendly with various boot or installation media."
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
 "can migrate your existing user data (if any) to it, and keep on rolling. "
 "This is therefore a <quote>zero downtime</quote> &debian-gnu; install. It's "
 "also a clever way for dealing with hardware that otherwise doesn't play "
 "friendly with various boot or installation media."
-msgstr "一旦您根据自己的要求配置好了新的 &debian; 系统，就可以将您原来系统中的用户数据(如果有的话)悉数迁移到新系统里去。然后就能继续爽了。一言以蔽之，这是一次<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不能通过任何引导或者安装介质完成安装的权宜之计。"
+msgstr ""
+"一旦您根据自己的要求配置好了新的 &debian; 系统，就可以将您原来系统中的用户数"
+"据(如果有的话)悉数迁移到新系统里去。然后就能继续爽了。一言以蔽之，这是一次"
+"<quote>不停机</quote>的 &debian-gnu; 安装。同时，这也是处理那些因为硬件原因不"
+"能通过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: para
-#: random-bits.xml:383
+#: random-bits.xml:390
 #, no-c-format
-#| msgid ""
-#| "As this is a mostly manual procedure, you should bear in mind that you "
-#| "will need to do a lot of basic configuration of the system yourself, "
-#| "which will also require more knowledge of Debian and of &arch-kernel; in "
-#| "general than performing a regular installation. You cannot expect this "
-#| "procedure to result in a system that is identical to a system from a "
-#| "regular installation. You should also keep in mind that this procedure "
-#| "only gives the basic steps to set up a system. Additional installation "
-#| "and/or configuration steps may be needed."
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
 "need to do a lot of basic configuration of the system yourself, which will "
@@ -880,16 +895,20 @@ msgid ""
 "installation. You should also keep in mind that this procedure only gives "
 "the basic steps to set up a system. Additional installation and/or "
 "configuration steps may be needed."
-msgstr "由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，并且要具有比常规安装更多的 &debian; 和 &arch-kernel; 知识。不要期望这种执行的结果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还需要额外的安装、或者配置步骤。"
+msgstr ""
+"由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，"
+"并且要具有比常规安装更多的 &debian; 和 &arch-kernel; 知识。不要期望这种执行的"
+"结果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能"
+"还需要额外的安装、或者配置步骤。"
 
 #. Tag: title
-#: random-bits.xml:397
+#: random-bits.xml:404
 #, no-c-format
 msgid "Getting Started"
 msgstr "准备开始"
 
 #. Tag: para
-#: random-bits.xml:398
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -903,7 +922,7 @@ msgstr ""
 "空间了(安装 GNOME 或 KDE 这样的桌面环境，还要更多)。"
 
 #. Tag: para
-#: random-bits.xml:406
+#: random-bits.xml:413
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -921,18 +940,8 @@ msgstr ""
 "userinput>。"
 
 #. Tag: para
-#: random-bits.xml:416
+#: random-bits.xml:423
 #, no-c-format
-#| msgid ""
-#| "Initialize and activate swap (substitute the partition number for your "
-#| "intended Debian swap partition): <informalexample><screen>\n"
-#| "# mkswap /dev/<replaceable>hda5</replaceable>\n"
-#| "# sync; sync; sync\n"
-#| "# swapon /dev/<replaceable>hda5</replaceable>\n"
-#| "</screen></informalexample> Mount one partition as <filename>/mnt/"
-#| "debinst</filename> (the installation point, to be the root (<filename>/</"
-#| "filename>) filesystem on your new system). The mount point name is "
-#| "strictly arbitrary, it is referenced later below."
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
 "intended &debian; swap partition): <informalexample><screen>\n"
@@ -944,14 +953,17 @@ msgid ""
 "filesystem on your new system). The mount point name is strictly arbitrary, "
 "it is referenced later below."
 msgstr ""
-"初始化并激活交换分区(请把分区号替换成您希望用作 &debian; 交换分区的分区号): <informalexample><screen>\n"
+"初始化并激活交换分区(请把分区号替换成您希望用作 &debian; 交换分区的分区号): "
+"<informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
-"</screen></informalexample> 把一个分区挂载到 <filename>/mnt/debinst</filename>(这是安装的位置，将来作为您新系统的根(<filename>/</filename>)文件系统)。挂载点的名称是任意的，后面的步骤将会用到。"
+"</screen></informalexample> 把一个分区挂载到 <filename>/mnt/debinst</"
+"filename>(这是安装的位置，将来作为您新系统的根(<filename>/</filename>)文件系"
+"统)。挂载点的名称是任意的，后面的步骤将会用到。"
 
 #. Tag: screen
-#: random-bits.xml:428
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -961,7 +973,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:431
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -972,25 +984,14 @@ msgstr ""
 "手动创建和加载这些目录。"
 
 #. Tag: title
-#: random-bits.xml:441
+#: random-bits.xml:448
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:442
+#: random-bits.xml:449
 #, no-c-format
-#| msgid ""
-#| "The utility used by the Debian installer, and recognized as the official "
-#| "way to install a Debian base system, is <command>debootstrap</command>. "
-#| "It uses <command>wget</command> and <command>ar</command>, but otherwise "
-#| "depends only on <classname>/bin/sh</classname> and basic Unix/Linux "
-#| "tools<footnote> <para> These include the GNU core utilities and commands "
-#| "like <command>sed</command>, <command>grep</command>, <command>tar</"
-#| "command> and <command>gzip</command>. </para> </footnote>. Install "
-#| "<command>wget</command> and <command>ar</command> if they aren't already "
-#| "on your current system, then download and install <command>debootstrap</"
-#| "command>."
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
 "way to install a &debian; base system, is <command>debootstrap</command>. It "
@@ -1001,22 +1002,19 @@ msgid ""
 "and <command>gzip</command>. </para> </footnote>. Install <command>wget</"
 "command> and <command>ar</command> if they aren't already on your current "
 "system, then download and install <command>debootstrap</command>."
-msgstr "&ebian; 安装程序使用的工具，同时也作为安装 &debian; 基本系统的正式方法，是 <command>debootstrap</command>。它调用了 <command>wget</command> 和 <command>ar</command>，而其他的仅依赖 <classname>/bin/sh</classname> 和基本的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令，像 <command>sed</command>、<command>grep</command>、<command>tar</command> 和 <command>gzip</command>。</para> </footnote>。如果您的系统里还没有 <command>wget</command> 和 <command>ar</command>，首先安装它们，然后下载并安装 <command>debootstrap</command>。"
+msgstr ""
+"&ebian; 安装程序使用的工具，同时也作为安装 &debian; 基本系统的正式方法，是 "
+"<command>debootstrap</command>。它调用了 <command>wget</command> 和 "
+"<command>ar</command>，而其他的仅依赖 <classname>/bin/sh</classname> 和基本"
+"的 Unix/Linux 工具<footnote> <para> 它们包括 GNU core 工具和命令，像 "
+"<command>sed</command>、<command>grep</command>、<command>tar</command> 和 "
+"<command>gzip</command>。</para> </footnote>。如果您的系统里还没有 "
+"<command>wget</command> 和 <command>ar</command>，首先安装它们，然后下载并安"
+"装 <command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:472
+#: random-bits.xml:479
 #, no-c-format
-#| msgid ""
-#| "Or, you can use the following procedure to install it manually. Make a "
-#| "work folder for extracting the .deb into: <informalexample><screen>\n"
-#| "# mkdir work\n"
-#| "# cd work\n"
-#| "</screen></informalexample> The <command>debootstrap</command> binary is "
-#| "located in the Debian archive (be sure to select the proper file for your "
-#| "architecture). Download the <command>debootstrap</command> .deb from the "
-#| "<ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> "
-#| "pool</ulink>, copy the package to the work folder, and extract the files "
-#| "from it. You will need to have root privileges to install the files."
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
 "folder for extracting the .deb into: <informalexample><screen>\n"
@@ -1029,13 +1027,18 @@ msgid ""
 "ulink>, copy the package to the work folder, and extract the files from it. "
 "You will need to have root privileges to install the files."
 msgstr ""
-"或者您也可以通过下面的步骤手动安装。先新建一个 work 目录，用于解压 .deb 文件： <informalexample><screen>\n"
+"或者您也可以通过下面的步骤手动安装。先新建一个 work 目录，用于解压 .deb 文"
+"件： <informalexample><screen>\n"
 "# mkdir work\n"
 "# cd work\n"
-"</screen></informalexample> <command>debootstrap</command> 的二进制文件位于 &debian; archive (请确保选择了合适的架构文件)。下载 <command>debootstrap</command> .deb，它位于 <ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> pool</ulink>，把软件包拷贝到 work 目录，并解压该文件。要将这些文件安装到系统，您需要 root 权限。"
+"</screen></informalexample> <command>debootstrap</command> 的二进制文件位于 "
+"&debian; archive (请确保选择了合适的架构文件)。下载 <command>debootstrap</"
+"command> .deb，它位于 <ulink url=\"http://ftp.debian.org/debian/pool/main/d/"
+"debootstrap/\"> pool</ulink>，把软件包拷贝到 work 目录，并解压该文件。要将这"
+"些文件安装到系统，您需要 root 权限。"
 
 #. Tag: screen
-#: random-bits.xml:487
+#: random-bits.xml:494
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1047,30 +1050,28 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:500
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:501
 #, no-c-format
-#| msgid ""
-#| "<command>debootstrap</command> can download the needed files directly "
-#| "from the archive when you run it. You can substitute any Debian archive "
-#| "mirror for <userinput>&archive-mirror;/debian</userinput> in the command "
-#| "example below, preferably a mirror close to you network-wise. Mirrors are "
-#| "listed at <ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
 "the archive when you run it. You can substitute any &debian; archive mirror "
 "for <userinput>&archive-mirror;/debian</userinput> in the command example "
 "below, preferably a mirror close to you network-wise. Mirrors are listed at "
 "<ulink url=\"http://www.debian.org/mirror/list\"></ulink>."
-msgstr "运行 <command>debootstrap</command> 后，它会从 archive 直接下载所需的文件。在下面的命令示例中，您可以根据自己的网络情况，选择一个较近的 &debian; archive 镜像，替换 <userinput>&archive-mirror;/debian</userinput>。镜像列表位于 <ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
+msgstr ""
+"运行 <command>debootstrap</command> 后，它会从 archive 直接下载所需的文件。在"
+"下面的命令示例中，您可以根据自己的网络情况，选择一个较近的 &debian; archive "
+"镜像，替换 <userinput>&archive-mirror;/debian</userinput>。镜像列表位于 "
+"<ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:503
+#: random-bits.xml:510
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1082,7 +1083,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:509
+#: random-bits.xml:516
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1102,7 +1103,7 @@ msgstr ""
 "<userinput>s390</userinput>, or <userinput>sparc</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:528
+#: random-bits.xml:535
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1112,21 +1113,14 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:534
+#: random-bits.xml:541
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本系统的配置"
 
 #. Tag: para
-#: random-bits.xml:535
+#: random-bits.xml:542
 #, 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 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"
@@ -1134,24 +1128,26 @@ msgid ""
 "</screen></informalexample> After chrooting you may need to set the terminal "
 "definition to be compatible with the &debian; base system, for example:"
 msgstr ""
-"现在您的磁盘上已经有了一个功能虽弱但却是真正的 &debian; 系统。键入 <command>chroot</command> 命令进入：<informalexample><screen>\n"
+"现在您的磁盘上已经有了一个功能虽弱但却是真正的 &debian; 系统。键入 "
+"<command>chroot</command> 命令进入：<informalexample><screen>\n"
 "# LANG=C chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample> 然后您需要设置与 &debian; 基本系统兼容的终端定义，例如："
+"</screen></informalexample> 然后您需要设置与 &debian; 基本系统兼容的终端定"
+"义，例如："
 
 #. Tag: screen
-#: random-bits.xml:545
+#: random-bits.xml:552
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:550
+#: random-bits.xml:557
 #, no-c-format
 msgid "Create device files"
 msgstr "创建设备文件"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1168,19 +1164,19 @@ msgstr ""
 "静态设备文件。"
 
 #. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:568
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "可以使用的选项有："
 
 #. Tag: para
-#: random-bits.xml:566
+#: random-bits.xml:573
 #, no-c-format
 msgid "create a default set of static device files using"
 msgstr "创建默认的静态设备文件，使用"
 
 #. Tag: screen
-#: random-bits.xml:569
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "# cd /dev\n"
@@ -1190,14 +1186,14 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:572
+#: random-bits.xml:579
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr "手动创建指定的设备文件，使用 <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:577
+#: random-bits.xml:584
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1208,55 +1204,14 @@ msgstr ""
 "postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
-#: random-bits.xml:590
+#: random-bits.xml:597
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:591
-#, no-c-format
-#| msgid ""
-#| "You need to create <filename>/etc/fstab</filename>. "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/fstab\n"
-#| "</screen></informalexample> Here is a sample you can modify to suit: "
-#| "<informalexample><screen>\n"
-#| "# /etc/fstab: static file system information.\n"
-#| "#\n"
-#| "# file system    mount point   type    options                  dump "
-#| "pass\n"
-#| "/dev/XXX         /             ext3    defaults                 0    1\n"
-#| "/dev/XXX         /boot         ext3    ro,nosuid,nodev          0    2\n"
-#| "\n"
-#| "/dev/XXX         none          swap    sw                       0    0\n"
-#| "proc             /proc         proc    defaults                 0    0\n"
-#| "\n"
-#| "/dev/fd0         /media/floppy auto    noauto,rw,sync,user,exec 0    0\n"
-#| "/dev/cdrom       /media/cdrom  iso9660 noauto,ro,user,exec      0    0\n"
-#| "\n"
-#| "/dev/XXX         /tmp          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2\n"
-#| "/dev/XXX         /usr          ext3    rw,nodev                 0    2\n"
-#| "/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2\n"
-#| "</screen></informalexample> Use <userinput>mount -a</userinput> to mount "
-#| "all the file systems you have specified in your <filename>/etc/fstab</"
-#| "filename>, or, to mount file systems individually, use: "
-#| "<informalexample><screen>\n"
-#| "# mount /path   # e.g.: mount /usr\n"
-#| "</screen></informalexample> Current Debian systems have mountpoints for "
-#| "removable media under <filename>/media</filename>, but keep compatibility "
-#| "symlinks in <filename>/</filename>. Create these as as needed, for "
-#| "example: <informalexample><screen>\n"
-#| "# cd /media\n"
-#| "# mkdir cdrom0\n"
-#| "# ln -s cdrom0 cdrom\n"
-#| "# cd /\n"
-#| "# ln -s media/cdrom\n"
-#| "</screen></informalexample> You can mount the proc file system multiple "
-#| "times and to arbitrary locations, though <filename>/proc</filename> is "
-#| "customary. If you didn't use <userinput>mount -a</userinput>, be sure to "
-#| "mount proc before continuing:"
+#: random-bits.xml:598
+#, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1299,7 +1254,8 @@ msgid ""
 msgstr ""
 "您需要新建 <filename>/etc/fstab</filename>。<informalexample><screen>\n"
 "# editor /etc/fstab\n"
-"</screen></informalexample> 这里有个样板，您可以根据自己的情况对它进行修改：<informalexample><screen>\n"
+"</screen></informalexample> 这里有个样板，您可以根据自己的情况对它进行修改："
+"<informalexample><screen>\n"
 "# /etc/fstab: static file system information.\n"
 "#\n"
 "# file system    mount point   type    options                  dump pass\n"
@@ -1316,24 +1272,31 @@ msgstr ""
 "/dev/XXX         /var          ext3    rw,nosuid,nodev          0    2\n"
 "/dev/XXX         /usr          ext3    rw,nodev                 0    2\n"
 "/dev/XXX         /home         ext3    rw,nosuid,nodev          0    2\n"
-"</screen></informalexample> 可以通过 <userinput>mount -a</userinput> 来挂载 <filename>/etc/fstab</filename> 中所标明的所有文件系统，您也可以逐个分别地挂载这些文件系统，像：<informalexample><screen>\n"
+"</screen></informalexample> 可以通过 <userinput>mount -a</userinput> 来挂载 "
+"<filename>/etc/fstab</filename> 中所标明的所有文件系统，您也可以逐个分别地挂"
+"载这些文件系统，像：<informalexample><screen>\n"
 "# mount /path   # e.g.: mount /usr\n"
-"</screen></informalexample> 当前的 &debian; 系统为可移动介质创建的挂载点位于 <filename>/media</filename>, 但为了保持兼容，仍有符号链接处于 <filename>/</filename> 目录下面。 如果需要，可以像下面这样创建这些挂载点: <informalexample><screen>\n"
+"</screen></informalexample> 当前的 &debian; 系统为可移动介质创建的挂载点位于 "
+"<filename>/media</filename>, 但为了保持兼容，仍有符号链接处于 <filename>/</"
+"filename> 目录下面。 如果需要，可以像下面这样创建这些挂载点: "
+"<informalexample><screen>\n"
 "# cd /media\n"
 "# mkdir cdrom0\n"
 "# ln -s cdrom0 cdrom\n"
 "# cd /\n"
 "# ln -s media/cdrom\n"
-"</screen></informalexample> 您可以多次挂载 proc 文件系统，通常是在 <filename>/proc</filename> 位置，但也可以选择任意的地方。如果没有使用 <userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
+"</screen></informalexample> 您可以多次挂载 proc 文件系统，通常是在 "
+"<filename>/proc</filename> 位置，但也可以选择任意的地方。如果没有使用 "
+"<userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
 
 #. Tag: screen
-#: random-bits.xml:617
+#: random-bits.xml:624
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:619
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1344,19 +1307,19 @@ msgstr ""
 "chroot: 以外加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:632
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:631
+#: random-bits.xml:638
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "设置时区"
 
 #. Tag: para
-#: random-bits.xml:632
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1368,7 +1331,7 @@ msgstr ""
 "间解释硬件时钟。下面命令可以让您设定和选择时区。"
 
 #. Tag: screen
-#: random-bits.xml:639
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1378,13 +1341,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:645
+#: random-bits.xml:652
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:646
+#: random-bits.xml:653
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1506,13 +1469,13 @@ msgstr ""
 "with the interface name (eth0, eth1, etc.) that you expect."
 
 #. Tag: title
-#: random-bits.xml:687
+#: random-bits.xml:694
 #, no-c-format
 msgid "Configure Apt"
 msgstr "配置 Apt"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:695
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1537,13 +1500,13 @@ msgstr ""
 "update</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:704
+#: random-bits.xml:711
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "本地化和键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:705
+#: random-bits.xml:712
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1561,7 +1524,7 @@ msgstr ""
 "</screen></informalexample> 配置您的键盘(如果需要)："
 
 #. Tag: screen
-#: random-bits.xml:715
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1571,7 +1534,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:724
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1579,13 +1542,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:727
+#: random-bits.xml:734
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:728
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1595,58 +1558,50 @@ msgstr ""
 "以用下面指令找到那些预先打包的内核："
 
 #. Tag: screen
-#: random-bits.xml:733
+#: random-bits.xml:740
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:735
+#: random-bits.xml:742
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "然后根据所选取的软件包名称安装内核软件包。"
 
 #. Tag: screen
-#: random-bits.xml:739
+#: random-bits.xml:746
 #, no-c-format
 msgid ""
 "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
 "replaceable>"
-msgstr "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>"
+msgstr ""
+"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</"
+"replaceable>"
 
 #. Tag: title
-#: random-bits.xml:745
+#: random-bits.xml:752
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:753
 #, 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 "
 "<command>debootstrap</command> does not install a boot loader, though you "
 "can use <command>aptitude</command> inside your &debian; chroot to do so."
-msgstr "要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot loader，因此您要在 &debian; 的 chroot 中使用 <command>aptitude</command> 完成。"
+msgstr ""
+"要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的"
+"内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
+"loader，因此您要在 &debian; 的 chroot 中使用 <command>aptitude</command> 完"
+"成。"
 
 #. Tag: para
-#: random-bits.xml:753
+#: random-bits.xml:760
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
-#| "userinput> for instructions on setting up the bootloader. If you are "
-#| "keeping the system you used to install Debian, just add an entry for the "
-#| "Debian install to your existing grub <filename>menu.lst</filename> or "
-#| "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
-#| "could also copy it to the new system and edit it there. After you are "
-#| "done editing, call <command>lilo</command> (remember it will use "
-#| "<filename>lilo.conf</filename> relative to the system you call it from)."
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
 "<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
@@ -1657,10 +1612,18 @@ msgid ""
 "new system and edit it there. After you are done editing, call "
 "<command>lilo</command> (remember it will use <filename>lilo.conf</filename> "
 "relative to the system you call it from)</phrase>."
-msgstr "通过 <userinput>info grub</userinput> <phrase arch=\"x86\"> 或 <userinput>man lilo.conf</userinput></phrase> 可以看到有关设置 bootloader 的指导。如果希望保留用来安装 &debian; 的系统，只需要为 &debian; 系统添加一条配置信息到在现有的 grub <filename>menu.lst</filename><phrase arch=\"x86\"> 或 <filename>lilo.conf</filename>。对于 <filename>lilo.conf</filename>，您也可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。修改好配置，运行 <command>lilo</command>(请记住，在哪个系统里运行 lilo，它就会用哪个系统里的 <filename>lilo.conf</filename>)</phrase>。"
+msgstr ""
+"通过 <userinput>info grub</userinput> <phrase arch=\"x86\"> 或 "
+"<userinput>man lilo.conf</userinput></phrase> 可以看到有关设置 bootloader 的"
+"指导。如果希望保留用来安装 &debian; 的系统，只需要为 &debian; 系统添加一条配"
+"置信息到在现有的 grub <filename>menu.lst</filename><phrase arch=\"x86\"> 或 "
+"<filename>lilo.conf</filename>。对于 <filename>lilo.conf</filename>，您也可以"
+"把这个文件拷贝到新的系统里，然后在新的系统里编辑它。修改好配置，运行 "
+"<command>lilo</command>(请记住，在哪个系统里运行 lilo，它就会用哪个系统里的 "
+"<filename>lilo.conf</filename>)</phrase>。"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:772
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1682,7 +1645,7 @@ msgstr ""
 "boot/grub/menu.lst</filename>。"
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:782
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1693,13 +1656,13 @@ msgstr ""
 "是安装 <command>grub</command>，但本附录中不讨论。"
 
 #. Tag: para
-#: random-bits.xml:781
+#: random-bits.xml:788
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子："
 
 #. Tag: screen
-#: random-bits.xml:785
+#: random-bits.xml:792
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1721,16 +1684,8 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:794
 #, no-c-format
-#| msgid ""
-#| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
-#| "up the bootloader. If you are keeping the system you used to install "
-#| "Debian, just add an entry for the Debian install to your existing "
-#| "<filename>yaboot.conf</filename>. You could also copy it to the new "
-#| "system and edit it there. After you are done editing, call ybin (remember "
-#| "it will use <filename>yaboot.conf</filename> relative to the system you "
-#| "call it from)."
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
 "the bootloader. If you are keeping the system you used to install &debian;, "
@@ -1738,10 +1693,15 @@ msgid ""
 "conf</filename>. You could also copy it to the new system and edit it there. "
 "After you are done editing, call ybin (remember it will use <filename>yaboot."
 "conf</filename> relative to the system you call it from)."
-msgstr "通过查阅 <userinput>man yaboot.conf</userinput> 可以得到一些有关设置 bootloader 的提示。如果您希望继续保留用来安装 &debian; 的系统，那么在 <filename>yaboot.conf</filename> 里为 &debian; 系统添加一条配置就可以了。您也可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。当您修改完毕配置，运行 ybin (请记住，您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
+msgstr ""
+"通过查阅 <userinput>man yaboot.conf</userinput> 可以得到一些有关设置 "
+"bootloader 的提示。如果您希望继续保留用来安装 &debian; 的系统，那么在 "
+"<filename>yaboot.conf</filename> 里为 &debian; 系统添加一条配置就可以了。您也"
+"可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。当您修改完毕配置，运"
+"行 ybin (请记住，您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:804
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1771,13 +1731,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:810
+#: random-bits.xml:817
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:811
+#: random-bits.xml:818
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1796,7 +1756,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:829
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1807,36 +1767,33 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:828
+#: random-bits.xml:835
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:839
+#: random-bits.xml:846
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:841
+#: random-bits.xml:848
 #, no-c-format
-#| msgid ""
-#| "This section explains how to install &debian-gnu; on a computer without "
-#| "an Ethernet card, but with just a remote gateway computer attached via a "
-#| "Null-Modem cable (also called Null-Printer cable). The gateway computer "
-#| "should be connected to a network that has a Debian mirror on it (e.g. to "
-#| "the Internet)."
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
 "Ethernet card, but with just a remote gateway computer attached via a Null-"
 "Modem cable (also called Null-Printer cable). The gateway computer should be "
 "connected to a network that has a &debian; mirror on it (e.g. to the "
 "Internet)."
-msgstr "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连接到具有 &debian; 镜像的网络(比如，互联网)。"
+msgstr ""
+"本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-"
+"Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连"
+"接到具有 &debian; 镜像的网络(比如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:856
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1850,7 +1807,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:857
+#: random-bits.xml:864
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1861,7 +1818,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1873,30 +1830,27 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:879
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:882
 #, no-c-format
-#| msgid ""
-#| "A target computer, called <emphasis>target</emphasis>, where Debian will "
-#| "be installed."
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
 "be installed."
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:888
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:893
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1905,7 +1859,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:899
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1916,13 +1870,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:904
+#: random-bits.xml:911
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:905
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1932,7 +1886,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:910
+#: random-bits.xml:917
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1974,13 +1928,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:916
+#: random-bits.xml:923
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:917
+#: random-bits.xml:924
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2004,13 +1958,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:936
+#: random-bits.xml:943
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:945
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2020,13 +1974,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:946
+#: random-bits.xml:953
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:951
+#: random-bits.xml:958
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2039,7 +1993,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:960
+#: random-bits.xml:967
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2050,19 +2004,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:972
+#: random-bits.xml:979
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:975
+#: random-bits.xml:982
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:980
+#: random-bits.xml:987
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2070,7 +2024,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:992
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2080,7 +2034,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:998
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2090,13 +2044,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1010
+#: random-bits.xml:1017
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:1019
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2110,7 +2064,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1027
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2121,7 +2075,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1032
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2134,7 +2088,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1032
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2142,7 +2096,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1047
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2157,7 +2111,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1055
+#: random-bits.xml:1062
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2175,7 +2129,7 @@ msgstr ""
 "footnote>)。"
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1081
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2183,7 +2137,7 @@ msgid ""
 msgstr "下一步是侦测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1087
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2194,7 +2148,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1093
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2208,7 +2162,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1102
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2216,7 +2170,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息(PPPoE 用户名和密码)。"
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1108
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2233,13 +2187,13 @@ msgstr ""
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
 #. Tag: title
-#: random-bits.xml:1121
+#: random-bits.xml:1128
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1129
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -2252,7 +2206,7 @@ msgstr ""
 "前端。"
 
 #. Tag: para
-#: random-bits.xml:1130
+#: random-bits.xml:1137
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -2267,7 +2221,7 @@ msgstr ""
 "有一些优点，比如可以使用鼠标，以及在一个屏幕下显示多个问题。"
 
 #. Tag: para
-#: random-bits.xml:1139
+#: random-bits.xml:1146
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -2287,15 +2241,8 @@ msgstr ""
 "<quote>Help</quote> 选项选取后看到。"
 
 #. Tag: para
-#: random-bits.xml:1150
+#: random-bits.xml:1157
 #, no-c-format
-#| msgid ""
-#| "There is also a graphical installer image that can be netbooted. And "
-#| "there is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso"
-#| "\"> <para> The mini ISO image can be downloaded from a Debian mirror as "
-#| "described in <xref linkend=\"downloading-files\"/>. Look for "
-#| "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
-#| "mainly useful for testing."
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
 "is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso\"> "
@@ -2303,19 +2250,15 @@ msgid ""
 "described in <xref linkend=\"downloading-files\"/>. Look for "
 "<filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is "
 "mainly useful for testing."
-msgstr "图形安装程序的映象也可用于网络引导。有一个特殊的 <quote>mini</quote> ISO 映象<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映象可在 &debian; 镜像的 <xref linkend=\"downloading-files\"/> 里下载。名字是 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>，主要用于测试。"
+msgstr ""
+"图形安装程序的映象也可用于网络引导。有一个特殊的 <quote>mini</quote> ISO 映象"
+"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映象可在 &debian; 镜像的 "
+"<xref linkend=\"downloading-files\"/> 里下载。名字是 <filename>netboot/gtk/"
+"mini.iso</filename>。</para> </footnote>，主要用于测试。"
 
 #. Tag: para
-#: random-bits.xml:1163
+#: random-bits.xml:1170
 #, no-c-format
-#| msgid ""
-#| "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
-#| "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
-#| "can be downloaded from a Debian mirror as described in <xref linkend="
-#| "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</"
-#| "filename>. </para> </footnote>. It should work on almost all PowerPC "
-#| "systems that have an ATI graphical card, but is unlikely to work on other "
-#| "systems."
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
 "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
@@ -2323,10 +2266,15 @@ msgid ""
 "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. "
 "</para> </footnote>. It should work on almost all PowerPC systems that have "
 "an ATI graphical card, but is unlikely to work on other systems."
-msgstr "对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 &debian; 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡的 PowerPC 系统上，但其它的不行。"
+msgstr ""
+"对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用"
+"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend="
+"\"downloading-files\"/> 中的一个 &debian; 镜像下载，名为 <filename>netboot/"
+"gtk/mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡"
+"的 PowerPC 系统上，但其它的不行。"
 
 #. Tag: para
-#: random-bits.xml:1177
+#: random-bits.xml:1184
 #, no-c-format
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
@@ -2334,7 +2282,7 @@ msgid ""
 msgstr "如同一般安装程序，它也可以在启动图形安装界面时添加引导参数。"
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1190
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -2346,7 +2294,7 @@ msgstr ""
 "内存条件，它将自动回到普通的 <quote>newt</quote> 前端。"
 
 #. Tag: para
-#: random-bits.xml:1190
+#: random-bits.xml:1197
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -2358,13 +2306,13 @@ msgstr ""
 "程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
 
 #. Tag: title
-#: random-bits.xml:1200
+#: random-bits.xml:1207
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "使用图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1201
+#: random-bits.xml:1208
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2375,7 +2323,7 @@ msgstr ""
 "用来给您的安装过程进行指导。"
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1214
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2392,7 +2340,7 @@ msgstr ""
 "换选择，而不是激活 &BTN-CONT; 。"
 
 #. Tag: para
-#: random-bits.xml:1217
+#: random-bits.xml:1224
 #, no-c-format
 msgid ""
 "If a dialog offers additional help information, a <guibutton>Help</"
@@ -2403,7 +2351,7 @@ msgstr ""
 "帮助信息可以通过该按钮或者按下 <keycap>F1</keycap> 键。"
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1230
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index e30a0ddc7..36d16099d 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.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: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:56+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -15,7 +15,6 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:5
 #, no-c-format
-#| msgid "Using the Debian Installer"
 msgid "Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序"
 
@@ -28,19 +27,16 @@ msgstr "安装程序如何工作"
 #. Tag: para
 #: using-d-i.xml:8
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer consists of a number of special-purpose components "
-#| "to perform each installation task. Each component performs its task, "
-#| "asking the user questions as necessary to do its job. The questions "
-#| "themselves are given priorities, and the priority of questions to be "
-#| "asked is set when the installer is started."
 msgid ""
 "The &debian; Installer consists of a number of special-purpose components to "
 "perform each installation task. Each component performs its task, asking the "
 "user questions as necessary to do its job. The questions themselves are "
 "given priorities, and the priority of questions to be asked is set when the "
 "installer is started."
-msgstr "&debian; 安装程序由一些特定功能的组件组成，它们完成各自的安装任务。每一组件执行任务时，会询问一些任务相关的问题。每个任务又有各自的优先级，在安装程序开始时可以设置优先级以决定哪些问题会被询问。"
+msgstr ""
+"&debian; 安装程序由一些特定功能的组件组成，它们完成各自的安装任务。每一组件执"
+"行任务时，会询问一些任务相关的问题。每个任务又有各自的优先级，在安装程序开始"
+"时可以设置优先级以决定哪些问题会被询问。"
 
 #. Tag: para
 #: using-d-i.xml:16
@@ -320,7 +316,6 @@ msgstr "cdrom-detect"
 #. Tag: para
 #: using-d-i.xml:185
 #, no-c-format
-#| msgid "Looks for and mounts a Debian installation CD."
 msgid "Looks for and mounts a &debian; installation CD."
 msgstr "寻找并挂载 &debian; 安装光盘。"
 
@@ -360,9 +355,6 @@ msgstr "choose-mirror"
 #. Tag: para
 #: using-d-i.xml:210
 #, no-c-format
-#| msgid ""
-#| "Presents a list of Debian archive mirrors. The user may choose the source "
-#| "of his installation packages."
 msgid ""
 "Presents a list of &debian; archive mirrors. The user may choose the source "
 "of his installation packages."
@@ -416,11 +408,23 @@ msgstr "Anna's Not Nearly APT。安装从选择的镜像或 CD 获取的软件�
 #. Tag: term
 #: using-d-i.xml:247
 #, no-c-format
+msgid "user-setup"
+msgstr "user-setup"
+
+#. Tag: para
+#: using-d-i.xml:247
+#, no-c-format
+msgid "Sets up the root password, and adds a non-root user."
+msgstr "建立 root 密码，然后添加一个非 root 用户。"
+
+#. Tag: term
+#: using-d-i.xml:255
+#, no-c-format
 msgid "clock-setup"
 msgstr "clock-setup"
 
 #. Tag: para
-#: using-d-i.xml:247
+#: using-d-i.xml:255
 #, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
@@ -428,46 +432,43 @@ msgid ""
 msgstr "更新系统时钟，并决定时钟是否使用 UTC。"
 
 #. Tag: term
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "tzsetup"
 msgstr "tzsetup"
 
 #. Tag: para
-#: using-d-i.xml:256
+#: using-d-i.xml:264
 #, no-c-format
 msgid "Selects the time zone, based on the location selected earlier."
 msgstr "选择时区，并基于前面选择的地点。"
 
 #. Tag: term
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
 msgid "partman"
 msgstr "partman"
 
 #. Tag: para
-#: using-d-i.xml:264
+#: using-d-i.xml:272
 #, no-c-format
-#| msgid ""
-#| "Allows the user to partition disks attached to the system, create file "
-#| "systems on the selected partitions, and attach them to the mountpoints. "
-#| "Included are also interesting features like a fully automatic mode or LVM "
-#| "support. This is the preferred partitioning tool in Debian."
 msgid ""
 "Allows the user to partition disks attached to the system, create file "
 "systems on the selected partitions, and attach them to the mountpoints. "
 "Included are also interesting features like a fully automatic mode or LVM "
 "support. This is the preferred partitioning tool in &debian;."
-msgstr "让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣的特性，如完全自动模式或 LVM 支持。&debian; 里它是推荐使用的分区工具。"
+msgstr ""
+"让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣"
+"的特性，如完全自动模式或 LVM 支持。&debian; 里它是推荐使用的分区工具。"
 
 #. Tag: term
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid "partitioner"
 msgstr "partitioner"
 
 #. Tag: para
-#: using-d-i.xml:276
+#: using-d-i.xml:284
 #, no-c-format
 msgid ""
 "Allows the user to partition disks attached to the system. A partitioning "
@@ -475,13 +476,13 @@ msgid ""
 msgstr "允许用户为系统中的磁盘分区。根据用户计算机的体系选择适合的分区工具。"
 
 #. Tag: term
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid "partconf"
 msgstr "partconf"
 
 #. Tag: para
-#: using-d-i.xml:286
+#: using-d-i.xml:294
 #, no-c-format
 msgid ""
 "Displays a list of partitions, and creates file systems on the selected "
@@ -489,13 +490,13 @@ msgid ""
 msgstr "显示分区列表，按用户指令为选择的分区创建文件系统。"
 
 #. Tag: term
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid "lvmcfg"
 msgstr "lvmcfg"
 
 #. Tag: para
-#: using-d-i.xml:295
+#: using-d-i.xml:303
 #, no-c-format
 msgid ""
 "Helps the user with the configuration of the <firstterm>LVM</firstterm> "
@@ -503,13 +504,13 @@ msgid ""
 msgstr "协助用户配置 <firstterm>LVM</firstterm> (Logical Volume Manager)。"
 
 #. Tag: term
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid "mdcfg"
 msgstr "mdcfg"
 
 #. Tag: para
-#: using-d-i.xml:304
+#: using-d-i.xml:312
 #, no-c-format
 msgid ""
 "Allows the user to set up Software <firstterm>RAID</firstterm> (Redundant "
@@ -521,13 +522,13 @@ msgstr ""
 "器的高级管理。"
 
 #. Tag: term
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid "base-installer"
 msgstr "base-installer"
 
 #. Tag: para
-#: using-d-i.xml:315
+#: using-d-i.xml:323
 #, no-c-format
 msgid ""
 "Installs the most basic set of packages which would allow the computer to "
@@ -535,18 +536,6 @@ msgid ""
 msgstr "安装一些基本的包，让计算机重启后能在 &debian-gnu; 下运行。"
 
 #. Tag: term
-#: using-d-i.xml:324
-#, no-c-format
-msgid "user-setup"
-msgstr "user-setup"
-
-#. Tag: para
-#: using-d-i.xml:324
-#, no-c-format
-msgid "Sets up the root password, and adds a non-root user."
-msgstr "建立 root 密码，然后添加一个非 root 用户。"
-
-#. Tag: term
 #: using-d-i.xml:332
 #, no-c-format
 msgid "apt-setup"
@@ -635,16 +624,13 @@ msgstr "save-logs"
 #. Tag: para
 #: using-d-i.xml:381
 #, no-c-format
-#| msgid ""
-#| "Provides a way for the user to record information on a floppy disk, "
-#| "network, hard disk, or other media when trouble is encountered, in order "
-#| "to accurately report installer software problems to Debian developers "
-#| "later."
 msgid ""
 "Provides a way for the user to record information on a floppy disk, network, "
 "hard disk, or other media when trouble is encountered, in order to "
 "accurately report installer software problems to &debian; developers later."
-msgstr "当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后精确地给 &debian; 开发人员报告安装程序的问题。"
+msgstr ""
+"当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后"
+"精确地给 &debian; 开发人员报告安装程序的问题。"
 
 #. Tag: title
 #: using-d-i.xml:399
@@ -670,23 +656,12 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:412
 #, no-c-format
-#| msgid "Setting up Debian Installer and Hardware Configuration"
 msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "启动 &debian; 安装程序与配置硬件"
 
 #. Tag: para
 #: using-d-i.xml:413
 #, no-c-format
-#| msgid ""
-#| "Let's assume the Debian Installer has booted and you are facing its first "
-#| "screen. At this time, the capabilities of &d-i; are still quite limited. "
-#| "It doesn't know much about your hardware, preferred language, or even the "
-#| "task it should perform. Don't worry. Because &d-i; is quite clever, it "
-#| "can automatically probe your hardware, locate the rest of its components "
-#| "and upgrade itself to a capable installation system. However, you still "
-#| "need to help &d-i; with some information it can't determine automatically "
-#| "(like selecting your preferred language, keyboard layout or desired "
-#| "network mirror)."
 msgid ""
 "Let's assume the &debian; Installer has booted and you are facing its first "
 "screen. At this time, the capabilities of &d-i; are still quite limited. It "
@@ -697,7 +672,12 @@ msgid ""
 "help &d-i; with some information it can't determine automatically (like "
 "selecting your preferred language, keyboard layout or desired network "
 "mirror)."
-msgstr "假设 &debian; 安装程序已经启动，然后您看到了初始画面。此时，&d-i; 的能力还很有限。它还不了解您的硬件，首选的语言，甚至不知道要执行什么任务。不必担心，因为 &d-i; 相当聪明，它能自动探测您的硬件，定位其余的组件，并更新自己以具备安装系统的能力。但您仍然要协助 &d-i;，提供给它不能自动决定的内容(比如选择您首选的语言、键盘布局或网络镜像)。"
+msgstr ""
+"假设 &debian; 安装程序已经启动，然后您看到了初始画面。此时，&d-i; 的能力还很"
+"有限。它还不了解您的硬件，首选的语言，甚至不知道要执行什么任务。不必担心，因"
+"为 &d-i; 相当聪明，它能自动探测您的硬件，定位其余的组件，并更新自己以具备安装"
+"系统的能力。但您仍然要协助 &d-i;，提供给它不能自动决定的内容(比如选择您首选的"
+"语言、键盘布局或网络镜像)。"
 
 #. Tag: para
 #: using-d-i.xml:426
@@ -858,19 +838,16 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:530
 #, no-c-format
-#| msgid ""
-#| "The selected geographic location (in most cases a country) will be used "
-#| "later in the installation process to select the correct time zone and a "
-#| "Debian mirror appropriate for that country. Language and country together "
-#| "will help determine the default locale for your system and select the "
-#| "correct keyboard layout."
 msgid ""
 "The selected geographic location (in most cases a country) will be used "
 "later in the installation process to select the correct time zone and a "
 "&debian; mirror appropriate for that country. Language and country together "
 "will help determine the default locale for your system and select the "
 "correct keyboard layout."
-msgstr "在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时区和该国对应的 &debian; 镜像。语言和国家合起来还有助于确定您系统默认的 locale，以及键盘布局。"
+msgstr ""
+"在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时"
+"区和该国对应的 &debian; 镜像。语言和国家合起来还有助于确定您系统默认的 "
+"locale，以及键盘布局。"
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -994,12 +971,13 @@ msgid ""
 "layout that conforms to the keyboard you are using, or select something "
 "close if the keyboard layout you want isn't represented. Once the system "
 "installation is complete, you'll be able to select a keyboard layout from a "
-"wider range of choices (run <command>dpkg-reconfigure keyboard-configuration</command> as root after you "
-"have completed the installation)."
+"wider range of choices (run <command>dpkg-reconfigure keyboard-"
+"configuration</command> as root after you have completed the installation)."
 msgstr ""
 "键盘经常按照不同语言使用的字符裁剪。为您使用的键盘选择一个合适布局，如果没有"
 "合适的布局，就选择一个近似的。一旦系统安装完毕，您可以从更大范围内选择键盘的"
-"布局(在安装完之后以 root 身份执行 <command>dpkg-reconfigure keyboard-configuration</command>)。"
+"布局(在安装完之后以 root 身份执行 <command>dpkg-reconfigure keyboard-"
+"configuration</command>)。"
 
 #. Tag: para
 #: using-d-i.xml:636
@@ -1036,42 +1014,25 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:675
 #, no-c-format
-#| msgid "Looking for the Debian Installer ISO Image"
 msgid "Looking for the &debian; Installer ISO Image"
 msgstr "寻找 &debian; 安装程序 ISO 映像"
 
 #. Tag: para
 #: using-d-i.xml:676
 #, no-c-format
-#| msgid ""
-#| "When installing via the <emphasis>hd-media</emphasis> method, there will "
-#| "be a moment where you need to find and mount the Debian Installer iso "
-#| "image in order to get the rest of the installation files. The component "
-#| "<command>iso-scan</command> does exactly this."
 msgid ""
 "When installing via the <emphasis>hd-media</emphasis> method, there will be "
 "a moment where you need to find and mount the &debian; Installer iso image "
 "in order to get the rest of the installation files. The component "
 "<command>iso-scan</command> does exactly this."
-msgstr "当安装是使用 <emphasis>hd-media</emphasis> 方式，将会有一个动作，是寻找和挂载 &debian; 安装程序 iso 映像，用于获取其它的安装文件。组件 <command>iso-scan</command> 正是用来完成此任务。"
+msgstr ""
+"当安装是使用 <emphasis>hd-media</emphasis> 方式，将会有一个动作，是寻找和挂"
+"载 &debian; 安装程序 iso 映像，用于获取其它的安装文件。组件 <command>iso-"
+"scan</command> 正是用来完成此任务。"
 
 #. Tag: para
 #: using-d-i.xml:683
 #, no-c-format
-#| msgid ""
-#| "At first, <command>iso-scan</command> automatically mounts all block "
-#| "devices (e.g. partitions) which have some known filesystem on them and "
-#| "sequentially searches for filenames ending with <filename>.iso</filename> "
-#| "(or <filename>.ISO</filename> for that matter). Beware that the first "
-#| "attempt scans only files in the root directory and in the first level of "
-#| "subdirectories (i.e. it finds <filename>/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, <filename>/data/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, but not <filename>/data/tmp/"
-#| "<replaceable>whatever</replaceable>.iso</filename>). After an iso image "
-#| "has been found, <command>iso-scan</command> checks its content to "
-#| "determine if the image is a valid Debian iso image or not. In the former "
-#| "case we are done, in the latter <command>iso-scan</command> seeks for "
-#| "another image."
 msgid ""
 "At first, <command>iso-scan</command> automatically mounts all block devices "
 "(e.g. partitions) which have some known filesystem on them and sequentially "
@@ -1085,7 +1046,16 @@ msgid ""
 "content to determine if the image is a valid &debian; iso image or not. In "
 "the former case we are done, in the latter <command>iso-scan</command> seeks "
 "for another image."
-msgstr "首先，<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如，分区)，然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</filename> 之类)。注意，首次只扫描位于根目录的文件，和第一层子目录 (例如，它找到 <filename>/<replaceable>whatever</replaceable>.iso</filename>，<filename>/data/<replaceable>whatever</replaceable>.iso</filename>，而不是 <filename>/data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件找到后，<command>iso-scan</command> 检查它包含的内容，确定该映象文件是不是有效的 &debian; iso 映象。如为前者，任务结束；若是后者，<command>iso-scan</command> 搜索其它的映象。"
+msgstr ""
+"首先，<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如，分"
+"区)，然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</"
+"filename> 之类)。注意，首次只扫描位于根目录的文件，和第一层子目录 (例如，它找"
+"到 <filename>/<replaceable>whatever</replaceable>.iso</filename>，<filename>/"
+"data/<replaceable>whatever</replaceable>.iso</filename>，而不是 <filename>/"
+"data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件"
+"找到后，<command>iso-scan</command> 检查它包含的内容，确定该映象文件是不是有"
+"效的 &debian; iso 映象。如为前者，任务结束；若是后者，<command>iso-scan</"
+"command> 搜索其它的映象。"
 
 #. Tag: para
 #: using-d-i.xml:700
@@ -1304,11 +1274,135 @@ msgstr "自动安装可以通过预置设置任何所需的时区。"
 #. Tag: title
 #: using-d-i.xml:901
 #, no-c-format
+msgid "Setting Up Users And Passwords"
+msgstr "设置用户和密码"
+
+#. Tag: para
+#: using-d-i.xml:902
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After the base system has been installed, the installer will allow you to "
+#| "set up the <quote>root</quote> account and/or an account for the first "
+#| "user. Other user accounts can be created after the installation has been "
+#| "completed."
+msgid ""
+"Just before configuring the clock, the installer will allow you to set up "
+"the <quote>root</quote> account and/or an account for the first user. Other "
+"user accounts can be created after the installation has been completed."
+msgstr ""
+"系统安装之后，安装程序要求您创建 <quote>root</quote> 帐号和/或第一个用户帐"
+"号。其他的用户帐号可以在安装完成之后创建。"
+
+#. Tag: title
+#: using-d-i.xml:916
+#, no-c-format
+msgid "Set the Root Password"
+msgstr "设置 root 密码"
+
+#. Tag: para
+#: using-d-i.xml:920
+#, no-c-format
+msgid ""
+"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
+"user</emphasis>; it is a login that bypasses all security protection on your "
+"system. The root account should only be used to perform system "
+"administration, and only used for as short a time as possible."
+msgstr ""
+"<emphasis>root</emphasis> 帐户也被称为<emphasis>超级用户</emphasis>；系统中的"
+"所有的安全防护措施对以该身份登录的都是无效的。root 帐户应该仅用来进行系统管"
+"理，而且使用时间应该尽可能短。"
+
+#. Tag: para
+#: using-d-i.xml:928
+#, no-c-format
+msgid ""
+"Any password you create should contain at least 6 characters, and should "
+"contain both upper- and lower-case characters, as well as punctuation "
+"characters. Take extra care when setting your root password, since it is "
+"such a powerful account. Avoid dictionary words or use of any personal "
+"information which could be guessed."
+msgstr ""
+"您所创建的任何密码都应该包含至少 6 个字符，同时包含大小写字母，并且最好带有标"
+"点符号等特殊字符。因为超级用户具有最高权限，因此在您设置 root 密码时尤其需要"
+"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
+
+#. Tag: para
+#: using-d-i.xml:936
+#, no-c-format
+msgid ""
+"If anyone ever tells you they need your root password, be extremely wary. "
+"You should normally never give your root password out, unless you are "
+"administering a machine with more than one system administrator."
+msgstr ""
+"如果他人向您索取您的 root 密码，也需要特别谨慎。除非您所管理的系统有多位管理"
+"员，否则通常不应该将超级用户密码交给别人。"
+
+#. Tag: title
+#: using-d-i.xml:946
+#, no-c-format
+msgid "Create an Ordinary User"
+msgstr "创建一个普通用户"
+
+#. Tag: para
+#: using-d-i.xml:948
+#, no-c-format
+msgid ""
+"The system will ask you whether you wish to create an ordinary user account "
+"at this point. This account should be your main personal log-in. You should "
+"<emphasis>not</emphasis> use the root account for daily use or as your "
+"personal login."
+msgstr ""
+"系统会询问您现在是否希望创建一个普通帐户。您将使用该帐户进行日常登录操作。切"
+"记，平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
+
+#. Tag: para
+#: using-d-i.xml:957
+#, no-c-format
+msgid ""
+"Why not? Well, one reason to avoid using root's privileges is that it is "
+"very easy to do irreparable damage as root. Another reason is that you might "
+"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
+"that is a program that takes advantage of your super-user powers to "
+"compromise the security of your system behind your back. Any good book on "
+"Unix system administration will cover this topic in more detail &mdash; "
+"consider reading one if it is new to you."
+msgstr ""
+"为什么呢？避免使用 root 特权帐户的一个原因是，它很容易对系统造成无法挽回的破"
+"坏。另一个原因是，您有可能被恶意诱使运行<emphasis>特洛伊木马</emphasis>程序 "
+"&mdash; 这是一种利用超级用户权限在您未知的情况下损害系统安全的程序。任何合格"
+"的 Unix 系统管理书籍中都会涉及到这一主题 &mdash; 如果您不是很了解这方面的内"
+"容，建议找一本进行学习。"
+
+#. Tag: para
+#: using-d-i.xml:967
+#, no-c-format
+msgid ""
+"You will first be prompted for the user's full name. Then you'll be asked "
+"for a name for the user account; generally your first name or something "
+"similar will suffice and indeed will be the default. Finally, you will be "
+"prompted for a password for this account."
+msgstr ""
+"您首先会被要求输入用户的全名。然后要求输入用户帐号名；通常您的名字或者类似的"
+"便满足要求，并为缺省值。最后，您将要求输入该帐号的密码。"
+
+#. Tag: para
+#: using-d-i.xml:974
+#, no-c-format
+msgid ""
+"If at any point after installation you would like to create another account, "
+"use the <command>adduser</command> command."
+msgstr ""
+"如果在安装完毕后还希望建立其它新帐户，请使用 <command>adduser</command> 命"
+"令。"
+
+#. Tag: title
+#: using-d-i.xml:985
+#, no-c-format
 msgid "Partitioning and Mount Point Selection"
 msgstr "分区与选择挂载点"
 
 #. Tag: para
-#: using-d-i.xml:902
+#: using-d-i.xml:986
 #, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1323,7 +1417,7 @@ msgstr ""
 "排挂载点，还可以选择为 RAID、LVM 或加密设备这组选项进行配置。"
 
 #. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:1007
 #, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
@@ -1333,7 +1427,7 @@ msgstr ""
 "\"partitioning\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:929
+#: using-d-i.xml:1013
 #, no-c-format
 msgid ""
 "If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1353,7 +1447,7 @@ msgstr ""
 "</screen></informalexample> 注意，这会是磁盘上已有的数据无法访问。"
 
 #. Tag: para
-#: using-d-i.xml:942
+#: using-d-i.xml:1026
 #, no-c-format
 msgid ""
 "First you will be given the opportunity to automatically partition either an "
@@ -1366,13 +1460,13 @@ msgstr ""
 "<guimenuitem>Manual</guimenuitem> 手动分区。"
 
 #. Tag: title
-#: using-d-i.xml:952
+#: using-d-i.xml:1036
 #, no-c-format
 msgid "Supported partitioning options"
 msgstr "支持的分区选项"
 
 #. Tag: para
-#: using-d-i.xml:953
+#: using-d-i.xml:1037
 #, no-c-format
 msgid ""
 "The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1383,7 +1477,7 @@ msgstr ""
 "块设备创建多种分区方案。"
 
 #. Tag: para
-#: using-d-i.xml:959
+#: using-d-i.xml:1043
 #, no-c-format
 msgid ""
 "Exactly which options are available depends mainly on the architecture, but "
@@ -1400,7 +1494,7 @@ msgstr ""
 "装下改变；高优先级下会采用默认值。"
 
 #. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:1054
 #, no-c-format
 msgid ""
 "The installer supports various forms of advanced partitioning and use of "
@@ -1408,31 +1502,31 @@ msgid ""
 msgstr "安装程序支持多种高级分区和存储设备，很多情况下可以组合使用。"
 
 #. Tag: emphasis
-#: using-d-i.xml:977
+#: using-d-i.xml:1061
 #, no-c-format
 msgid "Logical Volume Management (LVM)"
 msgstr "逻辑卷管理(LVM)"
 
 #. Tag: emphasis
-#: using-d-i.xml:980
+#: using-d-i.xml:1064
 #, no-c-format
 msgid "Software RAID"
 msgstr "Software RAID"
 
 #. Tag: para
-#: using-d-i.xml:981
+#: using-d-i.xml:1065
 #, no-c-format
 msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
 msgstr "支持 RAID levels 0, 1, 4, 5, 6 和 10。"
 
 #. Tag: emphasis
-#: using-d-i.xml:985
+#: using-d-i.xml:1069
 #, no-c-format
 msgid "Encryption"
 msgstr "加密"
 
 #. Tag: para
-#: using-d-i.xml:987
+#: using-d-i.xml:1071
 #, no-c-format
 msgid ""
 "<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1440,7 +1534,7 @@ msgstr ""
 "<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
 
 #. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1073
 #, no-c-format
 msgid ""
 "Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1453,13 +1547,13 @@ msgstr ""
 "sataraid;\">我们的 Wiki</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:995
+#: using-d-i.xml:1079
 #, no-c-format
 msgid "<emphasis>Multipath</emphasis> (experimental)"
 msgstr "<emphasis>Multipath</emphasis> (experimental)"
 
 #. Tag: para
-#: using-d-i.xml:997
+#: using-d-i.xml:1081
 #, no-c-format
 msgid ""
 "See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1470,13 +1564,13 @@ msgstr ""
 "于 multipath 只在安装程序启动时打开才支持。"
 
 #. Tag: para
-#: using-d-i.xml:1004
+#: using-d-i.xml:1088
 #, no-c-format
 msgid "The following file systems are supported."
 msgstr "支持下列的文件系统。"
 
 #. Tag: para
-#: using-d-i.xml:1009
+#: using-d-i.xml:1093
 #, no-c-format
 msgid ""
 "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1488,7 +1582,7 @@ msgstr ""
 "emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1014
+#: using-d-i.xml:1098
 #, no-c-format
 msgid ""
 "The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1499,26 +1593,26 @@ msgstr ""
 "filename> 分区选择 ext2 作为默认值。"
 
 #. Tag: para
-#: using-d-i.xml:1019
+#: using-d-i.xml:1103
 #, no-c-format
 msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
-#: using-d-i.xml:1022
+#: using-d-i.xml:1106
 #, no-c-format
 msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
 msgstr "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
 
 #. Tag: para
-#: using-d-i.xml:1025
+#: using-d-i.xml:1109
 #, no-c-format
 msgid ""
 "<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
 msgstr "<emphasis>reiserfs</emphasis> (选项；并不是所有架构都支持)"
 
 #. Tag: para
-#: using-d-i.xml:1027
+#: using-d-i.xml:1111
 #, no-c-format
 msgid ""
 "Support for the Reiser file system is no longer available by default. When "
@@ -1531,13 +1625,13 @@ msgstr ""
 "版本 3。"
 
 #. Tag: emphasis
-#: using-d-i.xml:1034
+#: using-d-i.xml:1118
 #, no-c-format
 msgid "jffs2"
 msgstr "jffs2"
 
 #. Tag: para
-#: using-d-i.xml:1035
+#: using-d-i.xml:1119
 #, no-c-format
 msgid ""
 "Used on some systems to read flash memory. It is not possible to create new "
@@ -1545,13 +1639,13 @@ msgid ""
 msgstr "在一些系统上用于读取闪存。不可以创建新的 jffs2 分区。"
 
 #. Tag: emphasis
-#: using-d-i.xml:1040
+#: using-d-i.xml:1124
 #, no-c-format
 msgid "qnx4"
 msgstr "qnx4"
 
 #. Tag: para
-#: using-d-i.xml:1041
+#: using-d-i.xml:1125
 #, no-c-format
 msgid ""
 "Existing partitions will be recognized and it is possible to assign mount "
@@ -1559,19 +1653,19 @@ msgid ""
 msgstr "识别已存在的分区并挂载它们。不可以创建新的 qnx4 分区。"
 
 #. Tag: para
-#: using-d-i.xml:1045
+#: using-d-i.xml:1129
 #, no-c-format
 msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
 
 #. Tag: para
-#: using-d-i.xml:1048
+#: using-d-i.xml:1132
 #, no-c-format
 msgid "<emphasis>NTFS</emphasis> (read-only)"
 msgstr "<emphasis>NTFS</emphasis> (只读)"
 
 #. Tag: para
-#: using-d-i.xml:1050
+#: using-d-i.xml:1134
 #, no-c-format
 msgid ""
 "Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1579,13 +1673,13 @@ msgid ""
 msgstr "已存在的 NTFS 分区可以调整大小，并挂载它们。不能创建新的 NTFS 分区。"
 
 #. Tag: title
-#: using-d-i.xml:1060
+#: using-d-i.xml:1144
 #, no-c-format
 msgid "Guided Partitioning"
 msgstr "导引式分区"
 
 #. Tag: para
-#: using-d-i.xml:1061
+#: using-d-i.xml:1145
 #, no-c-format
 msgid ""
 "If you choose guided partitioning, you may have three options: to create "
@@ -1601,14 +1695,14 @@ msgstr ""
 "footnote>"
 
 #. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1160
 #, no-c-format
 msgid ""
 "The option to use (encrypted) LVM may not be available on all architectures."
 msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
 
 #. Tag: para
-#: using-d-i.xml:1081
+#: using-d-i.xml:1165
 #, no-c-format
 msgid ""
 "When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1622,7 +1716,7 @@ msgstr ""
 "大分区将无法读取，对您的(私有)数据提供了额外的安全性。"
 
 #. Tag: para
-#: using-d-i.xml:1090
+#: using-d-i.xml:1174
 #, no-c-format
 msgid ""
 "When using encrypted LVM, the installer will also automatically erase the "
@@ -1636,7 +1730,7 @@ msgstr ""
 "时间。"
 
 #. Tag: para
-#: using-d-i.xml:1099
+#: using-d-i.xml:1183
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1651,7 +1745,7 @@ msgstr ""
 "安装程序会在写入磁盘之前让您确认。"
 
 #. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1193
 #, no-c-format
 msgid ""
 "If you choose guided partitioning (either classic or using (encrypted) LVM) "
@@ -1666,7 +1760,7 @@ msgstr ""
 "的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
 
 #. Tag: para
-#: using-d-i.xml:1118
+#: using-d-i.xml:1202
 #, no-c-format
 msgid ""
 "Any data on the disk you select will eventually be lost, but you will always "
@@ -1680,7 +1774,7 @@ msgstr ""
 "销。"
 
 #. Tag: para
-#: using-d-i.xml:1126
+#: using-d-i.xml:1210
 #, no-c-format
 msgid ""
 "Next, you will be able to choose from the schemes listed in the table below. "
@@ -1696,73 +1790,73 @@ msgstr ""
 "1GB 以上的空间(具体大小视所选的方式而不同)，那么导引式分区将以失败告终。"
 
 #. Tag: entry
-#: using-d-i.xml:1142
+#: using-d-i.xml:1226
 #, no-c-format
 msgid "Partitioning scheme"
 msgstr "分区方式"
 
 #. Tag: entry
-#: using-d-i.xml:1143
+#: using-d-i.xml:1227
 #, no-c-format
 msgid "Minimum space"
 msgstr "所需最小空间"
 
 #. Tag: entry
-#: using-d-i.xml:1144
+#: using-d-i.xml:1228
 #, no-c-format
 msgid "Created partitions"
 msgstr "所新建的分区"
 
 #. Tag: entry
-#: using-d-i.xml:1150
+#: using-d-i.xml:1234
 #, no-c-format
 msgid "All files in one partition"
 msgstr "所有文件在同一分区"
 
 #. Tag: entry
-#: using-d-i.xml:1151
+#: using-d-i.xml:1235
 #, no-c-format
 msgid "600MB"
 msgstr "600MB"
 
 #. Tag: entry
-#: using-d-i.xml:1152
+#: using-d-i.xml:1236
 #, no-c-format
 msgid "<filename>/</filename>, swap"
 msgstr "<filename>/</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1154
+#: using-d-i.xml:1238
 #, no-c-format
 msgid "Separate /home partition"
 msgstr "建立 /home 分区"
 
 #. Tag: entry
-#: using-d-i.xml:1155
+#: using-d-i.xml:1239
 #, no-c-format
 msgid "500MB"
 msgstr "500MB"
 
 #. Tag: entry
-#: using-d-i.xml:1156
+#: using-d-i.xml:1240
 #, no-c-format
 msgid "<filename>/</filename>, <filename>/home</filename>, swap"
 msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
-#: using-d-i.xml:1160
+#: using-d-i.xml:1244
 #, no-c-format
 msgid "Separate /home, /usr, /var and /tmp partitions"
 msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
 
 #. Tag: entry
-#: using-d-i.xml:1161
+#: using-d-i.xml:1245
 #, no-c-format
 msgid "<entry>1GB</entry>"
 msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1162
+#: using-d-i.xml:1246
 #, no-c-format
 msgid ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1772,7 +1866,7 @@ msgstr ""
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 
 #. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1255
 #, no-c-format
 msgid ""
 "If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1784,7 +1878,7 @@ msgstr ""
 "boot</filename> 分区。其他的分区，除了交换分区，都会建在 LVM 分区之内。"
 
 #. Tag: para
-#: using-d-i.xml:1177
+#: using-d-i.xml:1261
 #, no-c-format
 msgid ""
 "If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1797,7 +1891,7 @@ msgstr ""
 "手动把某个分区作为 EFI 引导分区。"
 
 #. Tag: para
-#: using-d-i.xml:1185
+#: using-d-i.xml:1269
 #, no-c-format
 msgid ""
 "After selecting a scheme, the next screen will show your new partition "
@@ -1808,7 +1902,7 @@ msgstr ""
 "区是否将被格式化，将以何种方式格式化，以及它们将被挂载到哪里的相关信息。"
 
 #. Tag: para
-#: using-d-i.xml:1191
+#: using-d-i.xml:1275
 #, no-c-format
 msgid ""
 "The list of partitions might look like this: <informalexample><screen>\n"
@@ -1856,7 +1950,7 @@ msgstr ""
 "置，但使用手动方式分区的结果会有所不同。"
 
 #. Tag: para
-#: using-d-i.xml:1204
+#: using-d-i.xml:1288
 #, no-c-format
 msgid ""
 "This concludes the guided partitioning. If you are satisfied with the "
@@ -1874,30 +1968,28 @@ msgstr ""
 "后再次运行导引式分区，或者按照下面的介绍进行手动分区。"
 
 #. Tag: title
-#: using-d-i.xml:1218
+#: using-d-i.xml:1302
 #, no-c-format
 msgid "Manual Partitioning"
 msgstr "手动分区"
 
 #. Tag: para
-#: using-d-i.xml:1219
+#: using-d-i.xml:1303
 #, no-c-format
-#| msgid ""
-#| "A similar screen to the one shown just above will be displayed if you "
-#| "choose manual partitioning except that your existing partition table will "
-#| "be shown and without the mount points. How to manually set up your "
-#| "partition table and the usage of partitions by your new Debian system "
-#| "will be covered in the remainder of this section."
 msgid ""
 "A similar screen to the one shown just above will be displayed if you choose "
 "manual partitioning except that your existing partition table will be shown "
 "and without the mount points. How to manually set up your partition table "
 "and the usage of partitions by your new &debian; system will be covered in "
 "the remainder of this section."
-msgstr "如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动设置您的分区表，以及新安装的 &debian; 系统将如何使用这些分区，将会在本节的后面谈到。"
+msgstr ""
+"如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在"
+"于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动"
+"设置您的分区表，以及新安装的 &debian; 系统将如何使用这些分区，将会在本节的后"
+"面谈到。"
 
 #. Tag: para
-#: using-d-i.xml:1227
+#: using-d-i.xml:1311
 #, no-c-format
 msgid ""
 "If you select a pristine disk which has neither partitions nor free space on "
@@ -1910,7 +2002,7 @@ msgstr ""
 "的磁盘条目下出现一个新行，上面写着 <quote>FREE SPACE</quote>。"
 
 #. Tag: para
-#: using-d-i.xml:1235
+#: using-d-i.xml:1319
 #, no-c-format
 msgid ""
 "If you select some free space, you will have the opportunity to create a new "
@@ -1945,7 +2037,7 @@ msgstr ""
 "动退回到 <command>partman</command> 的主界面。"
 
 #. Tag: para
-#: using-d-i.xml:1257
+#: using-d-i.xml:1341
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -1964,7 +2056,7 @@ msgstr ""
 "这个菜单中，您还可以删除分区。"
 
 #. Tag: para
-#: using-d-i.xml:1268
+#: using-d-i.xml:1352
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -1979,7 +2071,7 @@ msgstr ""
 "面的步骤，直到您纠正了这个错误。"
 
 #. Tag: para
-#: using-d-i.xml:1276
+#: using-d-i.xml:1360
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -1990,7 +2082,7 @@ msgstr ""
 "点，不让您继续操作，直到您划分出这样一个分区。"
 
 #. Tag: para
-#: using-d-i.xml:1282
+#: using-d-i.xml:1366
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -2006,7 +2098,7 @@ msgstr ""
 "filename> 或者 <filename>partman-lvm</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1290
+#: using-d-i.xml:1374
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2020,13 +2112,13 @@ msgstr ""
 "此分区。"
 
 #. Tag: title
-#: using-d-i.xml:1318
+#: using-d-i.xml:1402
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "配置多磁盘设备(软 RAID)"
 
 #. Tag: para
-#: using-d-i.xml:1319
+#: using-d-i.xml:1403
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2044,7 +2136,7 @@ msgstr ""
 "<firstterm>软 RAID</firstterm>)。"
 
 #. Tag: para
-#: using-d-i.xml:1332
+#: using-d-i.xml:1416
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -2057,7 +2149,7 @@ msgstr ""
 "command> 格式化，分配挂载点，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:1340
+#: using-d-i.xml:1424
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -2149,101 +2241,101 @@ msgstr ""
 "listitem> </varlistentry></variablelist> 总结："
 
 #. Tag: entry
-#: using-d-i.xml:1454
+#: using-d-i.xml:1538
 #, no-c-format
 msgid "Type"
 msgstr "类型"
 
 #. Tag: entry
-#: using-d-i.xml:1455
+#: using-d-i.xml:1539
 #, no-c-format
 msgid "Minimum Devices"
 msgstr "最少设备"
 
 #. Tag: entry
-#: using-d-i.xml:1456
+#: using-d-i.xml:1540
 #, no-c-format
 msgid "Spare Device"
 msgstr "备用设备"
 
 #. Tag: entry
-#: using-d-i.xml:1457
+#: using-d-i.xml:1541
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr "幸免于磁盘损坏？"
 
 #. Tag: entry
-#: using-d-i.xml:1458
+#: using-d-i.xml:1542
 #, no-c-format
 msgid "Available Space"
 msgstr "可用空间"
 
 #. Tag: entry
-#: using-d-i.xml:1464
+#: using-d-i.xml:1548
 #, no-c-format
 msgid "RAID0"
 msgstr "RAID0"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1465 using-d-i.xml:1473 using-d-i.xml:1503
+#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr "<entry>2</entry>"
 
 # index.docbook:1106, index.docbook:1107
 #. Tag: entry
-#: using-d-i.xml:1466 using-d-i.xml:1467
+#: using-d-i.xml:1550 using-d-i.xml:1551
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr "<entry>否</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1468
+#: using-d-i.xml:1552
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr "容量为最小分区乘以 RAID 设备数"
 
 #. Tag: entry
-#: using-d-i.xml:1472
+#: using-d-i.xml:1556
 #, no-c-format
 msgid "RAID1"
 msgstr "RAID1"
 
 # index.docbook:1114, index.docbook:1122
 #. Tag: entry
-#: using-d-i.xml:1474 using-d-i.xml:1482 using-d-i.xml:1493 using-d-i.xml:1504
+#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
 #, no-c-format
 msgid "optional"
 msgstr "可选"
 
 # index.docbook:1115, index.docbook:1123
 #. Tag: entry
-#: using-d-i.xml:1475 using-d-i.xml:1483 using-d-i.xml:1494 using-d-i.xml:1505
+#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>是</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1476
+#: using-d-i.xml:1560
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr "容量为 RAID 最小分区"
 
 #. Tag: entry
-#: using-d-i.xml:1480
+#: using-d-i.xml:1564
 #, no-c-format
 msgid "RAID5"
 msgstr "RAID5"
 
 #. Tag: entry
-#: using-d-i.xml:1481
+#: using-d-i.xml:1565
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr "<entry>3</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1484
+#: using-d-i.xml:1568
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2251,20 +2343,20 @@ msgid ""
 msgstr "容量为最小分区乘以(RAID 设备数量减一)"
 
 #. Tag: entry
-#: using-d-i.xml:1491
+#: using-d-i.xml:1575
 #, no-c-format
 msgid "RAID6"
 msgstr "RAID6"
 
 # index.docbook:1105, index.docbook:1113
 #. Tag: entry
-#: using-d-i.xml:1492
+#: using-d-i.xml:1576
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr "<entry>4</entry>"
 
 #. Tag: entry
-#: using-d-i.xml:1495
+#: using-d-i.xml:1579
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2272,13 +2364,13 @@ msgid ""
 msgstr "容量为最小分区乘以(RAID 设备数量减二)"
 
 #. Tag: entry
-#: using-d-i.xml:1502
+#: using-d-i.xml:1586
 #, no-c-format
 msgid "RAID10"
 msgstr "RAID10"
 
 #. Tag: entry
-#: using-d-i.xml:1506
+#: using-d-i.xml:1590
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2286,7 +2378,7 @@ msgid ""
 msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
 
 #. Tag: para
-#: using-d-i.xml:1513
+#: using-d-i.xml:1597
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2296,7 +2388,7 @@ msgstr ""
 "\">Software RAID HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1518
+#: using-d-i.xml:1602
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2311,7 +2403,7 @@ msgstr ""
 "volume for RAID</guimenuitem> </menuchoice>。)"
 
 #. Tag: para
-#: using-d-i.xml:1527
+#: using-d-i.xml:1611
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2329,7 +2421,7 @@ msgstr ""
 "<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
 
 #. Tag: para
-#: using-d-i.xml:1539
+#: using-d-i.xml:1623
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2344,7 +2436,7 @@ msgstr ""
 "验的用户，从 shell 手动地处理一些配置和安装步骤，也许会绕开这些问题。"
 
 #. Tag: para
-#: using-d-i.xml:1548
+#: using-d-i.xml:1632
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2364,7 +2456,7 @@ msgstr ""
 "RAID1)。后续操作会根据您选择的 MD 类型而定。"
 
 #. Tag: para
-#: using-d-i.xml:1561
+#: using-d-i.xml:1645
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2375,7 +2467,7 @@ msgstr ""
 "组成 MD 的分区。"
 
 #. Tag: para
-#: using-d-i.xml:1568
+#: using-d-i.xml:1652
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2392,7 +2484,7 @@ msgstr ""
 "将不会允许您继续下去，直到纠正错误。"
 
 #. Tag: para
-#: using-d-i.xml:1580
+#: using-d-i.xml:1664
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2402,7 +2494,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: using-d-i.xml:1586
+#: using-d-i.xml:1670
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2412,7 +2504,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: using-d-i.xml:1592
+#: using-d-i.xml:1676
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2430,7 +2522,7 @@ msgstr ""
 "贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
 
 #. Tag: para
-#: using-d-i.xml:1606
+#: using-d-i.xml:1690
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2446,7 +2538,7 @@ msgstr ""
 "RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
 
 #. Tag: para
-#: using-d-i.xml:1615
+#: using-d-i.xml:1699
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2459,13 +2551,13 @@ msgstr ""
 "您的新 MD 设备，并分配挂载点这样的属性。"
 
 #. Tag: title
-#: using-d-i.xml:1630
+#: using-d-i.xml:1714
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr "配置逻辑卷管理(LVM)"
 
 #. Tag: para
-#: using-d-i.xml:1631
+#: using-d-i.xml:1715
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2479,7 +2571,7 @@ msgstr ""
 "或符号链接等方法来折腾。"
 
 #. Tag: para
-#: using-d-i.xml:1639
+#: using-d-i.xml:1723
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2497,7 +2589,7 @@ msgstr ""
 "点在于它可以跨越多个物理磁盘。"
 
 #. Tag: para
-#: using-d-i.xml:1649
+#: using-d-i.xml:1733
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2515,7 +2607,7 @@ msgstr ""
 "阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:1660
+#: using-d-i.xml:1744
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2530,7 +2622,7 @@ msgstr ""
 "<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
 
 #. Tag: para
-#: using-d-i.xml:1669
+#: using-d-i.xml:1753
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2547,7 +2639,7 @@ msgstr ""
 "了 LVM 配置的小结。菜单项本身是与内容相关，只显示可用的操作。可能的操作有："
 
 #. Tag: para
-#: using-d-i.xml:1680
+#: using-d-i.xml:1764
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2557,43 +2649,43 @@ msgstr ""
 "名称和逻辑卷尺寸等"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1685
+#: using-d-i.xml:1769
 #, no-c-format
 msgid "Create volume group"
 msgstr "Create volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1688
+#: using-d-i.xml:1772
 #, no-c-format
 msgid "Create logical volume"
 msgstr "Create logical volume"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1691
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Delete volume group"
 msgstr "Delete volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1694
+#: using-d-i.xml:1778
 #, no-c-format
 msgid "Delete logical volume"
 msgstr "Delete logical volume"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1697
+#: using-d-i.xml:1781
 #, no-c-format
 msgid "Extend volume group"
 msgstr "Extend volume group"
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1700
+#: using-d-i.xml:1784
 #, no-c-format
 msgid "Reduce volume group"
 msgstr "Reduce volume group"
 
 #. Tag: para
-#: using-d-i.xml:1702
+#: using-d-i.xml:1786
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2602,7 +2694,7 @@ msgstr ""
 "<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
 
 #. Tag: para
-#: using-d-i.xml:1708
+#: using-d-i.xml:1792
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2610,7 +2702,7 @@ msgid ""
 msgstr "使用该菜单内的选项首先创建卷组，然后在里面创建逻辑卷。"
 
 #. Tag: para
-#: using-d-i.xml:1713
+#: using-d-i.xml:1797
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2621,13 +2713,13 @@ msgstr ""
 "通的分区一样(您也应该这样对待它们)。"
 
 #. Tag: title
-#: using-d-i.xml:1727
+#: using-d-i.xml:1811
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr "配置加密卷"
 
 #. Tag: para
-#: using-d-i.xml:1728
+#: using-d-i.xml:1812
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2645,7 +2737,7 @@ msgstr ""
 "许可以访问硬盘，但是没有正确的口令，硬盘上的数据看起来就像是随机的字符。"
 
 #. Tag: para
-#: using-d-i.xml:1740
+#: using-d-i.xml:1824
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2668,7 +2760,7 @@ msgstr ""
 "加载内核。"
 
 #. Tag: para
-#: using-d-i.xml:1755
+#: using-d-i.xml:1839
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2680,7 +2772,7 @@ msgstr ""
 "密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
 
 #. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1846
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2698,7 +2790,7 @@ msgstr ""
 "guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
 
 #. Tag: para
-#: using-d-i.xml:1773
+#: using-d-i.xml:1857
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2713,7 +2805,7 @@ msgstr ""
 "使用默认的方法。"
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1869
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2726,13 +2818,13 @@ msgstr ""
 "的安全考虑的选择。"
 
 #. Tag: term
-#: using-d-i.xml:1795
+#: using-d-i.xml:1879
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr "Encryption: <userinput>aes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1881
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2755,13 +2847,13 @@ msgstr ""
 "纪的敏感信息。"
 
 #. Tag: term
-#: using-d-i.xml:1815
+#: using-d-i.xml:1899
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr "Key size: <userinput>256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1817
+#: using-d-i.xml:1901
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2773,13 +2865,13 @@ msgstr ""
 "加长度自然会降低性能。cipher 决定可用的密钥长度。"
 
 #. Tag: term
-#: using-d-i.xml:1829
+#: using-d-i.xml:1913
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1915
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2795,7 +2887,7 @@ msgstr ""
 "复模板推断信息。"
 
 #. Tag: para
-#: using-d-i.xml:1841
+#: using-d-i.xml:1925
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2808,25 +2900,25 @@ msgstr ""
 "法时，才使用其他的算法。"
 
 #. Tag: term
-#: using-d-i.xml:1853
+#: using-d-i.xml:1937
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr "Encryption key: <userinput>Passphrase</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1855
+#: using-d-i.xml:1939
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr "这里您可以为分区选择所使用的加密密钥类型。"
 
 #. Tag: term
-#: using-d-i.xml:1861
+#: using-d-i.xml:1945
 #, no-c-format
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #. Tag: para
-#: using-d-i.xml:1862
+#: using-d-i.xml:1946
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2839,13 +2931,13 @@ msgstr ""
 "使用时要求输入。"
 
 #. Tag: term
-#: using-d-i.xml:1877 using-d-i.xml:1970
+#: using-d-i.xml:1961 using-d-i.xml:2054
 #, no-c-format
 msgid "Random key"
 msgstr "Random key"
 
 #. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -2860,7 +2952,7 @@ msgstr ""
 "面临暴力破解，但是除非加密算法中有未知的弱点，这辈子也不会被攻破。)"
 
 #. Tag: para
-#: using-d-i.xml:1887
+#: using-d-i.xml:1971
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -2877,13 +2969,13 @@ msgstr ""
 "写入到交换分区的数据。"
 
 #. Tag: term
-#: using-d-i.xml:1906 using-d-i.xml:1983
+#: using-d-i.xml:1990 using-d-i.xml:2067
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr "Erase data: <userinput>yes</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1992
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -2901,7 +2993,7 @@ msgstr ""
 "备上的数据。</para></footnote>。"
 
 #. Tag: para
-#: using-d-i.xml:1928
+#: using-d-i.xml:2012
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -2913,13 +3005,13 @@ msgstr ""
 "下面内容："
 
 #. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:2021
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr "Encryption: <userinput>AES256</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -2930,25 +3022,25 @@ msgstr ""
 "时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
 
 #. Tag: term
-#: using-d-i.xml:1949
+#: using-d-i.xml:2033
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 
 #. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:2035
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr "这里您可以为分区选择加密密钥的类型。"
 
 #. Tag: term
-#: using-d-i.xml:1957
+#: using-d-i.xml:2041
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr "Keyfile (GnuPG)"
 
 #. Tag: para
-#: using-d-i.xml:1958
+#: using-d-i.xml:2042
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -2960,19 +3052,19 @@ msgstr ""
 "application> 加密。要使用它，您需要输入正确的 passphrase (在以后会要求提供)。"
 
 #. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2055
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr "请查阅前面有关随机密钥的章节。"
 
 #. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2069
 #, no-c-format
 msgid "Please see the the section on erasing data above."
 msgstr "请查阅前面有关删除数据的章节。"
 
 #. Tag: para
-#: using-d-i.xml:1994
+#: using-d-i.xml:2078
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -2987,7 +3079,7 @@ msgstr ""
 "标记分区上的数据，以及写新分区表等动作。对于大的分区，这会花一些时间。"
 
 #. Tag: para
-#: using-d-i.xml:2004
+#: using-d-i.xml:2088
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -3001,7 +3093,7 @@ msgstr ""
 "(比如生日、爱好、宠物的名字、以及家里其他成员的名字，等等)。"
 
 #. Tag: para
-#: using-d-i.xml:2013
+#: using-d-i.xml:2097
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -3021,7 +3113,7 @@ msgstr ""
 "所选择的键盘布局未能正确建立，而且是在为根文件系统输入 passphrase 的时候。"
 
 #. Tag: para
-#: using-d-i.xml:2026
+#: using-d-i.xml:2110
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -3040,7 +3132,7 @@ msgstr ""
 "程在每个要加密的分区重复进行。"
 
 #. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2126
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -3071,7 +3163,7 @@ msgstr ""
 "您不合适，可以进行修改。"
 
 #. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3087,7 +3179,7 @@ msgstr ""
 "面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
 
 #. Tag: para
-#: using-d-i.xml:2065
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -3095,13 +3187,13 @@ msgid ""
 msgstr "当您满意分区之后，可以继续安装过程。"
 
 #. Tag: title
-#: using-d-i.xml:2076
+#: using-d-i.xml:2160
 #, no-c-format
 msgid "Installing the Base System"
 msgstr "安装基本系统"
 
 #. Tag: para
-#: using-d-i.xml:2077
+#: using-d-i.xml:2161
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -3113,7 +3205,7 @@ msgstr ""
 "果您用较慢的计算机或网络，这要花费好一会儿时间。"
 
 #. Tag: para
-#: using-d-i.xml:2090
+#: using-d-i.xml:2174
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -3128,7 +3220,7 @@ msgstr ""
 "Alt</keycap><keycap>F1</keycap></keycombo>。"
 
 #. Tag: para
-#: using-d-i.xml:2099
+#: using-d-i.xml:2183
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -3139,7 +3231,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2105
+#: using-d-i.xml:2189
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3152,7 +3244,7 @@ msgstr ""
 "核。"
 
 #. Tag: para
-#: using-d-i.xml:2112
+#: using-d-i.xml:2196
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -3167,7 +3259,7 @@ msgstr ""
 "看，正常情况下应该安装这些软件。"
 
 #. Tag: para
-#: using-d-i.xml:2122
+#: using-d-i.xml:2206
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -3179,125 +3271,6 @@ msgstr ""
 "</quote>。上面提到的原则只适用于之后的安装过程。"
 
 #. Tag: title
-#: using-d-i.xml:2134
-#, no-c-format
-msgid "Setting Up Users And Passwords"
-msgstr "设置用户和密码"
-
-#. Tag: para
-#: using-d-i.xml:2135
-#, no-c-format
-msgid ""
-"After the base system has been installed, the installer will allow you to "
-"set up the <quote>root</quote> account and/or an account for the first user. "
-"Other user accounts can be created after the installation has been completed."
-msgstr ""
-"系统安装之后，安装程序要求您创建 <quote>root</quote> 帐号和/或第一个用户帐"
-"号。其他的用户帐号可以在安装完成之后创建。"
-
-#. Tag: title
-#: using-d-i.xml:2149
-#, no-c-format
-msgid "Set the Root Password"
-msgstr "设置 root 密码"
-
-#. Tag: para
-#: using-d-i.xml:2153
-#, no-c-format
-msgid ""
-"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
-"user</emphasis>; it is a login that bypasses all security protection on your "
-"system. The root account should only be used to perform system "
-"administration, and only used for as short a time as possible."
-msgstr ""
-"<emphasis>root</emphasis> 帐户也被称为<emphasis>超级用户</emphasis>；系统中的"
-"所有的安全防护措施对以该身份登录的都是无效的。root 帐户应该仅用来进行系统管"
-"理，而且使用时间应该尽可能短。"
-
-#. Tag: para
-#: using-d-i.xml:2161
-#, no-c-format
-msgid ""
-"Any password you create should contain at least 6 characters, and should "
-"contain both upper- and lower-case characters, as well as punctuation "
-"characters. Take extra care when setting your root password, since it is "
-"such a powerful account. Avoid dictionary words or use of any personal "
-"information which could be guessed."
-msgstr ""
-"您所创建的任何密码都应该包含至少 6 个字符，同时包含大小写字母，并且最好带有标"
-"点符号等特殊字符。因为超级用户具有最高权限，因此在您设置 root 密码时尤其需要"
-"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
-
-#. Tag: para
-#: using-d-i.xml:2169
-#, no-c-format
-msgid ""
-"If anyone ever tells you they need your root password, be extremely wary. "
-"You should normally never give your root password out, unless you are "
-"administering a machine with more than one system administrator."
-msgstr ""
-"如果他人向您索取您的 root 密码，也需要特别谨慎。除非您所管理的系统有多位管理"
-"员，否则通常不应该将超级用户密码交给别人。"
-
-#. Tag: title
-#: using-d-i.xml:2179
-#, no-c-format
-msgid "Create an Ordinary User"
-msgstr "创建一个普通用户"
-
-#. Tag: para
-#: using-d-i.xml:2181
-#, no-c-format
-msgid ""
-"The system will ask you whether you wish to create an ordinary user account "
-"at this point. This account should be your main personal log-in. You should "
-"<emphasis>not</emphasis> use the root account for daily use or as your "
-"personal login."
-msgstr ""
-"系统会询问您现在是否希望创建一个普通帐户。您将使用该帐户进行日常登录操作。切"
-"记，平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
-
-#. Tag: para
-#: using-d-i.xml:2190
-#, no-c-format
-msgid ""
-"Why not? Well, one reason to avoid using root's privileges is that it is "
-"very easy to do irreparable damage as root. Another reason is that you might "
-"be tricked into running a <emphasis>Trojan-horse</emphasis> program &mdash; "
-"that is a program that takes advantage of your super-user powers to "
-"compromise the security of your system behind your back. Any good book on "
-"Unix system administration will cover this topic in more detail &mdash; "
-"consider reading one if it is new to you."
-msgstr ""
-"为什么呢？避免使用 root 特权帐户的一个原因是，它很容易对系统造成无法挽回的破"
-"坏。另一个原因是，您有可能被恶意诱使运行<emphasis>特洛伊木马</emphasis>程序 "
-"&mdash; 这是一种利用超级用户权限在您未知的情况下损害系统安全的程序。任何合格"
-"的 Unix 系统管理书籍中都会涉及到这一主题 &mdash; 如果您不是很了解这方面的内"
-"容，建议找一本进行学习。"
-
-#. Tag: para
-#: using-d-i.xml:2200
-#, no-c-format
-msgid ""
-"You will first be prompted for the user's full name. Then you'll be asked "
-"for a name for the user account; generally your first name or something "
-"similar will suffice and indeed will be the default. Finally, you will be "
-"prompted for a password for this account."
-msgstr ""
-"您首先会被要求输入用户的全名。然后要求输入用户帐号名；通常您的名字或者类似的"
-"便满足要求，并为缺省值。最后，您将要求输入该帐号的密码。"
-
-#. Tag: para
-#: using-d-i.xml:2207
-#, no-c-format
-msgid ""
-"If at any point after installation you would like to create another account, "
-"use the <command>adduser</command> command."
-msgstr ""
-"如果在安装完毕后还希望建立其它新帐户，请使用 <command>adduser</command> 命"
-"令。"
-
-#. Tag: title
 #: using-d-i.xml:2218
 #, no-c-format
 msgid "Installing Additional Software"
@@ -3859,19 +3832,16 @@ msgstr "检测其他的操作系统"
 #. Tag: para
 #: using-d-i.xml:2595
 #, no-c-format
-#| msgid ""
-#| "Before a boot loader is installed, the installer will attempt to probe "
-#| "for other operating systems which are installed on the machine. If it "
-#| "finds a supported operating system, you will be informed of this during "
-#| "the boot loader installation step, and the computer will be configured to "
-#| "boot this other operating system in addition to Debian."
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
 "other operating systems which are installed on the machine. If it finds a "
 "supported operating system, you will be informed of this during the boot "
 "loader installation step, and the computer will be configured to boot this "
 "other operating system in addition to &debian;."
-msgstr "在 boot loader 安装之前，安装程序会试着侦测已经安装到计算机上的其他操作系统。如果它找到支持的操作系统，您将在启动 boot loader 安装步骤里得到提示。与 &debian; 一起，计算机也将配置为可以启动其他操作系统。"
+msgstr ""
+"在 boot loader 安装之前，安装程序会试着侦测已经安装到计算机上的其他操作系统。"
+"如果它找到支持的操作系统，您将在启动 boot loader 安装步骤里得到提示。与 "
+"&debian; 一起，计算机也将配置为可以启动其他操作系统。"
 
 #. Tag: para
 #: using-d-i.xml:2603
@@ -4014,22 +3984,19 @@ msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 #. Tag: term
 #: using-d-i.xml:2704
 #, no-c-format
-#| msgid "new Debian partition"
 msgid "new &debian; partition"
 msgstr "新 &debian; 分区"
 
 #. Tag: para
 #: using-d-i.xml:2704
 #, no-c-format
-#| msgid ""
-#| "Choose this if you want to use another boot manager. <command>LILO</"
-#| "command> will install itself at the beginning of the new Debian partition "
-#| "and it will serve as a secondary boot loader."
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
 "will install itself at the beginning of the new &debian; partition and it "
 "will serve as a secondary boot loader."
-msgstr "如果您想使用其它启动管理，选择此方式。<command>LILO</command> 将它自己安装到新 &debian; 分区的起始位置，并能作为第二 boot loader。"
+msgstr ""
+"如果您想使用其它启动管理，选择此方式。<command>LILO</command> 将它自己安装到"
+"新 &debian; 分区的起始位置，并能作为第二 boot loader。"
 
 #. Tag: term
 #: using-d-i.xml:2713
@@ -4053,19 +4020,16 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2723
 #, no-c-format
-#| msgid ""
-#| "If you can no longer boot into Windows 9x (or DOS) after this step, "
-#| "you'll need to use a Windows 9x (MS-DOS) boot disk and use the "
-#| "<userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS master "
-#| "boot record &mdash; however, this means that you'll need to use some "
-#| "other way to get back into Debian!"
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
 "need to use a Windows 9x (MS-DOS) boot disk and use the <userinput>fdisk /"
 "mbr</userinput> command to reinstall the MS-DOS master boot record &mdash; "
 "however, this means that you'll need to use some other way to get back into "
 "&debian;!"
-msgstr "如果此步之后无法启动 Windows 9x (或 DOS)，您需要使用一个 Windows 9x (MS-DOS) 启动盘，并用 <userinput>fdisk /mbr</userinput> 命令重新安装 MS-DOS 主引导记录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;！"
+msgstr ""
+"如果此步之后无法启动 Windows 9x (或 DOS)，您需要使用一个 Windows 9x (MS-DOS) "
+"启动盘，并用 <userinput>fdisk /mbr</userinput> 命令重新安装 MS-DOS 主引导记"
+"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;！"
 
 #. Tag: title
 #: using-d-i.xml:2739
@@ -4121,14 +4085,21 @@ msgstr "选择正确的分区！"
 
 #. Tag: para
 #: using-d-i.xml:2771
-#, no-c-format
-msgid ""
-"The criteria for selecting a partition is that it is FAT format filesystem "
-"with its <emphasis>boot</emphasis> flag set. &d-i; may show multiple choices "
-"depending on what it finds from scanning all of the disks of the system "
-"including EFI partitions of other system disks and EFI diagnostic "
-"partitions. Remember, <command>elilo</command> may format the partition "
-"during the installation, erasing any previous contents!"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The criteria for selecting a partition is that it is FAT format "
+#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+#| "multiple choices depending on what it finds from scanning all of the "
+#| "disks of the system including EFI partitions of other system disks and "
+#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
+#| "the partition during the installation, erasing any previous contents!"
+msgid ""
+"The criterion for selecting a partition is that it must be a FAT format "
+"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
+"multiple choices depending on what it finds from scanning all of the disks "
+"of the system including EFI partitions of other system disks and EFI "
+"diagnostic partitions. Remember, <command>elilo</command> may format the "
+"partition during the installation, erasing any previous contents!"
 msgstr ""
 "选择分区的准则是格式化为 FAT 的文件系统并有 <emphasis>boot</emphasis> 标志。"
 "&d-i; 可能会显示多个选择，这取决于被扫描的包含 EFI 分区的磁盘和 EFI 诊断分"
@@ -4193,17 +4164,15 @@ msgstr "elilo.efi"
 #. Tag: para
 #: using-d-i.xml:2821
 #, no-c-format
-#| msgid ""
-#| "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
-#| "runs to boot the system. It is the program behind the <guimenuitem>Debian "
-#| "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
-#| "command menu."
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
 "runs to boot the system. It is the program behind the <guimenuitem>&debian; "
 "GNU/Linux</guimenuitem> menu item of the <quote>EFI Boot Manager</quote> "
 "command menu."
-msgstr "这是用于启动系统的 <quote>EFI Boot Manager</quote> boot loader 程序。也是 <guimenuitem>&debian; GNU/Linux</guimenuitem> 菜单项背后的程序，位于 <quote>EFI Boot Manager</quote> 命令菜单。"
+msgstr ""
+"这是用于启动系统的 <quote>EFI Boot Manager</quote> boot loader 程序。也是 "
+"<guimenuitem>&debian; GNU/Linux</guimenuitem> 菜单项背后的程序，位于 "
+"<quote>EFI Boot Manager</quote> 命令菜单。"
 
 #. Tag: filename
 #: using-d-i.xml:2831
@@ -4214,18 +4183,15 @@ msgstr "initrd.img"
 #. Tag: para
 #: using-d-i.xml:2832
 #, no-c-format
-#| msgid ""
-#| "This is the initial root filesystem used to boot the kernel. It is a copy "
-#| "of the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
-#| "standard Debian installation it would be the file in <filename>/boot</"
-#| "filename> pointed to by the symbolic link <filename>/initrd.img</"
-#| "filename>."
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
 "the file referenced in the <filename>/etc/elilo.conf</filename>. In a "
 "standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
-msgstr "这是用于启动内核最初的文件系统。它是引用 <filename>/etc/elilo.conf</filename> 的复制文件。在标准的 &debian; 安装程序程序中他是 <filename>/boot</filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
+msgstr ""
+"这是用于启动内核最初的文件系统。它是引用 <filename>/etc/elilo.conf</"
+"filename> 的复制文件。在标准的 &debian; 安装程序程序中他是 <filename>/boot</"
+"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
 
 #. Tag: filename
 #: using-d-i.xml:2844
@@ -4253,17 +4219,15 @@ msgstr "vmlinuz"
 #. Tag: para
 #: using-d-i.xml:2856
 #, no-c-format
-#| msgid ""
-#| "This is the compressed kernel itself. It is a copy of the file referenced "
-#| "in the <filename>/etc/elilo.conf</filename>. In a standard Debian "
-#| "installation it would be the file in <filename>/boot</filename> pointed "
-#| "to by the symbolic link <filename>/vmlinuz</filename>."
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
 "the <filename>/etc/elilo.conf</filename>. In a standard &debian; "
 "installation it would be the file in <filename>/boot</filename> pointed to "
 "by the symbolic link <filename>/vmlinuz</filename>."
-msgstr "此为压缩内核本身。它是引用 <filename>/etc/elilo.conf</filename> 的复制文件。在标准的 &debian; 安装程序程序中他是 <filename>/boot</filename> 符号链接 <filename>/vmlinuz</filename> 指向的文件。"
+msgstr ""
+"此为压缩内核本身。它是引用 <filename>/etc/elilo.conf</filename> 的复制文件。"
+"在标准的 &debian; 安装程序程序中他是 <filename>/boot</filename> 符号链接 "
+"<filename>/vmlinuz</filename> 指向的文件。"
 
 #. Tag: title
 #: using-d-i.xml:2876
@@ -4512,15 +4476,13 @@ msgstr "完成安装"
 #. Tag: para
 #: using-d-i.xml:3053
 #, no-c-format
-#| msgid ""
-#| "This is the last step in the Debian installation process during which the "
-#| "installer will do any last minute tasks. It mostly consists of tidying up "
-#| "after the &d-i;."
 msgid ""
 "This is the last step in the &debian; installation process during which the "
 "installer will do any last minute tasks. It mostly consists of tidying up "
 "after the &d-i;."
-msgstr "这是在您 &debian; 安装过程的最后一步。在这最后的几分钟工作里，主要进行一些 &d-i; 之后的清理。"
+msgstr ""
+"这是在您 &debian; 安装过程的最后一步。在这最后的几分钟工作里，主要进行一些 "
+"&d-i; 之后的清理。"
 
 #. Tag: title
 #: using-d-i.xml:3066
@@ -4576,15 +4538,13 @@ msgstr "重新启动系统"
 #. Tag: para
 #: using-d-i.xml:3103
 #, no-c-format
-#| msgid ""
-#| "You will be prompted to remove the boot media (CD, floppy, etc) that you "
-#| "used to boot the installer. After that the system will be rebooted into "
-#| "your new Debian system."
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
 "used to boot the installer. After that the system will be rebooted into your "
 "new &debian; system."
-msgstr "您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 &debian; 系统。"
+msgstr ""
+"您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 "
+"&debian; 系统。"
 
 #. Tag: para
 #: using-d-i.xml:3109
@@ -4624,15 +4584,13 @@ msgstr "保存安装记录"
 #. Tag: para
 #: using-d-i.xml:3138
 #, no-c-format
-#| msgid ""
-#| "If the installation is successful, the logfiles created during the "
-#| "installation process will be automatically saved to <filename>/var/log/"
-#| "installer/</filename> on your new Debian system."
 msgid ""
 "If the installation is successful, the logfiles created during the "
 "installation process will be automatically saved to <filename>/var/log/"
 "installer/</filename> on your new &debian; system."
-msgstr "如果安装成功，安装过程中创建的记录文件，会被自动保存在您的新 &debian; 系统上的 <filename>/var/log/installer/</filename>。"
+msgstr ""
+"如果安装成功，安装过程中创建的记录文件，会被自动保存在您的新 &debian; 系统上"
+"的 <filename>/var/log/installer/</filename>。"
 
 #. Tag: para
 #: using-d-i.xml:3145
@@ -5051,19 +5009,17 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:3429
 #, no-c-format
-#| msgid ""
-#| "Tarballs containing current packages for the most common firmware are "
-#| "available from: <itemizedlist> <listitem><para> <ulink url=\"&url-"
-#| "firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
-#| "download the tarball for the correct release and unpack it to the file "
-#| "system on the medium."
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
 "firmware are available from: <itemizedlist> <listitem><para> <ulink url="
 "\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
 "download the tarball or zip file for the correct release and unpack it to "
 "the file system on the medium."
-msgstr "大多数固件的压缩包和 zip 文件可以从这里获得： <itemizedlist> <listitem><para> <ulink url=\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文件系统里面。"
+msgstr ""
+"大多数固件的压缩包和 zip 文件可以从这里获得： <itemizedlist> "
+"<listitem><para> <ulink url=\"&url-firmware-tarballs;\"></ulink> </para></"
+"listitem> </itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文"
+"件系统里面。"
 
 #. Tag: para
 #: using-d-i.xml:3443
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 2171e232f..a3fde326e 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -15,22 +15,19 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:4
 #, no-c-format
-#| msgid "Welcome to Debian"
 msgid "Welcome to &debian;"
 msgstr "欢迎使用 &debian;"
 
 #. Tag: para
 #: welcome.xml:5
 #, no-c-format
-#| msgid ""
-#| "This chapter provides an overview of the Debian Project and &debian-gnu;. "
-#| "If you already know about the Debian Project's history and the &debian-"
-#| "gnu; distribution, feel free to skip to the next chapter."
 msgid ""
 "This chapter provides an overview of the &debian; Project and &debian-gnu;. "
 "If you already know about the &debian; Project's history and the &debian-"
 "gnu; distribution, feel free to skip to the next chapter."
-msgstr "本章将简要介绍 &debian; 计划和 &debian-gnu;。如果您已经对 &debian; 计划的历史和 &debian-gnu; 发行版有一定的了解，请略过本章。"
+msgstr ""
+"本章将简要介绍 &debian; 计划和 &debian-gnu;。如果您已经对 &debian; 计划的历史"
+"和 &debian-gnu; 发行版有一定的了解，请略过本章。"
 
 #. Tag: title
 #: welcome.xml:19
@@ -345,24 +342,12 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-#| msgid "What is Debian GNU/Linux?"
 msgid "What is &debian; GNU/Linux?"
 msgstr "什么是 &debian; GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
 #, no-c-format
-#| msgid ""
-#| "The combination of Debian's philosophy and methodology and the GNU tools, "
-#| "the Linux kernel, and other important free software, form a unique "
-#| "software distribution called Debian GNU/Linux. This distribution is made "
-#| "up of a large number of software <emphasis>packages</emphasis>. Each "
-#| "package in the distribution contains executables, scripts, documentation, "
-#| "and configuration information, and has a <emphasis>maintainer</emphasis> "
-#| "who is primarily responsible for keeping the package up-to-date, tracking "
-#| "bug reports, and communicating with the upstream author(s) of the "
-#| "packaged software. Our extremely large user base, combined with our bug "
-#| "tracking system ensures that problems are found and fixed quickly."
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
@@ -374,80 +359,67 @@ msgid ""
 "communicating with the upstream author(s) of the packaged software. Our "
 "extremely large user base, combined with our bug tracking system ensures "
 "that problems are found and fixed quickly."
-msgstr "将 &debian; 哲学与方法论，GNU 工具集、Linux 内核，以及其他重要的自由软件结合在一起所构成的独特的软件发行版称为 &ebian; GNU/Linux。该发行版由大量的软件<emphasis>包</emphasis>组成。发行版中的每个软件包都包含了执行文件、脚本、文档和配置信息，并拥有一位<emphasis>维护者</emphasis>，其职责是保持软件包更新、跟踪 bug 报告，并与软件源作者保持联络。我们巨大的用户群，结合 bug 跟踪系统可以确保问题被及时发现和修复。"
+msgstr ""
+"将 &debian; 哲学与方法论，GNU 工具集、Linux 内核，以及其他重要的自由软件结合"
+"在一起所构成的独特的软件发行版称为 &ebian; GNU/Linux。该发行版由大量的软件"
+"<emphasis>包</emphasis>组成。发行版中的每个软件包都包含了执行文件、脚本、文档"
+"和配置信息，并拥有一位<emphasis>维护者</emphasis>，其职责是保持软件包更新、跟"
+"踪 bug 报告，并与软件源作者保持联络。我们巨大的用户群，结合 bug 跟踪系统可以"
+"确保问题被及时发现和修复。"
 
 #. Tag: para
 #: welcome.xml:246
 #, no-c-format
-#| msgid ""
-#| "Debian's attention to detail allows us to produce a high-quality, stable, "
-#| "and scalable distribution. Installations can be easily configured to "
-#| "serve many roles, from stripped-down firewalls to desktop scientific "
-#| "workstations to high-end network servers."
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
 "and scalable distribution. Installations can be easily configured to serve "
 "many roles, from stripped-down firewalls to desktop scientific workstations "
 "to high-end network servers."
-msgstr "&debian; 对细节的注重使我们可以生产出高质、稳定和灵活的发行版。安装程序可以方便地使之应用到各种场合，从精简的防火墙到桌面科学工作站，甚至高端网络服务器都可以轻松胜任。"
+msgstr ""
+"&debian; 对细节的注重使我们可以生产出高质、稳定和灵活的发行版。安装程序可以方"
+"便地使之应用到各种场合，从精简的防火墙到桌面科学工作站，甚至高端网络服务器都"
+"可以轻松胜任。"
 
 #. Tag: para
 #: welcome.xml:253
 #, no-c-format
-#| msgid ""
-#| "Debian is especially popular among advanced users because of its "
-#| "technical excellence and its deep commitment to the needs and "
-#| "expectations of the Linux community. Debian also introduced many features "
-#| "to Linux that are now commonplace."
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
 "excellence and its deep commitment to the needs and expectations of the "
 "Linux community. &debian; also introduced many features to Linux that are "
 "now commonplace."
-msgstr "&debian; 在高级用户中非常流行的原因在于它具有优秀的技术，而且它对 Linux 的深入贡献满足了社区的需求与期望。&debian; 为 Linux 引入的许多特性现在已经成为了非常通用的标准。"
+msgstr ""
+"&debian; 在高级用户中非常流行的原因在于它具有优秀的技术，而且它对 Linux 的深"
+"入贡献满足了社区的需求与期望。&debian; 为 Linux 引入的许多特性现在已经成为了"
+"非常通用的标准。"
 
 #. Tag: para
 #: welcome.xml:260
 #, no-c-format
-#| msgid ""
-#| "For example, Debian was the first Linux distribution to include a package "
-#| "management system for easy installation and removal of software. It was "
-#| "also the first Linux distribution that could be upgraded without "
-#| "requiring reinstallation."
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
 "management system for easy installation and removal of software. It was also "
 "the first Linux distribution that could be upgraded without requiring "
 "reinstallation."
-msgstr "例如，&debian; 是第一种使用包管理系统的 Linux 发行版，它让安装和删除软件变得非常容易。而且它还是第一个可以不用重新安装就能升级的 Linux 发行版。"
+msgstr ""
+"例如，&debian; 是第一种使用包管理系统的 Linux 发行版，它让安装和删除软件变得"
+"非常容易。而且它还是第一个可以不用重新安装就能升级的 Linux 发行版。"
 
 #. Tag: para
 #: welcome.xml:267
 #, no-c-format
-#| msgid ""
-#| "Debian continues to be a leader in Linux development. Its development "
-#| "process is an example of just how well the Open Source development model "
-#| "can work &mdash; even for very complex tasks such as building and "
-#| "maintaining a complete operating system."
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
 "process is an example of just how well the Open Source development model can "
 "work &mdash; even for very complex tasks such as building and maintaining a "
 "complete operating system."
-msgstr "&debian; 一直充当着 Linux 开发的带头人。它的开发过程是开源开发模式如何工作的范例 &mdash; 即使是用于创建和维护一个完整操作系统这样复杂的任务。"
+msgstr ""
+"&debian; 一直充当着 Linux 开发的带头人。它的开发过程是开源开发模式如何工作的"
+"范例 &mdash; 即使是用于创建和维护一个完整操作系统这样复杂的任务。"
 
 #. Tag: para
 #: welcome.xml:274
 #, no-c-format
-#| msgid ""
-#| "The feature that most distinguishes Debian from other Linux distributions "
-#| "is its package management system. These tools give the administrator of a "
-#| "Debian system complete control over the packages installed on that "
-#| "system, including the ability to install a single package or "
-#| "automatically update the entire operating system. Individual packages can "
-#| "also be protected from being updated. You can even tell the package "
-#| "management system about software you have compiled yourself and what "
-#| "dependencies it fulfills."
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
 "is its package management system. These tools give the administrator of a "
@@ -456,19 +428,15 @@ msgid ""
 "the entire operating system. Individual packages can also be protected from "
 "being updated. You can even tell the package management system about "
 "software you have compiled yourself and what dependencies it fulfills."
-msgstr "&debian; 与其他 Linux 发行版最大的不同之处在于包管理系统的特性。这些工具给予 &debian; 系统管理员对安装到系统上的软件包的完全控制，包括安装单个软件包和自动升级整个操作系统。个别软件包也可以被保护不被升级。您甚至可以告诉包管理系统哪些软件是您自己编译的以及它们所需要的依赖关系。"
+msgstr ""
+"&debian; 与其他 Linux 发行版最大的不同之处在于包管理系统的特性。这些工具给予 "
+"&debian; 系统管理员对安装到系统上的软件包的完全控制，包括安装单个软件包和自动"
+"升级整个操作系统。个别软件包也可以被保护不被升级。您甚至可以告诉包管理系统哪"
+"些软件是您自己编译的以及它们所需要的依赖关系。"
 
 #. Tag: para
 #: welcome.xml:285
 #, no-c-format
-#| msgid ""
-#| "To protect your system against <quote>Trojan horses</quote> and other "
-#| "malevolent software, Debian's servers verify that uploaded packages come "
-#| "from their registered Debian maintainers. Debian packagers also take "
-#| "great care to configure their packages in a secure manner. When security "
-#| "problems in shipped packages do appear, fixes are usually available very "
-#| "quickly. With Debian's simple update options, security fixes can be "
-#| "downloaded and installed automatically across the Internet."
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
 "malevolent software, &debian;'s servers verify that uploaded packages come "
@@ -477,19 +445,16 @@ msgid ""
 "problems in shipped packages do appear, fixes are usually available very "
 "quickly. With &debian;'s simple update options, security fixes can be "
 "downloaded and installed automatically across the Internet."
-msgstr "为了提防<quote>特洛伊木马</quote>和其他恶意软件，更好地保护您的系统，&debian; 服务器会校验 &debian; 注册维护人员所上传的软件包。&debian; 的打包人员也会特别注意以安全的方式配置软件包。当发布出去的软件包有安全问题时，通常会很快被修复。依靠 &debian; 的简易更新选项，安全更新可以通过互联网自动下载和安装。"
+msgstr ""
+"为了提防<quote>特洛伊木马</quote>和其他恶意软件，更好地保护您的系统，"
+"&debian; 服务器会校验 &debian; 注册维护人员所上传的软件包。&debian; 的打包人"
+"员也会特别注意以安全的方式配置软件包。当发布出去的软件包有安全问题时，通常会"
+"很快被修复。依靠 &debian; 的简易更新选项，安全更新可以通过互联网自动下载和安"
+"装。"
 
 #. Tag: para
 #: welcome.xml:295
 #, no-c-format
-#| msgid ""
-#| "The primary, and best, method of getting support for your Debian GNU/"
-#| "Linux system and communicating with Debian Developers is through the many "
-#| "mailing lists maintained by the Debian Project (there are more than &num-"
-#| "of-debian-maillists; at this writing). The easiest way to subscribe to "
-#| "one or more of these lists is visit <ulink url=\"&url-debian-lists-"
-#| "subscribe;\"> Debian's mailing list subscription page</ulink> and fill "
-#| "out the form you'll find there."
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
 "system and communicating with &debian; Developers is through the many "
@@ -498,12 +463,16 @@ msgid ""
 "or more of these lists is visit <ulink url=\"&url-debian-lists-subscribe;\"> "
 "Debian's mailing list subscription page</ulink> and fill out the form you'll "
 "find there."
-msgstr "为您的 &debian; GNU/Linux 系统寻求技术支持和联络 &debian; 开发人员的主要的，也是最好的方法是通过 &debian; 计划的邮件列表(书写本文时已有 &num-of-debian-maillists; 个邮件列表)进行沟通。订阅这些列表的最简单方法是访问 <ulink url=\"&url-debian-lists-subscribe;\"> Debian 邮件列表订阅页</ulink>并填写相应表单。"
+msgstr ""
+"为您的 &debian; GNU/Linux 系统寻求技术支持和联络 &debian; 开发人员的主要的，"
+"也是最好的方法是通过 &debian; 计划的邮件列表(书写本文时已有 &num-of-debian-"
+"maillists; 个邮件列表)进行沟通。订阅这些列表的最简单方法是访问 <ulink url="
+"\"&url-debian-lists-subscribe;\"> Debian 邮件列表订阅页</ulink>并填写相应表"
+"单。"
 
 #. Tag: title
 #: welcome.xml:315
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "什么是 &debian; GNU/Hurd?"
 
@@ -512,22 +481,18 @@ msgstr "什么是 &debian; GNU/Hurd?"
 #, no-c-format
 msgid ""
 "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
-msgstr "&debian; GNU/kFreeBSD 是一种 &debian; GNU 系统，它采用了 kFreeBSD 内核。"
+msgstr ""
+"&debian; GNU/kFreeBSD 是一种 &debian; GNU 系统，它采用了 kFreeBSD 内核。"
 
 #. Tag: para
 #: welcome.xml:321
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
 "amd64 architectures, although ports to other architectures is possible."
-msgstr "此 &debian; 平台当前仅为 i386 和 amd64 体系开发，虽然它也可以移植到其他的体系。"
+msgstr ""
+"此 &debian; 平台当前仅为 i386 和 amd64 体系开发，虽然它也可以移植到其他的体"
+"系。"
 
 #. Tag: para
 #: welcome.xml:326
@@ -535,25 +500,25 @@ msgstr "此 &debian; 平台当前仅为 i386 和 amd64 体系开发，虽然它�
 msgid ""
 "Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
-msgstr "请留意 &debian; GNU/kFreeBSD 并不是一种 Linux 系统，因此很多 Linux 系统上的信息并不适用于它。"
+msgstr ""
+"请留意 &debian; GNU/kFreeBSD 并不是一种 Linux 系统，因此很多 Linux 系统上的信"
+"息并不适用于它。"
 
 #. Tag: para
 #: welcome.xml:331
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
 "kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
-msgstr "要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> 以及 <email>debian-bsd@lists.debian.org</email> 邮件列表。"
+msgstr ""
+"要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/kfreebsd-gnu/"
+"\"> &debian; GNU/kFreeBSD ports page</ulink> 以及 <email>debian-bsd@lists."
+"debian.org</email> 邮件列表。"
 
 #. Tag: title
 #: welcome.xml:350
 #, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
 msgid "What is &debian; GNU/Hurd?"
 msgstr "什么是 &debian; GNU/Hurd?"
 
@@ -563,24 +528,21 @@ msgstr "什么是 &debian; GNU/Hurd?"
 msgid ""
 "&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
 "of servers running on top of the GNU Mach microkernel."
-msgstr "&debian; GNU/Hurd 是一种 &debian; GNU 系统，包含 GNU Hurd &mdash; 一组运行在 GNU Mach 未内核上的服务。"
+msgstr ""
+"&debian; GNU/Hurd 是一种 &debian; GNU 系统，包含 GNU Hurd &mdash; 一组运行在 "
+"GNU Mach 未内核上的服务。"
 
 #. Tag: para
 #: welcome.xml:357
 #, no-c-format
-#| msgid ""
-#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
-#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
-#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
-#| "day-to-day use, but work is continuing. The Hurd is currently only being "
-#| "developed for the i386 architecture, although ports to other "
-#| "architectures will be made once the system becomes more stable."
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
 "is continuing. The Hurd is currently only being developed for the i386 "
 "architecture, although ports to other architectures will be made once the "
 "system becomes more stable."
-msgstr "Hurd 还没有完成，不适合日常应用，但开发仍在继续。Hurd 当前仅为 i386 体系开发，当系统稳定之后也会移植到其他的体系。"
+msgstr ""
+"Hurd 还没有完成，不适合日常应用，但开发仍在继续。Hurd 当前仅为 i386 体系开"
+"发，当系统稳定之后也会移植到其他的体系。"
 
 #. Tag: para
 #: welcome.xml:365
@@ -588,57 +550,53 @@ msgstr "Hurd 还没有完成，不适合日常应用，但开发仍在继续。H
 msgid ""
 "Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
-msgstr "请留意 &debian; GNU/Hurd 并不是一种 Linux 系统，因此许多 Linux 系统上的信息并不适用于它。"
+msgstr ""
+"请留意 &debian; GNU/Hurd 并不是一种 Linux 系统，因此许多 Linux 系统上的信息并"
+"不适用于它。"
 
 #. Tag: para
 #: welcome.xml:370
 #, no-c-format
-#| msgid ""
-#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
-#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
 "\"> &debian; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
-msgstr "要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/hurd/\"> &debian; GNU/Hurd ports page</ulink> 以及 <email>debian-hurd@lists.debian.org</email> 邮件列表。"
+msgstr ""
+"要了解更多信息，请参阅 <ulink url=\"http://www.debian.org/ports/hurd/\"> "
+"&debian; GNU/Hurd ports page</ulink> 以及 <email>debian-hurd@lists.debian."
+"org</email> 邮件列表。"
 
 #. Tag: title
 #: welcome.xml:387
 #, no-c-format
-#| msgid "Getting Debian"
 msgid "Getting &debian;"
 msgstr "获得 &debian;"
 
 #. Tag: para
 #: welcome.xml:389
 #, no-c-format
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official Debian CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of Debian mirrors</ulink> contains a full set of "
-#| "official Debian mirrors, so you can easily find the nearest one."
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
 "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
 "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
 "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
 "official &debian; mirrors, so you can easily find the nearest one."
-msgstr "关于如何从因特网上下载 &debian-gnu; 或者购买官方 &debian; 光盘的信息，请参阅 <ulink url=\"&url-debian-distrib;\">distribution web page</ulink>。<ulink url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> 包含完整的 &debian; 官方镜像，您可以很容易找到最近的一个。"
+msgstr ""
+"关于如何从因特网上下载 &debian-gnu; 或者购买官方 &debian; 光盘的信息，请参阅 "
+"<ulink url=\"&url-debian-distrib;\">distribution web page</ulink>。<ulink "
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> 包含完整的 "
+"&debian; 官方镜像，您可以很容易找到最近的一个。"
 
 #. Tag: para
 #: welcome.xml:398
 #, no-c-format
-#| msgid ""
-#| "Debian can be upgraded after installation very easily. The installation "
-#| "procedure will help set up the system so that you can make those upgrades "
-#| "once installation is complete, if need be."
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
 "procedure will help set up the system so that you can make those upgrades "
 "once installation is complete, if need be."
-msgstr "&debian; 可以很容易地在安装之后升级。如果需要，安装步骤将帮助您建立系统，使您可以在安装之后立即进行升级。"
+msgstr ""
+"&debian; 可以很容易地在安装之后升级。如果需要，安装步骤将帮助您建立系统，使您"
+"可以在安装之后立即进行升级。"
 
 #. Tag: title
 #: welcome.xml:413
@@ -670,32 +628,26 @@ msgstr "文档的组织"
 #. Tag: para
 #: welcome.xml:435
 #, no-c-format
-#| msgid ""
-#| "This document is meant to serve as a manual for first-time Debian users. "
-#| "It tries to make as few assumptions as possible about your level of "
-#| "expertise. However, we do assume that you have a general understanding of "
-#| "how the hardware in your computer works."
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
 "It tries to make as few assumptions as possible about your level of "
 "expertise. However, we do assume that you have a general understanding of "
 "how the hardware in your computer works."
-msgstr "本文意在成为 &debian; 的新手的使用手册。尽管它对用户的专业知识水平已经做了尽量少的假设，但我们还是设想您对计算机硬件如何工作有一个基本的了解。"
+msgstr ""
+"本文意在成为 &debian; 的新手的使用手册。尽管它对用户的专业知识水平已经做了尽"
+"量少的假设，但我们还是设想您对计算机硬件如何工作有一个基本的了解。"
 
 #. Tag: para
 #: welcome.xml:442
 #, no-c-format
-#| msgid ""
-#| "Expert users may also find interesting reference information in this "
-#| "document, including minimum installation sizes, details about the "
-#| "hardware supported by the Debian installation system, and so on. We "
-#| "encourage expert users to jump around in the document."
 msgid ""
 "Expert users may also find interesting reference information in this "
 "document, including minimum installation sizes, details about the hardware "
 "supported by the &debian; installation system, and so on. We encourage "
 "expert users to jump around in the document."
-msgstr "专业用户可以在本手册中找到一些有趣的参考信息，包括最小安装尺寸，&debian; 安装程序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
+msgstr ""
+"专业用户可以在本手册中找到一些有趣的参考信息，包括最小安装尺寸，&debian; 安装"
+"程序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
 
 #. Tag: para
 #: welcome.xml:449
@@ -721,17 +673,14 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:463
 #, no-c-format
-#| msgid ""
-#| "Backup your system, perform any necessary planning and hardware "
-#| "configuration prior to installing Debian, in <xref linkend=\"preparing\"/"
-#| ">. If you are preparing a multi-boot system, you may need to create "
-#| "partitionable space on your hard disk for Debian to use."
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
 "configuration prior to installing &debian;, in <xref linkend=\"preparing\"/"
 ">. If you are preparing a multi-boot system, you may need to create "
 "partitionable space on your hard disk for &debian; to use."
-msgstr "备份系统，在安装 &debian; 之前进行必要的规划和硬件配置，位于 <xref linkend=\"preparing\"/>。如果需要多重引导系统，您可能需要为 &debian; 创建分区空间。"
+msgstr ""
+"备份系统，在安装 &debian; 之前进行必要的规划和硬件配置，位于 <xref linkend="
+"\"preparing\"/>。如果需要多重引导系统，您可能需要为 &debian; 创建分区空间。"
 
 #. Tag: para
 #: welcome.xml:471
@@ -754,15 +703,6 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这
 #. Tag: para
 #: welcome.xml:484
 #, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a Debian server (if you "
-#| "are not installing from a CD), partitioning your hard drives and "
-#| "installation of a base system, then selection and installation of tasks. "
-#| "(Some background about setting up the partitions for your Debian system "
-#| "is explained in <xref linkend=\"partitioning\"/>.)"
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
 "This involves choosing your language, configuring peripheral driver modules, "
@@ -772,7 +712,11 @@ msgid ""
 "then selection and installation of tasks. (Some background about setting up "
 "the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
-msgstr "执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光盘方式安装)，给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背景知识位于 <xref linkend=\"partitioning\"/>。)"
+msgstr ""
+"执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边"
+"驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光"
+"盘方式安装)，给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背"
+"景知识位于 <xref linkend=\"partitioning\"/>。)"
 
 #. Tag: para
 #: welcome.xml:497
@@ -785,15 +729,13 @@ msgstr "从您新安装的基本系统启动，<xref linkend=\"boot-new\"/>。"
 #. Tag: para
 #: welcome.xml:505
 #, no-c-format
-#| msgid ""
-#| "Once you've got your system installed, you can read <xref linkend=\"post-"
-#| "install\"/>. That chapter explains where to look to find more information "
-#| "about Unix and Debian, and how to replace your kernel."
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
 "install\"/>. That chapter explains where to look to find more information "
 "about Unix and &debian;, and how to replace your kernel."
-msgstr "一旦您安装完系统，可以阅读 <xref linkend=\"post-install\"/>。该章将解释在哪里寻找更多有关 Unix 和 &debian; 的信息，以及如何替换您的内核。"
+msgstr ""
+"一旦您安装完系统，可以阅读 <xref linkend=\"post-install\"/>。该章将解释在哪里"
+"寻找更多有关 Unix 和 &debian; 的信息，以及如何替换您的内核。"
 
 #. Tag: para
 #: welcome.xml:515
@@ -848,17 +790,6 @@ msgstr "关于版权与软件协议"
 #. Tag: para
 #: welcome.xml:553
 #, no-c-format
-#| msgid ""
-#| "We're sure that you've read some of the licenses that come with most "
-#| "commercial software &mdash; they usually say that you can only use one "
-#| "copy of the software on a single computer. This system's license isn't "
-#| "like that at all. We encourage you to put a copy of &debian-gnu; on every "
-#| "computer in your school or place of business. Lend your installation "
-#| "media to your friends and help them install it on their computers! You "
-#| "can even make thousands of copies and <emphasis>sell</emphasis> them "
-#| "&mdash; albeit with a few restrictions. Your freedom to install and use "
-#| "the system comes directly from Debian being based on <emphasis>free "
-#| "software</emphasis>."
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
@@ -869,7 +800,13 @@ msgid ""
 "thousands of copies and <emphasis>sell</emphasis> them &mdash; albeit with a "
 "few restrictions. Your freedom to install and use the system comes directly "
 "from &debian; being based on <emphasis>free software</emphasis>."
-msgstr "我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用到您的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们的计算机上！您甚至可以制作上千份拷贝，然后<emphasis>出售</emphasis>它们 &mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 &debian; 是基于<emphasis>自由软件</emphasis>。"
+msgstr ""
+"我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
+"机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用"
+"到您的学校或商业机构的每台计算机上。将安装介质借给朋友，并帮助他们安装到他们"
+"的计算机上！您甚至可以制作上千份拷贝，然后<emphasis>出售</emphasis>它们 "
+"&mdash; 尽管有一些限制。您安装和使用系统的自由权利因为 &debian; 是基于"
+"<emphasis>自由软件</emphasis>。"
 
 #. Tag: para
 #: welcome.xml:566
@@ -882,20 +819,15 @@ msgid ""
 "of distributing or using those programs. Free software also means that not "
 "only may anyone extend, adapt, and modify the software, but that they may "
 "distribute the results of their work as well."
-msgstr "称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权，也不是指包含该软件的 CD 必须免费分派。自由软件，某种程度上意味着您不须为分发和使用这些程序付费。自由软件还是指任何人可以扩展、改写、修改该软件，并且他们工作的成果也这样发布。"
+msgstr ""
+"称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权，也不是指包含该软件"
+"的 CD 必须免费分派。自由软件，某种程度上意味着您不须为分发和使用这些程序付"
+"费。自由软件还是指任何人可以扩展、改写、修改该软件，并且他们工作的成果也这样"
+"发布。"
 
 #. Tag: para
 #: welcome.xml:577
 #, no-c-format
-#| msgid ""
-#| "The Debian project, as a pragmatic concession to its users, does make "
-#| "some packages available that do not meet our criteria for being free. "
-#| "These packages are not part of the official distribution, however, and "
-#| "are only available from the <userinput>contrib</userinput> or "
-#| "<userinput>non-free</userinput> areas of Debian mirrors or on third-party "
-#| "CD-ROMs; see the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, "
-#| "under <quote>The Debian FTP archives</quote>, for more information about "
-#| "the layout and contents of the archives."
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
 "packages available that do not meet our criteria for being free. These "
@@ -905,23 +837,16 @@ msgid ""
 "<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian "
 "FTP archives</quote>, for more information about the layout and contents of "
 "the archives."
-msgstr "注意，&debian; 计划因为考虑用户实用性，也有不符合我们自由规则的软件包存在。这些软件包不属于官方发行版，只存在于 <userinput>contrib</userinput> 或 <userinput>non-free</userinput> &debian; 镜像区域或者第三方的 CD-ROM 中，请参阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的 <quote>The Debian FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
+msgstr ""
+"注意，&debian; 计划因为考虑用户实用性，也有不符合我们自由规则的软件包存在。这"
+"些软件包不属于官方发行版，只存在于 <userinput>contrib</userinput> 或 "
+"<userinput>non-free</userinput> &debian; 镜像区域或者第三方的 CD-ROM 中，请参"
+"阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的 <quote>The Debian "
+"FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
 
 #. Tag: para
 #: welcome.xml:591
 #, no-c-format
-#| msgid ""
-#| "Many of the programs in the system are licensed under the <emphasis>GNU</"
-#| "emphasis> <emphasis>General Public License</emphasis>, often simply "
-#| "referred to as <quote>the GPL</quote>. The GPL requires you to make the "
-#| "<emphasis>source code</emphasis> of the programs available whenever you "
-#| "distribute a binary copy of the program; that provision of the license "
-#| "ensures that any user will be able to modify the software. Because of "
-#| "this provision, the source code<footnote> <para> For information on how "
-#| "to locate, unpack, and build binaries from Debian source packages, see "
-#| "the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under "
-#| "<quote>Basics of the Debian Package Management System</quote>. </para> </"
-#| "footnote> for all such programs is available in the Debian system."
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
 "emphasis> <emphasis>General Public License</emphasis>, often simply referred "
@@ -934,37 +859,41 @@ msgid ""
 "<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>Basics of "
 "the Debian Package Management System</quote>. </para> </footnote> for all "
 "such programs is available in the &debian; system."
-msgstr "系统中很多软件所使用的许可证都是 <emphasis>GNU</emphasis> <emphasis>General Public License (通用公共授权)</emphasis>，通常简称为 <quote>the GPL</quote>。GPL 要求您将程序的<emphasis>源码</emphasis>随您发布的二进制拷贝一起提供；许可证的这项规定确保任何用户都可以修改软件。正是由于此规定，所有这些程序的源码<footnote> <para>对于如何根据 &debian; 源码包寻找、解包和创建二进制软件包，请查阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的<quote>Basics of the Debian Package Management System</quote>章节。</para> </footnote>都可以在 &debian; 系统中得到。"
+msgstr ""
+"系统中很多软件所使用的许可证都是 <emphasis>GNU</emphasis> <emphasis>General "
+"Public License (通用公共授权)</emphasis>，通常简称为 <quote>the GPL</quote>。"
+"GPL 要求您将程序的<emphasis>源码</emphasis>随您发布的二进制拷贝一起提供；许可"
+"证的这项规定确保任何用户都可以修改软件。正是由于此规定，所有这些程序的源码"
+"<footnote> <para>对于如何根据 &debian; 源码包寻找、解包和创建二进制软件包，请"
+"查阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的<quote>Basics of "
+"the Debian Package Management System</quote>章节。</para> </footnote>都可以"
+"在 &debian; 系统中得到。"
 
 #. Tag: para
 #: welcome.xml:610
 #, no-c-format
-#| msgid ""
-#| "There are several other forms of copyright statements and software "
-#| "licenses used on the programs in Debian. You can find the copyrights and "
-#| "licenses for every package installed on your system by looking in the "
-#| "file <filename>/usr/share/doc/<replaceable>package-name</replaceable>/"
-#| "copyright </filename> once you've installed a package on your system."
 msgid ""
 "There are several other forms of copyright statements and software licenses "
 "used on the programs in &debian;. You can find the copyrights and licenses "
 "for every package installed on your system by looking in the file <filename>/"
 "usr/share/doc/<replaceable>package-name</replaceable>/copyright </filename> "
 "once you've installed a package on your system."
-msgstr "&debian; 中的程序还有许多其他形式的版权声明和软件许可证。您可以在您的系统中找到每个软件包相关的版权和许可证，它们位于 <filename>/usr/share/doc/<replaceable>软件包名</replaceable>/copyright </filename>，这些文件在您将软件包安装到系统后就存在了。"
+msgstr ""
+"&debian; 中的程序还有许多其他形式的版权声明和软件许可证。您可以在您的系统中找"
+"到每个软件包相关的版权和许可证，它们位于 <filename>/usr/share/doc/"
+"<replaceable>软件包名</replaceable>/copyright </filename>，这些文件在您将软件"
+"包安装到系统后就存在了。"
 
 #. Tag: para
 #: welcome.xml:620
 #, no-c-format
-#| msgid ""
-#| "For more information about licenses and how Debian determines whether "
-#| "software is free enough to be included in the main distribution, see the "
-#| "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgid ""
 "For more information about licenses and how &debian; determines whether "
 "software is free enough to be included in the main distribution, see the "
 "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
-msgstr "关于 &debian; 如何判断软件是否足够自由到可以包括在主发行版中的信息，请参阅 <ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>。"
+msgstr ""
+"关于 &debian; 如何判断软件是否足够自由到可以包括在主发行版中的信息，请参阅 "
+"<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>。"
 
 #. Tag: para
 #: welcome.xml:626
@@ -977,4 +906,8 @@ msgid ""
 "the software is free, you are empowered to modify that software to suit your "
 "needs &mdash; and to enjoy the benefits of the changes made by others who "
 "have extended the software in this way."
-msgstr "在此，最重要的法律声明是此软件<emphasis>无担保</emphasis>。程序员创造此软件为的是使社群受益，而不能保证软件适用于任何特定用途。但是，因为软件是自由的，您可以修改此软件以使其能适用于您的需要 &mdash; 并享用其他人采用这种途径扩展后的修改成果。"
+msgstr ""
+"在此，最重要的法律声明是此软件<emphasis>无担保</emphasis>。程序员创造此软件为"
+"的是使社群受益，而不能保证软件适用于任何特定用途。但是，因为软件是自由的，您"
+"可以修改此软件以使其能适用于您的需要 &mdash; 并享用其他人采用这种途径扩展后的"
+"修改成果。"