Regenerate PO(T) files

15 files changed, 2238 insertions, 742 deletions

diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index c41d0d245..5b9f0837f 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-01 16:35+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -26,10 +26,15 @@ 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."
 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 ""
@@ -180,9 +185,17 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "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."
 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 "
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index a03c2ed29..784d7686c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-07 11:55+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,13 +20,19 @@ msgstr "&debian-gnu; 安装手册"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 "
 "&arch-title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于"
@@ -34,17 +40,28 @@ msgstr ""
 
 #. 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 "
+#| "&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."
 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."
+"&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 安装系统进行了增补和修订。但是，对于 "
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 7d8d27641..b9e52500c 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-01 16:50+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -96,10 +96,16 @@ msgstr "从 CD 光盘上引导"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -129,9 +135,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -220,10 +232,34 @@ msgstr "通过网络使用 Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -308,12 +344,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -894,10 +938,24 @@ msgstr "引导界面"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1053,16 +1111,27 @@ msgstr "CD 的内容"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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)</"
@@ -1097,9 +1166,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1247,10 +1323,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 引导器会显示一个菜单页用于选择启动内核和选项。进入选择"
@@ -1264,11 +1344,16 @@ msgstr "选项 2: 从 EFI Shell 启动"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "某些情况下，选项 1 无法成功，重新启动机器然后在 EFI Boot Manager 画面出现的时"
@@ -1342,9 +1427,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1496,11 +1587,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "按下 <command>ENTER</command>。会加载并启动内核。内核在 Debian 安装程序的第一"
 "个屏幕显示常规的初始化信息。"
@@ -1660,13 +1755,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "在下载并且处理配置文件后，引导装载程序将显示它的提示符。从这里开始，安装过程"
 "将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到"
@@ -1681,13 +1782,22 @@ msgstr "SGI TFTP 引导"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -1861,9 +1971,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -1959,7 +2075,28 @@ msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -1978,7 +2115,7 @@ msgid ""
 "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."
+"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 分区的"
@@ -2539,8 +2676,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Debian 安装程序的参数"
 
 #. Tag: para
@@ -2727,9 +2865,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -2899,12 +3041,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"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) 磁盘的支持。注意，这种支持当前是实验性"
@@ -3233,14 +3381,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "默认情况下，安装程序会使用 http 协议从 Debian 镜像下载文件，在普通优先级下不"
 "能修改协议为 ftp。设置该参数为 <userinput>ftp</userinput>，您可以迫使安装程序"
@@ -3689,10 +3844,13 @@ msgstr "软盘的可靠性"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "对于用软盘安装 Debian 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
@@ -4144,14 +4302,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "如果您有一个可以运转的 Debian 系统，发送安装报告最简单的方法是安装 "
 "<classname>installation-report</classname> 和 <classname>reportbug</"
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 5659cf6ff..8e8f5951e 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:19+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,8 +14,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "启动进入新 Debian 系统"
 
 #. Tag: title
@@ -48,8 +49,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -60,11 +61,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -75,13 +83,25 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
+"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 "
@@ -523,11 +543,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 96c2d7ecb..3a9b4fbe0 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-07 11:54+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,10 +20,14 @@ msgstr "系统需求"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "本章包括运行 Debian 所需硬件的信息。您还能找到更多有关 GNU 和 &arch-kernel; "
@@ -47,13 +51,13 @@ msgstr "支持的硬件"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移植"
 "了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 Debian 移植版的"
@@ -79,9 +83,12 @@ msgstr "支持的体系"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&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</"
@@ -95,8 +102,9 @@ msgstr "体系"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian 命名"
 
 #. Tag: entry
@@ -444,7 +452,7 @@ msgstr "type"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -470,9 +478,9 @@ msgstr ""
 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."
+"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/"
@@ -557,11 +565,16 @@ msgstr "AMD64 和 Intel EM64T 处理器都获得支持。"
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 标准发布版只支持安装到一"
@@ -570,10 +583,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多"
@@ -594,14 +611,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Intel I/O Processor (IOP) 产品线可以在一些数据存储和处理的产品中找到。Debian "
 "当前支持 IOP32x 平台，IOP 80219 和 32x 芯片通常在 Network Attached Storage "
@@ -691,10 +716,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 "
 "Debian 是一个不错的方法。"
@@ -730,24 +758,43 @@ 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>."
+#, fuzzy, 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\", "
+"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>."
 msgstr ""
 "然而，Debian GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 或"
 "更早的处理器上。尽管体系命名为 \"i386\"，Debian 的 Sarge (r3.1) 版已经"
@@ -795,22 +842,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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, "
 "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> </"
+"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>."
+"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>."
 msgstr ""
 "&arch-title; 上的 Debian 支持以下平台：<itemizedlist> <listitem><para> SGI "
 "IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近"
@@ -825,10 +887,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -849,17 +916,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
+#| "covered here. This includes the Cobalt 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 "
 "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 "
+"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 "
+"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>."
@@ -918,9 +998,12 @@ msgstr "内核变种"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr "在 Debian 中有两种基于 CPU 类型的 powerpc 内核："
 
@@ -992,12 +1075,17 @@ msgstr "Power Macintosh (pmac) 子体系"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (以及其它一些制造商 &mdash; 比如 Power Computing) 生产了一系列基于 "
 "PowerPC 处理器 的 Macintosh 计算机。为体系支持的目的，它们被划分为 NuBus"
@@ -1425,18 +1513,29 @@ 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>."
+#, fuzzy, 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 "
+"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>."
 msgstr ""
 "NuBus 系统现在还不被 Debian/powerpc 支持。单内核的 Linux/PPC 内核体系不支持这"
 "些机器；而必须使用 MkLinux Mach 微内核，而它未被 Debian 支持。它们包括： "
@@ -1562,11 +1661,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 "
 "位子体系在上一版本后已经停止支持。"
@@ -1651,11 +1754,18 @@ msgstr "多处理器"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1677,11 +1787,11 @@ msgstr ""
 #| "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 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>"
+"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>"
 msgstr ""
 "为了给单 CPU 系统优化内核，您需要替换标准的 Debian 内核。<phrase arch="
 "\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前"
@@ -1691,11 +1801,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1707,21 +1824,31 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"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
-#, no-c-format
+#, fuzzy, 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."
+"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; 内核映像并不支"
@@ -1740,7 +1867,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1753,14 +1880,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
 "&mdash; 在本体系架构下可以使用，并且有一个预编译的 Debian 内核映象已经开启这"
@@ -1822,13 +1957,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, fuzzy, 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 and PCIe 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 "
+"&debian;'s support for graphical interfaces is determined by the underlying "
 "support found in X.Org's X11 system. Most AGP, PCI and PCIe 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;."
+"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 视频卡都"
 "能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持情况，见 "
@@ -2049,14 +2190,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, 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>"
+#, fuzzy, 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 "
+"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>"
 msgstr ""
 "有些情况下，您需要的驱动程序不包含在 Debian 软件包里面。必须在互联网上寻找它"
 "们的源码，并自己动手编译驱动程序。该如何做已经超出了本手册的范围。<phrase "
@@ -2309,9 +2457,15 @@ msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2472,14 +2626,21 @@ msgstr "安装介质"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "本章将助您选则安装 Debian 所采用的介质。例如，您的电脑上有一个软驱，就可以用"
 "来安装 Debian。这里有一整章专门用于说明介质：<xref linkend=\"install-methods"
@@ -2625,10 +2786,17 @@ msgstr "U 盘"
 
 #. Tag: para
 #: hardware.xml:1767
-#, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2711,14 +2879,22 @@ msgstr "受支持的存储系统"
 
 #. Tag: para
 #: hardware.xml:1821
-#, 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="
+#, fuzzy, 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, "
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Debian 启动盘包括一个用于最大可能数量系统的内核。不幸的是，这将产生一个大内"
@@ -2729,11 +2905,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, 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 "
+#, fuzzy, 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 驱"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f8f22b32a..cb05ac45d 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -26,14 +26,28 @@ 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -53,7 +67,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -62,7 +88,7 @@ msgid ""
 "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 "
+"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."
@@ -103,25 +129,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, 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
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-"
 "debian-mirrors;\">Debian 镜像列表</ulink>。"
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 镜像服务器下载文件的时候，请确认下载的文件是处于"
@@ -135,9 +169,15 @@ msgstr "在哪里能找到安装映像"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -194,10 +234,14 @@ msgstr "GLAN Tank 安装文件"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank 需要内核和 ramdisk，位于您打算安装 Debian 的 ext2 磁盘分区上。这些"
@@ -211,10 +255,14 @@ msgstr "Kurobox Pro 安装文件"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Kurobox Pro 需要内核和 ramdisk，位于您打算安装 Debian 的 ext2 磁盘分区上。这"
@@ -361,12 +409,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 或 "
@@ -504,10 +559,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "这些工具可以在官方 Debian 光盘中找到，位于 <filename>/tools</filename> 目录"
 "下。"
@@ -520,10 +578,19 @@ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -559,12 +626,17 @@ msgstr "写磁盘映像：使用<command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经"
 "设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 Debian 镜像下"
@@ -916,14 +988,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -970,7 +1051,19 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -981,7 +1074,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
 "化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
@@ -1086,10 +1179,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1104,7 +1205,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1117,7 +1231,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘"
 "重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</"
@@ -1250,12 +1364,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 盘上。然后，卸"
@@ -1384,7 +1503,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1443,7 +1562,8 @@ msgstr ""
 #| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
 #| "filename>."
 msgid ""
-"Copy the following files from a Debian CD image to <filename>c:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "将以下文件从 Debian 存档中拷贝到硬盘中比较方便的地方，比如 <filename>/boot/"
 "newinstall/</filename>。"
@@ -1471,14 +1591,24 @@ msgstr "在 OldWorld Macs 上引导硬盘安装程序"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1493,12 +1623,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1544,10 +1686,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1663,10 +1810,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。Debian 里面有一个 "
 "<classname>rbootd</classname> 软件包。"
@@ -1933,13 +2083,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2063,10 +2244,16 @@ 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 "
+#, fuzzy, 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."
@@ -2077,10 +2264,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2271,8 +2471,8 @@ msgstr "自动化安装"
 #| "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 "
+"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 ""
@@ -2283,15 +2483,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, 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
+#, fuzzy, 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 "
+"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."
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index fa493fc37..2e21f34c8 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:20+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -81,12 +81,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "有些安装方法需要其它种类的映像而非 CD 的映像。<phrase condition=\"unofficial-"
 "build\"> <ulink url=\"&url-d-i;\">&d-i; 的主页</ulink> 上有到其它种类的映像的"
@@ -152,11 +157,15 @@ msgstr "软盘"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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</"
@@ -223,10 +232,14 @@ msgstr "U 盘"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "我们也可以从移动 USB 存储设备来安装系统。比如说您带着一个 USB 的钥匙链走遍天"
@@ -234,14 +247,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -332,12 +354,21 @@ msgstr "从硬盘启动"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -443,12 +474,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "如果您有一个 DOS 或 Windows 分区并想保留它，要小心使用自动分区。如果选择手动"
@@ -600,10 +637,13 @@ msgstr "末了&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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\"/>。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 08cb0e830..65554b577 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,14 +14,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, 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"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "决定 Debian 分区以及大小"
 
 #. Tag: para
@@ -108,14 +110,21 @@ msgstr "目录树"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem "
 "Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知"
@@ -385,15 +394,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -448,9 +470,16 @@ msgstr "推荐的分区方案"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -477,17 +506,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "如果您计划安装 Debian 发布版以外的程序，也许需要一个独立的 <filename>/usr/"
 "local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/"
@@ -759,15 +798,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, 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 "
+#, fuzzy, 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."
@@ -783,9 +828,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -986,14 +1036,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留"
@@ -1071,12 +1129,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index f26de975b..395d56ac6 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -84,7 +84,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -92,7 +101,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</"
@@ -104,19 +113,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "让自己适应 Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian 和其它的发行版有些不同。即使您熟悉其它发行版的 Linux，您也应该了解 "
@@ -126,15 +143,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Debian 软件包系统"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -264,13 +297,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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> 目录里有很多有用的文档，特别是 "
@@ -282,19 +323,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 "
 "Debian 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/"
@@ -328,12 +383,17 @@ msgstr "让您的系统使用 E-Mail"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "今天，email 是许多人生活中一个重要的组成部分。建立它有很多种选择，并且对于很"
 "多 Debian 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
@@ -383,17 +443,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "配合逐步流行的图形桌面系统，使用图形 e-mail 程序，像 GNOME 的 "
@@ -472,10 +543,14 @@ msgstr "发送邮件到系统之外"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 系统只架设了处理本地系统的邮件，而不是用于发送或接收"
@@ -509,13 +584,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 软件包对应"
@@ -721,11 +802,18 @@ msgstr "编译新内核"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -789,9 +877,15 @@ msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -817,10 +911,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -867,7 +968,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -879,7 +993,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "现在，可以开始配置您的内核了。如果您已经安装配置好，并正在运行 X11，请执行 "
@@ -960,9 +1074,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 280213927..1e0eaf225 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,13 +20,19 @@ msgstr "在 &architecture; 上安装 &debian-gnu; &release;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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; 将带给您来自世界各地的高质量的自由软"
@@ -35,10 +41,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 1cb5174af..20c38ef4e 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,9 +20,13 @@ msgstr "开始安装 &debian-gnu; 之前"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -37,11 +41,15 @@ msgstr "安装概述"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 时，极少出现必须进行完全重新安装的情"
 "况，导致这种情况的可能大多是硬盘的物理故障。"
@@ -61,15 +69,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -106,25 +125,32 @@ msgstr "在开始整个安装过程之前，收集您的计算机的硬件信息
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, 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
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "如果您不是使用 Debian CD，请寻找和(或)下载安装程序软件，还有用于您电脑上的特"
 "殊硬件的驱动程序；"
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "设置从磁带/软盘/USB 盘，或者其它存有系统启动文件的设备上启动(对于大多数 "
@@ -169,8 +195,9 @@ msgstr "加上一个或多个直接存取设备(DASD)；"
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 的分区；"
 
 #. Tag: para
@@ -363,10 +390,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -376,10 +408,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "您正在阅读的文档，是 Debian 下一个发行版安装指南的开发版本；有<ulink url="
@@ -455,10 +491,14 @@ msgstr "用于 &arch-title; 的 Linux"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"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 的章"
@@ -1037,11 +1077,19 @@ msgstr "5 GB"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, fuzzy, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1090,12 +1138,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1157,11 +1215,11 @@ msgid ""
 "If you already have an operating system on your system <phrase arch=\"any-"
 "x86\"> (Windows 9x, Windows NT/2000/XP, 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "如果您已经在您的机器中安装有操作系统<phrase arch=\"x86\"> (Windows 9x、"
 "Windows NT/2000/XP、OS/2、MacOS、Solaris、FreeBSD，&hellip;) </phrase> "
@@ -1217,10 +1275,15 @@ msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1254,11 +1317,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1270,10 +1340,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "如果您的计算机上有 FAT 或 NTFS 文件系统，它被 DOS 和 Windows 使用，您可以等到"
@@ -1281,11 +1355,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1300,12 +1383,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&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 和其它操作系统的安装过程可能会让您无法启动 "
@@ -1340,8 +1430,8 @@ msgid ""
 "partitioning; you should create a &arch-parttype; placeholder partition to "
 "come <emphasis>before</emphasis> the other bootable partitions on the disk. "
 "(The small partitions dedicated to Apple disk drivers are not bootable.) You "
-"can delete the placeholder with the Debian partition tools later during the "
-"actual install, and replace it with &arch-parttype; partitions."
+"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; Linux 分区必须被安置在其它分区之"
 "前，特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。即，您必须在"
@@ -1351,11 +1441,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "如果您现在有一块硬盘，这块硬盘上仅有一个分区(这是桌面电脑的通常设置)，同时希"
 "望能多重启动原有的操作系统和 Debian，那么您将需要："
@@ -1397,17 +1491,21 @@ msgstr "把原有的操作系统安装到属于它的新分区上。"
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "启动到原有的操作系统，以确保一切正常，再下载 Debian 安装程序的启动文件。"
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, fuzzy, 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
@@ -1418,12 +1516,17 @@ msgstr "从 DOS 或 Windows 分区"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "如果您想在已有的 FAT 或 NTFS 分区上动手，那么建议您或者按照下面介绍的方案操"
 "作，或者使用 Windows 或者 DOS 自己的工具软件。否则的话，真的没必要从 DOS 或"
@@ -1431,13 +1534,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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."
 msgstr ""
@@ -1455,11 +1566,22 @@ msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, fuzzy, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"XP), 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 "
@@ -1476,14 +1598,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 的安装"
@@ -1507,17 +1636,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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."
+#| "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."
 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</"
+"&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> 的拷贝。您可以从离您最近的 "
@@ -1578,11 +1718,17 @@ msgstr "为 DOS 分区"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1594,12 +1740,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面几个扇区全部清零。您应"
 "该在运行 DOS 的 <command>format</command> 命令之前，到 Debian 系统中，像这样"
@@ -1619,11 +1770,18 @@ msgstr "在 SunOS 下分区"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1752,10 +1910,18 @@ msgstr "安装前的硬件和操作系统的相关设置"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1777,13 +1943,21 @@ msgstr "BIOS 设置菜单的使用"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS 为引导您的机器提供了基本的帮助，进而能让操作系统能访问您的硬件。您的系统"
 "应该会有 BIOS 的设置菜单，通过它，我们就能配置 BIOS。在进行安装前，您"
@@ -1913,7 +2087,16 @@ msgstr "选择引导设备"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -1921,7 +2104,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "许多 BIOS 的设置菜单都能让您选择用来引导系统的设备。我们来设置一下，让它先在 "
 "<filename>A:</filename> (第一个软驱)中找寻可引导的操作系统，不行的话，再在第"
@@ -2515,17 +2698,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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."
 msgstr ""
 "在实际安装之前，您必须仔细检查一些规划和准备步骤。IBM 有关于整个过程的文档，"
 "如，怎样准备安装介质和如何从该介质启动。这里毋需复制那些信息。但是，我们会在"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 8f369a99e..295affa40 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -540,12 +540,26 @@ 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"
+#, fuzzy, 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 "
+"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 "
@@ -919,14 +933,22 @@ msgstr "使用 DHCP 服务器指定预置文件"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
@@ -961,13 +983,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 Debian 镜像。这"
 "种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互进"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 3b7077d94..ad3861e2f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-14 15:56+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -821,7 +821,16 @@ msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -830,7 +839,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册"
 "后面要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> "
@@ -842,13 +851,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 系统，就可以将您原来系统中的用户数据"
 "(如果有的话)悉数迁移到 Debian 里去。然后就能继续爽了。一言以蔽之，这是一次"
@@ -857,11 +872,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -913,10 +937,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -963,17 +997,28 @@ msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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>."
 msgstr ""
 "Debian 安装程序使用的工具，同时也作为安装 Debian 基本系统的正式方法，是 "
 "<command>debootstrap</command>。它调用了 <command>wget</command> 和 "
@@ -986,14 +1031,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1029,10 +1085,16 @@ msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1092,13 +1154,20 @@ msgstr "基本系统的配置"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "虽然功能还很弱，现在您的磁盘上已经有了一个真正的 Debian 系统。用 "
 "<command>chroot</command> 命令进入：<informalexample><screen>\n"
@@ -1183,7 +1252,48 @@ msgstr "分区的挂载"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1210,7 +1320,7 @@ msgid ""
 "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 "
+"</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"
@@ -1557,12 +1667,17 @@ msgstr "Boot Loader 的设置"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的"
 "内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
@@ -1583,8 +1698,8 @@ msgstr ""
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
 "<userinput>man lilo.conf</userinput></phrase> 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 "
+"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><phrase arch=\"x86\">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 "
@@ -1662,11 +1777,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1758,12 +1881,19 @@ msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-"
 "Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连"
@@ -1814,10 +1944,13 @@ msgstr "需求"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 Debian。"
 
 #. Tag: para
@@ -2219,11 +2352,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2235,11 +2375,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 59da6cde0..57ccf2f3f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,8 +14,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "使用 Debian 安装程序"
 
 #. Tag: title
@@ -26,9 +27,15 @@ msgstr "安装程序如何工作"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -315,8 +322,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "寻找并挂载 Debian 安装光盘。"
 
 #. Tag: term
@@ -354,10 +362,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr "列出 Debian 软件包镜像。用户可以选择从哪里安装软件包。"
 
 #. Tag: term
@@ -439,12 +450,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣"
 "的特性，如完全自动模式或 LVM 支持。Debian 里它是推荐使用的分区工具。"
@@ -623,11 +639,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后"
 "精确地给 Debian 开发人员报告安装程序的问题。"
@@ -655,15 +676,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -837,11 +869,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1012,18 +1050,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, 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
+#, fuzzy, 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."
+"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</"
@@ -1031,7 +1075,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1042,9 +1100,9 @@ msgid ""
 "<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."
+"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</"
@@ -1850,13 +1908,19 @@ msgstr "手动分区"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在"
 "于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动"
@@ -3825,13 +3889,19 @@ msgstr "检测其他的操作系统"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "在 boot loader 安装之前，安装程序会试着侦测已经安装到计算机上的其他操作系统。"
 "如果它找到支持的操作系统，您将在启动 boot loader 安装步骤里得到提示。与 "
@@ -3977,17 +4047,22 @@ msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "新 Debian 分区"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"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。"
@@ -4013,13 +4088,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "如果此步之后无法启动 Windows 9x (或 DOS)，您需要使用一个 Windows 9x (MS-DOS) "
 "启动盘，并用 <userinput>fdisk /mbr</userinput> 命令重新安装 MS-DOS 主引导记"
@@ -4150,10 +4231,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4169,11 +4255,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"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</"
@@ -4205,12 +4297,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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> 符号链接 "
@@ -4462,9 +4559,13 @@ msgstr "完成安装"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4524,11 +4625,15 @@ msgstr "重新启动系统"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 "
 "Debian 系统。"
@@ -4570,11 +4675,15 @@ msgstr "保存安装记录"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "如果安装成功，安装过程中创建的记录文件，会被自动保存在您的新 Debian 系统上的 "
 "<filename>/var/log/installer/</filename>。"
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index fb1c2c643..4dfb91f9d 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,17 +14,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "欢迎使用 Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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; 发行版有一定的了解，请略过本章。"
@@ -341,17 +346,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, 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
+#, fuzzy, 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 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 "
+"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 "
@@ -369,9 +386,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -382,12 +404,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian 在高级用户中非常流行的原因在于它具有优秀的技术，而且它对 Linux 的深入"
 "贡献满足了社区的需求与期望。Debian 为 Linux 引入的许多特性现在已经成为了非常"
@@ -395,9 +422,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -407,9 +439,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -419,11 +456,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -436,15 +482,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "为了提防 <quote>特洛伊木马</quote> 和其他恶意软件，更好地保护您的系统，"
 "Debian 服务器会校验 Debian 注册维护人员所上传的软件包。Debian 的打包人员也会"
@@ -453,15 +507,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "为您的 Debian GNU/Linux 系统寻求技术支持和联络 Debian 开发人员的主要的，也是"
 "最好的方法是通过 Debian 计划的邮件列表(书写本文时已有 &num-of-debian-"
@@ -473,28 +535,39 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "什么是 Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd 是将 Debian GNU 系统的 Linux 宏内核替换为 GNU Hurd &mdash; 运"
+"行在 GNU Mach 微内核上的一组服务。Hurd 还没有完成，不适合日常应用，但开发仍在"
+"继续。Hurd 当前仅为 i386 体系开发，当系统稳定之后也会移植到其他的体系。"
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -507,7 +580,7 @@ msgstr ""
 #| "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 "
+"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/hurd/\"> "
@@ -516,16 +589,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "什么是 Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -552,16 +626,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; 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/\"> "
@@ -570,19 +648,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "获得 Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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;\">发行网页</ulink>。<ulink url=\"&url-"
@@ -591,9 +676,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -629,24 +718,34 @@ msgstr "文档的组织"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 的新手的使用手册。尽管它对用户的专业知识水平已 经做了尽量"
 "少的假设，但我们还是设想您对计算机硬件如何工作有一个基本 的了解。"
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "专业用户可以在本手册中找到一些有趣的参考信息，包括最小安装尺寸，Debian 安装程"
 "序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
@@ -674,12 +773,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 创建分区空间。"
@@ -704,15 +808,24 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言，设置周边"
@@ -730,11 +843,15 @@ msgstr "从您新安装的基本系统启动，<xref linkend=\"boot-new\"/>。"
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "一旦您安装完系统，可以阅读 <xref linkend=\"post-install\"/>。该章将解释在哪里"
 "寻找更多有关 Unix 和 Debian 的信息，以及如何替换您的内核。"
@@ -791,7 +908,18 @@ msgstr "关于版权与软件协议"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -801,7 +929,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
 "机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用"
@@ -829,16 +957,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "注意，Debian 计划因为考虑用户实用性，也有不符合我们自由规则的软件包存在。这些"
 "软件包不属于官方发行版，只存在于 <userinput>contrib</userinput> 或 "
@@ -848,7 +985,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -857,10 +1006,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "系统中很多软件所使用的许可证都是 <emphasis>GNU</emphasis> <emphasis>General "
 "Public License (通用公共授权)</emphasis>，通常简称为 <quote>the GPL</quote>。"
@@ -873,13 +1022,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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>"
@@ -888,9 +1043,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""