From fe3819affd5fa6e6a3d0624cf5f2dcd454b24309 Mon Sep 17 00:00:00 2001
From: Holger Wansing <linux@wansing-online.de>
Date: Fri, 9 Jan 2015 19:20:39 +0000
Subject: Refresh po and pot files after changings in en

---
 po/zh_CN/boot-installer.po  | 779 ++++++++++++++++++++++++--------------------
 po/zh_CN/hardware.po        | 585 +++++++++++++++++----------------
 po/zh_CN/install-methods.po | 308 +++++++++---------
 po/zh_CN/partitioning.po    | 178 +++++-----
 po/zh_CN/preseed.po         | 325 ++++++++++++++----
 po/zh_CN/random-bits.po     | 313 ++++++++++--------
 po/zh_CN/using-d-i.po       | 388 +++++++++++-----------
 7 files changed, 1635 insertions(+), 1241 deletions(-)

(limited to 'po/zh_CN')

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 48c78c74a..13daa2422 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: 2014-08-26 20:40+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-25 16:26+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -97,8 +97,8 @@ msgstr "从 TFTP 引导"
 
 # index.docbook:432, index.docbook:786, index.docbook:1338, index.docbook:1819, index.docbook:2242, index.docbook:2338
 #. Tag: para
-#: boot-installer.xml:70 boot-installer.xml:630 boot-installer.xml:1252
-#: boot-installer.xml:1436 boot-installer.xml:1759 boot-installer.xml:1869
+#: boot-installer.xml:70 boot-installer.xml:689 boot-installer.xml:1311
+#: boot-installer.xml:1495 boot-installer.xml:1818 boot-installer.xml:1928
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Booting from the network requires that you have a network connection and "
@@ -113,8 +113,8 @@ msgstr ""
 
 # index.docbook:437, index.docbook:791, index.docbook:1343, index.docbook:1824, index.docbook:2247, index.docbook:2343
 #. Tag: para
-#: boot-installer.xml:76 boot-installer.xml:636 boot-installer.xml:1258
-#: boot-installer.xml:1442 boot-installer.xml:1765 boot-installer.xml:1875
+#: boot-installer.xml:76 boot-installer.xml:695 boot-installer.xml:1317
+#: boot-installer.xml:1501 boot-installer.xml:1824 boot-installer.xml:1934
 #, no-c-format
 msgid ""
 "Older systems such as the 715 might require the use of an RBOOT server "
@@ -123,8 +123,8 @@ msgstr "较早的系统比如 715 也许需要使用一台 RBOOT 服务器来取
 
 # index.docbook:442, index.docbook:796, index.docbook:1348, index.docbook:1829, index.docbook:2252, index.docbook:2348
 #. Tag: para
-#: boot-installer.xml:81 boot-installer.xml:641 boot-installer.xml:1263
-#: boot-installer.xml:1447 boot-installer.xml:1770 boot-installer.xml:1880
+#: boot-installer.xml:81 boot-installer.xml:700 boot-installer.xml:1322
+#: boot-installer.xml:1506 boot-installer.xml:1829 boot-installer.xml:1939
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The installation method to support network booting is described in <xref "
@@ -263,18 +263,91 @@ msgid ""
 "the ${fdt_addr_r} parameter."
 msgstr ""
 
+# index.docbook:700, index.docbook:2176
+#. Tag: title
+#: boot-installer.xml:160
+#, fuzzy, no-c-format
+#| msgid "Booting from USB memory stick"
+msgid "Booting from a USB stick in u-boot"
+msgstr "从 U 盘引导"
+
+#. Tag: para
+#: boot-installer.xml:161
+#, no-c-format
+msgid ""
+"Many modern u-boot versions have USB support and allow booting from USB mass "
+"storage devices such as USB sticks. Unfortunately the exact steps required "
+"to do that can vary quite a bit from device to device."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:168
+#, no-c-format
+msgid ""
+"U-Boot v2014.10 has introduced a common commandline handling and autoboot "
+"framework. This allows building generic boot images that work on any system "
+"implementing this framework. The &d-i; supports installation from a USB "
+"stick on such systems, but unfortunately not all platforms have adopted this "
+"new framework yet."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:177
+#, no-c-format
+msgid ""
+"To build a bootable USB stick for installing &debian;, unpack the hd-media "
+"tarball (see <xref linkend=\"where-files\"/>) onto a USB stick formatted "
+"with a filesystem supported by the u-boot version on your device. For modern "
+"u-boot versions, any of FAT16 / FAT32 / ext2 / ext3 / ext4 usually works. "
+"Then copy the ISO image file of the first &debian; installation CD or DVD "
+"onto the stick."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:187
+#, no-c-format
+msgid ""
+"The autoboot framework in modern u-boot versions works similar to the boot "
+"ordering options in a PC BIOS, i.e. it checks a list of possible boot "
+"devices for a valid boot image and starts the first one it finds. If there "
+"is no operating system installed, plugging in the USB stick and powering up "
+"the system should result in starting the installer. You can also initiate "
+"the USB-boot process any time from the u-boot prompt by entering the "
+"<quote>run usb_boot</quote> command."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:197
+#, no-c-format
+msgid ""
+"One problem that can come up when booting from a USB stick while using a "
+"serial console can be a console baudrate mismatch. If a console variable is "
+"defined in u-boot, the &d-i; boot script automatically passes it to the "
+"kernel to set the primary console device and, if applicable, the console "
+"baudrate. Unfortunately the handling of the console variable varies from "
+"platform to platform - on some platforms, the console variable includes the "
+"baudrate (as in <quote>console=ttyS0,115200</quote>), while on other "
+"platforms the console variable contains only the device (as in "
+"<quote>console=ttyS0</quote>). The latter case leads to a garbled console "
+"output when the default baudrate differs between u-boot and the kernel. "
+"Modern u-boot versions often use 115200 baud while the kernel still defaults "
+"to the traditional 9600 baud. If this happens, you should manually set the "
+"console variable to contain the correct baudrate for your system and then "
+"start the installer with the <quote>run usb_boot</quote> command."
+msgstr ""
+
 # index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
 #. Tag: title
-#: boot-installer.xml:286 boot-installer.xml:865 boot-installer.xml:1522
-#: boot-installer.xml:1903
+#: boot-installer.xml:345 boot-installer.xml:924 boot-installer.xml:1581
+#: boot-installer.xml:1962
 #, no-c-format
 msgid "Booting from a CD-ROM"
 msgstr "从 CD-ROM 启动"
 
 # index.docbook:531, index.docbook:584, index.docbook:957, index.docbook:1776, index.docbook:2024, index.docbook:2378
 #. Tag: para
-#: boot-installer.xml:292 boot-installer.xml:871 boot-installer.xml:1528
-#: boot-installer.xml:1909
+#: boot-installer.xml:351 boot-installer.xml:930 boot-installer.xml:1587
+#: boot-installer.xml:1968
 #, no-c-format
 msgid ""
 "The easiest route for most people will be to use a set of &debian; CDs. If "
@@ -290,8 +363,8 @@ msgstr ""
 
 # index.docbook:542, index.docbook:595, index.docbook:968, index.docbook:1787, index.docbook:2035, index.docbook:2389
 #. Tag: para
-#: boot-installer.xml:303 boot-installer.xml:882 boot-installer.xml:1539
-#: boot-installer.xml:1920
+#: boot-installer.xml:362 boot-installer.xml:941 boot-installer.xml:1598
+#: boot-installer.xml:1979
 #, no-c-format
 msgid ""
 "Note that certain CD drives may require special drivers, and thus be "
@@ -306,8 +379,8 @@ msgstr ""
 
 # index.docbook:550, index.docbook:603, index.docbook:976, index.docbook:1795, index.docbook:2043, index.docbook:2397
 #. Tag: para
-#: boot-installer.xml:311 boot-installer.xml:890 boot-installer.xml:1547
-#: boot-installer.xml:1928
+#: boot-installer.xml:370 boot-installer.xml:949 boot-installer.xml:1606
+#: boot-installer.xml:1987
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Even if you cannot boot from CD-ROM, you can probably install the "
@@ -328,8 +401,8 @@ msgstr ""
 
 # index.docbook:558, index.docbook:611, index.docbook:984, index.docbook:1803, index.docbook:2051, index.docbook:2405
 #. Tag: para
-#: boot-installer.xml:319 boot-installer.xml:898 boot-installer.xml:1555
-#: boot-installer.xml:1936
+#: boot-installer.xml:378 boot-installer.xml:957 boot-installer.xml:1614
+#: boot-installer.xml:1995
 #, no-c-format
 msgid ""
 "If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -337,19 +410,19 @@ msgstr ""
 "如果您遇到引导方面的问题，请参见 <xref linkend=\"boot-troubleshooting\"/>。"
 
 #. Tag: title
-#: boot-installer.xml:393
+#: boot-installer.xml:452
 #, no-c-format
 msgid "Booting from Windows"
 msgstr "从 Windows 引导"
 
 #. Tag: para
-#: boot-installer.xml:394
+#: boot-installer.xml:453
 #, no-c-format
 msgid "To start the installer from Windows, you can either"
 msgstr "从 Windows 下启动安装程序，您可以"
 
 #. Tag: para
-#: boot-installer.xml:399
+#: boot-installer.xml:458
 #, no-c-format
 msgid ""
 "obtain CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> or USB memory "
@@ -362,7 +435,7 @@ msgstr ""
 "condition=\"bootable-usb\"> 或 U 盘</phrase> 安装介质，或"
 
 #. Tag: para
-#: boot-installer.xml:407
+#: boot-installer.xml:466
 #, no-c-format
 msgid ""
 "download a standalone Windows executable, which is available as tools/win32-"
@@ -372,7 +445,7 @@ msgstr ""
 "stable/win32-loader.exe，"
 
 #. Tag: para
-#: boot-installer.xml:415
+#: boot-installer.xml:474
 #, no-c-format
 msgid ""
 "If you use an installation CD or DVD, a pre-installation program should be "
@@ -386,7 +459,7 @@ msgstr ""
 "<command>setup.exe</command> 程序。"
 
 #. Tag: para
-#: boot-installer.xml:423
+#: boot-installer.xml:482
 #, no-c-format
 msgid ""
 "After the program has been started, a few preliminary questions will be "
@@ -397,14 +470,14 @@ msgstr ""
 "序。"
 
 #. Tag: title
-#: boot-installer.xml:433
+#: boot-installer.xml:492
 #, fuzzy, no-c-format
 #| msgid "Booting from DOS"
 msgid "Booting from DOS using loadlin"
 msgstr "从 DOS 引导"
 
 #. Tag: para
-#: boot-installer.xml:434
+#: boot-installer.xml:493
 #, no-c-format
 msgid ""
 "Boot into DOS (not Windows). To do this, you can for instance boot from a "
@@ -412,7 +485,7 @@ msgid ""
 msgstr "要启动到 DOS (非 Windows)，您可以从一个用于恢复或诊断的磁盘引导。"
 
 #. Tag: para
-#: boot-installer.xml:439
+#: boot-installer.xml:498
 #, no-c-format
 msgid ""
 "If you can access the installation CD, change the current drive to the CD-"
@@ -429,7 +502,7 @@ msgstr ""
 "\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
 
 #. Tag: para
-#: boot-installer.xml:449
+#: boot-installer.xml:508
 #, no-c-format
 msgid ""
 "Enter the subdirectory for the flavor you chose, e.g., "
@@ -450,7 +523,7 @@ msgstr ""
 "会加载并运行安装程序。"
 
 #. Tag: title
-#: boot-installer.xml:467
+#: boot-installer.xml:526
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Booting from Linux Using <command>LILO</command> or <command>GRUB</"
@@ -460,7 +533,7 @@ msgid ""
 msgstr "引导 Linux 使用 <command>LILO</command> 或 <command>GRUB</command>"
 
 #. Tag: para
-#: boot-installer.xml:470
+#: boot-installer.xml:529
 #, no-c-format
 msgid ""
 "To boot the installer from hard disk, you must first download and place the "
@@ -470,7 +543,7 @@ msgstr ""
 "<xref linkend=\"boot-drive-files\"/>。"
 
 #. Tag: para
-#: boot-installer.xml:475
+#: boot-installer.xml:534
 #, no-c-format
 msgid ""
 "If you intend to use the hard drive only for booting and then download "
@@ -486,7 +559,7 @@ msgstr ""
 "您重新分区用于引导的硬盘，需要小心操作。"
 
 #. Tag: para
-#: boot-installer.xml:485
+#: boot-installer.xml:544
 #, no-c-format
 msgid ""
 "Alternatively, if you intend to keep an existing partition on the hard drive "
@@ -502,7 +575,7 @@ msgstr ""
 "以从硬盘引导，并从 CD/DVD 映像文件上安装，而不使用网络。"
 
 #. Tag: para
-#: boot-installer.xml:494
+#: boot-installer.xml:553
 #, no-c-format
 msgid ""
 "For <command>LILO</command>, you will need to configure two essential things "
@@ -520,7 +593,7 @@ msgstr ""
 "lilo.conf</filename> 的例子："
 
 #. Tag: screen
-#: boot-installer.xml:515
+#: boot-installer.xml:574
 #, no-c-format
 msgid ""
 "image=/boot/newinstall/vmlinuz\n"
@@ -532,7 +605,7 @@ msgstr ""
 "       initrd=/boot/newinstall/initrd.gz"
 
 #. Tag: para
-#: boot-installer.xml:515
+#: boot-installer.xml:574
 #, no-c-format
 msgid ""
 "For more details, refer to the <citerefentry><refentrytitle>initrd</"
@@ -547,7 +620,7 @@ msgstr ""
 "行 <userinput>lilo</userinput> 并且重新启动。"
 
 #. Tag: para
-#: boot-installer.xml:524
+#: boot-installer.xml:583
 #, no-c-format
 msgid ""
 "The procedure for <command>GRUB1</command> is quite similar. Locate your "
@@ -562,7 +635,7 @@ msgstr ""
 "boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
 
 #. Tag: screen
-#: boot-installer.xml:532
+#: boot-installer.xml:591
 #, no-c-format
 msgid ""
 "title  New Install\n"
@@ -576,7 +649,7 @@ msgstr ""
 "initrd /boot/newinstall/initrd.gz"
 
 #. Tag: para
-#: boot-installer.xml:534
+#: boot-installer.xml:593
 #, no-c-format
 msgid ""
 "The procedure for <command>GRUB2</command> is very similar. The file is "
@@ -587,7 +660,7 @@ msgstr ""
 "filename> 替代 <filename>menu.lst</filename> 文件。安装程序的入口，例如:"
 
 #. Tag: screen
-#: boot-installer.xml:540
+#: boot-installer.xml:599
 #, no-c-format
 msgid ""
 "menuentry 'New Install' {\n"
@@ -607,7 +680,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: boot-installer.xml:542
+#: boot-installer.xml:601
 #, no-c-format
 msgid ""
 "From here on, there should be no difference between <command>GRUB</command> "
@@ -618,13 +691,13 @@ msgstr ""
 
 # index.docbook:700, index.docbook:2176
 #. Tag: title
-#: boot-installer.xml:551
+#: boot-installer.xml:610
 #, no-c-format
 msgid "Booting from USB Memory Stick"
 msgstr "从 U 盘引导"
 
 #. Tag: para
-#: boot-installer.xml:552
+#: boot-installer.xml:611
 #, no-c-format
 msgid ""
 "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
@@ -641,14 +714,14 @@ msgstr ""
 
 # index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
 #. Tag: title
-#: boot-installer.xml:566 boot-installer.xml:1809
+#: boot-installer.xml:625 boot-installer.xml:1868
 #, no-c-format
 msgid "Booting from Floppies"
 msgstr "从软盘引导"
 
 # index.docbook:724, index.docbook:2286
 #. Tag: para
-#: boot-installer.xml:567 boot-installer.xml:1817
+#: boot-installer.xml:626 boot-installer.xml:1876
 #, no-c-format
 msgid ""
 "You will have already downloaded the floppy images you needed and created "
@@ -658,7 +731,7 @@ msgstr ""
 "\"create-floppy\"/>。"
 
 #. Tag: para
-#: boot-installer.xml:574
+#: boot-installer.xml:633
 #, no-c-format
 msgid ""
 "To boot from the installer boot floppy, place it in the primary floppy "
@@ -668,7 +741,7 @@ msgstr ""
 "开。"
 
 #. Tag: para
-#: boot-installer.xml:580
+#: boot-installer.xml:639
 #, no-c-format
 msgid ""
 "For installing from an LS-120 drive (ATAPI version) with a set of floppies, "
@@ -684,7 +757,7 @@ msgstr ""
 "(master)，那么在提示符下输入 <userinput>install root=/dev/hdc</userinput>。"
 
 #. Tag: para
-#: boot-installer.xml:590
+#: boot-installer.xml:649
 #, no-c-format
 msgid ""
 "Note that on some machines, <keycombo><keycap>Control</keycap> <keycap>Alt</"
@@ -699,7 +772,7 @@ msgstr ""
 "选择。在其它情况下，请在引导时使用硬重启。"
 
 #. Tag: para
-#: boot-installer.xml:599
+#: boot-installer.xml:658
 #, no-c-format
 msgid ""
 "The floppy disk will be accessed, and you should then see a screen that "
@@ -709,7 +782,7 @@ msgstr ""
 "</prompt> 提示符。"
 
 #. Tag: para
-#: boot-installer.xml:605
+#: boot-installer.xml:664
 #, no-c-format
 msgid ""
 "Once you press &enterkey;, you should see the message "
@@ -725,7 +798,7 @@ msgstr ""
 "下面 <xref linkend=\"kernel-msgs\"/> 可以找到。"
 
 #. Tag: para
-#: boot-installer.xml:614
+#: boot-installer.xml:673
 #, no-c-format
 msgid ""
 "After booting from the boot floppy, the root floppy is requested. Insert the "
@@ -738,26 +811,26 @@ msgstr ""
 
 # index.docbook:274, index.docbook:780, index.docbook:1320, index.docbook:1813, index.docbook:1896, index.docbook:2236, index.docbook:2332
 #. Tag: title
-#: boot-installer.xml:624 boot-installer.xml:1234 boot-installer.xml:1376
-#: boot-installer.xml:1430 boot-installer.xml:1753 boot-installer.xml:1863
+#: boot-installer.xml:683 boot-installer.xml:1293 boot-installer.xml:1435
+#: boot-installer.xml:1489 boot-installer.xml:1812 boot-installer.xml:1922
 #, no-c-format
 msgid "Booting with TFTP"
 msgstr "用 TFTP 引导"
 
 #. Tag: para
-#: boot-installer.xml:649
+#: boot-installer.xml:708
 #, no-c-format
 msgid "There are various ways to do a TFTP boot on i386."
 msgstr "在 i386 体系上有很多方法用 TFTP 进行引导。"
 
 #. Tag: title
-#: boot-installer.xml:655
+#: boot-installer.xml:714
 #, no-c-format
 msgid "NIC or Motherboard that support PXE"
 msgstr "支持 PXE 的网卡或者主板"
 
 #. Tag: para
-#: boot-installer.xml:656
+#: boot-installer.xml:715
 #, no-c-format
 msgid ""
 "It could be that your Network Interface Card or Motherboard provides PXE "
@@ -770,13 +843,13 @@ msgstr ""
 "引导。"
 
 #. Tag: title
-#: boot-installer.xml:667
+#: boot-installer.xml:726
 #, no-c-format
 msgid "NIC with Network BootROM"
 msgstr "网络 BootROM 的网卡"
 
 #. Tag: para
-#: boot-installer.xml:668
+#: boot-installer.xml:727
 #, no-c-format
 msgid ""
 "It could be that your Network Interface Card provides TFTP boot "
@@ -784,7 +857,7 @@ msgid ""
 msgstr "您的网卡很有可能提供了 TFTP 引导功能。"
 
 #. Tag: para
-#: boot-installer.xml:673
+#: boot-installer.xml:732
 #, no-c-format
 msgid ""
 "Let us (<email>&email-debian-boot-list;</email>) know how did you manage it. "
@@ -794,13 +867,13 @@ msgstr ""
 "文档。"
 
 #. Tag: title
-#: boot-installer.xml:681
+#: boot-installer.xml:740
 #, no-c-format
 msgid "Etherboot"
 msgstr "Etherboot"
 
 #. Tag: para
-#: boot-installer.xml:682
+#: boot-installer.xml:741
 #, no-c-format
 msgid ""
 "The <ulink url=\"http://www.etherboot.org\">etherboot project</ulink> "
@@ -811,13 +884,13 @@ msgstr ""
 
 # index.docbook:1943, index.docbook:2477
 #. Tag: title
-#: boot-installer.xml:692
+#: boot-installer.xml:751
 #, no-c-format
 msgid "The Boot Screen"
 msgstr "引导界面"
 
 #. Tag: para
-#: boot-installer.xml:693
+#: boot-installer.xml:752
 #, no-c-format
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
@@ -852,7 +925,7 @@ msgstr ""
 "项，在其下方，因此会有双倍的选项。"
 
 #. Tag: para
-#: boot-installer.xml:705
+#: boot-installer.xml:764
 #, fuzzy, no-c-format
 #| msgid ""
 #| "For a normal installation, select either the <quote>Install</quote> or "
@@ -872,7 +945,7 @@ msgstr ""
 "quote> 入口已经选中 &mdash; 然后按下 &enterkey; 引导安装程序。"
 
 #. Tag: para
-#: boot-installer.xml:713
+#: boot-installer.xml:772
 #, no-c-format
 msgid ""
 "The <quote>Advanced options</quote> entry gives access to a second menu that "
@@ -883,7 +956,7 @@ msgstr ""
 "expert 模式、rescue 模式和自动安装。"
 
 #. Tag: para
-#: boot-installer.xml:719
+#: boot-installer.xml:778
 #, no-c-format
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
@@ -899,7 +972,7 @@ msgstr ""
 "您所做的修改。"
 
 #. Tag: para
-#: boot-installer.xml:728
+#: boot-installer.xml:787
 #, no-c-format
 msgid ""
 "Choosing the <quote>Help</quote> entry will result in the first help screen "
@@ -928,7 +1001,7 @@ msgstr ""
 "(例如：<userinput>install fb=false</userinput>)。"
 
 #. Tag: para
-#: boot-installer.xml:746
+#: boot-installer.xml:805
 #, no-c-format
 msgid ""
 "The keyboard is assumed to have a default American English layout at this "
@@ -944,7 +1017,7 @@ msgstr ""
 "说明了如何找到要使用正确的键。"
 
 #. Tag: para
-#: boot-installer.xml:756
+#: boot-installer.xml:815
 #, no-c-format
 msgid ""
 "If you are using a system that has the BIOS configured to use serial "
@@ -962,7 +1035,7 @@ msgstr ""
 "Assistant</quote> (IRA)。"
 
 #. Tag: para
-#: boot-installer.xml:766
+#: boot-installer.xml:825
 #, no-c-format
 msgid ""
 "To bypass the graphical boot screen you can either blindly press &escapekey; "
@@ -980,13 +1053,13 @@ msgstr ""
 "userinput>，这在帮助里面有说明。"
 
 #. Tag: title
-#: boot-installer.xml:782
+#: boot-installer.xml:841
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:783
+#: boot-installer.xml:842
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -997,7 +1070,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:791
+#: boot-installer.xml:850
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -1009,7 +1082,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:800
+#: boot-installer.xml:859
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -1023,7 +1096,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:811
+#: boot-installer.xml:870
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -1035,7 +1108,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:824
+#: boot-installer.xml:883
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -1047,7 +1120,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:838
+#: boot-installer.xml:897
 #, no-c-format
 msgid ""
 "Just as with the text-based installer it is possible to add boot parameters "
@@ -1055,7 +1128,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:844
+#: boot-installer.xml:903
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -1065,7 +1138,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:851
+#: boot-installer.xml:910
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -1075,13 +1148,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:906
+#: boot-installer.xml:965
 #, no-c-format
 msgid "CD Contents"
 msgstr "CD 的内容"
 
 #. Tag: para
-#: boot-installer.xml:908
+#: boot-installer.xml:967
 #, no-c-format
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
@@ -1102,7 +1175,7 @@ msgstr ""
 "光盘套件，则可以不使用网络就能安装大量软件包，建立完整的系统。"
 
 #. Tag: para
-#: boot-installer.xml:924
+#: boot-installer.xml:983
 #, no-c-format
 msgid ""
 "The IA-64 architecture uses the next generation Extensible Firmware "
@@ -1125,7 +1198,7 @@ msgstr ""
 "MBR 或者引导块记录。"
 
 #. Tag: para
-#: boot-installer.xml:940
+#: boot-installer.xml:999
 #, no-c-format
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
@@ -1140,7 +1213,7 @@ msgstr ""
 "说明如下。"
 
 #. Tag: para
-#: boot-installer.xml:949
+#: boot-installer.xml:1008
 #, no-c-format
 msgid ""
 "Most of the details of how <command>ELILO</command> actually loads and "
@@ -1159,7 +1232,7 @@ msgstr ""
 "查一个 EFI 分区是否合适。"
 
 #. Tag: para
-#: boot-installer.xml:961
+#: boot-installer.xml:1020
 #, no-c-format
 msgid ""
 "The EFI Boot Manager is presented as the last step of the firmware "
@@ -1179,13 +1252,13 @@ msgstr ""
 "用第一个，当然，该选项不可用或者 CD 由于某种原因没法启动，使用第二个。"
 
 #. Tag: title
-#: boot-installer.xml:980
+#: boot-installer.xml:1039
 #, no-c-format
 msgid "IMPORTANT"
 msgstr "重要"
 
 #. Tag: para
-#: boot-installer.xml:981
+#: boot-installer.xml:1040
 #, no-c-format
 msgid ""
 "The EFI Boot Manager will select a default boot action, typically the first "
@@ -1202,13 +1275,13 @@ msgstr ""
 "command>返回 Boot Manager。"
 
 #. Tag: title
-#: boot-installer.xml:993
+#: boot-installer.xml:1052
 #, no-c-format
 msgid "Option 1: Booting from the Boot Option Maintenance Menu"
 msgstr "选项 1: 从 Boot Option Maintenance Menu 启动"
 
 #. Tag: para
-#: boot-installer.xml:1000
+#: boot-installer.xml:1059
 #, no-c-format
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1219,7 +1292,7 @@ msgstr ""
 "Boot Manager 页面和菜单。"
 
 #. Tag: para
-#: boot-installer.xml:1006
+#: boot-installer.xml:1065
 #, no-c-format
 msgid ""
 "Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
@@ -1229,7 +1302,7 @@ msgstr ""
 "<command>ENTER</command>。会显示一个新菜单。"
 
 #. Tag: para
-#: boot-installer.xml:1012
+#: boot-installer.xml:1071
 #, no-c-format
 msgid ""
 "Select <command>Boot From a File</command> from the menu with the arrow keys "
@@ -1245,7 +1318,7 @@ msgstr ""
 "Boot</command>标签。如果您检查菜单行其他部分，会看到对应的设备和控制器信息。"
 
 #. Tag: para
-#: boot-installer.xml:1023
+#: boot-installer.xml:1082
 #, no-c-format
 msgid ""
 "You can choose either of the entries that refer to the CD/DVD drive. Select "
@@ -1261,7 +1334,7 @@ msgstr ""
 "的 CD 目录列表，要求您进行(额外的)下一步。"
 
 #. Tag: para
-#: boot-installer.xml:1034
+#: boot-installer.xml:1093
 #, no-c-format
 msgid ""
 "You will only need this step if you chose <command>Debian Inst [Acpi ...</"
@@ -1275,7 +1348,7 @@ msgstr ""
 "择，并按下 <command>ENTER</command>。这将进入启动步骤。"
 
 #. Tag: para
-#: boot-installer.xml:1046
+#: boot-installer.xml:1105
 #, no-c-format
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
@@ -1286,13 +1359,13 @@ msgstr ""
 "进入选择启动内核和选项。"
 
 #. Tag: title
-#: boot-installer.xml:1056
+#: boot-installer.xml:1115
 #, no-c-format
 msgid "Option 2: Booting from the EFI Shell"
 msgstr "选项 2: 从 EFI Shell 启动"
 
 #. Tag: para
-#: boot-installer.xml:1057
+#: boot-installer.xml:1116
 #, no-c-format
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
@@ -1305,7 +1378,7 @@ msgstr ""
 "来引导 &debian; 安装程序 CD :"
 
 #. Tag: para
-#: boot-installer.xml:1068
+#: boot-installer.xml:1127
 #, no-c-format
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1314,7 +1387,7 @@ msgid ""
 msgstr "把 CD 放入 DVD/CD 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:1074
+#: boot-installer.xml:1133
 #, no-c-format
 msgid ""
 "Select <command>EFI Shell</command> from the menu with the arrow keys and "
@@ -1334,7 +1407,7 @@ msgstr ""
 "用于初始化 CD 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:1088
+#: boot-installer.xml:1147
 #, no-c-format
 msgid ""
 "Examine the output from the shell looking for the CDROM drive. It is most "
@@ -1347,7 +1420,7 @@ msgstr ""
 "<filename>fs<replaceable>n</replaceable></filename>。"
 
 #. Tag: para
-#: boot-installer.xml:1095
+#: boot-installer.xml:1154
 #, no-c-format
 msgid ""
 "Enter <command>fs<replaceable>n</replaceable>:</command> and press "
@@ -1360,7 +1433,7 @@ msgstr ""
 "光盘的分区号。Shell 现在将在提示符下显示分区号。"
 
 #. Tag: para
-#: boot-installer.xml:1102
+#: boot-installer.xml:1161
 #, no-c-format
 msgid ""
 "Enter <command>elilo</command> and press <command>ENTER</command>. This will "
@@ -1370,7 +1443,7 @@ msgstr ""
 "骤。"
 
 #. Tag: para
-#: boot-installer.xml:1109
+#: boot-installer.xml:1168
 #, no-c-format
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
@@ -1384,13 +1457,13 @@ msgstr ""
 "replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
 
 #. Tag: title
-#: boot-installer.xml:1123
+#: boot-installer.xml:1182
 #, no-c-format
 msgid "Installing using a Serial Console"
 msgstr "使用串口控制台安装"
 
 #. Tag: para
-#: boot-installer.xml:1125
+#: boot-installer.xml:1184
 #, no-c-format
 msgid ""
 "You may choose to perform an install using a monitor and keyboard or using a "
@@ -1408,7 +1481,7 @@ msgstr ""
 "置。"
 
 #. Tag: para
-#: boot-installer.xml:1136
+#: boot-installer.xml:1195
 #, no-c-format
 msgid ""
 "In most circumstances, you will want the installer to use the same baud rate "
@@ -1420,7 +1493,7 @@ msgstr ""
 "置，可以通过命令 <command>baud</command> 在 EFI shell 获得。"
 
 #. Tag: para
-#: boot-installer.xml:1143
+#: boot-installer.xml:1202
 #, no-c-format
 msgid ""
 "If there is not an option available that is configured for the serial device "
@@ -1435,7 +1508,7 @@ msgstr ""
 "窗口。"
 
 #. Tag: para
-#: boot-installer.xml:1154
+#: boot-installer.xml:1213
 #, no-c-format
 msgid ""
 "Most IA-64 boxes ship with a default console setting of 9600 baud. This "
@@ -1450,7 +1523,7 @@ msgstr ""
 "装。参考 <classname>Params</classname> 帮助菜单，获得启动文本模式安装的指导。"
 
 #. Tag: para
-#: boot-installer.xml:1163
+#: boot-installer.xml:1222
 #, no-c-format
 msgid ""
 "If you select the wrong console type, you will be able to select the kernel "
@@ -1462,13 +1535,13 @@ msgstr ""
 "核启动后死掉，只有重新启动才能开始安装。"
 
 #. Tag: title
-#: boot-installer.xml:1172
+#: boot-installer.xml:1231
 #, no-c-format
 msgid "Selecting the Boot Kernel and Options"
 msgstr "选择启动内核与选项"
 
 #. Tag: para
-#: boot-installer.xml:1174
+#: boot-installer.xml:1233
 #, no-c-format
 msgid ""
 "The boot loader will display a form with a menu list and a text window with "
@@ -1485,7 +1558,7 @@ msgstr ""
 "<classname>Params</classname>窗口解释命令行参数。"
 
 #. Tag: para
-#: boot-installer.xml:1186
+#: boot-installer.xml:1245
 #, no-c-format
 msgid ""
 "Consult the <classname>General</classname> help screen for the description "
@@ -1505,7 +1578,7 @@ msgstr ""
 "始安装："
 
 #. Tag: para
-#: boot-installer.xml:1204
+#: boot-installer.xml:1263
 #, no-c-format
 msgid ""
 "Select the kernel version and installation mode most appropriate to your "
@@ -1513,7 +1586,7 @@ msgid ""
 msgstr "使用方向键选择您需要的内核版本和适合的安装模式。"
 
 #. Tag: para
-#: boot-installer.xml:1209
+#: boot-installer.xml:1268
 #, no-c-format
 msgid ""
 "Enter any boot parameters by typing at the keyboard. The text will be "
@@ -1524,7 +1597,7 @@ msgstr ""
 "控制台)指定的。"
 
 #. Tag: para
-#: boot-installer.xml:1216
+#: boot-installer.xml:1275
 #, no-c-format
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
@@ -1535,7 +1608,7 @@ msgstr ""
 "一个屏幕显示常规的初始化信息。"
 
 #. Tag: para
-#: boot-installer.xml:1225 boot-installer.xml:1362
+#: boot-installer.xml:1284 boot-installer.xml:1421
 #, no-c-format
 msgid ""
 "Proceed to the next chapter to continue the installation where you will set "
@@ -1543,7 +1616,7 @@ msgid ""
 msgstr "进入到下一章继续安装本地语言，网络和磁盘分区。"
 
 #. Tag: para
-#: boot-installer.xml:1236
+#: boot-installer.xml:1295
 #, no-c-format
 msgid ""
 "Booting an IA-64 system from the network is similar to a CD boot. The only "
@@ -1560,7 +1633,7 @@ msgstr ""
 "器。"
 
 #. Tag: para
-#: boot-installer.xml:1271
+#: boot-installer.xml:1330
 #, no-c-format
 msgid ""
 "Network booting an IA-64 system requires two architecture-specific actions. "
@@ -1573,13 +1646,13 @@ msgstr ""
 "必须在 EFI boot manager 下定义来打开网络的装入。"
 
 #. Tag: title
-#: boot-installer.xml:1282
+#: boot-installer.xml:1341
 #, no-c-format
 msgid "Configuring the Server"
 msgstr "配置网络服务器"
 
 #. Tag: para
-#: boot-installer.xml:1283
+#: boot-installer.xml:1342
 #, no-c-format
 msgid ""
 "A suitable TFTP entry for network booting an IA-64 system looks something "
@@ -1603,7 +1676,7 @@ msgstr ""
 "在客户端运行。"
 
 #. Tag: para
-#: boot-installer.xml:1293
+#: boot-installer.xml:1352
 #, no-c-format
 msgid ""
 "Extract the <filename>netboot.tar.gz</filename> file into the directory used "
@@ -1618,7 +1691,7 @@ msgstr ""
 "它包括 IA-64 系统需要的启动文件。"
 
 #. Tag: screen
-#: boot-installer.xml:1303
+#: boot-installer.xml:1362
 #, no-c-format
 msgid ""
 "# cd /var/lib/tftp\n"
@@ -1636,7 +1709,7 @@ msgstr ""
 "[...]"
 
 #. Tag: para
-#: boot-installer.xml:1303
+#: boot-installer.xml:1362
 #, no-c-format
 msgid ""
 "The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
@@ -1655,13 +1728,13 @@ msgstr ""
 "filename>。请查看 <classname>elilo</classname> 软件包附带的文档以获得细节。"
 
 #. Tag: title
-#: boot-installer.xml:1320
+#: boot-installer.xml:1379
 #, no-c-format
 msgid "Configuring the Client"
 msgstr "配置客户机"
 
 #. Tag: para
-#: boot-installer.xml:1321
+#: boot-installer.xml:1380
 #, no-c-format
 msgid ""
 "To configure the client to support TFTP booting, start by booting to EFI and "
@@ -1688,7 +1761,7 @@ msgstr ""
 "DHCP 查询，然后会从服务器装入 <filename>elilo.efi</filename>。"
 
 #. Tag: para
-#: boot-installer.xml:1353
+#: boot-installer.xml:1412
 #, no-c-format
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
@@ -1703,13 +1776,13 @@ msgstr ""
 
 # index.docbook:1899, index.docbook:1946
 #. Tag: title
-#: boot-installer.xml:1379 boot-installer.xml:1403
+#: boot-installer.xml:1438 boot-installer.xml:1462
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "SGI TFTP 引导"
 
 #. Tag: para
-#: boot-installer.xml:1380
+#: boot-installer.xml:1439
 #, no-c-format
 msgid ""
 "After entering the command monitor use <informalexample><screen>\n"
@@ -1731,13 +1804,13 @@ msgstr ""
 
 # index.docbook:1943, index.docbook:2477
 #. Tag: title
-#: boot-installer.xml:1400 boot-installer.xml:2155
+#: boot-installer.xml:1459 boot-installer.xml:2214
 #, no-c-format
 msgid "Boot Parameters"
 msgstr "引导参数"
 
 #. Tag: para
-#: boot-installer.xml:1404
+#: boot-installer.xml:1463
 #, no-c-format
 msgid ""
 "On SGI machines you can append boot parameters to the <command>bootp():</"
@@ -1747,7 +1820,7 @@ msgstr ""
 "参数。"
 
 #. Tag: para
-#: boot-installer.xml:1409
+#: boot-installer.xml:1468
 #, no-c-format
 msgid ""
 "Following the <command>bootp():</command> command you can give the path and "
@@ -1765,19 +1838,19 @@ msgstr ""
 "command>:"
 
 #. Tag: screen
-#: boot-installer.xml:1419
+#: boot-installer.xml:1478
 #, no-c-format
 msgid "bootp(): append=\"root=/dev/sda1\""
 msgstr "bootp(): append=\"root=/dev/sda1\""
 
 #. Tag: title
-#: boot-installer.xml:1462
+#: boot-installer.xml:1521
 #, no-c-format
 msgid "s390 Limitations"
 msgstr "s390 的限制"
 
 #. Tag: para
-#: boot-installer.xml:1463
+#: boot-installer.xml:1522
 #, no-c-format
 msgid ""
 "In order to run the installation system a working network setup and ssh "
@@ -1785,7 +1858,7 @@ msgid ""
 msgstr "为了在 S/390 上安装系统，需要一个工作的网络设置和 ssh 会话。"
 
 #. Tag: para
-#: boot-installer.xml:1468
+#: boot-installer.xml:1527
 #, no-c-format
 msgid ""
 "The booting process starts with a network setup that prompts you for several "
@@ -1797,13 +1870,13 @@ msgstr ""
 "一个 ssh 会话登录进入系统，并且开始一个标准系统安装。"
 
 #. Tag: title
-#: boot-installer.xml:1479
+#: boot-installer.xml:1538
 #, no-c-format
 msgid "s390 Boot Parameters"
 msgstr "s390 引导参数"
 
 #. Tag: para
-#: boot-installer.xml:1480
+#: boot-installer.xml:1539
 #, fuzzy, no-c-format
 #| msgid ""
 #| "On S/390 you can append boot parameters in the parm file. This file can "
@@ -1824,7 +1897,7 @@ msgstr ""
 "映像。"
 
 #. Tag: para
-#: boot-installer.xml:1497
+#: boot-installer.xml:1556
 #, no-c-format
 msgid ""
 "If you boot the installer in a logical partition (LPAR) or virtual machine "
@@ -1847,7 +1920,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1562
+#: boot-installer.xml:1621
 #, no-c-format
 msgid ""
 "Currently, the only &arch-title; subarchitectures that support CD-ROM "
@@ -1863,7 +1936,7 @@ msgstr ""
 "keycap> 和 <keycap>Delete</keycap> 组合键引导出厂默认的 CD/DVD 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:1571
+#: boot-installer.xml:1630
 #, no-c-format
 msgid ""
 "To boot a PowerMac from an external Firewire CD/DVD drive invoke Open "
@@ -1880,13 +1953,13 @@ msgstr ""
 "</screen></informalexample> 另一种方法引导出厂默认的 CD/DVD 驱动器，键入"
 
 #. Tag: screen
-#: boot-installer.xml:1582
+#: boot-installer.xml:1641
 #, no-c-format
 msgid "0 &gt; boot cd:,\\install\\yaboot"
 msgstr "0 &gt; boot cd:,\\install\\yaboot"
 
 #. Tag: para
-#: boot-installer.xml:1584
+#: boot-installer.xml:1643
 #, no-c-format
 msgid ""
 "OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
@@ -1901,7 +1974,7 @@ msgstr ""
 "安装程序 从 CD 上选择所需要的文件。"
 
 #. Tag: para
-#: boot-installer.xml:1593
+#: boot-installer.xml:1652
 #, no-c-format
 msgid ""
 "To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> key "
@@ -1912,13 +1985,13 @@ msgstr ""
 "<keycap>Esc</keycap> 键，出现 SmartFirmware 提示符后，键入"
 
 #. Tag: screen
-#: boot-installer.xml:1599
+#: boot-installer.xml:1658
 #, no-c-format
 msgid "boot cd install/pegasos"
 msgstr "boot cd install/pegasos"
 
 #. Tag: para
-#: boot-installer.xml:1601
+#: boot-installer.xml:1660
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> "
@@ -1933,20 +2006,20 @@ msgstr ""
 "<keycap>Esc</keycap> 键，出现 SmartFirmware 提示符后，键入"
 
 #. Tag: screen
-#: boot-installer.xml:1606
+#: boot-installer.xml:1665
 #, no-c-format
 msgid "0 > boot cdrom"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1612
+#: boot-installer.xml:1671
 #, no-c-format
 msgid "Booting from Hard Disk"
 msgstr "从硬盘引导"
 
 # index.docbook:1591, index.docbook:2097
 #. Tag: para
-#: boot-installer.xml:1618
+#: boot-installer.xml:1677
 #, no-c-format
 msgid ""
 "Booting from an existing operating system is often a convenient option; for "
@@ -1957,7 +2030,7 @@ msgstr ""
 
 # index.docbook:1597, index.docbook:2103
 #. Tag: para
-#: boot-installer.xml:1624
+#: boot-installer.xml:1683
 #, no-c-format
 msgid ""
 "To boot the installer from hard disk, you will have already completed "
@@ -1968,13 +2041,13 @@ msgstr ""
 "下载并且安置所需文件。"
 
 #. Tag: title
-#: boot-installer.xml:1644
+#: boot-installer.xml:1703
 #, no-c-format
 msgid "Booting OldWorld PowerMacs from MacOS"
 msgstr "从 OldWorld PowerMacs 的 MacOS 上引导"
 
 #. Tag: para
-#: boot-installer.xml:1645
+#: boot-installer.xml:1704
 #, no-c-format
 msgid ""
 "If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
@@ -1995,13 +2068,13 @@ msgstr ""
 "序。"
 
 #. Tag: title
-#: boot-installer.xml:1663
+#: boot-installer.xml:1722
 #, no-c-format
 msgid "Booting NewWorld Macs from OpenFirmware"
 msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 
 #. Tag: para
-#: boot-installer.xml:1664
+#: boot-installer.xml:1723
 #, no-c-format
 msgid ""
 "You will have already placed the <filename>vmlinux</filename>, "
@@ -2042,19 +2115,19 @@ msgstr ""
 
 # index.docbook:700, index.docbook:2176
 #. Tag: title
-#: boot-installer.xml:1696
+#: boot-installer.xml:1755
 #, no-c-format
 msgid "Booting from USB memory stick"
 msgstr "从 U 盘引导"
 
 #. Tag: para
-#: boot-installer.xml:1697
+#: boot-installer.xml:1756
 #, no-c-format
 msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
 msgstr "当前，New World PowerMac 系统支持从 USB 引导。"
 
 #. Tag: para
-#: boot-installer.xml:1703
+#: boot-installer.xml:1762
 #, no-c-format
 msgid ""
 "Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
@@ -2067,7 +2140,7 @@ msgstr ""
 "Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
 
 #. Tag: para
-#: boot-installer.xml:1712
+#: boot-installer.xml:1771
 #, no-c-format
 msgid ""
 "You will need to work out where the USB storage device appears in the device "
@@ -2088,7 +2161,7 @@ msgstr ""
 "disk@1</filename> 。"
 
 #. Tag: para
-#: boot-installer.xml:1724
+#: boot-installer.xml:1783
 #, no-c-format
 msgid ""
 "Having worked out the device path, use a command like this to boot the "
@@ -2112,7 +2185,7 @@ msgstr ""
 "command>。"
 
 #. Tag: para
-#: boot-installer.xml:1738
+#: boot-installer.xml:1797
 #, no-c-format
 msgid ""
 "The system should now boot up, and you should be presented with the "
@@ -2123,7 +2196,7 @@ msgstr ""
 "动参数，或者只按下 &enterkey;。"
 
 #. Tag: para
-#: boot-installer.xml:1744
+#: boot-installer.xml:1803
 #, no-c-format
 msgid ""
 "This boot method is new, and may be difficult to get to work on some "
@@ -2134,13 +2207,13 @@ msgstr ""
 "下安装报告，参阅 <xref linkend=\"submit-bug\"/>。"
 
 #. Tag: para
-#: boot-installer.xml:1778
+#: boot-installer.xml:1837
 #, no-c-format
 msgid "Currently, PReP and New World PowerMac systems support netbooting."
 msgstr "目前来说，PReP 以及 New World PowerMac 系统支持网络引导。"
 
 #. Tag: para
-#: boot-installer.xml:1782
+#: boot-installer.xml:1841
 #, no-c-format
 msgid ""
 "On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
@@ -2173,7 +2246,7 @@ msgstr ""
 "<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
 
 #. Tag: para
-#: boot-installer.xml:1810
+#: boot-installer.xml:1869
 #, no-c-format
 msgid ""
 "Booting from floppies is supported for &arch-title;, although it is "
@@ -2185,7 +2258,7 @@ msgstr ""
 "没有安装 软盘驱动器，并且附带的 USB 软盘并不支持引导。"
 
 #. Tag: para
-#: boot-installer.xml:1822
+#: boot-installer.xml:1881
 #, no-c-format
 msgid ""
 "To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
@@ -2196,7 +2269,7 @@ msgstr ""
 "按下电源开关前把它放到软盘驱动器内。"
 
 #. Tag: para
-#: boot-installer.xml:1828
+#: boot-installer.xml:1887
 #, no-c-format
 msgid ""
 "For those not familiar with Macintosh floppy operations: a floppy placed in "
@@ -2208,7 +2281,7 @@ msgstr ""
 "序。一个 没有有效引导系统的软盘将回被弹出，并且机器将检查硬盘分区。"
 
 #. Tag: para
-#: boot-installer.xml:1835
+#: boot-installer.xml:1894
 #, no-c-format
 msgid ""
 "After booting, the <filename>root.bin</filename> floppy is requested. Insert "
@@ -2219,13 +2292,13 @@ msgstr ""
 "&enterkey;。安装程序将在根系统被装入内存后自动启动。"
 
 #. Tag: title
-#: boot-installer.xml:1846
+#: boot-installer.xml:1905
 #, no-c-format
 msgid "PowerPC Boot Parameters"
 msgstr "PowerPC 引导参数"
 
 #. Tag: para
-#: boot-installer.xml:1847
+#: boot-installer.xml:1906
 #, no-c-format
 msgid ""
 "Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
@@ -2240,7 +2313,7 @@ msgstr ""
 "128 来说，请改变其值为 <userinput>video=aty128fb:vmode:6</userinput> 。"
 
 #. Tag: para
-#: boot-installer.xml:1888
+#: boot-installer.xml:1947
 #, no-c-format
 msgid ""
 "On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -2259,7 +2332,7 @@ msgstr ""
 "i; 。"
 
 #. Tag: para
-#: boot-installer.xml:1943
+#: boot-installer.xml:2002
 #, no-c-format
 msgid ""
 "Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -2271,13 +2344,13 @@ msgstr ""
 "盘)。"
 
 #. Tag: title
-#: boot-installer.xml:1952
+#: boot-installer.xml:2011
 #, no-c-format
 msgid "IDPROM Messages"
 msgstr "IDPROM 消息"
 
 #. Tag: para
-#: boot-installer.xml:1953
+#: boot-installer.xml:2012
 #, no-c-format
 msgid ""
 "If you cannot boot because you get messages about a problem with "
@@ -2291,13 +2364,13 @@ msgstr ""
 "nvram-faq;\">Sun NVRAM FAQ</ulink> 以获得更多信息。"
 
 #. Tag: title
-#: boot-installer.xml:1972
+#: boot-installer.xml:2031
 #, no-c-format
 msgid "Accessibility"
 msgstr "辅助功能"
 
 #. Tag: para
-#: boot-installer.xml:1973
+#: boot-installer.xml:2032
 #, no-c-format
 msgid ""
 "Some users may need specific support because of e.g. some visual impairment. "
@@ -2322,13 +2395,13 @@ msgstr ""
 "要注意在大多数架构下 boot loader 将视您的键盘为 QWERTY 布局。"
 
 #. Tag: title
-#: boot-installer.xml:1993
+#: boot-installer.xml:2052
 #, no-c-format
 msgid "Installer front-end"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1994
+#: boot-installer.xml:2053
 #, no-c-format
 msgid ""
 "The &debian; installer supports several front-ends for asking questions, "
@@ -2340,13 +2413,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2006
+#: boot-installer.xml:2065
 #, no-c-format
 msgid "USB Braille Displays"
 msgstr "USB 盲文点显器"
 
 #. Tag: para
-#: boot-installer.xml:2007
+#: boot-installer.xml:2066
 #, no-c-format
 msgid ""
 "USB braille displays should be automatically detected. A textual version of "
@@ -2365,13 +2438,13 @@ msgstr ""
 "website</ulink> 可以找到盲文点显器的键绑定文档。"
 
 #. Tag: title
-#: boot-installer.xml:2022
+#: boot-installer.xml:2081
 #, no-c-format
 msgid "Serial Braille Displays"
 msgstr "串口盲文点显器"
 
 #. Tag: para
-#: boot-installer.xml:2023
+#: boot-installer.xml:2082
 #, no-c-format
 msgid ""
 "Serial braille displays cannot safely be automatically detected (since that "
@@ -2406,13 +2479,13 @@ msgstr ""
 "\"><classname>brltty</classname> website</ulink> 找到。"
 
 #. Tag: title
-#: boot-installer.xml:2046 boot-installer.xml:3053
+#: boot-installer.xml:2105 boot-installer.xml:3114
 #, no-c-format
 msgid "Software Speech Synthesis"
 msgstr "软件语音合成(Software Speech Synthesis)"
 
 #. Tag: para
-#: boot-installer.xml:2047
+#: boot-installer.xml:2106
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Support for hardware speech synthesis devices is available only alongside "
@@ -2430,7 +2503,7 @@ msgstr ""
 "择 <quote>Graphical install</quote> 项。"
 
 #. Tag: para
-#: boot-installer.xml:2056
+#: boot-installer.xml:2115
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Support for software speech synthesis can be activated by selecting it in "
@@ -2448,7 +2521,7 @@ msgstr ""
 "<classname>espeak</classname>)。"
 
 #. Tag: para
-#: boot-installer.xml:2062
+#: boot-installer.xml:2121
 #, no-c-format
 msgid ""
 "The default speech rate is quite slow. To make it faster, press "
@@ -2462,13 +2535,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2081
+#: boot-installer.xml:2140
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "硬件语音合成(Hardware Speech Synthesis)"
 
 #. Tag: para
-#: boot-installer.xml:2082
+#: boot-installer.xml:2141
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Support for hardware speech synthesis devices is available only alongside "
@@ -2484,7 +2557,7 @@ msgstr ""
 "择 <quote>Graphical install</quote> 项。"
 
 #. Tag: para
-#: boot-installer.xml:2089
+#: boot-installer.xml:2148
 #, no-c-format
 msgid ""
 "Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2504,13 +2577,13 @@ msgstr ""
 "音合成设备的支持也会被自动安装到最终系统里面。"
 
 #. Tag: title
-#: boot-installer.xml:2104
+#: boot-installer.xml:2163
 #, no-c-format
 msgid "Board Devices"
 msgstr "板卡设备"
 
 #. Tag: para
-#: boot-installer.xml:2105
+#: boot-installer.xml:2164
 #, no-c-format
 msgid ""
 "Some accessibility devices are actual boards that are plugged inside the "
@@ -2525,7 +2598,7 @@ msgstr ""
 "数量。"
 
 #. Tag: para
-#: boot-installer.xml:2113
+#: boot-installer.xml:2172
 #, no-c-format
 msgid ""
 "If desired a textual version of the bootloader can be activated before "
@@ -2535,13 +2608,13 @@ msgstr ""
 "userinput> &enterkey;。"
 
 #. Tag: title
-#: boot-installer.xml:2121
+#: boot-installer.xml:2180
 #, no-c-format
 msgid "High-Contrast Theme"
 msgstr "高亮主题"
 
 #. Tag: para
-#: boot-installer.xml:2122
+#: boot-installer.xml:2181
 #, fuzzy, no-c-format
 #| msgid ""
 #| "For users with low vision, the installer can use a high-contrast theme "
@@ -2556,13 +2629,13 @@ msgstr ""
 "<userinput>theme=dark</userinput> 引导参数即可。"
 
 #. Tag: title
-#: boot-installer.xml:2131
+#: boot-installer.xml:2190
 #, no-c-format
 msgid "Preseeding"
 msgstr "预置"
 
 #. Tag: para
-#: boot-installer.xml:2132
+#: boot-installer.xml:2191
 #, no-c-format
 msgid ""
 "Alternatively, &debian; can be installed completely automatically by using "
@@ -2572,13 +2645,13 @@ msgstr ""
 "\"appendix-preseed\"/>。"
 
 #. Tag: title
-#: boot-installer.xml:2140
+#: boot-installer.xml:2199
 #, no-c-format
 msgid "Accessibility of the installed system"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2141
+#: boot-installer.xml:2200
 #, no-c-format
 msgid ""
 "Documentation on accessibility of the installed system is available on the "
@@ -2587,7 +2660,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2156
+#: boot-installer.xml:2215
 #, no-c-format
 msgid ""
 "Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2600,7 +2673,7 @@ msgstr ""
 "要给内核一点小小的帮助。"
 
 #. Tag: para
-#: boot-installer.xml:2163
+#: boot-installer.xml:2222
 #, no-c-format
 msgid ""
 "If this is the first time you're booting the system, try the default boot "
@@ -2613,7 +2686,7 @@ msgstr ""
 "的硬件特定参数。"
 
 #. Tag: para
-#: boot-installer.xml:2170
+#: boot-installer.xml:2229
 #, no-c-format
 msgid ""
 "Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2628,13 +2701,13 @@ msgstr ""
 "linkend=\"boot-troubleshooting\"/>。"
 
 #. Tag: title
-#: boot-installer.xml:2182
+#: boot-installer.xml:2241
 #, no-c-format
 msgid "Boot console"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2184
+#: boot-installer.xml:2243
 #, no-c-format
 msgid ""
 "If you are booting with a serial console, generally the kernel will "
@@ -2651,16 +2724,18 @@ msgstr ""
 "是串口设备，通常是 <filename>ttyS0</filename> 形式。"
 
 #. Tag: para
-#: boot-installer.xml:2196
+#: boot-installer.xml:2255
 #, no-c-format
 msgid ""
 "You may need to specify parameters for the serial port, such as speed and "
 "parity, for instance <userinput>console=ttyS0,9600n8</userinput>; other "
-"typical speeds may be 57600 or 115200."
+"typical speeds may be 57600 or 115200. Be sure to specify this option after "
+"<quote>---</quote>, so that it is copied into the bootloader configuration "
+"for the installed system (if supported by the installer for the bootloader)."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2202
+#: boot-installer.xml:2263
 #, no-c-format
 msgid ""
 "In order to ensure the terminal type used by the installer matches your "
@@ -2685,7 +2760,7 @@ msgstr ""
 "literal> 终端类型，而它又非常接近于 <literal>vt102</literal> 类型。"
 
 #. Tag: para
-#: boot-installer.xml:2218
+#: boot-installer.xml:2279
 #, no-c-format
 msgid ""
 "For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2698,13 +2773,13 @@ msgstr ""
 "<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
 
 #. Tag: title
-#: boot-installer.xml:2230
+#: boot-installer.xml:2291
 #, no-c-format
 msgid "&debian; Installer Parameters"
 msgstr "&debian; 安装程序的参数"
 
 #. Tag: para
-#: boot-installer.xml:2231
+#: boot-installer.xml:2292
 #, no-c-format
 msgid ""
 "The installation system recognizes a few additional boot "
@@ -2717,7 +2792,7 @@ msgstr ""
 "para> </footnote>，它们很有用。"
 
 #. Tag: para
-#: boot-installer.xml:2244
+#: boot-installer.xml:2305
 #, no-c-format
 msgid ""
 "A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2731,19 +2806,19 @@ msgstr ""
 "用简写。"
 
 #. Tag: term
-#: boot-installer.xml:2256
+#: boot-installer.xml:2317
 #, no-c-format
 msgid "debconf/priority (priority)"
 msgstr "debconf/priority (priority)"
 
 #. Tag: para
-#: boot-installer.xml:2257
+#: boot-installer.xml:2318
 #, no-c-format
 msgid "This parameter sets the lowest priority of messages to be displayed."
 msgstr "这些参数设置将设置显示的信息为最低的级别。"
 
 #. Tag: para
-#: boot-installer.xml:2261
+#: boot-installer.xml:2322
 #, no-c-format
 msgid ""
 "The default installation uses <userinput>priority=high</userinput>. This "
@@ -2756,7 +2831,7 @@ msgstr ""
 "将按照要求调整优先级别。"
 
 #. Tag: para
-#: boot-installer.xml:2268
+#: boot-installer.xml:2329
 #, no-c-format
 msgid ""
 "If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2774,13 +2849,13 @@ msgstr ""
 "且尝试正确无误地执行各项事宜。"
 
 #. Tag: term
-#: boot-installer.xml:2282
+#: boot-installer.xml:2343
 #, no-c-format
 msgid "DEBIAN_FRONTEND"
 msgstr "DEBIAN_FRONTEND"
 
 #. Tag: para
-#: boot-installer.xml:2283
+#: boot-installer.xml:2344
 #, no-c-format
 msgid ""
 "This boot parameter controls the type of user interface used for the "
@@ -2813,13 +2888,13 @@ msgstr ""
 "所支持的平台上使用 <userinput>gtk</userinput> 前端。"
 
 #. Tag: term
-#: boot-installer.xml:2314
+#: boot-installer.xml:2375
 #, no-c-format
 msgid "BOOT_DEBUG"
 msgstr "BOOT_DEBUG"
 
 #. Tag: para
-#: boot-installer.xml:2315
+#: boot-installer.xml:2376
 #, no-c-format
 msgid ""
 "Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2831,49 +2906,49 @@ msgstr ""
 "debug shell。(退出 shell 以后会继续引导过程。)"
 
 #. Tag: userinput
-#: boot-installer.xml:2324
+#: boot-installer.xml:2385
 #, no-c-format
 msgid "BOOT_DEBUG=0"
 msgstr "BOOT_DEBUG=0"
 
 #. Tag: para
-#: boot-installer.xml:2325
+#: boot-installer.xml:2386
 #, no-c-format
 msgid "This is the default."
 msgstr "此为默认。"
 
 #. Tag: userinput
-#: boot-installer.xml:2329
+#: boot-installer.xml:2390
 #, no-c-format
 msgid "BOOT_DEBUG=1"
 msgstr "BOOT_DEBUG=1"
 
 #. Tag: para
-#: boot-installer.xml:2330
+#: boot-installer.xml:2391
 #, no-c-format
 msgid "More verbose than usual."
 msgstr "更多的信息。"
 
 #. Tag: userinput
-#: boot-installer.xml:2334
+#: boot-installer.xml:2395
 #, no-c-format
 msgid "BOOT_DEBUG=2"
 msgstr "BOOT_DEBUG=2"
 
 #. Tag: para
-#: boot-installer.xml:2335
+#: boot-installer.xml:2396
 #, no-c-format
 msgid "Lots of debugging information."
 msgstr "大量的调试信息。"
 
 #. Tag: userinput
-#: boot-installer.xml:2339
+#: boot-installer.xml:2400
 #, no-c-format
 msgid "BOOT_DEBUG=3"
 msgstr "BOOT_DEBUG=3"
 
 #. Tag: para
-#: boot-installer.xml:2340
+#: boot-installer.xml:2401
 #, no-c-format
 msgid ""
 "Shells are run at various points in the boot process to allow detailed "
@@ -2883,13 +2958,13 @@ msgstr ""
 "Shell 将继续引导过程。"
 
 #. Tag: term
-#: boot-installer.xml:2354
+#: boot-installer.xml:2415
 #, no-c-format
 msgid "INSTALL_MEDIA_DEV"
 msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
-#: boot-installer.xml:2355
+#: boot-installer.xml:2416
 #, no-c-format
 msgid ""
 "The value of the parameter is the path to the device to load the &debian; "
@@ -2900,7 +2975,7 @@ msgstr ""
 "<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
 
 #. Tag: para
-#: boot-installer.xml:2361
+#: boot-installer.xml:2422
 #, no-c-format
 msgid ""
 "The boot floppy, which normally scans all floppies it can to find the root "
@@ -2909,19 +2984,19 @@ msgstr ""
 "引导软盘通常会扫描所有的软盘来找到根软盘，可以通过此参数设置只查找一个设备。"
 
 #. Tag: term
-#: boot-installer.xml:2372
+#: boot-installer.xml:2433
 #, no-c-format
 msgid "log_host"
 msgstr "log_host"
 
 #. Tag: term
-#: boot-installer.xml:2373
+#: boot-installer.xml:2434
 #, no-c-format
 msgid "log_port"
 msgstr "log_port"
 
 #. Tag: para
-#: boot-installer.xml:2374
+#: boot-installer.xml:2435
 #, no-c-format
 msgid ""
 "Causes the installer to send log messages to a remote syslog on the "
@@ -2932,13 +3007,13 @@ msgstr ""
 "定，默认端口是 syslog 标准端口 514。"
 
 #. Tag: term
-#: boot-installer.xml:2385
+#: boot-installer.xml:2446
 #, no-c-format
 msgid "lowmem"
 msgstr "lowmem"
 
 #. Tag: para
-#: boot-installer.xml:2386
+#: boot-installer.xml:2447
 #, no-c-format
 msgid ""
 "Can be used to force the installer to a lowmem level higher than the one the "
@@ -2949,13 +3024,13 @@ msgstr ""
 "和 2。参阅 <xref linkend=\"lowmem\"/>。"
 
 #. Tag: term
-#: boot-installer.xml:2396
+#: boot-installer.xml:2457
 #, no-c-format
 msgid "noshell"
 msgstr "noshell"
 
 #. Tag: para
-#: boot-installer.xml:2397
+#: boot-installer.xml:2458
 #, no-c-format
 msgid ""
 "Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2965,13 +3040,13 @@ msgstr ""
 "处。"
 
 #. Tag: term
-#: boot-installer.xml:2406
+#: boot-installer.xml:2467
 #, no-c-format
 msgid "debian-installer/framebuffer (fb)"
 msgstr "debian-installer/framebuffer (fb)"
 
 #. Tag: para
-#: boot-installer.xml:2407
+#: boot-installer.xml:2468
 #, no-c-format
 msgid ""
 "Some architectures use the kernel framebuffer to offer installation in a "
@@ -2987,13 +3062,13 @@ msgstr ""
 "bogl 的相关错误信息、一个空白的屏幕，或者在开始安装几分钟后停止。"
 
 #. Tag: para
-#: boot-installer.xml:2416
+#: boot-installer.xml:2477
 #, no-c-format
 msgid "Such problems have been reported on hppa."
 msgstr "在 hppa 上面报告过存在这些问题。"
 
 #. Tag: para
-#: boot-installer.xml:2420
+#: boot-installer.xml:2481
 #, no-c-format
 msgid ""
 "Because of display problems on some systems, framebuffer support is "
@@ -3010,13 +3085,13 @@ msgstr ""
 "<userinput>fb=true</userinput>。"
 
 #. Tag: term
-#: boot-installer.xml:2434
+#: boot-installer.xml:2495
 #, no-c-format
 msgid "debian-installer/theme (theme)"
 msgstr "debian-installer/theme (theme)"
 
 #. Tag: para
-#: boot-installer.xml:2435
+#: boot-installer.xml:2496
 #, no-c-format
 msgid ""
 "A theme determines how the user interface of the installer looks (colors, "
@@ -3031,13 +3106,13 @@ msgstr ""
 "<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
 
 #. Tag: term
-#: boot-installer.xml:2447 boot-installer.xml:2680
+#: boot-installer.xml:2508 boot-installer.xml:2741
 #, no-c-format
 msgid "netcfg/disable_autoconfig"
 msgstr "netcfg/disable_autoconfig"
 
 #. Tag: para
-#: boot-installer.xml:2448
+#: boot-installer.xml:2509
 #, fuzzy, no-c-format
 #| msgid ""
 #| "By default, the &d-i; automatically probes for network configuration via "
@@ -3054,7 +3129,7 @@ msgstr ""
 "视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
 
 #. Tag: para
-#: boot-installer.xml:2455
+#: boot-installer.xml:2516
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you have a DHCP server on your local network, but want to avoid it "
@@ -3073,13 +3148,13 @@ msgstr ""
 "阻止通过 DHCP 配置网络，并手工输入信息。"
 
 #. Tag: term
-#: boot-installer.xml:2466
+#: boot-installer.xml:2527
 #, no-c-format
 msgid "hw-detect/start_pcmcia"
 msgstr "hw-detect/start_pcmcia"
 
 #. Tag: para
-#: boot-installer.xml:2467
+#: boot-installer.xml:2528
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -3089,13 +3164,13 @@ msgstr ""
 "携机会有这种现象。"
 
 #. Tag: term
-#: boot-installer.xml:2477
+#: boot-installer.xml:2538
 #, no-c-format
 msgid "disk-detect/dmraid/enable (dmraid)"
 msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
-#: boot-installer.xml:2478
+#: boot-installer.xml:2539
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -3109,13 +3184,13 @@ msgstr ""
 "ulink> 找到。"
 
 #. Tag: term
-#: boot-installer.xml:2489
+#: boot-installer.xml:2550
 #, no-c-format
 msgid "preseed/url (url)"
 msgstr "preseed/url (url)"
 
 #. Tag: para
-#: boot-installer.xml:2490
+#: boot-installer.xml:2551
 #, no-c-format
 msgid ""
 "Specify the url to a preconfiguration file to download and use for "
@@ -3125,13 +3200,13 @@ msgstr ""
 "install\"/>。"
 
 #. Tag: term
-#: boot-installer.xml:2499
+#: boot-installer.xml:2560
 #, no-c-format
 msgid "preseed/file (file)"
 msgstr "preseed/file (file)"
 
 #. Tag: para
-#: boot-installer.xml:2500
+#: boot-installer.xml:2561
 #, no-c-format
 msgid ""
 "Specify the path to a preconfiguration file to load for automating the "
@@ -3141,13 +3216,13 @@ msgstr ""
 ">。"
 
 #. Tag: term
-#: boot-installer.xml:2509
+#: boot-installer.xml:2570
 #, no-c-format
 msgid "preseed/interactive"
 msgstr "preseed/interactive"
 
 #. Tag: para
-#: boot-installer.xml:2510
+#: boot-installer.xml:2571
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to display questions even if they have "
@@ -3161,13 +3236,13 @@ msgstr ""
 "<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
 
 #. Tag: term
-#: boot-installer.xml:2522
+#: boot-installer.xml:2583
 #, no-c-format
 msgid "auto-install/enable (auto)"
 msgstr "auto-install/enable (auto)"
 
 #. Tag: para
-#: boot-installer.xml:2523
+#: boot-installer.xml:2584
 #, no-c-format
 msgid ""
 "Delay questions that are normally asked before preseeding is possible until "
@@ -3178,13 +3253,13 @@ msgstr ""
 "auto\"/> 了解自动安装的详细信息。"
 
 #. Tag: term
-#: boot-installer.xml:2534
+#: boot-installer.xml:2595
 #, no-c-format
 msgid "finish-install/keep-consoles"
 msgstr "finish-install/keep-consoles"
 
 #. Tag: para
-#: boot-installer.xml:2535
+#: boot-installer.xml:2596
 #, no-c-format
 msgid ""
 "During installations from serial or management console, the regular virtual "
@@ -3195,13 +3270,13 @@ msgstr ""
 "inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
 
 #. Tag: term
-#: boot-installer.xml:2546
+#: boot-installer.xml:2607
 #, no-c-format
 msgid "cdrom-detect/eject"
 msgstr "cdrom-detect/eject"
 
 #. Tag: para
-#: boot-installer.xml:2547
+#: boot-installer.xml:2608
 #, no-c-format
 msgid ""
 "By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3217,7 +3292,7 @@ msgstr ""
 "新加载介质。"
 
 #. Tag: para
-#: boot-installer.xml:2556
+#: boot-installer.xml:2617
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3228,13 +3303,13 @@ msgstr ""
 "后，不会自动从光盘引导。"
 
 #. Tag: term
-#: boot-installer.xml:2567
+#: boot-installer.xml:2628
 #, no-c-format
 msgid "base-installer/install-recommends (recommends)"
 msgstr "base-installer/install-recommends (recommends)"
 
 #. Tag: para
-#: boot-installer.xml:2568
+#: boot-installer.xml:2629
 #, no-c-format
 msgid ""
 "By setting this option to <userinput>false</userinput>, the package "
@@ -3247,7 +3322,7 @@ msgstr ""
 "<xref linkend=\"di-install-base\"/>。"
 
 #. Tag: para
-#: boot-installer.xml:2575
+#: boot-installer.xml:2636
 #, no-c-format
 msgid ""
 "Note that this option allows to have a leaner system, but can also result in "
@@ -3261,13 +3336,13 @@ msgstr ""
 "非常有经验的用户来使用。"
 
 #. Tag: term
-#: boot-installer.xml:2587
+#: boot-installer.xml:2648
 #, no-c-format
 msgid "debian-installer/allow_unauthenticated"
 msgstr "debian-installer/allow_unauthenticated"
 
 #. Tag: para
-#: boot-installer.xml:2588
+#: boot-installer.xml:2649
 #, no-c-format
 msgid ""
 "By default the installer requires that repositories be authenticated using a "
@@ -3280,13 +3355,13 @@ msgstr ""
 "emphasis>"
 
 #. Tag: term
-#: boot-installer.xml:2599
+#: boot-installer.xml:2660
 #, no-c-format
 msgid "ramdisk_size"
 msgstr "ramdisk_size"
 
 #. Tag: para
-#: boot-installer.xml:2600
+#: boot-installer.xml:2661
 #, no-c-format
 msgid ""
 "This parameter should already be set to a correct value where needed; set it "
@@ -3297,13 +3372,13 @@ msgstr ""
 "置。该值的单位是 kB。"
 
 #. Tag: term
-#: boot-installer.xml:2610
+#: boot-installer.xml:2671
 #, no-c-format
 msgid "rescue/enable"
 msgstr "rescue/enable"
 
 #. Tag: para
-#: boot-installer.xml:2611
+#: boot-installer.xml:2672
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3313,13 +3388,13 @@ msgstr ""
 "<xref linkend=\"rescue\"/>。"
 
 #. Tag: title
-#: boot-installer.xml:2624
+#: boot-installer.xml:2685
 #, no-c-format
 msgid "Using boot parameters to answer questions"
 msgstr "使用内核模块参数回答提问"
 
 #. Tag: para
-#: boot-installer.xml:2625
+#: boot-installer.xml:2686
 #, no-c-format
 msgid ""
 "With some exceptions, a value can be set at the boot prompt for any question "
@@ -3332,25 +3407,25 @@ msgstr ""
 "bootparms\"/> 找到。下面是一些具体的例子。"
 
 #. Tag: term
-#: boot-installer.xml:2637
+#: boot-installer.xml:2698
 #, no-c-format
 msgid "debian-installer/language (language)"
 msgstr "debian-installer/language (language)"
 
 #. Tag: term
-#: boot-installer.xml:2638
+#: boot-installer.xml:2699
 #, no-c-format
 msgid "debian-installer/country (country)"
 msgstr "debian-installer/country (country)"
 
 #. Tag: term
-#: boot-installer.xml:2639
+#: boot-installer.xml:2700
 #, no-c-format
 msgid "debian-installer/locale (locale)"
 msgstr "debian-installer/locale (locale)"
 
 #. Tag: para
-#: boot-installer.xml:2640
+#: boot-installer.xml:2701
 #, no-c-format
 msgid ""
 "There are two ways to specify the language, country and locale to use for "
@@ -3360,7 +3435,7 @@ msgstr ""
 "和地方(locale)。"
 
 #. Tag: para
-#: boot-installer.xml:2645
+#: boot-installer.xml:2706
 #, no-c-format
 msgid ""
 "The first and easiest is to pass only the parameter <literal>locale</"
@@ -3378,7 +3453,7 @@ msgstr ""
 "式组合。"
 
 #. Tag: para
-#: boot-installer.xml:2654
+#: boot-installer.xml:2715
 #, no-c-format
 msgid ""
 "The second, more flexible option is to specify <literal>language</literal> "
@@ -3393,13 +3468,13 @@ msgstr ""
 "locale=en_GB.UTF-8</userinput>。"
 
 #. Tag: term
-#: boot-installer.xml:2666
+#: boot-installer.xml:2727
 #, no-c-format
 msgid "anna/choose_modules (modules)"
 msgstr "anna/choose_modules (modules)"
 
 #. Tag: para
-#: boot-installer.xml:2667
+#: boot-installer.xml:2728
 #, no-c-format
 msgid ""
 "Can be used to automatically load installer components that are not loaded "
@@ -3414,7 +3489,7 @@ msgstr ""
 "classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
 
 #. Tag: para
-#: boot-installer.xml:2681
+#: boot-installer.xml:2742
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Set to <userinput>true</userinput> if you want to disable DHCP and "
@@ -3426,13 +3501,13 @@ msgstr ""
 "如果您想禁止 DHCP 使用静态网络设置，将它设为 <userinput>true</userinput>。"
 
 #. Tag: term
-#: boot-installer.xml:2690
+#: boot-installer.xml:2751
 #, no-c-format
 msgid "mirror/protocol (protocol)"
 msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
-#: boot-installer.xml:2691
+#: boot-installer.xml:2752
 #, no-c-format
 msgid ""
 "By default the installer will use the http protocol to download files from "
@@ -3447,13 +3522,13 @@ msgstr ""
 "序使用该协议。注意，必须手动输入主机名，而不是从列表中选择 ftp 镜像。"
 
 #. Tag: term
-#: boot-installer.xml:2704
+#: boot-installer.xml:2765
 #, no-c-format
 msgid "tasksel:tasksel/first (tasks)"
 msgstr "tasksel:tasksel/first (tasks)"
 
 #. Tag: para
-#: boot-installer.xml:2705
+#: boot-installer.xml:2766
 #, no-c-format
 msgid ""
 "Can be used to select tasks that are not available from the interactive task "
@@ -3464,13 +3539,13 @@ msgstr ""
 "literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
 
 #. Tag: title
-#: boot-installer.xml:2719
+#: boot-installer.xml:2780
 #, no-c-format
 msgid "Passing parameters to kernel modules"
 msgstr "给内核模块传递参数"
 
 #. Tag: para
-#: boot-installer.xml:2720
+#: boot-installer.xml:2781
 #, no-c-format
 msgid ""
 "If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3490,7 +3565,7 @@ msgstr ""
 "配置中。"
 
 #. Tag: para
-#: boot-installer.xml:2733
+#: boot-installer.xml:2794
 #, no-c-format
 msgid ""
 "Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3502,7 +3577,7 @@ msgstr ""
 "并很好地设置默认参数。然而，某些情况下还是需要手动设置参数。"
 
 #. Tag: para
-#: boot-installer.xml:2740
+#: boot-installer.xml:2801
 #, no-c-format
 msgid ""
 "The syntax to use to set parameters for modules is: "
@@ -3522,19 +3597,19 @@ msgstr ""
 "用："
 
 #. Tag: screen
-#: boot-installer.xml:2750
+#: boot-installer.xml:2811
 #, no-c-format
 msgid "3c509.xcvr=3 3c509.irq=10"
 msgstr "3c509.xcvr=3 3c509.irq=10"
 
 #. Tag: title
-#: boot-installer.xml:2756
+#: boot-installer.xml:2817
 #, no-c-format
 msgid "Blacklisting kernel modules"
 msgstr "内核模块黑名单"
 
 #. Tag: para
-#: boot-installer.xml:2757
+#: boot-installer.xml:2818
 #, no-c-format
 msgid ""
 "Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3549,7 +3624,7 @@ msgstr ""
 "间冲突或者错误的驱动先加载，将造成设备无法正常工作。"
 
 #. Tag: para
-#: boot-installer.xml:2766
+#: boot-installer.xml:2827
 #, no-c-format
 msgid ""
 "You can blacklist a module using the following syntax: "
@@ -3563,7 +3638,7 @@ msgstr ""
 "入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
 
 #. Tag: para
-#: boot-installer.xml:2774
+#: boot-installer.xml:2835
 #, no-c-format
 msgid ""
 "Note that a module may still be loaded by the installation system itself. "
@@ -3575,19 +3650,19 @@ msgstr ""
 "件检查过程中从显示的模块列表中取消该模块。"
 
 #. Tag: title
-#: boot-installer.xml:2790
+#: boot-installer.xml:2851
 #, no-c-format
 msgid "Troubleshooting the Installation Process"
 msgstr "安装过程中的故障修复"
 
 #. Tag: title
-#: boot-installer.xml:2795
+#: boot-installer.xml:2856
 #, no-c-format
 msgid "CD-ROM Reliability"
 msgstr "CD-ROM 的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:2796
+#: boot-installer.xml:2857
 #, no-c-format
 msgid ""
 "Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3599,7 +3674,7 @@ msgstr ""
 "&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
 
 #. Tag: para
-#: boot-installer.xml:2803
+#: boot-installer.xml:2864
 #, no-c-format
 msgid ""
 "There are many different possible causes for these problems. We can only "
@@ -3610,13 +3685,13 @@ msgstr ""
 "下的由您来处理。"
 
 #. Tag: para
-#: boot-installer.xml:2809
+#: boot-installer.xml:2870
 #, no-c-format
 msgid "There are two very simple things that you should try first."
 msgstr "您首先应试试两种最简单的方法。"
 
 #. Tag: para
-#: boot-installer.xml:2814
+#: boot-installer.xml:2875
 #, no-c-format
 msgid ""
 "If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3624,7 +3699,7 @@ msgid ""
 msgstr "如果 CD-ROM 没有引导，检查一下它是否放好，并且没有弄脏。"
 
 #. Tag: para
-#: boot-installer.xml:2820
+#: boot-installer.xml:2881
 #, no-c-format
 msgid ""
 "If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3637,7 +3712,7 @@ msgstr ""
 "DMA 相关的问题可以用这种方法解决。"
 
 #. Tag: para
-#: boot-installer.xml:2830
+#: boot-installer.xml:2891
 #, no-c-format
 msgid ""
 "If this does not work, then try the suggestions in the subsections below. "
@@ -3648,7 +3723,7 @@ msgstr ""
 "CD-ROM 和 DVD，为了方便，只提到 CD-ROM。"
 
 #. Tag: para
-#: boot-installer.xml:2836
+#: boot-installer.xml:2897
 #, no-c-format
 msgid ""
 "If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3656,13 +3731,13 @@ msgid ""
 msgstr "如果您用 CD-ROM 无法安装，试试其他可用的安装方法。"
 
 #. Tag: title
-#: boot-installer.xml:2844
+#: boot-installer.xml:2905
 #, no-c-format
 msgid "Common issues"
 msgstr "常见问题"
 
 #. Tag: para
-#: boot-installer.xml:2847
+#: boot-installer.xml:2908
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3670,7 +3745,7 @@ msgid ""
 msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
 
 #. Tag: para
-#: boot-installer.xml:2864
+#: boot-installer.xml:2925
 #, no-c-format
 msgid ""
 "Some very old CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3680,19 +3755,19 @@ msgstr ""
 "正常工作。"
 
 #. Tag: title
-#: boot-installer.xml:2875
+#: boot-installer.xml:2936
 #, no-c-format
 msgid "How to investigate and maybe solve issues"
 msgstr "如何调查研究或许可以解决问题"
 
 #. Tag: para
-#: boot-installer.xml:2876
+#: boot-installer.xml:2937
 #, no-c-format
 msgid "If the CD-ROM fails to boot, try the suggestions listed below."
 msgstr "如果从 CD-ROM 引导失败，试试下面所列的建议。"
 
 #. Tag: para
-#: boot-installer.xml:2881
+#: boot-installer.xml:2942
 #, no-c-format
 msgid ""
 "Check that your BIOS actually supports booting from CD-ROM (only an issue "
@@ -3702,7 +3777,7 @@ msgstr ""
 "开支持从 CD 引导。"
 
 #. Tag: para
-#: boot-installer.xml:2888
+#: boot-installer.xml:2949
 #, no-c-format
 msgid ""
 "If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3726,7 +3801,7 @@ msgstr ""
 "用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
 
 #. Tag: screen
-#: boot-installer.xml:2901
+#: boot-installer.xml:2962
 #, no-c-format
 msgid ""
 "$ dd if=/dev/cdrom | \\\n"
@@ -3748,7 +3823,7 @@ msgstr ""
 "134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
 
 #. Tag: para
-#: boot-installer.xml:2906
+#: boot-installer.xml:2967
 #, no-c-format
 msgid ""
 "If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3767,7 +3842,7 @@ msgstr ""
 "shell。"
 
 #. Tag: para
-#: boot-installer.xml:2918
+#: boot-installer.xml:2979
 #, no-c-format
 msgid ""
 "Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3779,7 +3854,7 @@ msgstr ""
 "<command>dmesg</command> 的输出。"
 
 #. Tag: para
-#: boot-installer.xml:2925
+#: boot-installer.xml:2986
 #, no-c-format
 msgid ""
 "Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3807,7 +3882,7 @@ msgstr ""
 "<command>modprobe</command> 手动加载。"
 
 #. Tag: para
-#: boot-installer.xml:2939
+#: boot-installer.xml:3000
 #, no-c-format
 msgid ""
 "Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3819,7 +3894,7 @@ msgstr ""
 "cdrom0</filename>。"
 
 #. Tag: para
-#: boot-installer.xml:2947
+#: boot-installer.xml:3008
 #, no-c-format
 msgid ""
 "Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3834,7 +3909,7 @@ msgstr ""
 "</screen></informalexample> 检查命令后面是否有什么错误信息。"
 
 #. Tag: para
-#: boot-installer.xml:2957
+#: boot-installer.xml:3018
 #, no-c-format
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3859,7 +3934,7 @@ msgstr ""
 "</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:2972
+#: boot-installer.xml:3033
 #, no-c-format
 msgid ""
 "If there are any problems during the installation, try checking the "
@@ -3871,13 +3946,13 @@ msgstr ""
 "性。如果 CD-ROM 可以读，该选项可以对其进行测试。"
 
 #. Tag: title
-#: boot-installer.xml:2987
+#: boot-installer.xml:3048
 #, no-c-format
 msgid "Floppy Disk Reliability"
 msgstr "软盘的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:2989
+#: boot-installer.xml:3050
 #, no-c-format
 msgid ""
 "The biggest problem for people using floppy disks to install &debian; seems "
@@ -3886,7 +3961,7 @@ msgstr ""
 "对于用软盘安装 &debian; 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
 #. Tag: para
-#: boot-installer.xml:2994
+#: boot-installer.xml:3055
 #, no-c-format
 msgid ""
 "The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3902,7 +3977,7 @@ msgstr ""
 "息。"
 
 #. Tag: para
-#: boot-installer.xml:3003
+#: boot-installer.xml:3064
 #, no-c-format
 msgid ""
 "If you are having the installation stall at a particular floppy, the first "
@@ -3917,7 +3992,7 @@ msgstr ""
 "化以后看起来没有错误。如果可能，在别的统上重写这些软盘更好一些。"
 
 #. Tag: para
-#: boot-installer.xml:3012
+#: boot-installer.xml:3073
 #, no-c-format
 msgid ""
 "One user reports he had to write the images to floppy <emphasis>three</"
@@ -3928,7 +4003,7 @@ msgstr ""
 "软盘才算工作良好。"
 
 #. Tag: para
-#: boot-installer.xml:3018
+#: boot-installer.xml:3079
 #, no-c-format
 msgid ""
 "Normally you should not have to download a floppy image again, but if you "
@@ -3939,7 +4014,7 @@ msgstr ""
 "来检验下载的映像是否正确。"
 
 #. Tag: para
-#: boot-installer.xml:3024
+#: boot-installer.xml:3085
 #, no-c-format
 msgid ""
 "Other users have reported that simply rebooting a few times with the same "
@@ -3950,13 +4025,13 @@ msgstr ""
 "有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
 
 #. Tag: title
-#: boot-installer.xml:3033
+#: boot-installer.xml:3094
 #, no-c-format
 msgid "Boot Configuration"
 msgstr "引导配置"
 
 #. Tag: para
-#: boot-installer.xml:3035
+#: boot-installer.xml:3096
 #, no-c-format
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3969,7 +4044,7 @@ msgstr ""
 "\"/> 讨论。"
 
 #. Tag: para
-#: boot-installer.xml:3044
+#: boot-installer.xml:3105
 #, no-c-format
 msgid ""
 "In some cases, malfunctions can be caused by missing device firmware (see "
@@ -3980,7 +4055,7 @@ msgstr ""
 "firmware\"/> 和 <xref linkend=\"loading-firmware\"/>)。"
 
 #. Tag: para
-#: boot-installer.xml:3055
+#: boot-installer.xml:3116
 #, no-c-format
 msgid ""
 "If software speech synthesis does not work, there is most probably an issue "
@@ -3995,37 +4070,37 @@ msgstr ""
 "台机器上声音可以正常工作的 Linux 系统上(比如，live CD)，运行下面命令的输出。"
 
 #. Tag: userinput
-#: boot-installer.xml:3066
+#: boot-installer.xml:3127
 #, no-c-format
 msgid "dmesg"
 msgstr "dmesg"
 
 #. Tag: userinput
-#: boot-installer.xml:3068
+#: boot-installer.xml:3129
 #, no-c-format
 msgid "lspci"
 msgstr "lspci"
 
 #. Tag: userinput
-#: boot-installer.xml:3070
+#: boot-installer.xml:3131
 #, no-c-format
 msgid "lsmod"
 msgstr "lsmod"
 
 #. Tag: userinput
-#: boot-installer.xml:3072
+#: boot-installer.xml:3133
 #, no-c-format
 msgid "amixer"
 msgstr "amixer"
 
 #. Tag: title
-#: boot-installer.xml:3080 boot-installer.xml:3191
+#: boot-installer.xml:3141 boot-installer.xml:3252
 #, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr "&arch-title; 常见安装问题"
 
 #. Tag: para
-#: boot-installer.xml:3081
+#: boot-installer.xml:3142
 #, no-c-format
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
@@ -4033,7 +4108,7 @@ msgid ""
 msgstr "有一些常见的安装问题，可以通过给安装程序特定的引导参数解决或避免。"
 
 #. Tag: para
-#: boot-installer.xml:3132
+#: boot-installer.xml:3193
 #, no-c-format
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4051,13 +4126,13 @@ msgstr ""
 "\"boot-parms\"/> 来获得细节信息。"
 
 #. Tag: title
-#: boot-installer.xml:3146
+#: boot-installer.xml:3207
 #, no-c-format
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr "在 PCMCIA 配置阶段系统停止"
 
 #. Tag: para
-#: boot-installer.xml:3147
+#: boot-installer.xml:3208
 #, no-c-format
 msgid ""
 "Some very old laptop models produced by Dell are known to crash when PCMCIA "
@@ -4075,7 +4150,7 @@ msgstr ""
 "题的资源区段。"
 
 #. Tag: para
-#: boot-installer.xml:3157
+#: boot-installer.xml:3218
 #, no-c-format
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4095,19 +4170,19 @@ msgstr ""
 "项。注意您在安装程序中，输入这些值的时候必须忽略逗号。"
 
 #. Tag: para
-#: boot-installer.xml:3192
+#: boot-installer.xml:3253
 #, no-c-format
 msgid "There are some common installation problems that are worth mentioning."
 msgstr "有一些常见的安装问题值得解释一下。"
 
 #. Tag: title
-#: boot-installer.xml:3198
+#: boot-installer.xml:3259
 #, no-c-format
 msgid "Misdirected video output"
 msgstr "错误的视频输出"
 
 #. Tag: para
-#: boot-installer.xml:3199
+#: boot-installer.xml:3260
 #, no-c-format
 msgid ""
 "It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4131,7 +4206,7 @@ msgstr ""
 "<userinput>video=atyfb:off</userinput> 启动安装程序。"
 
 #. Tag: para
-#: boot-installer.xml:3213
+#: boot-installer.xml:3274
 #, no-c-format
 msgid ""
 "Note that you may also have to manually add this parameter to the silo "
@@ -4144,13 +4219,13 @@ msgstr ""
 "xorg.conf</filename> 中的视频驱动。"
 
 #. Tag: title
-#: boot-installer.xml:3224
+#: boot-installer.xml:3285
 #, no-c-format
 msgid "Failure to Boot or Install from CD-ROM"
 msgstr "从 CD-ROM 上引导或安装失败"
 
 #. Tag: para
-#: boot-installer.xml:3225
+#: boot-installer.xml:3286
 #, no-c-format
 msgid ""
 "Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4161,19 +4236,19 @@ msgstr ""
 "费解的错误。SunBlade 系统被报告了很多问题。"
 
 #. Tag: para
-#: boot-installer.xml:3231
+#: boot-installer.xml:3292
 #, no-c-format
 msgid "We recommend to install such systems by netbooting the installer."
 msgstr "我们建议从网络安装这些系统。"
 
 #. Tag: title
-#: boot-installer.xml:3240
+#: boot-installer.xml:3301
 #, no-c-format
 msgid "Interpreting the Kernel Startup Messages"
 msgstr "内核起始信息注解"
 
 #. Tag: para
-#: boot-installer.xml:3242
+#: boot-installer.xml:3303
 #, no-c-format
 msgid ""
 "During the boot sequence, you may see many messages in the form "
@@ -4207,13 +4282,13 @@ msgstr ""
 "linkend=\"kernel-baking\"/>)</phrase>。"
 
 #. Tag: title
-#: boot-installer.xml:3267
+#: boot-installer.xml:3328
 #, no-c-format
 msgid "Reporting Installation Problems"
 msgstr "报告安装问题"
 
 #. Tag: para
-#: boot-installer.xml:3268
+#: boot-installer.xml:3329
 #, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
@@ -4230,7 +4305,7 @@ msgstr ""
 "索。如果您正在提交一个 bug 报告，可以报告里附上该信息。"
 
 #. Tag: para
-#: boot-installer.xml:3279
+#: boot-installer.xml:3340
 #, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4241,13 +4316,13 @@ msgstr ""
 "新安装的系统启动后，放在 <filename>/var/log/debian-installer/</filename> 里。"
 
 #. Tag: title
-#: boot-installer.xml:3290
+#: boot-installer.xml:3351
 #, no-c-format
 msgid "Submitting Installation Reports"
 msgstr "提交缺陷报告"
 
 #. Tag: para
-#: boot-installer.xml:3291
+#: boot-installer.xml:3352
 #, no-c-format
 msgid ""
 "If you still have problems, please submit an installation report. We also "
@@ -4259,7 +4334,7 @@ msgstr ""
 "这让我们可以尽可能多地了解硬件的配置数量。"
 
 #. Tag: para
-#: boot-installer.xml:3298
+#: boot-installer.xml:3359
 #, no-c-format
 msgid ""
 "Note that your installation report will be published in the Debian Bug "
@@ -4270,7 +4345,7 @@ msgstr ""
 "件列表。确保您使用的邮件地址可以被公开。"
 
 #. Tag: para
-#: boot-installer.xml:3304
+#: boot-installer.xml:3365
 #, no-c-format
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
@@ -4289,7 +4364,7 @@ msgstr ""
 "command> 命令。"
 
 #. Tag: para
-#: boot-installer.xml:3314
+#: boot-installer.xml:3375
 #, no-c-format
 msgid ""
 "Alternatively you can use this template when filling out installation "
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index fbb672555..0729a50d1 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: 2014-10-05 18:15+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-25 23:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -467,8 +467,8 @@ msgstr "AMD64 和 Intel 64 处理器都获得支持。"
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
-#: hardware.xml:282 hardware.xml:603 hardware.xml:622 hardware.xml:701
-#: hardware.xml:759 hardware.xml:789
+#: hardware.xml:282 hardware.xml:627 hardware.xml:646 hardware.xml:704
+#: hardware.xml:762 hardware.xml:792
 #, no-c-format
 msgid "CPU, Main Boards, and Video Support"
 msgstr "CPU，主板和视频支持"
@@ -742,37 +742,43 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:497
 #, no-c-format
-msgid "LinkSprite pcDuino"
+msgid "LeMaker Banana Pi"
 msgstr ""
 
 #. Tag: para
 #: hardware.xml:500
 #, no-c-format
-msgid "Mele A1000"
+msgid "LinkSprite pcDuino"
 msgstr ""
 
 #. Tag: para
 #: hardware.xml:503
 #, no-c-format
-msgid "Miniand Hackberry"
+msgid "Mele A1000"
 msgstr ""
 
 #. Tag: para
 #: hardware.xml:506
 #, no-c-format
+msgid "Miniand Hackberry"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:509
+#, no-c-format
 msgid ""
 "Olimex A10-Olinuxino-LIME / A10s-Olinuxino Micro / A13-Olinuxino / A13-"
-"Olinuxino Micro / A20-Olinuxino Micro"
+"Olinuxino Micro / A20-Olinuxino-LIME / A20-Olinuxino Micro"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:510
+#: hardware.xml:514
 #, no-c-format
 msgid "PineRiver Mini X-Plus"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:516
+#: hardware.xml:520
 #, no-c-format
 msgid ""
 "System support for Allwinner sunXi-based devices is limited to drivers and "
@@ -781,7 +787,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:522
+#: hardware.xml:526
 #, no-c-format
 msgid ""
 "The mainline Linux kernel generally supports serial console, ethernet, SATA, "
@@ -791,13 +797,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:533
+#: hardware.xml:537
 #, no-c-format
 msgid "SolidRun Cubox-i2eX / Cubox-i4Pro"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:535
+#: hardware.xml:539
 #, no-c-format
 msgid ""
 "The Cubox-i series is a set of small, cubical-shaped systems based on the "
@@ -805,11 +811,32 @@ msgid ""
 "to drivers and device-tree information available in the mainline Linux "
 "kernel; the Freescale 3.0 kernel series for the Cubox-i is not supported by "
 "Debian. Available drivers in the mainline kernel include serial console, "
-"ethernet, USB, MMC/SD-card and basic local display support over HDMI."
+"ethernet, USB, MMC/SD-card and display support over HDMI (console and X11). "
+"In addition to that, the eSATA port on the Cubox-i4Pro is supported."
+msgstr ""
+
+#. Tag: term
+#: hardware.xml:554
+#, no-c-format
+msgid "Wandboard Quad"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:550
+#: hardware.xml:556
+#, no-c-format
+msgid ""
+"The Wandboard Quad is a development board based on the Freescale i.MX6 Quad "
+"SoC. System support for it is limited to drivers and device-tree information "
+"available in the mainline Linux kernel; the wandboard-specific 3.0 and 3.10 "
+"kernel series from wandboard.org are not supported by Debian. The mainline "
+"kernel includes driver support for serial console, display via HDMI (console "
+"and X11), ethernet, USB, MMC/SD and SATA. Support for the onboard audio "
+"options (analog, S/PDIF, HDMI-Audio) and for the onboard WLAN/Bluetooth "
+"module is not available in &debian; 8."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:574
 #, no-c-format
 msgid ""
 "Generally, the ARM multiplatform support in the Linux kernel allows running "
@@ -822,7 +849,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:561
+#: hardware.xml:585
 #, no-c-format
 msgid ""
 "When using &d-i; on such systems, you have to manually make the system "
@@ -831,19 +858,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:570
+#: hardware.xml:594
 #, no-c-format
 msgid "Platforms no longer supported by Debian/armhf"
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:574
+#: hardware.xml:598
 #, no-c-format
 msgid "EfikaMX"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:575
+#: hardware.xml:599
 #, no-c-format
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
@@ -854,7 +881,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:583
+#: hardware.xml:607
 #, no-c-format
 msgid ""
 "Using the armmp multiplatform kernel on the EfikaMX platform would require "
@@ -862,7 +889,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:604
+#: hardware.xml:628
 #, no-c-format
 msgid ""
 "There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -878,7 +905,7 @@ msgstr ""
 "位的 userland。"
 
 #. Tag: para
-#: hardware.xml:623
+#: hardware.xml:647
 #, no-c-format
 msgid ""
 "Complete information concerning supported peripherals can be found at <ulink "
@@ -890,13 +917,13 @@ msgstr ""
 
 # index.docbook:808, index.docbook:914
 #. Tag: title
-#: hardware.xml:631 hardware.xml:736
+#: hardware.xml:655 hardware.xml:739
 #, no-c-format
 msgid "<title>CPU</title>"
 msgstr "<title>CPU</title>"
 
 #. Tag: para
-#: hardware.xml:632
+#: hardware.xml:656
 #, no-c-format
 msgid ""
 "Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -909,42 +936,20 @@ msgstr ""
 "Athlon XP 和 Intel P4 Xeon 这些处理器。"
 
 #. Tag: para
-#: hardware.xml:639
+#: hardware.xml:663
 #, 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>."
-msgstr ""
-"然而，&debian; GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 "
-"或更早的处理器上。尽管体系命名为 \"i386\"，&debian; 的 Sarge (r3.1) 版已经"
-"<emphasis>放弃</emphasis>对真正的 80386 处理器(以及它们的克隆)的支持"
-"<footnote> <para> 我们已经尽力避免，但由于编译器和内核的一系列因素，起因是 "
-"GCC 提供的 C++ ABI 的 bug，最终只能如此。如果您自己动手从源码编译内核和所有的"
-"软件包，仍然可以将 &debian; GNU/Linux 运行在真正的 80386 处理器上，这部分内容"
-"超出了本手册的范畴。</para> </footnote>。(Linux 从来没有任何版本支持 286 或更"
-"早的芯片。) 所有的 i486 和后续的处理器仍然支持<footnote> <para> 许多 "
-"&debian; 软件包在新的计算机上可以运行地稍微快一点，但另一方面却舍弃了对旧芯片"
-"的支持。1989 年发布的 i486 有三个 opcode (bswap、cmpxchg 和 xadd)，然而 1986 "
-"年发布的 i386 却没有。过去多数 &debian; 软件包不能使用它们，现在没有这个问题"
-"了。</para> </footnote>。"
-
-#. Tag: para
-#: hardware.xml:672
+"on 486 or earlier processors. Despite the architecture name \"i386\", "
+"support for actual 80386 and 80486 processors (and their clones) was dropped "
+"with the Sarge (r3.1) and Squeeze (r6.0) releases of &debian;, respectively. "
+"The Intel Pentium and clones, including those without an FPU (Floating-Point "
+"Unit or math coprocessor), are supported. The Intel Quark is <emphasis>not</"
+"emphasis> supported, due to hardware errata."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:675
 #, no-c-format
 msgid ""
 "If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
@@ -955,13 +960,13 @@ msgstr ""
 "安装程序替代 (32位) i386 架构的安装程序。"
 
 #. Tag: title
-#: hardware.xml:681
+#: hardware.xml:684
 #, no-c-format
 msgid "I/O Bus"
 msgstr "I/O 总线"
 
 #. Tag: para
-#: hardware.xml:682
+#: hardware.xml:685
 #, no-c-format
 msgid ""
 "The system bus is the part of the motherboard which allows the CPU to "
@@ -975,7 +980,7 @@ msgstr ""
 "线)。近年来出售的个人电脑都会使用里面的一种。"
 
 #. Tag: para
-#: hardware.xml:702
+#: hardware.xml:705
 #, no-c-format
 msgid ""
 "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1005,7 +1010,7 @@ msgstr ""
 "\"> debian-&arch-listname; mailing list</ulink>。"
 
 #. Tag: para
-#: hardware.xml:737
+#: hardware.xml:740
 #, no-c-format
 msgid ""
 "On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -1018,7 +1023,7 @@ msgstr ""
 "持 R5000。"
 
 #. Tag: para
-#: hardware.xml:743
+#: hardware.xml:746
 #, no-c-format
 msgid ""
 "Some MIPS machines can be operated in both big and little endian mode. For "
@@ -1029,7 +1034,7 @@ msgstr ""
 "endian MIPS，请阅读 mipsel 体系的相关文档。"
 
 #. Tag: para
-#: hardware.xml:760
+#: hardware.xml:763
 #, fuzzy, no-c-format
 #| msgid ""
 #| "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1066,7 +1071,7 @@ msgstr ""
 "mailing list</ulink>。"
 
 #. Tag: para
-#: hardware.xml:790
+#: hardware.xml:793
 #, no-c-format
 msgid ""
 "For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -1076,13 +1081,13 @@ msgstr ""
 "PreP 子体系获得支持。"
 
 #. Tag: title
-#: hardware.xml:811
+#: hardware.xml:814
 #, no-c-format
 msgid "Kernel Flavours"
 msgstr "内核变种"
 
 #. Tag: para
-#: hardware.xml:813
+#: hardware.xml:816
 #, no-c-format
 msgid ""
 "There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -1090,13 +1095,13 @@ msgid ""
 msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核："
 
 #. Tag: term
-#: hardware.xml:820
+#: hardware.xml:823
 #, no-c-format
 msgid "<term>powerpc</term>"
 msgstr "<term>powerpc</term>"
 
 #. Tag: para
-#: hardware.xml:821
+#: hardware.xml:824
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Most systems use this kernel flavour, which supports the PowerPC 601, "
@@ -1111,31 +1116,31 @@ msgstr ""
 "器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
 
 #. Tag: term
-#: hardware.xml:831
+#: hardware.xml:834
 #, no-c-format
 msgid "powerpc-smp"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:832
+#: hardware.xml:835
 #, no-c-format
 msgid "All Apple PowerMac G4 SMP machines."
 msgstr ""
 
 #. Tag: term
-#: hardware.xml:840
+#: hardware.xml:843
 #, no-c-format
 msgid "power64"
 msgstr "power64"
 
 #. Tag: para
-#: hardware.xml:841
+#: hardware.xml:844
 #, no-c-format
 msgid "The power64 kernel flavour supports the following CPUs:"
 msgstr "power64 内核支持以下的 CPU："
 
 #. Tag: para
-#: hardware.xml:845
+#: hardware.xml:848
 #, no-c-format
 msgid ""
 "The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -1147,7 +1152,7 @@ msgstr ""
 "7044-270。"
 
 #. Tag: para
-#: hardware.xml:851
+#: hardware.xml:854
 #, no-c-format
 msgid ""
 "The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -1157,7 +1162,7 @@ msgstr ""
 "630、650、655、670 和 690。"
 
 #. Tag: para
-#: hardware.xml:856
+#: hardware.xml:859
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
@@ -1170,19 +1175,19 @@ msgstr ""
 "采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系，并使用这种内核。"
 
 #. Tag: para
-#: hardware.xml:862
+#: hardware.xml:865
 #, no-c-format
 msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:895
+#: hardware.xml:898
 #, no-c-format
 msgid "Power Macintosh (pmac) subarchitecture"
 msgstr "Power Macintosh (pmac) 子体系"
 
 #. Tag: para
-#: hardware.xml:897
+#: hardware.xml:900
 #, no-c-format
 msgid ""
 "Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -1195,7 +1200,7 @@ msgstr ""
 "(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
 
 #. Tag: para
-#: hardware.xml:904
+#: hardware.xml:907
 #, no-c-format
 msgid ""
 "OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -1208,7 +1213,7 @@ msgstr ""
 "些 Apple iMac PowerPC 前身使用 4 位数字命名方式，它们都是 OldWorld 的。"
 
 #. Tag: para
-#: hardware.xml:912
+#: hardware.xml:915
 #, no-c-format
 msgid ""
 "The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1223,7 +1228,7 @@ msgstr ""
 "MacOS 的系统。"
 
 #. Tag: para
-#: hardware.xml:920
+#: hardware.xml:923
 #, no-c-format
 msgid ""
 "Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1238,397 +1243,397 @@ msgstr ""
 
 # index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
 #. Tag: entry
-#: hardware.xml:936 hardware.xml:1071 hardware.xml:1115 hardware.xml:1148
+#: hardware.xml:939 hardware.xml:1074 hardware.xml:1118 hardware.xml:1151
 #, no-c-format
 msgid "Model Name/Number"
 msgstr "型号名称/编号"
 
 #. Tag: entry
-#: hardware.xml:937
+#: hardware.xml:940
 #, no-c-format
 msgid "Generation"
 msgstr "世代"
 
 #. Tag: entry
-#: hardware.xml:943
+#: hardware.xml:946
 #, no-c-format
 msgid "Apple"
 msgstr "Apple"
 
 #. Tag: entry
-#: hardware.xml:944
+#: hardware.xml:947
 #, no-c-format
 msgid "iMac Bondi Blue, 5 Flavors, Slot Loading"
 msgstr "iMac Bondi Blue, 5 Flavors, Slot Loading"
 
 # index.docbook:1249, index.docbook:1252, index.docbook:1255, index.docbook:1258, index.docbook:1261, index.docbook:1264, index.docbook:1267, index.docbook:1270, index.docbook:1273, index.docbook:1276, index.docbook:1279, index.docbook:1282, index.docbook:1285, index.docbook:1288, index.docbook:1291, index.docbook:1294
 #. Tag: entry
-#: hardware.xml:945 hardware.xml:948 hardware.xml:951 hardware.xml:954
-#: hardware.xml:957 hardware.xml:960 hardware.xml:963 hardware.xml:966
-#: hardware.xml:969 hardware.xml:972 hardware.xml:975 hardware.xml:978
-#: hardware.xml:981 hardware.xml:984 hardware.xml:987 hardware.xml:990
+#: hardware.xml:948 hardware.xml:951 hardware.xml:954 hardware.xml:957
+#: hardware.xml:960 hardware.xml:963 hardware.xml:966 hardware.xml:969
+#: hardware.xml:972 hardware.xml:975 hardware.xml:978 hardware.xml:981
+#: hardware.xml:984 hardware.xml:987 hardware.xml:990 hardware.xml:993
 #, no-c-format
 msgid "NewWorld"
 msgstr "NewWorld"
 
 #. Tag: entry
-#: hardware.xml:947
+#: hardware.xml:950
 #, no-c-format
 msgid "iMac Summer 2000, Early 2001"
 msgstr "iMac Summer 2000, Early 2001"
 
 #. Tag: entry
-#: hardware.xml:950
+#: hardware.xml:953
 #, no-c-format
 msgid "iMac G5"
 msgstr "iMac G5"
 
 #. Tag: entry
-#: hardware.xml:953
+#: hardware.xml:956
 #, no-c-format
 msgid "iBook, iBook SE, iBook Dual USB"
 msgstr "iBook, iBook SE, iBook Dual USB"
 
 #. Tag: entry
-#: hardware.xml:956
+#: hardware.xml:959
 #, no-c-format
 msgid "iBook2"
 msgstr "iBook2"
 
 #. Tag: entry
-#: hardware.xml:959
+#: hardware.xml:962
 #, no-c-format
 msgid "iBook G4"
 msgstr "iBook G4"
 
 #. Tag: entry
-#: hardware.xml:962
+#: hardware.xml:965
 #, no-c-format
 msgid "Power Macintosh Blue and White (B&amp;W) G3"
 msgstr "Power Macintosh Blue and White (B&amp;W) G3"
 
 #. Tag: entry
-#: hardware.xml:965
+#: hardware.xml:968
 #, no-c-format
 msgid "Power Macintosh G4 PCI, AGP, Cube"
 msgstr "Power Macintosh G4 PCI, AGP, Cube"
 
 #. Tag: entry
-#: hardware.xml:968
+#: hardware.xml:971
 #, no-c-format
 msgid "Power Macintosh G4 Gigabit Ethernet"
 msgstr "Power Macintosh G4 Gigabit Ethernet"
 
 #. Tag: entry
-#: hardware.xml:971
+#: hardware.xml:974
 #, no-c-format
 msgid "Power Macintosh G4 Digital Audio, Quicksilver"
 msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
 
 #. Tag: entry
-#: hardware.xml:974
+#: hardware.xml:977
 #, no-c-format
 msgid "Power Macintosh G5"
 msgstr "Power Macintosh G5"
 
 #. Tag: entry
-#: hardware.xml:977
+#: hardware.xml:980
 #, no-c-format
 msgid "PowerBook G3 FireWire Pismo (2000)"
 msgstr "PowerBook G3 FireWire Pismo (2000)"
 
 #. Tag: entry
-#: hardware.xml:980
+#: hardware.xml:983
 #, no-c-format
 msgid "PowerBook G3 Lombard (1999)"
 msgstr "PowerBook G3 Lombard (1999)"
 
 #. Tag: entry
-#: hardware.xml:983
+#: hardware.xml:986
 #, no-c-format
 msgid "PowerBook G4 Titanium"
 msgstr "PowerBook G4 Titanium"
 
 #. Tag: entry
-#: hardware.xml:986
+#: hardware.xml:989
 #, no-c-format
 msgid "PowerBook G4 Aluminum"
 msgstr "PowerBook G4 Aluminum"
 
 #. Tag: entry
-#: hardware.xml:989
+#: hardware.xml:992
 #, no-c-format
 msgid "Xserve G5"
 msgstr "Xserve G5"
 
 #. Tag: entry
-#: hardware.xml:992
+#: hardware.xml:995
 #, no-c-format
 msgid "Performa 4400, 54xx, 5500"
 msgstr "Performa 4400, 54xx, 5500"
 
 # index.docbook:1297, index.docbook:1300, index.docbook:1303, index.docbook:1306, index.docbook:1309, index.docbook:1312, index.docbook:1315, index.docbook:1318, index.docbook:1321, index.docbook:1324, index.docbook:1327, index.docbook:1330, index.docbook:1336, index.docbook:1339, index.docbook:1345, index.docbook:1351, index.docbook:1357
 #. Tag: entry
-#: hardware.xml:993 hardware.xml:996 hardware.xml:999 hardware.xml:1002
-#: hardware.xml:1005 hardware.xml:1008 hardware.xml:1011 hardware.xml:1014
-#: hardware.xml:1017 hardware.xml:1020 hardware.xml:1023 hardware.xml:1026
-#: hardware.xml:1032 hardware.xml:1035 hardware.xml:1041 hardware.xml:1047
-#: hardware.xml:1053
+#: hardware.xml:996 hardware.xml:999 hardware.xml:1002 hardware.xml:1005
+#: hardware.xml:1008 hardware.xml:1011 hardware.xml:1014 hardware.xml:1017
+#: hardware.xml:1020 hardware.xml:1023 hardware.xml:1026 hardware.xml:1029
+#: hardware.xml:1035 hardware.xml:1038 hardware.xml:1044 hardware.xml:1050
+#: hardware.xml:1056
 #, no-c-format
 msgid "OldWorld"
 msgstr "OldWorld"
 
 #. Tag: entry
-#: hardware.xml:995
+#: hardware.xml:998
 #, no-c-format
 msgid "Performa 6360, 6400, 6500"
 msgstr "Performa 6360, 6400, 6500"
 
 #. Tag: entry
-#: hardware.xml:998
+#: hardware.xml:1001
 #, no-c-format
 msgid "Power Macintosh 4400, 5400"
 msgstr "Power Macintosh 4400, 5400"
 
 #. Tag: entry
-#: hardware.xml:1001
+#: hardware.xml:1004
 #, no-c-format
 msgid "Power Macintosh 7200, 7300, 7500, 7600"
 msgstr "Power Macintosh 7200, 7300, 7500, 7600"
 
 #. Tag: entry
-#: hardware.xml:1004
+#: hardware.xml:1007
 #, no-c-format
 msgid "Power Macintosh 8200, 8500, 8600"
 msgstr "Power Macintosh 8200, 8500, 8600"
 
 #. Tag: entry
-#: hardware.xml:1007
+#: hardware.xml:1010
 #, no-c-format
 msgid "Power Macintosh 9500, 9600"
 msgstr "Power Macintosh 9500, 9600"
 
 #. Tag: entry
-#: hardware.xml:1010
+#: hardware.xml:1013
 #, no-c-format
 msgid "Power Macintosh (Beige) G3 Minitower"
 msgstr "Power Macintosh (Beige) G3 Minitower"
 
 #. Tag: entry
-#: hardware.xml:1013
+#: hardware.xml:1016
 #, no-c-format
 msgid "Power Macintosh (Beige) Desktop, All-in-One"
 msgstr "Power Macintosh (Beige) Desktop, All-in-One"
 
 #. Tag: entry
-#: hardware.xml:1016
+#: hardware.xml:1019
 #, no-c-format
 msgid "PowerBook 2400, 3400, 3500"
 msgstr "PowerBook 2400, 3400, 3500"
 
 #. Tag: entry
-#: hardware.xml:1019
+#: hardware.xml:1022
 #, no-c-format
 msgid "PowerBook G3 Wallstreet (1998)"
 msgstr "PowerBook G3 Wallstreet (1998)"
 
 #. Tag: entry
-#: hardware.xml:1022
+#: hardware.xml:1025
 #, no-c-format
 msgid "Twentieth Anniversary Macintosh"
 msgstr "Twentieth Anniversary Macintosh"
 
 #. Tag: entry
-#: hardware.xml:1025
+#: hardware.xml:1028
 #, no-c-format
 msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
 msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
 
 #. Tag: entry
-#: hardware.xml:1030
+#: hardware.xml:1033
 #, no-c-format
 msgid "Power Computing"
 msgstr "Power Computing"
 
 #. Tag: entry
-#: hardware.xml:1031
+#: hardware.xml:1034
 #, no-c-format
 msgid "PowerBase, PowerTower / Pro, PowerWave"
 msgstr "PowerBase, PowerTower / Pro, PowerWave"
 
 #. Tag: entry
-#: hardware.xml:1034
+#: hardware.xml:1037
 #, no-c-format
 msgid "PowerCenter / Pro, PowerCurve"
 msgstr "PowerCenter / Pro, PowerCurve"
 
 #. Tag: entry
-#: hardware.xml:1039
+#: hardware.xml:1042
 #, no-c-format
 msgid "UMAX"
 msgstr "UMAX"
 
 #. Tag: entry
-#: hardware.xml:1040
+#: hardware.xml:1043
 #, no-c-format
 msgid "C500, C600, J700, S900"
 msgstr "C500, C600, J700, S900"
 
 #. Tag: entry
-#: hardware.xml:1045
+#: hardware.xml:1048
 #, no-c-format
 msgid "<entry>APS</entry>"
 msgstr "<entry>APS</entry>"
 
 #. Tag: entry
-#: hardware.xml:1046
+#: hardware.xml:1049
 #, no-c-format
 msgid "APS Tech M*Power 604e/2000"
 msgstr "APS Tech M*Power 604e/2000"
 
 # index.docbook:1355, index.docbook:1381
 #. Tag: entry
-#: hardware.xml:1051 hardware.xml:1077
+#: hardware.xml:1054 hardware.xml:1080
 #, no-c-format
 msgid "Motorola"
 msgstr "Motorola"
 
 #. Tag: entry
-#: hardware.xml:1052
+#: hardware.xml:1055
 #, no-c-format
 msgid "Starmax 3000, 4000, 5000, 5500"
 msgstr "Starmax 3000, 4000, 5000, 5500"
 
 #. Tag: title
-#: hardware.xml:1061
+#: hardware.xml:1064
 #, no-c-format
 msgid "PReP subarchitecture"
 msgstr "PReP 子体系"
 
 #. Tag: entry
-#: hardware.xml:1078
+#: hardware.xml:1081
 #, no-c-format
 msgid "Firepower, PowerStack Series E, PowerStack II"
 msgstr "Firepower, PowerStack Series E, PowerStack II"
 
 #. Tag: entry
-#: hardware.xml:1080
+#: hardware.xml:1083
 #, no-c-format
 msgid "MPC 7xx, 8xx"
 msgstr "MPC 7xx, 8xx"
 
 #. Tag: entry
-#: hardware.xml:1082
+#: hardware.xml:1085
 #, no-c-format
 msgid "MTX, MTX+"
 msgstr "MTX, MTX+"
 
 #. Tag: entry
-#: hardware.xml:1084
+#: hardware.xml:1087
 #, no-c-format
 msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
 msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
 
 #. Tag: entry
-#: hardware.xml:1086
+#: hardware.xml:1089
 #, no-c-format
 msgid "MCP(N)750"
 msgstr "MCP(N)750"
 
 # index.docbook:1394, index.docbook:1425
 #. Tag: entry
-#: hardware.xml:1090 hardware.xml:1121
+#: hardware.xml:1093 hardware.xml:1124
 #, no-c-format
 msgid "IBM RS/6000"
 msgstr "IBM RS/6000"
 
 #. Tag: entry
-#: hardware.xml:1091
+#: hardware.xml:1094
 #, no-c-format
 msgid "40P, 43P"
 msgstr "40P, 43P"
 
 #. Tag: entry
-#: hardware.xml:1093
+#: hardware.xml:1096
 #, no-c-format
 msgid "Power 830/850/860 (6070, 6050)"
 msgstr "Power 830/850/860 (6070, 6050)"
 
 #. Tag: entry
-#: hardware.xml:1095
+#: hardware.xml:1098
 #, no-c-format
 msgid "6030, 7025, 7043"
 msgstr "6030, 7025, 7043"
 
 #. Tag: entry
-#: hardware.xml:1097
+#: hardware.xml:1100
 #, no-c-format
 msgid "p640"
 msgstr "p640"
 
 #. Tag: title
-#: hardware.xml:1105
+#: hardware.xml:1108
 #, fuzzy, no-c-format
 #| msgid "PReP subarchitecture"
 msgid "CHRP subarchitecture"
 msgstr "PReP 子体系"
 
 #. Tag: entry
-#: hardware.xml:1122
+#: hardware.xml:1125
 #, no-c-format
 msgid "B50, 43P-150, 44P"
 msgstr "B50, 43P-150, 44P"
 
 #. Tag: entry
-#: hardware.xml:1125
+#: hardware.xml:1128
 #, no-c-format
 msgid "Genesi"
 msgstr "Genesi"
 
 #. Tag: entry
-#: hardware.xml:1126
+#: hardware.xml:1129
 #, no-c-format
 msgid "Pegasos I, Pegasos II"
 msgstr "Pegasos I, Pegasos II"
 
 #. Tag: entry
-#: hardware.xml:1129
+#: hardware.xml:1132
 #, no-c-format
 msgid "Fixstars"
 msgstr ""
 
 #. Tag: entry
-#: hardware.xml:1130
+#: hardware.xml:1133
 #, no-c-format
 msgid "YDL PowerStation"
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:1138
+#: hardware.xml:1141
 #, no-c-format
 msgid "APUS subarchitecture (unsupported)"
 msgstr "APUS 子体系 (不支持)"
 
 #. Tag: entry
-#: hardware.xml:1154
+#: hardware.xml:1157
 #, no-c-format
 msgid "Amiga Power-UP Systems (APUS)"
 msgstr "Amiga Power-UP Systems (APUS)"
 
 #. Tag: entry
-#: hardware.xml:1155
+#: hardware.xml:1158
 #, no-c-format
 msgid "A1200, A3000, A4000"
 msgstr "A1200, A3000, A4000"
 
 #. Tag: title
-#: hardware.xml:1163
+#: hardware.xml:1166
 #, no-c-format
 msgid "Nubus PowerMac subarchitecture (unsupported)"
 msgstr "Nubus PowerMac 子体系 (不支持)"
 
 #. Tag: para
-#: hardware.xml:1165
+#: hardware.xml:1168
 #, no-c-format
 msgid ""
 "NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1652,13 +1657,13 @@ msgstr ""
 "nubus-pmac.sourceforge.net/\"></ulink>"
 
 #. Tag: title
-#: hardware.xml:1202
+#: hardware.xml:1205
 #, no-c-format
 msgid "Non-PowerPC Macs"
 msgstr "Non-PowerPC Macs"
 
 #. Tag: para
-#: hardware.xml:1204
+#: hardware.xml:1207
 #, no-c-format
 msgid ""
 "Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1674,7 +1679,7 @@ msgstr ""
 "字，像 Mac IIcx、LCIII 或 Quadra 950。"
 
 #. Tag: para
-#: hardware.xml:1213
+#: hardware.xml:1216
 #, no-c-format
 msgid ""
 "This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1689,7 +1694,7 @@ msgstr ""
 "840AV, 900, 950), 最后是 Performa 200-640CD。"
 
 #. Tag: para
-#: hardware.xml:1221
+#: hardware.xml:1224
 #, no-c-format
 msgid ""
 "In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1700,13 +1705,13 @@ msgstr ""
 "Duo 210-550c (不包含带有 Nubus 的 PowerBook 500，见前面说明。)"
 
 #. Tag: title
-#: hardware.xml:1237
+#: hardware.xml:1240
 #, no-c-format
 msgid "zSeries and System z machine types"
 msgstr "zSeries 和 System z 机器类型"
 
 #. Tag: para
-#: hardware.xml:1238
+#: hardware.xml:1241
 #, no-c-format
 msgid ""
 "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
@@ -1728,13 +1733,13 @@ msgstr ""
 "ulink>。"
 
 #. Tag: title
-#: hardware.xml:1255
+#: hardware.xml:1258
 #, no-c-format
 msgid "PAV and HyperPAV"
 msgstr "PAV 和 HyperPAV"
 
 #. Tag: para
-#: hardware.xml:1256
+#: hardware.xml:1259
 #, no-c-format
 msgid ""
 "PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1747,13 +1752,13 @@ msgstr ""
 
 # index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
 #. Tag: title
-#: hardware.xml:1272
+#: hardware.xml:1275
 #, no-c-format
 msgid "CPU and Main Boards Support"
 msgstr "CPU 和主板支持"
 
 #. Tag: para
-#: hardware.xml:1273
+#: hardware.xml:1276
 #, no-c-format
 msgid ""
 "Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1765,13 +1770,13 @@ msgstr ""
 "sun4m、sun4u 或 sun4v。下面说明包括哪些机器，以及每个获得支持的级别。"
 
 #. Tag: term
-#: hardware.xml:1284
+#: hardware.xml:1287
 #, no-c-format
 msgid "sun4, sun4c, sun4d, sun4m"
 msgstr "sun4, sun4c, sun4d, sun4m"
 
 #. Tag: para
-#: hardware.xml:1286
+#: hardware.xml:1289
 #, no-c-format
 msgid ""
 "None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1784,7 +1789,7 @@ msgstr ""
 "SPARCstation page</ulink>。"
 
 #. Tag: para
-#: hardware.xml:1293
+#: hardware.xml:1296
 #, no-c-format
 msgid ""
 "The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1795,13 +1800,13 @@ msgstr ""
 "32 位子体系在上一版本后已经停止支持。"
 
 #. Tag: term
-#: hardware.xml:1303
+#: hardware.xml:1306
 #, no-c-format
 msgid "sun4u"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1305
+#: hardware.xml:1308
 #, no-c-format
 msgid ""
 "This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1817,13 +1822,13 @@ msgstr ""
 "到 UP 和 SMP 配置中。"
 
 #. Tag: term
-#: hardware.xml:1318
+#: hardware.xml:1321
 #, no-c-format
 msgid "sun4v"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:1320
+#: hardware.xml:1323
 #, no-c-format
 msgid ""
 "This is the newest addition to the Sparc family, which includes machines "
@@ -1836,7 +1841,7 @@ msgstr ""
 "smp 内核。"
 
 #. Tag: para
-#: hardware.xml:1331
+#: hardware.xml:1334
 #, no-c-format
 msgid ""
 "Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1846,13 +1851,13 @@ msgstr ""
 "持而得不到支持。"
 
 #. Tag: title
-#: hardware.xml:1340
+#: hardware.xml:1343
 #, no-c-format
 msgid "Laptops"
 msgstr "便携机"
 
 #. Tag: para
-#: hardware.xml:1341
+#: hardware.xml:1344
 #, no-c-format
 msgid ""
 "From a technical point of view, laptops are normal PCs, so all information "
@@ -1874,13 +1879,13 @@ msgstr ""
 
 # index.docbook:1624, index.docbook:1649, index.docbook:1672
 #. Tag: title
-#: hardware.xml:1358 hardware.xml:1378 hardware.xml:1405 hardware.xml:1428
+#: hardware.xml:1361 hardware.xml:1381 hardware.xml:1408 hardware.xml:1431
 #, no-c-format
 msgid "Multiple Processors"
 msgstr "多处理器"
 
 #. Tag: para
-#: hardware.xml:1359
+#: hardware.xml:1362
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1907,7 +1912,7 @@ msgstr ""
 "集成在一个物理芯片上。"
 
 #. Tag: para
-#: hardware.xml:1369
+#: hardware.xml:1372
 #, no-c-format
 msgid ""
 "The standard &debian; &release; kernel image has been compiled with SMP "
@@ -1917,7 +1922,7 @@ msgstr ""
 "使用也没有问题。"
 
 #. Tag: para
-#: hardware.xml:1380
+#: hardware.xml:1383
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1933,7 +1938,7 @@ msgstr ""
 "者核心)数量，并可以在单处理器系统上关闭 SMP 功能。"
 
 #. Tag: para
-#: hardware.xml:1389
+#: hardware.xml:1392
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Having multiple processors in a computer was originally only an issue for "
@@ -1953,7 +1958,7 @@ msgstr ""
 "两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
 
 #. Tag: para
-#: hardware.xml:1396
+#: hardware.xml:1399
 #, no-c-format
 msgid ""
 "The 586 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1961,7 +1966,7 @@ msgid ""
 msgstr "&arch-title; 的 586 &debian; 内核映像软件包没有支持 SMP 。"
 
 #. Tag: para
-#: hardware.xml:1406
+#: hardware.xml:1409
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1976,7 +1981,7 @@ msgstr ""
 "核仅使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1415
+#: hardware.xml:1418
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you'll have to replace "
@@ -1992,7 +1997,7 @@ msgstr ""
 "</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1429
+#: hardware.xml:1432
 #, no-c-format
 msgid ""
 "Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2008,7 +2013,7 @@ msgstr ""
 "装，因为非 SMP 的内核也能在 SMP 的系统下启动，只不过内核只使用第一个 CPU。"
 
 #. Tag: para
-#: hardware.xml:1439
+#: hardware.xml:1442
 #, no-c-format
 msgid ""
 "In order to take advantage of multiple processors, you should check to see "
@@ -2019,7 +2024,7 @@ msgstr ""
 "一个合适的内核软件包。"
 
 #. Tag: para
-#: hardware.xml:1445
+#: hardware.xml:1448
 #, no-c-format
 msgid ""
 "You can also build your own customized kernel to support SMP.<phrase arch="
@@ -2034,13 +2039,13 @@ msgstr ""
 "<quote>&smp-config-option;</quote>。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1456
+#: hardware.xml:1459
 #, no-c-format
 msgid "Graphics Card Support"
 msgstr "图形卡支持"
 
 #. Tag: para
-#: hardware.xml:1457
+#: hardware.xml:1460
 #, no-c-format
 msgid ""
 "&debian;'s support for graphical interfaces is determined by the underlying "
@@ -2061,7 +2066,7 @@ msgstr ""
 "功能也需要安装额外的固件，但这是罕有的例子。"
 
 #. Tag: para
-#: hardware.xml:1470
+#: hardware.xml:1473
 #, no-c-format
 msgid ""
 "Details on supported graphics cards and pointing devices can be found at "
@@ -2072,13 +2077,13 @@ msgstr ""
 "&debian; &release; 包含 X.Org &x11ver; 版。"
 
 #. Tag: para
-#: hardware.xml:1475
+#: hardware.xml:1478
 #, no-c-format
 msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
 msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
 
 #. Tag: para
-#: hardware.xml:1480
+#: hardware.xml:1483
 #, no-c-format
 msgid ""
 "Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2097,7 +2102,7 @@ msgstr ""
 "卡。"
 
 #. Tag: para
-#: hardware.xml:1490
+#: hardware.xml:1493
 #, no-c-format
 msgid ""
 "It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2120,13 +2125,13 @@ msgstr ""
 "自动激活串口控制台。"
 
 #. Tag: title
-#: hardware.xml:1512
+#: hardware.xml:1515
 #, no-c-format
 msgid "Network Connectivity Hardware"
 msgstr "网络连接硬件"
 
 #. Tag: para
-#: hardware.xml:1513
+#: hardware.xml:1516
 #, no-c-format
 msgid ""
 "Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2141,7 +2146,7 @@ msgstr ""
 "很好。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1523
+#: hardware.xml:1526
 #, no-c-format
 msgid ""
 "This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2149,61 +2154,61 @@ msgid ""
 msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡："
 
 #. Tag: para
-#: hardware.xml:1529
+#: hardware.xml:1532
 #, no-c-format
 msgid "Sun LANCE"
 msgstr "Sun LANCE"
 
 #. Tag: para
-#: hardware.xml:1534
+#: hardware.xml:1537
 #, no-c-format
 msgid "Sun Happy Meal"
 msgstr "Sun Happy Meal"
 
 #. Tag: para
-#: hardware.xml:1539
+#: hardware.xml:1542
 #, no-c-format
 msgid "Sun BigMAC"
 msgstr "Sun BigMAC"
 
 #. Tag: para
-#: hardware.xml:1544
+#: hardware.xml:1547
 #, no-c-format
 msgid "Sun QuadEthernet"
 msgstr "Sun QuadEthernet"
 
 #. Tag: para
-#: hardware.xml:1549
+#: hardware.xml:1552
 #, no-c-format
 msgid "MyriCOM Gigabit Ethernet"
 msgstr "MyriCOM Gigabit Ethernet"
 
 #. Tag: para
-#: hardware.xml:1556
+#: hardware.xml:1559
 #, no-c-format
 msgid "The list of supported network devices is:"
 msgstr "支持的网络设备有："
 
 #. Tag: para
-#: hardware.xml:1561
+#: hardware.xml:1564
 #, no-c-format
 msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
 msgstr "Channel to Channel (CTC) 和 ESCON connection (实际或模拟)"
 
 #. Tag: para
-#: hardware.xml:1566
+#: hardware.xml:1569
 #, no-c-format
 msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
 msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
 
 #. Tag: para
-#: hardware.xml:1571
+#: hardware.xml:1574
 #, no-c-format
 msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
 msgstr "QDIO 模式的 OSA-Express，HiperSockets 和 Guest-LANs"
 
 #. Tag: para
-#: hardware.xml:1580
+#: hardware.xml:1583
 #, no-c-format
 msgid ""
 "On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2213,19 +2218,19 @@ msgstr ""
 "块。"
 
 #. Tag: para
-#: hardware.xml:1585
+#: hardware.xml:1588
 #, no-c-format
 msgid "ISDN is supported, but not during the installation."
 msgstr "ISDN 虽也获得支持，不过不能在安装阶段使用。"
 
 #. Tag: title
-#: hardware.xml:1592
+#: hardware.xml:1595
 #, no-c-format
 msgid "Wireless Network Cards"
 msgstr "无线网卡"
 
 #. Tag: para
-#: hardware.xml:1593
+#: hardware.xml:1596
 #, no-c-format
 msgid ""
 "Wireless networking is in general supported as well and a growing number of "
@@ -2236,7 +2241,7 @@ msgstr ""
 "核能支持的无线网卡也越来越多。"
 
 #. Tag: para
-#: hardware.xml:1600
+#: hardware.xml:1603
 #, no-c-format
 msgid ""
 "If firmware is needed, the installer will prompt you to load firmware. See "
@@ -2247,7 +2252,7 @@ msgstr ""
 "> 了解如何在安装过程中加载固件的更多信息。"
 
 #. Tag: para
-#: hardware.xml:1605
+#: hardware.xml:1608
 #, no-c-format
 msgid ""
 "Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2258,7 +2263,7 @@ msgstr ""
 "作，但是却不能在安装过程中使用。"
 
 #. Tag: para
-#: hardware.xml:1610
+#: hardware.xml:1613
 #, no-c-format
 msgid ""
 "If there is a problem with wireless and there is no other NIC you can use "
@@ -2274,7 +2279,7 @@ msgstr ""
 "件，并手动配置网络。"
 
 #. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1623
 #, no-c-format
 msgid ""
 "In some cases the driver you need may not be available as a &debian; "
@@ -2290,13 +2295,13 @@ msgstr ""
 "classname> 软件包，它让您使用 Windows 的驱动程序。</phrase>"
 
 #. Tag: title
-#: hardware.xml:1634
+#: hardware.xml:1637
 #, no-c-format
 msgid "Known Issues for &arch-title;"
 msgstr "&arch-title; 的一些已知问题"
 
 #. Tag: para
-#: hardware.xml:1635
+#: hardware.xml:1638
 #, no-c-format
 msgid ""
 "There are a couple of issues with specific network cards that are worth "
@@ -2304,13 +2309,13 @@ msgid ""
 msgstr "有些特定的网卡事项需要在此提及。"
 
 #. Tag: title
-#: hardware.xml:1642
+#: hardware.xml:1645
 #, no-c-format
 msgid "Conflict between tulip and dfme drivers"
 msgstr "tulip 和 dfme 驱动程序之间的冲突"
 
 #. Tag: para
-#: hardware.xml:1644
+#: hardware.xml:1647
 #, no-c-format
 msgid ""
 "There are various PCI network cards that have the same PCI identification, "
@@ -2326,7 +2331,7 @@ msgstr ""
 "如果使用不正确的驱动程序，网卡可能不工作，或者工作不正常。"
 
 #. Tag: para
-#: hardware.xml:1654
+#: hardware.xml:1657
 #, no-c-format
 msgid ""
 "This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2339,7 +2344,7 @@ msgstr ""
 "\"module-blacklist\"/> 将错误的驱动模块加入黑名单，以阻止这种情况发生。"
 
 #. Tag: para
-#: hardware.xml:1662
+#: hardware.xml:1665
 #, no-c-format
 msgid ""
 "An alternative solution during the installation is to switch to a shell and "
@@ -2356,13 +2361,13 @@ msgstr ""
 "之后错误的模块可能还会加载。"
 
 #. Tag: title
-#: hardware.xml:1675
+#: hardware.xml:1678
 #, no-c-format
 msgid "Sun B100 blade"
 msgstr "Sun B100 blade"
 
 #. Tag: para
-#: hardware.xml:1677
+#: hardware.xml:1680
 #, no-c-format
 msgid ""
 "The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2371,13 +2376,13 @@ msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
 
 #. Tag: title
-#: hardware.xml:1692
+#: hardware.xml:1695
 #, no-c-format
 msgid "Braille Displays"
 msgstr "盲文点触设备(Braille Display)"
 
 #. Tag: para
-#: hardware.xml:1693
+#: hardware.xml:1696
 #, no-c-format
 msgid ""
 "Support for braille displays is determined by the underlying support found "
@@ -2394,13 +2399,13 @@ msgstr ""
 "的 <classname>brltty</classname> 版本是 &brlttyver; 。"
 
 #. Tag: title
-#: hardware.xml:1707
+#: hardware.xml:1710
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr "硬件语音合成(Hardware Speech Synthesis)"
 
 #. Tag: para
-#: hardware.xml:1708
+#: hardware.xml:1711
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is determined by the "
@@ -2419,13 +2424,13 @@ msgstr ""
 "gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
 
 #. Tag: title
-#: hardware.xml:1728
+#: hardware.xml:1731
 #, no-c-format
 msgid "Peripherals and Other Hardware"
 msgstr "外围设备与其他硬件"
 
 #. Tag: para
-#: hardware.xml:1729
+#: hardware.xml:1732
 #, fuzzy, no-c-format
 #| msgid ""
 #| "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2440,7 +2445,7 @@ msgstr ""
 "设备。然而，在安装系统的时候，并不需要其中的大部分设备。"
 
 #. Tag: para
-#: hardware.xml:1735
+#: hardware.xml:1738
 #, no-c-format
 msgid ""
 "USB hardware generally works fine. On some very old PC systems some USB "
@@ -2453,7 +2458,7 @@ msgstr ""
 "要任何额外的配置就能工作。"
 
 #. Tag: para
-#: hardware.xml:1744
+#: hardware.xml:1747
 #, no-c-format
 msgid ""
 "Package installations from XPRAM and tape are not supported by this system. "
@@ -2464,13 +2469,13 @@ msgstr ""
 "通过 NFS、HTTP、FTP 从网络上取得。"
 
 #. Tag: title
-#: hardware.xml:1757
+#: hardware.xml:1760
 #, no-c-format
 msgid "Devices Requiring Firmware"
 msgstr "需要固件的设备"
 
 #. Tag: para
-#: hardware.xml:1758
+#: hardware.xml:1761
 #, no-c-format
 msgid ""
 "Besides the availability of a device driver, some hardware also requires so-"
@@ -2489,7 +2494,7 @@ msgstr ""
 "系统中。"
 
 #. Tag: para
-#: hardware.xml:1769
+#: hardware.xml:1772
 #, no-c-format
 msgid ""
 "On many older devices which require firmware to work, the firmware file was "
@@ -2503,7 +2508,7 @@ msgstr ""
 "主系统上传到设备中。"
 
 #. Tag: para
-#: hardware.xml:1777
+#: hardware.xml:1780
 #, no-c-format
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
@@ -2518,7 +2523,7 @@ msgstr ""
 "gnu; 可以合法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
-#: hardware.xml:1786
+#: hardware.xml:1789
 #, no-c-format
 msgid ""
 "However, this does not mean that such hardware cannot be used during an "
@@ -2533,7 +2538,7 @@ msgstr ""
 "\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
 
 #. Tag: para
-#: hardware.xml:1795
+#: hardware.xml:1798
 #, no-c-format
 msgid ""
 "If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -2550,13 +2555,13 @@ msgstr ""
 "卡上)。"
 
 #. Tag: title
-#: hardware.xml:1812
+#: hardware.xml:1815
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
-#: hardware.xml:1814
+#: hardware.xml:1817
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -2570,7 +2575,7 @@ msgstr ""
 "心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
 
 #. Tag: para
-#: hardware.xml:1822
+#: hardware.xml:1825
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2584,7 +2589,7 @@ msgstr ""
 "<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
 
 #. Tag: para
-#: hardware.xml:1830
+#: hardware.xml:1833
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2600,13 +2605,13 @@ msgstr ""
 "&arch-kernel; 友好的硬件销售商。"
 
 #. Tag: title
-#: hardware.xml:1841
+#: hardware.xml:1844
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
-#: hardware.xml:1842
+#: hardware.xml:1845
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2621,7 +2626,7 @@ msgstr ""
 "于我们未被授权使用这些文档，造成它们无法在 &arch-kernel; 下工作。"
 
 #. Tag: para
-#: hardware.xml:1852
+#: hardware.xml:1855
 #, no-c-format
 msgid ""
 "In many cases there are standards (or at least some de-facto standards) "
@@ -2641,7 +2646,7 @@ msgstr ""
 "所有设备都是符合标准的。"
 
 #. Tag: para
-#: hardware.xml:1864
+#: hardware.xml:1867
 #, no-c-format
 msgid ""
 "In other fields, among them e.g. printers, this is unfortunately not the "
@@ -2659,7 +2664,7 @@ msgstr ""
 "于厂商提供的闭源驱动程序。"
 
 #. Tag: para
-#: hardware.xml:1875
+#: hardware.xml:1878
 #, no-c-format
 msgid ""
 "Even if there is a vendor-provided closed-source driver for such hardware "
@@ -2680,7 +2685,7 @@ msgstr ""
 "统升级造成的不便。"
 
 #. Tag: para
-#: hardware.xml:1888
+#: hardware.xml:1891
 #, no-c-format
 msgid ""
 "You can help improve this situation by encouraging manufacturers of closed "
@@ -2691,13 +2696,13 @@ msgstr ""
 "来改变这种状况。"
 
 #. Tag: title
-#: hardware.xml:1903
+#: hardware.xml:1906
 #, no-c-format
 msgid "Installation Media"
 msgstr "安装介质"
 
 #. Tag: para
-#: hardware.xml:1905
+#: hardware.xml:1908
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -2711,13 +2716,13 @@ msgstr ""
 "读那一章的时候，可能需要回过头来参考本页。"
 
 #. Tag: title
-#: hardware.xml:1915
+#: hardware.xml:1918
 #, no-c-format
 msgid "Floppies"
 msgstr "软盘"
 
 #. Tag: para
-#: hardware.xml:1916
+#: hardware.xml:1919
 #, no-c-format
 msgid ""
 "In some cases, you'll have to do your first boot from floppy disks. "
@@ -2728,19 +2733,19 @@ msgstr ""
 "(1440 千字节)软驱。"
 
 #. Tag: para
-#: hardware.xml:1922
+#: hardware.xml:1925
 #, no-c-format
 msgid "For CHRP, floppy support is currently broken."
 msgstr "用于 CHRP 的软盘支持已经被停止。"
 
 #. Tag: title
-#: hardware.xml:1929
+#: hardware.xml:1932
 #, no-c-format
 msgid "CD-ROM/DVD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1931
+#: hardware.xml:1934
 #, no-c-format
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
@@ -2751,19 +2756,19 @@ msgstr ""
 "作系统的角度看，它们所用的技术是相同的。"
 
 #. Tag: para
-#: hardware.xml:1937
+#: hardware.xml:1940
 #, no-c-format
 msgid "CD-ROM based installation is supported for most architectures."
 msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
 
 #. Tag: para
-#: hardware.xml:1941
+#: hardware.xml:1944
 #, no-c-format
 msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
 msgstr "PC 上的 SATA、IDE/ATAPI 和 SCSI CD-ROM 都获得支持。"
 
 #. Tag: para
-#: hardware.xml:1945
+#: hardware.xml:1948
 #, no-c-format
 msgid ""
 "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2773,13 +2778,13 @@ msgstr ""
 "获得支持。"
 
 #. Tag: para
-#: hardware.xml:1950
+#: hardware.xml:1953
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
 msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
 
 #. Tag: para
-#: hardware.xml:1954
+#: hardware.xml:1957
 #, no-c-format
 msgid ""
 "On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2797,13 +2802,13 @@ msgstr ""
 "固件上选择 <quote>System installation</quote> 项。"
 
 #. Tag: title
-#: hardware.xml:1968
+#: hardware.xml:1971
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "U 盘"
 
 #. Tag: para
-#: hardware.xml:1970
+#: hardware.xml:1973
 #, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
@@ -2818,13 +2823,13 @@ msgstr ""
 "CD/DVD-ROM 驱动器，从 U 盘引导是安装操作系统的标准方法。"
 
 #. Tag: title
-#: hardware.xml:1982
+#: hardware.xml:1985
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. Tag: para
-#: hardware.xml:1984
+#: hardware.xml:1987
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2841,7 +2846,7 @@ msgstr ""
 "用 ISDN 和 PPP。"
 
 #. Tag: para
-#: hardware.xml:1994
+#: hardware.xml:1997
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2860,7 +2865,7 @@ msgstr ""
 "安装技术。</phrase>"
 
 #. Tag: para
-#: hardware.xml:2007
+#: hardware.xml:2010
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2870,13 +2875,13 @@ msgstr ""
 "择。"
 
 #. Tag: title
-#: hardware.xml:2016
+#: hardware.xml:2019
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. Tag: para
-#: hardware.xml:2018
+#: hardware.xml:2021
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2888,7 +2893,7 @@ msgstr ""
 "安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
 
 #. Tag: para
-#: hardware.xml:2025
+#: hardware.xml:2028
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2898,13 +2903,13 @@ msgstr ""
 "(UFS slices)进行安装。"
 
 #. Tag: title
-#: hardware.xml:2034
+#: hardware.xml:2037
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
-#: hardware.xml:2036
+#: hardware.xml:2039
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2921,13 +2926,13 @@ msgstr ""
 ">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
 
 #. Tag: title
-#: hardware.xml:2049
+#: hardware.xml:2052
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "受支持的存储系统"
 
 #. Tag: para
-#: hardware.xml:2051
+#: hardware.xml:2054
 #, no-c-format
 msgid ""
 "The &debian; installer contains a kernel which is built to maximize the "
@@ -2935,7 +2940,7 @@ msgid ""
 msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
 
 #. Tag: para
-#: hardware.xml:2055
+#: hardware.xml:2058
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for IDE (also "
@@ -2947,7 +2952,7 @@ msgstr ""
 "动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
 
 #. Tag: para
-#: hardware.xml:2072
+#: hardware.xml:2075
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2969,7 +2974,7 @@ msgstr ""
 "以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
 
 #. Tag: para
-#: hardware.xml:2105
+#: hardware.xml:2108
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2980,7 +2985,7 @@ msgstr ""
 "支持 CHRP 系统上的软盘。"
 
 #. Tag: para
-#: hardware.xml:2111
+#: hardware.xml:2114
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2991,7 +2996,7 @@ msgstr ""
 "支持软驱。"
 
 #. Tag: para
-#: hardware.xml:2117
+#: hardware.xml:2120
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2999,7 +3004,7 @@ msgid ""
 msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
 
 #. Tag: para
-#: hardware.xml:2122
+#: hardware.xml:2125
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -3011,13 +3016,13 @@ msgstr ""
 "持。"
 
 #. Tag: title
-#: hardware.xml:2139
+#: hardware.xml:2142
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "内存与磁盘空间的需求"
 
 #. Tag: para
-#: hardware.xml:2141
+#: hardware.xml:2144
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3030,7 +3035,7 @@ msgstr ""
 "hardware-reqts\"/>。"
 
 #. Tag: para
-#: hardware.xml:2148
+#: hardware.xml:2151
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Installation on systems with less memory<footnote condition=\"gtk\"> "
@@ -3054,6 +3059,38 @@ msgstr ""
 "形界面两种方式之间选择，应选择普通方式。</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) 版"
+#~ "已经<emphasis>放弃</emphasis>对真正的 80386 处理器(以及它们的克隆)的支持"
+#~ "<footnote> <para> 我们已经尽力避免，但由于编译器和内核的一系列因素，起因"
+#~ "是 GCC 提供的 C++ ABI 的 bug，最终只能如此。如果您自己动手从源码编译内核和"
+#~ "所有的软件包，仍然可以将 &debian; GNU/Linux 运行在真正的 80386 处理器上，"
+#~ "这部分内容超出了本手册的范畴。</para> </footnote>。(Linux 从来没有任何版本"
+#~ "支持 286 或更早的芯片。) 所有的 i486 和后续的处理器仍然支持<footnote> "
+#~ "<para> 许多 &debian; 软件包在新的计算机上可以运行地稍微快一点，但另一方面"
+#~ "却舍弃了对旧芯片的支持。1989 年发布的 i486 有三个 opcode (bswap、cmpxchg "
+#~ "和 xadd)，然而 1986 年发布的 i386 却没有。过去多数 &debian; 软件包不能使用"
+#~ "它们，现在没有这个问题了。</para> </footnote>。"
+
 #~ msgid "iop32x"
 #~ msgstr "iop32x"
 
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 9c68edcc6..1e1f376b9 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: 2014-10-05 18:15+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-26 00:19+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -294,18 +294,20 @@ msgid ""
 "kernel (see <xref linkend=\"armhf-armmp-supported-platforms\"/>) consist of "
 "a standard Linux kernel image, a standard Linux initial ramdisk image and a "
 "system-specific device-tree blob. The kernel and the initial ramdisk image "
-"can be obtained from &armmp-firmware-img; and the device-tree blob can be "
-"obtained from &armmp-dtb-img;."
+"for tftp-booting can be obtained from &armmp-firmware-img; and the device-"
+"tree blob can be obtained from &armmp-dtb-img;. The tar archive for creating "
+"a bootable USB stick with the installer can be obtained from &armmp-hd-media-"
+"tarball;."
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:263
+#: install-methods.xml:265
 #, no-c-format
 msgid "Creating Floppies from Disk Images"
 msgstr "从软盘映像创建引导软盘"
 
 #. Tag: para
-#: install-methods.xml:264
+#: install-methods.xml:266
 #, no-c-format
 msgid ""
 "Bootable floppy disks are generally used as a last resort to boot the "
@@ -315,7 +317,7 @@ msgstr ""
 "最后一种方法。"
 
 #. Tag: para
-#: install-methods.xml:269
+#: install-methods.xml:271
 #, no-c-format
 msgid ""
 "Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -323,7 +325,7 @@ msgid ""
 msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
 
 #. Tag: para
-#: install-methods.xml:274
+#: install-methods.xml:276
 #, no-c-format
 msgid ""
 "Disk images are files containing the complete contents of a floppy disk in "
@@ -341,7 +343,7 @@ msgstr ""
 "按扇区复制</emphasis>到软盘中。"
 
 #. Tag: para
-#: install-methods.xml:285
+#: install-methods.xml:287
 #, no-c-format
 msgid ""
 "There are different techniques for creating floppies from disk images. This "
@@ -352,7 +354,7 @@ msgstr ""
 "像创建引导软盘。"
 
 #. Tag: para
-#: install-methods.xml:291
+#: install-methods.xml:293
 #, no-c-format
 msgid ""
 "Before you can create the floppies, you will first need to download them "
@@ -366,7 +368,7 @@ msgstr ""
 "DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
 
 #. Tag: para
-#: install-methods.xml:299
+#: install-methods.xml:301
 #, no-c-format
 msgid ""
 "No matter which method you use to create your floppies, you should remember "
@@ -377,13 +379,13 @@ msgstr ""
 "保内容不会在无意被抹掉。"
 
 #. Tag: title
-#: install-methods.xml:307
+#: install-methods.xml:309
 #, no-c-format
 msgid "Writing Disk Images From a Linux or Unix System"
 msgstr "从 Linux 或者 Unix 系统写软盘映像"
 
 #. Tag: para
-#: install-methods.xml:308
+#: install-methods.xml:310
 #, no-c-format
 msgid ""
 "To write the floppy disk image files to the floppy disks, you will probably "
@@ -415,7 +417,7 @@ msgstr ""
 "(Solaris 系统中使用 <command>eject</command> 命令，请参见其手册)</phrase>。"
 
 #. Tag: para
-#: install-methods.xml:329
+#: install-methods.xml:331
 #, no-c-format
 msgid ""
 "Some systems attempt to automatically mount a floppy disk when you place it "
@@ -445,7 +447,7 @@ msgstr ""
 "统，请咨询您的系统管理员)。</phrase>"
 
 #. Tag: para
-#: install-methods.xml:350
+#: install-methods.xml:352
 #, no-c-format
 msgid ""
 "If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -456,13 +458,13 @@ msgstr ""
 "command> 命令能够很好地对此进行控制，当然您可能需要先安装它。"
 
 #. Tag: title
-#: install-methods.xml:368
+#: install-methods.xml:370
 #, no-c-format
 msgid "Writing Disk Images From DOS, Windows, or OS/2"
 msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
 
 #. Tag: para
-#: install-methods.xml:370
+#: install-methods.xml:372
 #, no-c-format
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
@@ -471,7 +473,7 @@ msgstr ""
 "如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
 
 #. Tag: para
-#: install-methods.xml:375
+#: install-methods.xml:377
 #, no-c-format
 msgid ""
 "The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -485,7 +487,7 @@ msgstr ""
 "或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
 
 #. Tag: para
-#: install-methods.xml:383
+#: install-methods.xml:385
 #, no-c-format
 msgid ""
 "The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -496,7 +498,7 @@ msgstr ""
 "可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
 
 #. Tag: para
-#: install-methods.xml:389
+#: install-methods.xml:391
 #, no-c-format
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
@@ -506,13 +508,13 @@ msgstr ""
 "下。"
 
 #. Tag: title
-#: install-methods.xml:402
+#: install-methods.xml:404
 #, no-c-format
 msgid "Writing Disk Images From MacOS"
 msgstr "在 MacOS 上写磁盘映像"
 
 #. Tag: para
-#: install-methods.xml:403
+#: install-methods.xml:405
 #, no-c-format
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -532,7 +534,7 @@ msgstr ""
 "您确认的确想要清空磁盘并写入磁盘映像。"
 
 #. Tag: para
-#: install-methods.xml:414
+#: install-methods.xml:416
 #, no-c-format
 msgid ""
 "You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -545,13 +547,13 @@ msgstr ""
 "您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
 
 #. Tag: title
-#: install-methods.xml:425
+#: install-methods.xml:427
 #, no-c-format
 msgid "Writing Disk Images with <command>Disk Copy</command>"
 msgstr "写磁盘映像：使用<command>Disk Copy</command>"
 
 #. Tag: para
-#: install-methods.xml:426
+#: install-methods.xml:428
 #, no-c-format
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
@@ -564,7 +566,7 @@ msgstr ""
 "下载映像文件的情况。"
 
 #. Tag: para
-#: install-methods.xml:435
+#: install-methods.xml:437
 #, no-c-format
 msgid ""
 "Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -574,7 +576,7 @@ msgstr ""
 "且用它打开 <filename>root.bin</filename> 文件。"
 
 #. Tag: para
-#: install-methods.xml:442
+#: install-methods.xml:444
 #, no-c-format
 msgid ""
 "Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -585,7 +587,7 @@ msgstr ""
 "<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
 
 #. Tag: para
-#: install-methods.xml:449
+#: install-methods.xml:451
 #, no-c-format
 msgid ""
 "<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -600,7 +602,7 @@ msgstr ""
 "会删除引导区。"
 
 #. Tag: para
-#: install-methods.xml:458
+#: install-methods.xml:460
 #, no-c-format
 msgid ""
 "Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -612,7 +614,7 @@ msgstr ""
 "ulink>。"
 
 #. Tag: para
-#: install-methods.xml:465
+#: install-methods.xml:467
 #, no-c-format
 msgid ""
 "Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -627,13 +629,13 @@ msgstr ""
 "删除它。完成后它应该会弹出软盘。"
 
 #. Tag: title
-#: install-methods.xml:480
+#: install-methods.xml:482
 #, no-c-format
 msgid "Writing Disk Images with <command>suntar</command>"
 msgstr "写磁盘映像：使用<command>suntar</command>"
 
 #. Tag: para
-#: install-methods.xml:484
+#: install-methods.xml:486
 #, no-c-format
 msgid ""
 "Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -646,21 +648,21 @@ msgstr ""
 "userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
 
 #. Tag: para
-#: install-methods.xml:492
+#: install-methods.xml:494
 #, no-c-format
 msgid ""
 "Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
 msgstr "按照要求插入软盘，然后点击 &enterkey; (从0扇区开始)。"
 
 #. Tag: para
-#: install-methods.xml:498
+#: install-methods.xml:500
 #, no-c-format
 msgid ""
 "Select the <filename>root.bin</filename> file in the file-opening dialog."
 msgstr "在打开文件对话框中选择 <filename>root.bin</filename> 文件。"
 
 #. Tag: para
-#: install-methods.xml:503
+#: install-methods.xml:505
 #, no-c-format
 msgid ""
 "After the floppy has been created successfully, select <menuchoice> "
@@ -673,7 +675,7 @@ msgstr ""
 "换别的软盘试试。"
 
 #. Tag: para
-#: install-methods.xml:511
+#: install-methods.xml:513
 #, no-c-format
 msgid ""
 "Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -684,13 +686,13 @@ msgstr ""
 "然在 MacOS 中挂载了它，MacOS 将会将其毁坏。"
 
 #. Tag: title
-#: install-methods.xml:530
+#: install-methods.xml:532
 #, no-c-format
 msgid "Preparing Files for USB Memory Stick Booting"
 msgstr "为从 U 盘引导准备文件"
 
 #. Tag: para
-#: install-methods.xml:532
+#: install-methods.xml:534
 #, no-c-format
 msgid ""
 "To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -711,7 +713,7 @@ msgstr ""
 "护开关。"
 
 #. Tag: para
-#: install-methods.xml:545
+#: install-methods.xml:547
 #, no-c-format
 msgid ""
 "The procedures described in this section will destroy anything already on "
@@ -723,13 +725,13 @@ msgstr ""
 "搞错，比如写成硬盘，将造成该设备上的所有信息丢失。"
 
 #. Tag: title
-#: install-methods.xml:555
+#: install-methods.xml:557
 #, no-c-format
 msgid "Preparing a USB stick using a hybrid CD or DVD image"
 msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
 
 #. Tag: para
-#: install-methods.xml:556
+#: install-methods.xml:558
 #, no-c-format
 msgid ""
 "Debian CD and DVD images can now be written directly a USB stick, which is a "
@@ -742,7 +744,7 @@ msgstr ""
 "cdrom\"/> 获取 CD 或 DVD 映像。"
 
 #. Tag: para
-#: install-methods.xml:563
+#: install-methods.xml:565
 #, no-c-format
 msgid ""
 "Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -755,7 +757,7 @@ msgstr ""
 ">)。"
 
 #. Tag: para
-#: install-methods.xml:570
+#: install-methods.xml:572
 #, no-c-format
 msgid ""
 "The CD or DVD image you choose should be written directly to the USB stick, "
@@ -768,7 +770,7 @@ msgstr ""
 "U 盘已经卸载："
 
 #. Tag: screen
-#: install-methods.xml:577
+#: install-methods.xml:579
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
@@ -780,7 +782,7 @@ msgstr ""
 "<prompt>#</prompt> <userinput>sync</userinput>"
 
 #. Tag: para
-#: install-methods.xml:579
+#: install-methods.xml:581
 #, no-c-format
 msgid ""
 "The image must be written to the whole-disk device and not a partition, e."
@@ -788,7 +790,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:584
+#: install-methods.xml:586
 #, no-c-format
 msgid ""
 "Simply writing the CD or DVD image to USB like this should work fine for "
@@ -799,7 +801,7 @@ msgstr ""
 "项主要提供给有特殊需要的用户。"
 
 #. Tag: para
-#: install-methods.xml:592
+#: install-methods.xml:594
 #, no-c-format
 msgid ""
 "The hybrid image on the stick does not occupy all the storage space, so it "
@@ -809,7 +811,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:600
+#: install-methods.xml:602
 #, no-c-format
 msgid ""
 "Create a second, FAT partition on the stick, mount the partition and copy or "
@@ -817,7 +819,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:605
+#: install-methods.xml:607
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -839,7 +841,7 @@ msgstr ""
 "# umount"
 
 #. Tag: para
-#: install-methods.xml:607
+#: install-methods.xml:609
 #, no-c-format
 msgid ""
 "You might have written the <filename>mini.iso</filename> to the USB stick. "
@@ -849,13 +851,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:621
+#: install-methods.xml:623
 #, no-c-format
 msgid "Manually copying files to the USB stick"
 msgstr "手动复制文件到 U 盘。"
 
 #. Tag: para
-#: install-methods.xml:622
+#: install-methods.xml:624
 #, no-c-format
 msgid ""
 "An alternative way to set up your USB stick is to manually copy the "
@@ -867,7 +869,7 @@ msgstr ""
 "可以使用较少容量，请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
 
 #. Tag: para
-#: install-methods.xml:629
+#: install-methods.xml:631
 #, no-c-format
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -882,7 +884,7 @@ msgstr ""
 "classname> 和对应的配置文件</phrase>。"
 
 #. Tag: para
-#: install-methods.xml:638
+#: install-methods.xml:640
 #, no-c-format
 msgid ""
 "Note that, although convenient, this method does have one major "
@@ -896,19 +898,19 @@ msgstr ""
 "量创建一个新的文件系统。"
 
 #. Tag: para
-#: install-methods.xml:646
+#: install-methods.xml:648
 #, no-c-format
 msgid "To use this image simply extract it directly to your USB stick:"
 msgstr "使用该映象只须将它直接解压到 U 盘："
 
 #. Tag: screen
-#: install-methods.xml:650
+#: install-methods.xml:652
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 
 #. Tag: para
-#: install-methods.xml:652
+#: install-methods.xml:654
 #, no-c-format
 msgid ""
 "Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -919,13 +921,13 @@ msgstr ""
 "的 <userinput>C</userinput> 命令，并直接解压映象："
 
 #. Tag: screen
-#: install-methods.xml:658
+#: install-methods.xml:660
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
-#: install-methods.xml:660
+#: install-methods.xml:662
 #, no-c-format
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
@@ -946,13 +948,13 @@ msgstr ""
 "(<userinput>umount /mnt</userinput>) 就完成了。"
 
 #. Tag: title
-#: install-methods.xml:677
+#: install-methods.xml:679
 #, no-c-format
 msgid "Manually copying files to the USB stick &mdash; the flexible way"
 msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
 
 #. Tag: para
-#: install-methods.xml:678
+#: install-methods.xml:680
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you like more flexibility or just want to know what's going on, you "
@@ -971,13 +973,13 @@ msgstr ""
 "文件放到 U 盘。"
 
 #. Tag: title
-#: install-methods.xml:693 install-methods.xml:815
+#: install-methods.xml:695 install-methods.xml:817
 #, no-c-format
 msgid "Partitioning the USB stick"
 msgstr "给 U 盘分区"
 
 #. Tag: para
-#: install-methods.xml:694
+#: install-methods.xml:696
 #, no-c-format
 msgid ""
 "We will show how to set up the memory stick to use the first partition, "
@@ -985,7 +987,7 @@ msgid ""
 msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设备。"
 
 #. Tag: para
-#: install-methods.xml:699
+#: install-methods.xml:701
 #, no-c-format
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -1017,7 +1019,7 @@ msgstr ""
 "&debian; 软件包内。"
 
 #. Tag: para
-#: install-methods.xml:723
+#: install-methods.xml:725
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -1034,7 +1036,7 @@ msgstr ""
 "用来改变 boot loader 的配置文件。"
 
 #. Tag: para
-#: install-methods.xml:733
+#: install-methods.xml:735
 #, no-c-format
 msgid ""
 "To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1057,13 +1059,13 @@ msgstr ""
 "filename> 文件。"
 
 #. Tag: title
-#: install-methods.xml:750 install-methods.xml:862
+#: install-methods.xml:752 install-methods.xml:864
 #, no-c-format
 msgid "Adding the installer image"
 msgstr "添加安装程序映像"
 
 #. Tag: para
-#: install-methods.xml:751
+#: install-methods.xml:753
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</"
@@ -1098,7 +1100,7 @@ msgstr ""
 "(8.3) 文件名。"
 
 #. Tag: para
-#: install-methods.xml:775
+#: install-methods.xml:777
 #, no-c-format
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1121,7 +1123,7 @@ msgstr ""
 "userinput> 到第二行尾部。还可以添加其他的参数。"
 
 #. Tag: para
-#: install-methods.xml:787
+#: install-methods.xml:789
 #, no-c-format
 msgid ""
 "To enable the boot prompt to permit further parameter appending, add a "
@@ -1130,7 +1132,7 @@ msgstr ""
 "添加 <userinput>prompt 1</userinput> 一行，使得引导提示符可以允许附加参数。"
 
 #. Tag: para
-#: install-methods.xml:792 install-methods.xml:902
+#: install-methods.xml:794 install-methods.xml:904
 #, no-c-format
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy the "
@@ -1148,7 +1150,7 @@ msgstr ""
 "footnote> 到 U 盘。完成后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
-#: install-methods.xml:816
+#: install-methods.xml:818
 #, no-c-format
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1175,7 +1177,7 @@ msgstr ""
 "command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
 
 #. Tag: para
-#: install-methods.xml:833
+#: install-methods.xml:835
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -1190,7 +1192,7 @@ msgstr ""
 "变启动引导器的配置文件。"
 
 #. Tag: para
-#: install-methods.xml:842
+#: install-methods.xml:844
 #, no-c-format
 msgid ""
 "The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1224,7 +1226,7 @@ msgstr ""
 "就可以用普通的 Unix 工具来处理了。"
 
 #. Tag: para
-#: install-methods.xml:863
+#: install-methods.xml:865
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1234,31 +1236,31 @@ msgstr ""
 "mnt</userinput>)，然后复制下面的安装程序映象文件到 U 盘："
 
 #. Tag: para
-#: install-methods.xml:870
+#: install-methods.xml:872
 #, no-c-format
 msgid "<filename>vmlinux</filename> (kernel binary)"
 msgstr "<filename>vmlinux</filename> (内核二进制文件)"
 
 #. Tag: para
-#: install-methods.xml:875
+#: install-methods.xml:877
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
 
 #. Tag: para
-#: install-methods.xml:880
+#: install-methods.xml:882
 #, no-c-format
 msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
 msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
 
 #. Tag: para
-#: install-methods.xml:885
+#: install-methods.xml:887
 #, no-c-format
 msgid "<filename>boot.msg</filename> (optional boot message)"
 msgstr "<filename>boot.msg</filename> (可选的启动信息)"
 
 #. Tag: para
-#: install-methods.xml:892
+#: install-methods.xml:894
 #, no-c-format
 msgid ""
 "The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1294,13 +1296,13 @@ msgstr ""
 "的大小。"
 
 #. Tag: title
-#: install-methods.xml:930
+#: install-methods.xml:932
 #, no-c-format
 msgid "Preparing Files for Hard Disk Booting"
 msgstr "为从硬盘引导准备文件"
 
 #. Tag: para
-#: install-methods.xml:931
+#: install-methods.xml:933
 #, no-c-format
 msgid ""
 "The installer may be booted using boot files placed on an existing hard "
@@ -1311,7 +1313,7 @@ msgstr ""
 "者直接使用 BIOS 提供的引导装载程序直接启动。"
 
 #. Tag: para
-#: install-methods.xml:937
+#: install-methods.xml:939
 #, no-c-format
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1324,7 +1326,7 @@ msgstr ""
 "缠不清。"
 
 #. Tag: para
-#: install-methods.xml:944
+#: install-methods.xml:946
 #, no-c-format
 msgid ""
 "The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1344,7 +1346,7 @@ msgstr ""
 "Linux 之间交换文件，特别是那些您下载的安装文件。"
 
 #. Tag: para
-#: install-methods.xml:955
+#: install-methods.xml:957
 #, no-c-format
 msgid ""
 "Different programs are used for hard disk installation system booting, "
@@ -1355,7 +1357,7 @@ msgstr ""
 "装程序的引导将使用不同的安装文件。"
 
 #. Tag: title
-#: install-methods.xml:964
+#: install-methods.xml:966
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Hard disk installer booting using <command>LILO</command> or "
@@ -1367,7 +1369,7 @@ msgstr ""
 "硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
 
 #. Tag: para
-#: install-methods.xml:966
+#: install-methods.xml:968
 #, no-c-format
 msgid ""
 "This section explains how to add to or even replace an existing linux "
@@ -1377,7 +1379,7 @@ msgstr ""
 "command> 或 <command>GRUB</command>。"
 
 #. Tag: para
-#: install-methods.xml:972
+#: install-methods.xml:974
 #, no-c-format
 msgid ""
 "At boot time, both bootloaders support loading in memory not only the "
@@ -1388,7 +1390,7 @@ msgstr ""
 "盘可以被用做内核的根文件系统。"
 
 #. Tag: para
-#: install-methods.xml:978
+#: install-methods.xml:980
 #, no-c-format
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
@@ -1399,19 +1401,19 @@ msgstr ""
 "newinstall/</filename>。"
 
 #. Tag: para
-#: install-methods.xml:986
+#: install-methods.xml:988
 #, no-c-format
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
 
 #. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:993
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
 
 #. Tag: para
-#: install-methods.xml:998
+#: install-methods.xml:1000
 #, no-c-format
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1419,14 +1421,14 @@ msgid ""
 msgstr "最后，要配置 bootloader，请进入 <xref linkend=\"boot-initrd\"/>。"
 
 #. Tag: title
-#: install-methods.xml:1008
+#: install-methods.xml:1010
 #, fuzzy, no-c-format
 #| msgid "Hard disk installer booting using <command>loadlin</command>"
 msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
 msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
 
 #. Tag: para
-#: install-methods.xml:1009
+#: install-methods.xml:1011
 #, no-c-format
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
@@ -1435,7 +1437,7 @@ msgstr ""
 "本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
 
 #. Tag: para
-#: install-methods.xml:1014
+#: install-methods.xml:1016
 #, no-c-format
 msgid ""
 "Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1443,26 +1445,26 @@ msgid ""
 msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
 
 #. Tag: para
-#: install-methods.xml:1019
+#: install-methods.xml:1021
 #, no-c-format
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
 
 #. Tag: para
-#: install-methods.xml:1024
+#: install-methods.xml:1026
 #, no-c-format
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin 工具)"
 
 #. Tag: title
-#: install-methods.xml:1037
+#: install-methods.xml:1039
 #, no-c-format
 msgid "Hard Disk Installer Booting for OldWorld Macs"
 msgstr "在 OldWorld Macs 上引导硬盘安装程序"
 
 #. Tag: para
-#: install-methods.xml:1038
+#: install-methods.xml:1040
 #, no-c-format
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1484,7 +1486,7 @@ msgstr ""
 "是必须的。"
 
 #. Tag: para
-#: install-methods.xml:1051
+#: install-methods.xml:1053
 #, no-c-format
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
@@ -1511,13 +1513,13 @@ msgstr ""
 "的系统文件夹中。"
 
 #. Tag: title
-#: install-methods.xml:1071
+#: install-methods.xml:1073
 #, no-c-format
 msgid "Hard Disk Installer Booting for NewWorld Macs"
 msgstr "在 NewWorld Macs 上启动硬盘安装程序"
 
 #. Tag: para
-#: install-methods.xml:1072
+#: install-methods.xml:1074
 #, no-c-format
 msgid ""
 "NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1535,7 +1537,7 @@ msgstr ""
 "不能用在 NewWorld PowerMacs 上。"
 
 #. Tag: para
-#: install-methods.xml:1083
+#: install-methods.xml:1085
 #, no-c-format
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1548,31 +1550,31 @@ msgstr ""
 "硬盘图标的方法来完成)。"
 
 #. Tag: filename
-#: install-methods.xml:1093 install-methods.xml:1419
+#: install-methods.xml:1095 install-methods.xml:1421
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1098 install-methods.xml:1424
+#: install-methods.xml:1100 install-methods.xml:1426
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1103 install-methods.xml:1429
+#: install-methods.xml:1105 install-methods.xml:1431
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1108 install-methods.xml:1434
+#: install-methods.xml:1110 install-methods.xml:1436
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
 #. Tag: para
-#: install-methods.xml:1113
+#: install-methods.xml:1115
 #, no-c-format
 msgid ""
 "Make a note of the partition number of the MacOS partition where you place "
@@ -1586,19 +1588,19 @@ msgstr ""
 "的时候，您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
 
 #. Tag: para
-#: install-methods.xml:1121
+#: install-methods.xml:1123
 #, no-c-format
 msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
 msgstr "要引导安装程序，请进入 <xref linkend=\"boot-newworld\"/>。"
 
 #. Tag: title
-#: install-methods.xml:1134
+#: install-methods.xml:1136
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "为使用 TFTP 网络引导准备文件"
 
 #. Tag: para
-#: install-methods.xml:1135
+#: install-methods.xml:1137
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1612,7 +1614,7 @@ msgstr ""
 "上面的某个特殊地方，并且配置好能够能够支持对您的机器进行引导。"
 
 #. Tag: para
-#: install-methods.xml:1143
+#: install-methods.xml:1145
 #, no-c-format
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1624,7 +1626,7 @@ msgstr ""
 "condition=\"supports-bootp\">，或 BOOTP 服务器</phrase>。"
 
 #. Tag: para
-#: install-methods.xml:1150
+#: install-methods.xml:1152
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1643,7 +1645,7 @@ msgstr ""
 "些系统只能通过 DHCP 来配置。"
 
 #. Tag: para
-#: install-methods.xml:1164
+#: install-methods.xml:1166
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1654,7 +1656,7 @@ msgstr ""
 "替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
 
 #. Tag: para
-#: install-methods.xml:1170
+#: install-methods.xml:1172
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1664,7 +1666,7 @@ msgstr ""
 "个 <classname>rbootd</classname> 软件包。"
 
 #. Tag: para
-#: install-methods.xml:1175
+#: install-methods.xml:1177
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1678,7 +1680,7 @@ msgstr ""
 "Linux 上面的一些操作例子。"
 
 #. Tag: para
-#: install-methods.xml:1183
+#: install-methods.xml:1185
 #, no-c-format
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1691,13 +1693,13 @@ msgstr ""
 "多问题。另一个好的选择是 <classname>atftpd</classname>。"
 
 #. Tag: title
-#: install-methods.xml:1199
+#: install-methods.xml:1201
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "设置 RARP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1200
+#: install-methods.xml:1202
 #, no-c-format
 msgid ""
 "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1715,7 +1717,7 @@ msgstr ""
 "addr show dev eth0</userinput> 命令。"
 
 #. Tag: para
-#: install-methods.xml:1212
+#: install-methods.xml:1214
 #, fuzzy, no-c-format
 #| msgid ""
 #| "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/"
@@ -1749,13 +1751,13 @@ msgstr ""
 "<userinput>/usr/etc/rarpd -a</userinput> 命令。"
 
 #. Tag: title
-#: install-methods.xml:1233
+#: install-methods.xml:1235
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "设置 DHCP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1234
+#: install-methods.xml:1236
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1768,7 +1770,7 @@ msgstr ""
 "配置示例文件(参阅 <filename>/etc/dhcp/dhcpd.conf</filename>)："
 
 #. Tag: screen
-#: install-methods.xml:1241
+#: install-methods.xml:1243
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1812,7 +1814,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: install-methods.xml:1243
+#: install-methods.xml:1245
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1828,7 +1830,7 @@ msgstr ""
 "TFTP 获取的文件名。"
 
 #. Tag: para
-#: install-methods.xml:1253
+#: install-methods.xml:1255
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1838,13 +1840,13 @@ msgstr ""
 "<userinput>/etc/init.d/isc-dhcp-server restart</userinput>。"
 
 #. Tag: title
-#: install-methods.xml:1261
+#: install-methods.xml:1263
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "在 DHCP 配置中打开 PXE 引导功能"
 
 #. Tag: para
-#: install-methods.xml:1262
+#: install-methods.xml:1264
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1914,13 +1916,13 @@ msgstr ""
 "的 <xref linkend=\"tftp-images\"/>)。"
 
 #. Tag: title
-#: install-methods.xml:1282
+#: install-methods.xml:1284
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr "架设 BOOTP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1283
+#: install-methods.xml:1285
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1935,7 +1937,7 @@ msgstr ""
 "<classname>isc-dhcp-server</classname> 软件包。"
 
 #. Tag: para
-#: install-methods.xml:1291
+#: install-methods.xml:1293
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1997,7 +1999,7 @@ msgstr ""
 "MAC 地址。</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1324
+#: install-methods.xml:1326
 #, fuzzy, no-c-format
 #| msgid ""
 #| "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -2029,13 +2031,13 @@ msgstr ""
 "<command>dhcpd</command>。"
 
 #. Tag: title
-#: install-methods.xml:1343
+#: install-methods.xml:1345
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "开启 TFTP 服务器"
 
 #. Tag: para
-#: install-methods.xml:1344
+#: install-methods.xml:1346
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -2044,7 +2046,7 @@ msgstr ""
 "要准备好 TFTP 服务器，您首先需要确定 <command>tftpd</command> 已经启动。"
 
 #. Tag: para
-#: install-methods.xml:1349
+#: install-methods.xml:1351
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2058,7 +2060,7 @@ msgstr ""
 "以在安装软件包的时候选择，也可以用重新配置软件包方式修改。"
 
 #. Tag: para
-#: install-methods.xml:1358
+#: install-methods.xml:1360
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2075,7 +2077,7 @@ msgstr ""
 "置文件示例。"
 
 #. Tag: para
-#: install-methods.xml:1368
+#: install-methods.xml:1370
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2089,7 +2091,7 @@ msgstr ""
 "问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
-#: install-methods.xml:1376
+#: install-methods.xml:1378
 #, no-c-format
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2117,13 +2119,13 @@ msgstr ""
 "错误。"
 
 #. Tag: title
-#: install-methods.xml:1398
+#: install-methods.xml:1400
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "将 TFTP 映像放到适当的位置"
 
 #. Tag: para
-#: install-methods.xml:1399
+#: install-methods.xml:1401
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2138,7 +2140,7 @@ msgstr ""
 "完全决定于 TFTP 客户程序，而且没有一个强制的标准。"
 
 #. Tag: para
-#: install-methods.xml:1408
+#: install-methods.xml:1410
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2153,13 +2155,13 @@ msgstr ""
 "件："
 
 #. Tag: filename
-#: install-methods.xml:1439
+#: install-methods.xml:1441
 #, no-c-format
 msgid "boot.msg"
 msgstr "boot.msg"
 
 #. Tag: para
-#: install-methods.xml:1444
+#: install-methods.xml:1446
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2174,7 +2176,7 @@ msgstr ""
 "需的文件名传递给 <command>tftpd</command>。"
 
 #. Tag: para
-#: install-methods.xml:1452
+#: install-methods.xml:1454
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2189,13 +2191,13 @@ msgstr ""
 "efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
 
 #. Tag: title
-#: install-methods.xml:1464
+#: install-methods.xml:1466
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "SPARC TFTP 引导"
 
 #. Tag: para
-#: install-methods.xml:1465
+#: install-methods.xml:1467
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -2223,7 +2225,7 @@ msgstr ""
 "并在必要时加上子体系名。"
 
 #. Tag: para
-#: install-methods.xml:1481
+#: install-methods.xml:1483
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2235,7 +2237,7 @@ msgstr ""
 "映像。假如映像找不到，查看 tftp 服务器的日志所需要的映像文件名。"
 
 #. Tag: para
-#: install-methods.xml:1488
+#: install-methods.xml:1490
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -2248,13 +2250,13 @@ msgstr ""
 "仍然必须被请放置在 TFTP 服务器要查找的目录中。"
 
 #. Tag: title
-#: install-methods.xml:1499
+#: install-methods.xml:1501
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "SGI TFTP 引导"
 
 #. Tag: para
-#: install-methods.xml:1500
+#: install-methods.xml:1502
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2268,13 +2270,13 @@ msgstr ""
 "现在 <filename>/etc/dhcpd.conf</filename>。"
 
 #. Tag: title
-#: install-methods.xml:1608
+#: install-methods.xml:1610
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "自动化安装"
 
 #. Tag: para
-#: install-methods.xml:1609
+#: install-methods.xml:1611
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -2289,13 +2291,13 @@ msgstr ""
 "更多细节。"
 
 #. Tag: title
-#: install-methods.xml:1621
+#: install-methods.xml:1623
 #, no-c-format
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序进行自动安装"
 
 #. Tag: para
-#: install-methods.xml:1622
+#: install-methods.xml:1624
 #, no-c-format
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
@@ -2307,7 +2309,7 @@ msgstr ""
 "介质上加载，并自动回答安装过程中的问题。"
 
 #. Tag: para
-#: install-methods.xml:1629
+#: install-methods.xml:1631
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 4df75d6f5..7f3a899d4 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: 2014-08-05 21:38+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-26 00:20+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -396,6 +396,17 @@ msgstr ""
 #: partitioning.xml:177
 #, no-c-format
 msgid ""
+"It is now recommended to have <filename>/usr</filename> on the root "
+"partition <filename>/</filename>, otherwise it could cause some trouble at "
+"boot time. This means that you should provide at least 600&ndash;750MB of "
+"disk space for the root partition including <filename>/usr</filename>, or "
+"5&ndash;6GB for a workstation or a server installation."
+msgstr ""
+
+#. Tag: para
+#: partitioning.xml:187
+#, 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 "
@@ -417,7 +428,7 @@ msgstr ""
 "很紧张，并且不准备做主版本的系统升级，可以为其准备 30 或 40MB 大小。"
 
 #. Tag: para
-#: partitioning.xml:193
+#: partitioning.xml:203
 #, no-c-format
 msgid ""
 "<filename>/tmp</filename>: temporary data created by programs will most "
@@ -433,7 +444,7 @@ msgstr ""
 "件。如果要使用这些程序，应该相应地调整 <filename>/tmp</filename> 目录的大小。"
 
 #. Tag: para
-#: partitioning.xml:204
+#: partitioning.xml:214
 #, no-c-format
 msgid ""
 "<filename>/home</filename>: every user will put his personal data into a "
@@ -450,13 +461,13 @@ msgstr ""
 "目录下计划保存大量的多媒体文件(图片、MP3、电影)，该预备更多的空间。"
 
 #. Tag: title
-#: partitioning.xml:225
+#: partitioning.xml:235
 #, no-c-format
 msgid "Recommended Partitioning Scheme"
 msgstr "推荐的分区方案"
 
 #. Tag: para
-#: partitioning.xml:226
+#: partitioning.xml:236
 #, no-c-format
 msgid ""
 "For new users, personal &debian; boxes, home systems, and other single-user "
@@ -472,20 +483,25 @@ msgstr ""
 "分区很大的时候，这将导致引导期间的延迟。"
 
 #. Tag: para
-#: partitioning.xml:235
-#, no-c-format
+#: partitioning.xml:245
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For multi-user systems or systems with lots of disk space, it's best to "
+#| "put <filename>/usr</filename>, <filename>/var</filename>, <filename>/tmp</"
+#| "filename>, and <filename>/home</filename> each on their own partitions "
+#| "separate from the <filename>/</filename> partition."
 msgid ""
 "For multi-user systems or systems with lots of disk space, it's best to put "
-"<filename>/usr</filename>, <filename>/var</filename>, <filename>/tmp</"
-"filename>, and <filename>/home</filename> each on their own partitions "
-"separate from the <filename>/</filename> partition."
+"<filename>/var</filename>, <filename>/tmp</filename>, and <filename>/home</"
+"filename> each on their own partitions separate from the <filename>/</"
+"filename> partition."
 msgstr ""
 "对于多用户系统或者有大量磁盘空间的系统，最好将 <filename>/usr</filename>、"
 "<filename>/var</filename>、<filename>/tmp</filename> 和 <filename>/home</"
 "filename> 分配到他们各自的分区，与 <filename>/</filename> 分区分离开来。"
 
 #. Tag: para
-#: partitioning.xml:243
+#: partitioning.xml:253
 #, no-c-format
 msgid ""
 "You might need a separate <filename>/usr/local</filename> partition if you "
@@ -506,7 +522,7 @@ msgstr ""
 "好。一般来说，分区状况在每台计算机都不同，这取决于它们的用途。"
 
 #. Tag: para
-#: partitioning.xml:255
+#: partitioning.xml:265
 #, no-c-format
 msgid ""
 "For very complex systems, you should see the <ulink url=\"&url-multidisk-"
@@ -518,7 +534,7 @@ msgstr ""
 "有用。"
 
 #. Tag: para
-#: partitioning.xml:262
+#: partitioning.xml:272
 #, no-c-format
 msgid ""
 "With respect to the issue of swap partition size, there are many views. One "
@@ -534,7 +550,7 @@ msgstr ""
 "交换分区。"
 
 #. Tag: para
-#: partitioning.xml:271
+#: partitioning.xml:281
 #, no-c-format
 msgid ""
 "On some 32-bit architectures (m68k and PowerPC), the maximum size of a swap "
@@ -550,7 +566,7 @@ msgstr ""
 "IDE 通道。内核将平衡使用多个交换分区以达到更好的性能。"
 
 #. Tag: para
-#: partitioning.xml:281
+#: partitioning.xml:291
 #, no-c-format
 msgid ""
 "As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE "
@@ -566,7 +582,7 @@ msgstr ""
 "区。"
 
 #. Tag: para
-#: partitioning.xml:290
+#: partitioning.xml:300
 #, no-c-format
 msgid ""
 "For an idea of the space taken by tasks you might be interested in adding "
@@ -577,13 +593,13 @@ msgstr ""
 "道，请查阅 <xref linkend=\"tasksel-size-list\"/>。"
 
 #. Tag: title
-#: partitioning.xml:306
+#: partitioning.xml:316
 #, no-c-format
 msgid "Device Names in Linux"
 msgstr "Linux 里面的设备名称"
 
 #. Tag: para
-#: partitioning.xml:307
+#: partitioning.xml:317
 #, no-c-format
 msgid ""
 "Linux disks and partition names may be different from other operating "
@@ -594,19 +610,19 @@ msgstr ""
 "Linux 所使用的设备名称。这里是基本的命名方案："
 
 #. Tag: para
-#: partitioning.xml:315
+#: partitioning.xml:325
 #, no-c-format
 msgid "The first floppy drive is named <filename>/dev/fd0</filename>."
 msgstr "第一个软盘驱动器被命名为 <filename>/dev/fd0</filename>。"
 
 #. Tag: para
-#: partitioning.xml:320
+#: partitioning.xml:330
 #, no-c-format
 msgid "The second floppy drive is named <filename>/dev/fd1</filename>."
 msgstr "第二个软盘驱动器被命名为 <filename>/dev/fd1</filename>。"
 
 #. Tag: para
-#: partitioning.xml:325
+#: partitioning.xml:335
 #, no-c-format
 msgid ""
 "The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
@@ -616,7 +632,7 @@ msgstr ""
 "filename>。"
 
 #. Tag: para
-#: partitioning.xml:331
+#: partitioning.xml:341
 #, no-c-format
 msgid ""
 "The second SCSI disk (address-wise) is named <filename>/dev/sdb</filename>, "
@@ -626,7 +642,7 @@ msgstr ""
 "等。"
 
 #. Tag: para
-#: partitioning.xml:337
+#: partitioning.xml:347
 #, no-c-format
 msgid ""
 "The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as "
@@ -636,7 +652,7 @@ msgstr ""
 "<filename>/dev/sr0</filename>。"
 
 #. Tag: para
-#: partitioning.xml:343
+#: partitioning.xml:353
 #, no-c-format
 msgid ""
 "The master disk on IDE primary controller is named <filename>/dev/hda</"
@@ -644,7 +660,7 @@ msgid ""
 msgstr "主 IDE 控制器下的主磁盘被命名为 <filename>/dev/hda</filename>。"
 
 #. Tag: para
-#: partitioning.xml:349
+#: partitioning.xml:359
 #, no-c-format
 msgid ""
 "The slave disk on IDE primary controller is named <filename>/dev/hdb</"
@@ -652,7 +668,7 @@ msgid ""
 msgstr "主 IDE 控制器的从盘命名为 <filename>/dev/hdb</filename>。"
 
 #. Tag: para
-#: partitioning.xml:355
+#: partitioning.xml:365
 #, no-c-format
 msgid ""
 "The master and slave disks of the secondary controller can be called "
@@ -665,20 +681,20 @@ msgstr ""
 "控制器的角色。"
 
 #. Tag: para
-#: partitioning.xml:366
+#: partitioning.xml:376
 #, no-c-format
 msgid "The first DASD device is named <filename>/dev/dasda</filename>."
 msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
 
 #. Tag: para
-#: partitioning.xml:372
+#: partitioning.xml:382
 #, no-c-format
 msgid ""
 "The second DASD device is named <filename>/dev/dasdb</filename>, and so on."
 msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>，等等。"
 
 #. Tag: para
-#: partitioning.xml:380
+#: partitioning.xml:390
 #, no-c-format
 msgid ""
 "The partitions on each disk are represented by appending a decimal number to "
@@ -691,7 +707,7 @@ msgstr ""
 "一个和第二个分区。"
 
 #. Tag: para
-#: partitioning.xml:387
+#: partitioning.xml:397
 #, no-c-format
 msgid ""
 "Here is a real-life example. Let's assume you have a system with 2 SCSI "
@@ -710,7 +726,7 @@ msgstr ""
 "filename> 及其分区。"
 
 #. Tag: para
-#: partitioning.xml:398
+#: partitioning.xml:408
 #, no-c-format
 msgid ""
 "Note that if you have two SCSI host bus adapters (i.e., controllers), the "
@@ -722,7 +738,7 @@ msgstr ""
 "的解决方案是观察引导信息，如果您知道驱动器型号和/或者容量。"
 
 #. Tag: para
-#: partitioning.xml:405
+#: partitioning.xml:415
 #, no-c-format
 msgid ""
 "Linux represents the primary partitions as the drive name, plus the numbers "
@@ -740,7 +756,7 @@ msgstr ""
 "适用。"
 
 #. Tag: para
-#: partitioning.xml:416
+#: partitioning.xml:426
 #, no-c-format
 msgid ""
 "Sun disk partitions allow for 8 separate partitions (or slices). The third "
@@ -753,7 +769,7 @@ msgstr ""
 "器(SILO 或者 SUN 的)使用。"
 
 #. Tag: para
-#: partitioning.xml:423
+#: partitioning.xml:433
 #, no-c-format
 msgid ""
 "The partitions on each disk are represented by appending a decimal number to "
@@ -766,13 +782,13 @@ msgstr ""
 "个 DASD 设备的第一个以及第二个分区。"
 
 #. Tag: title
-#: partitioning.xml:438
+#: partitioning.xml:448
 #, no-c-format
 msgid "&debian; Partitioning Programs"
 msgstr "&debian; 分区程序"
 
 #. Tag: para
-#: partitioning.xml:439
+#: partitioning.xml:449
 #, no-c-format
 msgid ""
 "Several varieties of partitioning programs have been adapted by &debian; "
@@ -784,7 +800,7 @@ msgstr ""
 "合您的体系的程序列表。"
 
 #. Tag: para
-#: partitioning.xml:452
+#: partitioning.xml:462
 #, no-c-format
 msgid ""
 "Recommended partitioning tool in &debian;. This Swiss army knife can also "
@@ -797,13 +813,13 @@ msgstr ""
 "区至挂接点。"
 
 #. Tag: para
-#: partitioning.xml:464
+#: partitioning.xml:474
 #, no-c-format
 msgid "The original Linux disk partitioner, good for gurus."
 msgstr "最早的 Linux 磁盘分区工具，对于老手很好用。"
 
 #. Tag: para
-#: partitioning.xml:468
+#: partitioning.xml:478
 #, no-c-format
 msgid ""
 "Be careful if you have existing FreeBSD partitions on your machine. The "
@@ -817,13 +833,13 @@ msgstr ""
 "参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
 
 #. Tag: para
-#: partitioning.xml:481
+#: partitioning.xml:491
 #, no-c-format
 msgid "A simple-to-use, full-screen disk partitioner for the rest of us."
 msgstr "一个简单易用、全屏幕的磁盘分区程序。供其他人员使用。"
 
 #. Tag: para
-#: partitioning.xml:485
+#: partitioning.xml:495
 #, no-c-format
 msgid ""
 "Note that <command>cfdisk</command> doesn't understand FreeBSD partitions at "
@@ -833,25 +849,25 @@ msgstr ""
 "设备名称与结果可能不同。"
 
 #. Tag: para
-#: partitioning.xml:495
+#: partitioning.xml:505
 #, no-c-format
 msgid "Atari-aware version of <command>fdisk</command>."
 msgstr "Atari 版本的 <command>fdisk</command>。"
 
 #. Tag: para
-#: partitioning.xml:504
+#: partitioning.xml:514
 #, no-c-format
 msgid "Amiga-aware version of <command>fdisk</command>."
 msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
 
 #. Tag: para
-#: partitioning.xml:513
+#: partitioning.xml:523
 #, no-c-format
 msgid "Mac-aware version of <command>fdisk</command>."
 msgstr "Mac-aware 版本的 <command>fdisk</command>。"
 
 #. Tag: para
-#: partitioning.xml:522
+#: partitioning.xml:532
 #, no-c-format
 msgid ""
 "PowerMac-aware version of <command>fdisk</command>, also used by BVM and "
@@ -861,7 +877,7 @@ msgstr ""
 "VMEbus 系统。"
 
 #. Tag: para
-#: partitioning.xml:532
+#: partitioning.xml:542
 #, no-c-format
 msgid ""
 "&arch-title; version of <command>fdisk</command>; Please read the fdasd "
@@ -876,7 +892,7 @@ msgstr ""
 "\"Installation Commands</ulink> 的第 13 章获得详细信息。"
 
 #. Tag: para
-#: partitioning.xml:543
+#: partitioning.xml:553
 #, no-c-format
 msgid ""
 "One of these programs will be run by default when you select "
@@ -889,13 +905,13 @@ msgstr ""
 "式。"
 
 #. Tag: para
-#: partitioning.xml:550
+#: partitioning.xml:560
 #, no-c-format
 msgid "Remember to mark your boot partition as <quote>Bootable</quote>."
 msgstr "要记得标记您的引导分区为 <quote>Bootable</quote>。"
 
 #. Tag: para
-#: partitioning.xml:553
+#: partitioning.xml:563
 #, no-c-format
 msgid ""
 "One key point when partitioning for Mac type disks is that the swap "
@@ -912,14 +928,14 @@ msgstr ""
 
 # index.docbook:612, index.docbook:672, index.docbook:696, index.docbook:793, index.docbook:912, index.docbook:989
 #. Tag: title
-#: partitioning.xml:569 partitioning.xml:593 partitioning.xml:689
-#: partitioning.xml:803 partitioning.xml:880
+#: partitioning.xml:579 partitioning.xml:603 partitioning.xml:699
+#: partitioning.xml:813 partitioning.xml:890
 #, no-c-format
 msgid "Partitioning for &arch-title;"
 msgstr "为 &arch-title; 准备分区"
 
 #. Tag: para
-#: partitioning.xml:570
+#: partitioning.xml:580
 #, no-c-format
 msgid ""
 "PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
@@ -945,7 +961,7 @@ msgstr ""
 "25&ndash;50 MB 一般来说应该足够了。"
 
 #. Tag: para
-#: partitioning.xml:594
+#: partitioning.xml:604
 #, no-c-format
 msgid ""
 "If you have an existing other operating system such as DOS or Windows and "
@@ -962,7 +978,7 @@ msgstr ""
 "<guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，更改其尺寸。"
 
 #. Tag: para
-#: partitioning.xml:604
+#: partitioning.xml:614
 #, no-c-format
 msgid ""
 "The PC BIOS generally adds additional constraints for disk partitioning. "
@@ -980,7 +996,7 @@ msgstr ""
 "的介绍，帮助您在大多数情况下进行规划。"
 
 #. Tag: para
-#: partitioning.xml:614
+#: partitioning.xml:624
 #, no-c-format
 msgid ""
 "<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -998,7 +1014,7 @@ msgstr ""
 "一个扩展分区。"
 
 #. Tag: para
-#: partitioning.xml:625
+#: partitioning.xml:635
 #, no-c-format
 msgid ""
 "Linux limits the partitions per drive to 255 partitions for SCSI disks (3 "
@@ -1014,7 +1030,7 @@ msgstr ""
 "过 20 个的分区，除非您首先为这些分区手工创建了设备文件。"
 
 #. Tag: para
-#: partitioning.xml:635
+#: partitioning.xml:645
 #, no-c-format
 msgid ""
 "If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1028,7 +1044,7 @@ msgstr ""
 "盘第一个 1024 柱面内(在没有 BIOS 转换的情况下，大约有 524MB)。"
 
 #. Tag: para
-#: partitioning.xml:643
+#: partitioning.xml:653
 #, no-c-format
 msgid ""
 "This restriction doesn't apply if you have a BIOS newer than around "
@@ -1052,7 +1068,7 @@ msgstr ""
 "&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
 
 #. Tag: para
-#: partitioning.xml:657
+#: partitioning.xml:667
 #, no-c-format
 msgid ""
 "If you have a large disk, you might have to use cylinder translation "
@@ -1072,7 +1088,7 @@ msgstr ""
 "</emphasis>的 1024 柱面内。"
 
 #. Tag: para
-#: partitioning.xml:669
+#: partitioning.xml:679
 #, no-c-format
 msgid ""
 "The recommended way of accomplishing this is to create a small "
@@ -1092,7 +1108,7 @@ msgstr ""
 "起作用，甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
 
 #. Tag: para
-#: partitioning.xml:690
+#: partitioning.xml:700
 #, no-c-format
 msgid ""
 "The <command>partman</command> disk partitioner is the default partitioning "
@@ -1106,13 +1122,13 @@ msgstr ""
 "<command>parted</command> 来进行磁盘分区的。"
 
 #. Tag: title
-#: partitioning.xml:702
+#: partitioning.xml:712
 #, no-c-format
 msgid "EFI Recognized Formats"
 msgstr "EFI 能够识别的格式"
 
 #. Tag: para
-#: partitioning.xml:703
+#: partitioning.xml:713
 #, no-c-format
 msgid ""
 "The IA-64 EFI firmware supports two partition table (or disk label) formats, "
@@ -1129,7 +1145,7 @@ msgstr ""
 "DOS 分区表。"
 
 #. Tag: para
-#: partitioning.xml:715
+#: partitioning.xml:725
 #, no-c-format
 msgid ""
 "The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1143,7 +1159,7 @@ msgstr ""
 "配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
 
 #. Tag: para
-#: partitioning.xml:723
+#: partitioning.xml:733
 #, no-c-format
 msgid ""
 "The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1188,13 +1204,13 @@ msgstr ""
 "它可能要扫描坏区。"
 
 #. Tag: title
-#: partitioning.xml:748
+#: partitioning.xml:758
 #, no-c-format
 msgid "Boot Loader Partition Requirements"
 msgstr "启动引导器分区要求"
 
 #. Tag: para
-#: partitioning.xml:749
+#: partitioning.xml:759
 #, no-c-format
 msgid ""
 "ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
@@ -1209,7 +1225,7 @@ msgstr ""
 "个内核的话，128MB 也许更好。"
 
 #. Tag: para
-#: partitioning.xml:758
+#: partitioning.xml:768
 #, no-c-format
 msgid ""
 "The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1231,7 +1247,7 @@ msgstr ""
 "入一个 EFI 分区。"
 
 #. Tag: para
-#: partitioning.xml:773
+#: partitioning.xml:783
 #, no-c-format
 msgid ""
 "It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1241,13 +1257,13 @@ msgstr ""
 "盘上。"
 
 #. Tag: title
-#: partitioning.xml:781
+#: partitioning.xml:791
 #, no-c-format
 msgid "EFI Diagnostic Partitions"
 msgstr "EFI 诊断分区"
 
 #. Tag: para
-#: partitioning.xml:782
+#: partitioning.xml:792
 #, no-c-format
 msgid ""
 "The EFI firmware is significantly more sophisticated than the usual BIOS "
@@ -1266,7 +1282,7 @@ msgstr ""
 "区的时候。"
 
 #. Tag: para
-#: partitioning.xml:804
+#: partitioning.xml:814
 #, no-c-format
 msgid ""
 "SGI machines require an SGI disk label in order to make the system bootable "
@@ -1282,13 +1298,13 @@ msgstr ""
 "入。注意 volume header 必须从 0 号扇区开始。"
 
 #. Tag: title
-#: partitioning.xml:821
+#: partitioning.xml:831
 #, no-c-format
 msgid "Partitioning Newer PowerMacs"
 msgstr "为较新的 PowerMacs 分区"
 
 #. Tag: para
-#: partitioning.xml:822
+#: partitioning.xml:832
 #, no-c-format
 msgid ""
 "If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1310,7 +1326,7 @@ msgstr ""
 "command> 里面使用 <userinput>b</userinput> 命令。"
 
 #. Tag: para
-#: partitioning.xml:835
+#: partitioning.xml:845
 #, no-c-format
 msgid ""
 "The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1321,7 +1337,7 @@ msgstr ""
 "为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
 
 #. Tag: para
-#: partitioning.xml:842
+#: partitioning.xml:852
 #, no-c-format
 msgid ""
 "Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1338,7 +1354,7 @@ msgstr ""
 "command> 工具可以用来维护这个分区。"
 
 #. Tag: para
-#: partitioning.xml:852
+#: partitioning.xml:862
 #, no-c-format
 msgid ""
 "In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
@@ -1358,7 +1374,7 @@ msgstr ""
 "顺序。"
 
 #. Tag: para
-#: partitioning.xml:864
+#: partitioning.xml:874
 #, no-c-format
 msgid ""
 "Apple disks normally have several small driver partitions. If you intend to "
@@ -1372,7 +1388,7 @@ msgstr ""
 "启动的时候，会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
 
 #. Tag: para
-#: partitioning.xml:881
+#: partitioning.xml:891
 #, no-c-format
 msgid ""
 "Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1385,7 +1401,7 @@ msgstr ""
 "<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
 
 #. Tag: para
-#: partitioning.xml:889
+#: partitioning.xml:899
 #, no-c-format
 msgid ""
 "Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1404,7 +1420,7 @@ msgstr ""
 "或者 UFS 分区在那里；它们将隔离分区表和引导块。"
 
 #. Tag: para
-#: partitioning.xml:900
+#: partitioning.xml:910
 #, no-c-format
 msgid ""
 "It is also advised that the third partition should be of type <quote>Whole "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 5483f83d3..753fcb3d5 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: 2014-08-03 08:11+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-26 13:49+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -371,12 +371,30 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:284
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Boot parameters to specify:\n"
+#| "- if you're netbooting:\n"
+#| "  preseed/url=http://host/path/to/preseed.cfg\n"
+#| "  preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
+#| "\n"
+#| "- if you're booting a remastered CD:\n"
+#| "  preseed/file=/cdrom/preseed.cfg\n"
+#| "  preseed/file/checksum=5da499872becccfeda2c4872f9171c3d\n"
+#| "\n"
+#| "- if you're installing from USB media (put the preconfiguration file in "
+#| "the\n"
+#| "  toplevel directory of the USB stick):\n"
+#| "  preseed/file=/hd-media/preseed.cfg\n"
+#| "  preseed/file/checksum=5da499872becccfeda2c4872f9171c3d"
 msgid ""
 "Boot parameters to specify:\n"
 "- if you're netbooting:\n"
 "  preseed/url=http://host/path/to/preseed.cfg\n"
 "  preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
+"- or\n"
+"  preseed/url=tftp://host/path/to/preseed.cfg\n"
+"  preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
 "\n"
 "- if you're booting a remastered CD:\n"
 "  preseed/file=/cdrom/preseed.cfg\n"
@@ -507,10 +525,16 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:349
-#, no-c-format
-msgid ""
-"A <quote>--</quote> in the boot options has special meaning. Kernel "
-"parameters that appear after the last <quote>--</quote> may be copied into "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "A <quote>--</quote> in the boot options has special meaning. Kernel "
+#| "parameters that appear after the last <quote>--</quote> may be copied "
+#| "into the bootloader configuration for the installed system (if supported "
+#| "by the installer for the bootloader). The installer will automatically "
+#| "filter out any options (like preconfiguration options) that it recognizes."
+msgid ""
+"A <quote>---</quote> in the boot options has special meaning. Kernel "
+"parameters that appear after the last <quote>---</quote> may be copied into "
 "the bootloader configuration for the installed system (if supported by the "
 "installer for the bootloader). The installer will automatically filter out "
 "any options (like preconfiguration options) that it recognizes."
@@ -1023,9 +1047,10 @@ msgstr "tasksel:tasksel/first"
 
 #. Tag: entry
 #: preseed.xml:548
-#, no-c-format
-msgid "<entry>desktop</entry>"
-msgstr "<entry>desktop</entry>"
+#, fuzzy, no-c-format
+#| msgid "kde-desktop"
+msgid "desktop"
+msgstr "kde-desktop"
 
 #. Tag: entry
 #: preseed.xml:548
@@ -2044,7 +2069,88 @@ msgstr "分区示例"
 
 #. Tag: screen
 #: preseed.xml:948
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# If the system has free space you can choose to only partition that "
+#| "space.\n"
+#| "# This is only honoured if partman-auto/method (below) is not set.\n"
+#| "#d-i partman-auto/init_automatically_partition select biggest_free\n"
+#| "\n"
+#| "# Alternatively, you may specify a disk to partition. If the system has "
+#| "only\n"
+#| "# one disk the installer will default to using that, but otherwise the "
+#| "device\n"
+#| "# name must be given in traditional, non-devfs format (so e.g. /dev/hda "
+#| "or\n"
+#| "# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
+#| "# For example, to use the first SCSI/SATA hard disk:\n"
+#| "#d-i partman-auto/disk string /dev/sda\n"
+#| "# In addition, you'll need to specify the method to use.\n"
+#| "# The presently available methods are:\n"
+#| "# - regular: use the usual partition types for your architecture\n"
+#| "# - lvm:     use LVM to partition the disk\n"
+#| "# - crypto:  use LVM within an encrypted partition\n"
+#| "d-i partman-auto/method string lvm\n"
+#| "\n"
+#| "# If one of the disks that are going to be automatically partitioned\n"
+#| "# contains an old LVM configuration, the user will normally receive a\n"
+#| "# warning. This can be preseeded away...\n"
+#| "d-i partman-lvm/device_remove_lvm boolean true\n"
+#| "# The same applies to pre-existing software RAID array:\n"
+#| "d-i partman-md/device_remove_md boolean true\n"
+#| "# And the same goes for the confirmation to write the lvm partitions.\n"
+#| "d-i partman-lvm/confirm boolean true\n"
+#| "d-i partman-lvm/confirm_nooverwrite boolean true\n"
+#| "\n"
+#| "# You can choose one of the three predefined partitioning recipes:\n"
+#| "# - atomic: all files in one partition\n"
+#| "# - home:   separate /home partition\n"
+#| "# - multi:  separate /home, /usr, /var, and /tmp partitions\n"
+#| "d-i partman-auto/choose_recipe select atomic\n"
+#| "\n"
+#| "# Or provide a recipe of your own...\n"
+#| "# If you have a way to get a recipe file into the d-i environment, you "
+#| "can\n"
+#| "# just point at it.\n"
+#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
+#| "\n"
+#| "# If not, you can put an entire recipe into the preconfiguration file in "
+#| "one\n"
+#| "# (logical) line. This example creates a small /boot partition, suitable\n"
+#| "# swap, and uses the rest of the space for the root partition:\n"
+#| "#d-i partman-auto/expert_recipe string                         \\\n"
+#| "#      boot-root ::                                            \\\n"
+#| "#              40 50 100 ext3                                  \\\n"
+#| "#                      $primary{ } $bootable{ }                \\\n"
+#| "#                      method{ format } format{ }              \\\n"
+#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
+#| "#                      mountpoint{ /boot }                     \\\n"
+#| "#              .                                               \\\n"
+#| "#              500 10000 1000000000 ext3                       \\\n"
+#| "#                      method{ format } format{ }              \\\n"
+#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
+#| "#                      mountpoint{ / }                         \\\n"
+#| "#              .                                               \\\n"
+#| "#              64 512 300% linux-swap                          \\\n"
+#| "#                      method{ swap } format{ }                \\\n"
+#| "#              .\n"
+#| "\n"
+#| "# The full recipe format is documented in the file partman-auto-recipe."
+#| "txt\n"
+#| "# included in the 'debian-installer' package or available from D-I "
+#| "source\n"
+#| "# repository. This also documents how to specify settings such as file\n"
+#| "# system labels, volume group names and which physical devices to "
+#| "include\n"
+#| "# in a volume group.\n"
+#| "\n"
+#| "# This makes partman automatically partition without confirmation, "
+#| "provided\n"
+#| "# that you told it what to do using one of the methods above.\n"
+#| "d-i partman-partitioning/confirm_write_new_label boolean true\n"
+#| "d-i partman/choose_partition select finish\n"
+#| "d-i partman/confirm boolean true\n"
+#| "d-i partman/confirm_nooverwrite boolean true"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -2078,7 +2184,7 @@ msgid ""
 "# You can choose one of the three predefined partitioning recipes:\n"
 "# - atomic: all files in one partition\n"
 "# - home:   separate /home partition\n"
-"# - multi:  separate /home, /usr, /var, and /tmp partitions\n"
+"# - multi:  separate /home, /var, and /tmp partitions\n"
 "d-i partman-auto/choose_recipe select atomic\n"
 "\n"
 "# Or provide a recipe of your own...\n"
@@ -2560,71 +2666,82 @@ msgid ""
 "Available tasks as of this writing include:"
 msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括："
 
-#. Tag: userinput
-#: preseed.xml:1051
-#, no-c-format
-msgid "standard"
-msgstr "standard"
+#. Tag: para
+#: preseed.xml:1050
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>standard</userinput> (standard tools)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1054
-#, no-c-format
-msgid "<userinput>desktop</userinput>"
+#. Tag: para
+#: preseed.xml:1053
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>desktop</userinput> (graphical desktop)"
 msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1057
-#, no-c-format
-msgid "gnome-desktop"
-msgstr "gnome-desktop"
+#. Tag: para
+#: preseed.xml:1056
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>gnome-desktop</userinput> (Gnome desktop)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1060
-#, no-c-format
-msgid "kde-desktop"
-msgstr "kde-desktop"
+#. Tag: para
+#: preseed.xml:1059
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>xfce-desktop</userinput> (XFCE desktop)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1063
-#, no-c-format
-msgid "web-server"
-msgstr "web-server"
+#. Tag: para
+#: preseed.xml:1062
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>kde-desktop</userinput> (KDE desktop)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1066
-#, no-c-format
-msgid "print-server"
-msgstr "print-server"
+#. Tag: para
+#: preseed.xml:1065
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>cinnamon-desktop</userinput> (Cinnamon desktop)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1069
-#, no-c-format
-msgid "dns-server"
-msgstr "dns-server"
+#. Tag: para
+#: preseed.xml:1068
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>mate-desktop</userinput> (MATE desktop)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1072
-#, no-c-format
-msgid "file-server"
-msgstr "file-server"
+#. Tag: para
+#: preseed.xml:1071
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>lxde-desktop</userinput> (LXDE desktop)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1075
-#, no-c-format
-msgid "mail-server"
-msgstr "mail-server"
+#. Tag: para
+#: preseed.xml:1074
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>web-server</userinput> (web server)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1078
-#, no-c-format
-msgid "sql-database"
-msgstr "sql-database"
+#. Tag: para
+#: preseed.xml:1077
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>print-server</userinput> (print server)"
+msgstr "<userinput>desktop</userinput>"
 
-#. Tag: userinput
-#: preseed.xml:1081
-#, no-c-format
-msgid "laptop"
-msgstr "laptop"
+#. Tag: para
+#: preseed.xml:1080
+#, fuzzy, no-c-format
+#| msgid "<userinput>desktop</userinput>"
+msgid "<userinput>ssh-server</userinput> (SSH server)"
+msgstr "<userinput>desktop</userinput>"
 
 #. Tag: para
 #: preseed.xml:1085
@@ -2691,7 +2808,51 @@ msgstr "安装 bootloader"
 
 #. Tag: screen
 #: preseed.xml:1108
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+#| "# To install to a particular device:\n"
+#| "#d-i grub-installer/bootdev  string /dev/sda\n"
+#| "\n"
+#| "# Optional password for grub, either in clear text\n"
+#| "#d-i grub-installer/password password r00tme\n"
+#| "#d-i grub-installer/password-again password r00tme\n"
+#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
+#| "\n"
+#| "# Use the following option to add additional boot parameters for the\n"
+#| "# installed system (if supported by the bootloader installer).\n"
+#| "# Note: options passed to the installer will be added automatically.\n"
+#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
 "you want lilo installed\n"
@@ -2723,6 +2884,8 @@ msgid ""
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
 "# To install to a particular device:\n"
 "#d-i grub-installer/bootdev  string /dev/sda\n"
+"# To install to the first device:\n"
+"#d-i grub-installer/bootdev  string default\n"
 "\n"
 "# Optional password for grub, either in clear text\n"
 "#d-i grub-installer/password password r00tme\n"
@@ -3101,3 +3264,33 @@ msgstr ""
 "也可以通过在前面设置 preseed/url 从 initrd 或者文件预置链载进入网络预置。这将"
 "使网络预置在网络连通时执行。您应该小心使用，因为这是两种预置，意味着您有机会"
 "执行 preseed/early 命令，第二个可以在网络连通后使用。"
+
+#~ msgid "<entry>desktop</entry>"
+#~ msgstr "<entry>desktop</entry>"
+
+#~ msgid "standard"
+#~ msgstr "standard"
+
+#~ msgid "gnome-desktop"
+#~ msgstr "gnome-desktop"
+
+#~ msgid "web-server"
+#~ msgstr "web-server"
+
+#~ msgid "print-server"
+#~ msgstr "print-server"
+
+#~ msgid "dns-server"
+#~ msgstr "dns-server"
+
+#~ msgid "file-server"
+#~ msgstr "file-server"
+
+#~ msgid "mail-server"
+#~ msgstr "mail-server"
+
+#~ msgid "sql-database"
+#~ msgstr "sql-database"
+
+#~ msgid "laptop"
+#~ msgstr "laptop"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 7f5b016ef..7594cd2be 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: 2014-10-05 18:15+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-26 13:55+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -627,115 +627,160 @@ msgstr "&task-desktop-lxde-dl;"
 msgid "&task-desktop-lxde-tot;"
 msgstr "&task-desktop-lxde-tot;"
 
+#. Tag: entry
+#: random-bits.xml:283
+#, fuzzy, no-c-format
+#| msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
+msgid "&nbsp;&nbsp;&bull;&nbsp;MATE"
+msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
+
 #. Tag: entry
 #: random-bits.xml:284
-#, no-c-format
-msgid "Laptop"
-msgstr "便携机"
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-inst;"
+msgid "&task-desktop-mate-inst;"
+msgstr "&task-desktop-gnome-inst;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:285
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-dl;"
+msgid "&task-desktop-mate-dl;"
+msgstr "&task-desktop-gnome-dl;"
+
+#. Tag: entry
 #: random-bits.xml:286
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-tot;"
+msgid "&task-desktop-mate-tot;"
+msgstr "&task-desktop-gnome-tot;"
+
+#. Tag: entry
+#: random-bits.xml:289
+#, fuzzy, no-c-format
+#| msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
+msgid "&nbsp;&nbsp;&bull;&nbsp;Cinnamon"
+msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
+
+#. Tag: entry
+#: random-bits.xml:290
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-inst;"
+msgid "&task-desktop-cinnamon-inst;"
+msgstr "&task-desktop-gnome-inst;"
+
+#. Tag: entry
+#: random-bits.xml:291
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-dl;"
+msgid "&task-desktop-cinnamon-dl;"
+msgstr "&task-desktop-gnome-dl;"
+
+#. Tag: entry
+#: random-bits.xml:292
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-tot;"
+msgid "&task-desktop-cinnamon-tot;"
+msgstr "&task-desktop-gnome-tot;"
+
+#. Tag: entry
+#: random-bits.xml:296
 #, no-c-format
-msgid ""
-"There is some overlap of the Laptop task with the Desktop environment task. "
-"If you install both, the Laptop task will only require a few MB additional "
-"disk space."
-msgstr ""
-"便携机(Laptop)任务与桌面环境任务有大量重复的内容，如果两个都安装，便携机任务"
-"只需要很小的额外空间。"
+msgid "Laptop"
+msgstr "便携机"
 
 #. Tag: entry
-#: random-bits.xml:293
+#: random-bits.xml:297
 #, no-c-format
 msgid "&task-laptop-inst;"
 msgstr "&task-laptop-inst;"
 
 #. Tag: entry
-#: random-bits.xml:294
+#: random-bits.xml:298
 #, no-c-format
 msgid "&task-laptop-dl;"
 msgstr "&task-laptop-dl;"
 
 #. Tag: entry
-#: random-bits.xml:295
+#: random-bits.xml:299
 #, no-c-format
 msgid "&task-laptop-tot;"
 msgstr "&task-laptop-tot;"
 
 #. Tag: entry
-#: random-bits.xml:299
+#: random-bits.xml:303
 #, no-c-format
 msgid "Web server"
 msgstr "Web 服务器"
 
 #. Tag: entry
-#: random-bits.xml:300
+#: random-bits.xml:304
 #, no-c-format
 msgid "&task-web-inst;"
 msgstr "&task-web-inst;"
 
 #. Tag: entry
-#: random-bits.xml:301
+#: random-bits.xml:305
 #, no-c-format
 msgid "&task-web-dl;"
 msgstr "&task-web-dl;"
 
 #. Tag: entry
-#: random-bits.xml:302
+#: random-bits.xml:306
 #, no-c-format
 msgid "&task-web-tot;"
 msgstr "&task-web-tot;"
 
 #. Tag: entry
-#: random-bits.xml:306
+#: random-bits.xml:310
 #, no-c-format
 msgid "Print server"
 msgstr "打印服务器"
 
 #. Tag: entry
-#: random-bits.xml:307
+#: random-bits.xml:311
 #, no-c-format
 msgid "&task-print-inst;"
 msgstr "&task-print-inst;"
 
 #. Tag: entry
-#: random-bits.xml:308
+#: random-bits.xml:312
 #, no-c-format
 msgid "&task-print-dl;"
 msgstr "&task-print-dl;"
 
 #. Tag: entry
-#: random-bits.xml:309
+#: random-bits.xml:313
 #, no-c-format
 msgid "&task-print-tot;"
 msgstr "&task-print-tot;"
 
 #. Tag: entry
-#: random-bits.xml:341
+#: random-bits.xml:317
 #, no-c-format
 msgid "SSH server"
 msgstr "SSH 服务器"
 
 #. Tag: entry
-#: random-bits.xml:342
+#: random-bits.xml:318
 #, no-c-format
 msgid "&task-ssh-inst;"
 msgstr "&task-ssh-inst;"
 
 #. Tag: entry
-#: random-bits.xml:343
+#: random-bits.xml:319
 #, no-c-format
 msgid "&task-ssh-dl;"
 msgstr "&task-ssh-dl;"
 
 #. Tag: entry
-#: random-bits.xml:344
+#: random-bits.xml:320
 #, no-c-format
 msgid "&task-ssh-tot;"
 msgstr "&task-ssh-tot;"
 
 #. Tag: para
-#: random-bits.xml:350
+#: random-bits.xml:326
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -748,13 +793,13 @@ msgstr ""
 "同；您应该留有 350MB 以上的空间用来下载和安装。"
 
 #. Tag: title
-#: random-bits.xml:365
+#: random-bits.xml:341
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:367
+#: random-bits.xml:343
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -775,7 +820,7 @@ msgstr ""
 "输入的。"
 
 #. Tag: para
-#: random-bits.xml:379
+#: random-bits.xml:355
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -790,7 +835,7 @@ msgstr ""
 "能通过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: para
-#: random-bits.xml:390
+#: random-bits.xml:366
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -808,13 +853,13 @@ msgstr ""
 "还需要额外的安装、或者配置步骤。"
 
 #. Tag: title
-#: random-bits.xml:404
+#: random-bits.xml:380
 #, no-c-format
 msgid "Getting Started"
 msgstr "准备开始"
 
 #. Tag: para
-#: random-bits.xml:405
+#: random-bits.xml:381
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -829,7 +874,7 @@ msgstr ""
 "境，还要更多)。"
 
 #. Tag: para
-#: random-bits.xml:413
+#: random-bits.xml:389
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -847,7 +892,7 @@ msgstr ""
 "userinput>。"
 
 #. Tag: para
-#: random-bits.xml:423
+#: random-bits.xml:399
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -870,7 +915,7 @@ msgstr ""
 "统)。挂载点的名称是任意的，后面的步骤将会用到。"
 
 #. Tag: screen
-#: random-bits.xml:435
+#: random-bits.xml:411
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -880,7 +925,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:438
+#: random-bits.xml:414
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -891,13 +936,13 @@ msgstr ""
 "手动创建和加载这些目录。"
 
 #. Tag: title
-#: random-bits.xml:448
+#: random-bits.xml:424
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:449
+#: random-bits.xml:425
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -920,7 +965,7 @@ msgstr ""
 "装 <command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:479
+#: random-bits.xml:455
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -945,7 +990,7 @@ msgstr ""
 "些文件安装到系统，您需要 root 权限。"
 
 #. Tag: screen
-#: random-bits.xml:494
+#: random-bits.xml:470
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -957,13 +1002,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:500
+#: random-bits.xml:476
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:501
+#: random-bits.xml:477
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -978,7 +1023,7 @@ msgstr ""
 "<ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:510
+#: random-bits.xml:486
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -990,7 +1035,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:516
+#: random-bits.xml:492
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1008,7 +1053,7 @@ msgstr ""
 "<userinput>ppc64el</userinput>, or <userinput>s390x</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:532
+#: random-bits.xml:508
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1018,13 +1063,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:538
+#: random-bits.xml:514
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本系统的配置"
 
 #. Tag: para
-#: random-bits.xml:539
+#: random-bits.xml:515
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1052,13 +1097,13 @@ msgstr ""
 "义，例如："
 
 #. Tag: title
-#: random-bits.xml:557
+#: random-bits.xml:533
 #, no-c-format
 msgid "Create device files"
 msgstr "创建设备文件"
 
 #. Tag: para
-#: random-bits.xml:558
+#: random-bits.xml:534
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1075,13 +1120,13 @@ msgstr ""
 "静态设备文件。"
 
 #. Tag: para
-#: random-bits.xml:568
+#: random-bits.xml:544
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "可以使用的选项有："
 
 #. Tag: para
-#: random-bits.xml:573
+#: random-bits.xml:549
 #, no-c-format
 msgid ""
 "install the makedev package, and create a default set of static device files "
@@ -1089,7 +1134,7 @@ msgid ""
 msgstr "安装 makedev 软件包，并创建默认的静态设备文件，使用(chroot 以后)"
 
 #. Tag: screen
-#: random-bits.xml:577
+#: random-bits.xml:553
 #, no-c-format
 msgid ""
 "# apt-get install makedev\n"
@@ -1103,14 +1148,14 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:580
+#: random-bits.xml:556
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr "手动创建指定的设备文件，使用 <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:585
+#: random-bits.xml:561
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1121,13 +1166,13 @@ msgstr ""
 "postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
-#: random-bits.xml:598
+#: random-bits.xml:574
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:599
+#: random-bits.xml:575
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1207,13 +1252,13 @@ msgstr ""
 "<userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:601
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:627
+#: random-bits.xml:603
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1224,19 +1269,19 @@ msgstr ""
 "chroot: 以外加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:633
+#: random-bits.xml:609
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:639
+#: random-bits.xml:615
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "设置时区"
 
 #. Tag: para
-#: random-bits.xml:640
+#: random-bits.xml:616
 #, fuzzy, no-c-format
 #| msgid ""
 #| "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1260,7 +1305,7 @@ msgstr ""
 "间解释硬件时钟。下面命令可以让您设定和选择时区。"
 
 #. Tag: screen
-#: random-bits.xml:654
+#: random-bits.xml:630
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# editor /etc/default/rcS\n"
@@ -1271,13 +1316,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:660
+#: random-bits.xml:636
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:661
+#: random-bits.xml:637
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1399,13 +1444,13 @@ msgstr ""
 "with the interface name (eth0, eth1, etc.) that you expect."
 
 #. Tag: title
-#: random-bits.xml:702
+#: random-bits.xml:678
 #, no-c-format
 msgid "Configure Apt"
 msgstr "配置 Apt"
 
 #. Tag: para
-#: random-bits.xml:703
+#: random-bits.xml:679
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1430,13 +1475,13 @@ msgstr ""
 "update</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:719
+#: random-bits.xml:695
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "本地化和键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:720
+#: random-bits.xml:696
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1454,7 +1499,7 @@ msgstr ""
 "</screen></informalexample> 配置您的键盘(如果需要)："
 
 #. Tag: screen
-#: random-bits.xml:730
+#: random-bits.xml:706
 #, no-c-format
 msgid ""
 "# aptitude install console-setup\n"
@@ -1464,7 +1509,7 @@ msgstr ""
 "# dpkg-reconfigure keyboard-configuration"
 
 #. Tag: para
-#: random-bits.xml:732
+#: random-bits.xml:708
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1472,13 +1517,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:742
+#: random-bits.xml:718
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:743
+#: random-bits.xml:719
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1488,31 +1533,31 @@ msgstr ""
 "以用下面指令找到那些预先打包的内核："
 
 #. Tag: screen
-#: random-bits.xml:748
+#: random-bits.xml:724
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:750
+#: random-bits.xml:726
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "然后根据所选取的软件包名称安装内核软件包。"
 
 #. Tag: screen
-#: random-bits.xml:754
+#: random-bits.xml:730
 #, no-c-format
 msgid "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 msgstr "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:760
+#: random-bits.xml:736
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:761
+#: random-bits.xml:737
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1526,7 +1571,7 @@ msgstr ""
 "成。"
 
 #. Tag: para
-#: random-bits.xml:768
+#: random-bits.xml:744
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1549,7 +1594,7 @@ msgstr ""
 "<filename>lilo.conf</filename> )</phrase>。"
 
 #. Tag: para
-#: random-bits.xml:780
+#: random-bits.xml:756
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub2</classname> is as easy as: "
@@ -1571,7 +1616,7 @@ msgstr ""
 "boot/grub/grub.cfg</filename>。"
 
 #. Tag: para
-#: random-bits.xml:790
+#: random-bits.xml:766
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1582,13 +1627,13 @@ msgstr ""
 "是安装 <command>grub2</command>，但它不属于本附录讨论范围。"
 
 #. Tag: para
-#: random-bits.xml:796
+#: random-bits.xml:772
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子："
 
 #. Tag: screen
-#: random-bits.xml:800
+#: random-bits.xml:776
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1610,7 +1655,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:802
+#: random-bits.xml:778
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1627,7 +1672,7 @@ msgstr ""
 "行 ybin (请记住，您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:812
+#: random-bits.xml:788
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1657,14 +1702,14 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:825
+#: random-bits.xml:801
 #, fuzzy, no-c-format
 #| msgid "Remote access: Installing SSH and setting a password"
 msgid "Remote access: Installing SSH and setting up access"
 msgstr "远程访问：安装 SSH 并设置密码"
 
 #. Tag: para
-#: random-bits.xml:826
+#: random-bits.xml:802
 #, no-c-format
 msgid ""
 "In case you can login to the system via console, you can skip this section. "
@@ -1690,7 +1735,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:850
+#: random-bits.xml:826
 #, no-c-format
 msgid ""
 "# adduser joe\n"
@@ -1698,13 +1743,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:855
+#: random-bits.xml:831
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:856
+#: random-bits.xml:832
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1723,7 +1768,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:867
+#: random-bits.xml:843
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1734,19 +1779,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:873
+#: random-bits.xml:849
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:884
+#: random-bits.xml:860
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:862
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1760,7 +1805,7 @@ msgstr ""
 "接到具有 &debian; 镜像的网络(比如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:894
+#: random-bits.xml:870
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1774,7 +1819,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:902
+#: random-bits.xml:878
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1785,7 +1830,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:907
+#: random-bits.xml:883
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1797,13 +1842,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:917
+#: random-bits.xml:893
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:920
+#: random-bits.xml:896
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1811,13 +1856,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:926
+#: random-bits.xml:902
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:931
+#: random-bits.xml:907
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1826,7 +1871,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:937
+#: random-bits.xml:913
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1837,13 +1882,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:949
+#: random-bits.xml:925
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:950
+#: random-bits.xml:926
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1853,7 +1898,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:955
+#: random-bits.xml:931
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1895,13 +1940,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:961
+#: random-bits.xml:937
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:962
+#: random-bits.xml:938
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1925,13 +1970,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:981
+#: random-bits.xml:957
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:983
+#: random-bits.xml:959
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1941,13 +1986,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:991
+#: random-bits.xml:967
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:972
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1960,7 +2005,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:1005
+#: random-bits.xml:981
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1971,19 +2016,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:1017
+#: random-bits.xml:993
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:996
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1001
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1991,7 +2036,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:1030
+#: random-bits.xml:1006
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2001,7 +2046,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:1036
+#: random-bits.xml:1012
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2011,13 +2056,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1055
+#: random-bits.xml:1031
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1057
+#: random-bits.xml:1033
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2031,7 +2076,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1065
+#: random-bits.xml:1041
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2042,7 +2087,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1070
+#: random-bits.xml:1046
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2055,7 +2100,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1077
+#: random-bits.xml:1053
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2063,7 +2108,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1085
+#: random-bits.xml:1061
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2078,7 +2123,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1100
+#: random-bits.xml:1076
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2096,7 +2141,7 @@ msgstr ""
 "footnote>)。"
 
 #. Tag: para
-#: random-bits.xml:1119
+#: random-bits.xml:1095
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2104,7 +2149,7 @@ msgid ""
 msgstr "下一步是侦测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1125
+#: random-bits.xml:1101
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2115,7 +2160,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1131
+#: random-bits.xml:1107
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2129,7 +2174,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1140
+#: random-bits.xml:1116
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2137,7 +2182,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息(PPPoE 用户名和密码)。"
 
 #. Tag: para
-#: random-bits.xml:1146
+#: random-bits.xml:1122
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2153,6 +2198,14 @@ msgstr ""
 "信息不正确或有错误出现，安装程序将停止，但可以选择 <guimenuitem>Configure "
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
+#~ msgid ""
+#~ "There is some overlap of the Laptop task with the Desktop environment "
+#~ "task. If you install both, the Laptop task will only require a few MB "
+#~ "additional disk space."
+#~ msgstr ""
+#~ "便携机(Laptop)任务与桌面环境任务有大量重复的内容，如果两个都安装，便携机任"
+#~ "务只需要很小的额外空间。"
+
 #~ msgid ""
 #~ "In case you can login to the system via console, you can skip this "
 #~ "section. If the system should be accessible via the network later on, you "
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index e764699f4..beb9b8bfe 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: 2014-10-05 18:15+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-26 15:04+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2034,8 +2034,9 @@ msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
 
 #. Tag: entry
 #: using-d-i.xml:1350
-#, no-c-format
-msgid "Separate /home, /usr, /var and /tmp partitions"
+#, fuzzy, no-c-format
+#| msgid "Separate /home, /usr, /var and /tmp partitions"
+msgid "Separate /home, /var and /tmp partitions"
 msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
 
 #. Tag: entry
@@ -2046,10 +2047,13 @@ msgstr "<entry>1GB</entry>"
 
 #. Tag: entry
 #: using-d-i.xml:1352
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
+#| "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 msgid ""
-"<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
-"filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
+"<filename>/</filename>, <filename>/home</filename>, <filename>/var</"
+"filename>, <filename>/tmp</filename>, swap"
 msgstr ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
@@ -3925,55 +3929,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2561
-#, fuzzy, no-c-format
-#| msgid ""
-#| "It is not possible to interactively select a different desktop during the "
-#| "installation. However, it <emphasis>is</emphasis> possible to get &d-i; "
-#| "to install a KDE desktop environment instead of GNOME by using preseeding "
-#| "(see <xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
-#| "<literal>desktop=kde</literal> at the boot prompt when starting the "
-#| "installer. Alternatively the more lightweight Xfce and LXDE desktop "
-#| "environments can be selected by using <literal>desktop=xfce</literal> or "
-#| "<literal>desktop=lxde</literal>."
-msgid ""
-"By default, &d-i; installs the Xfce desktop environment. It is not possible "
-"to interactively select a different desktop environment during the "
-"installation, however, it <emphasis>is</emphasis> possible to have the "
-"installer install a different desktop environment by using preseeding (see "
-"<xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
-"<literal>desktop=name_of_the_desktop_environment</literal> at the boot "
-"prompt when starting the installer. Possible variants in this case are "
-"<literal>desktop=gnome</literal>, <literal>desktop=kde</literal>, "
-"<literal>desktop=lxde</literal> or <literal>desktop=xfce</literal>."
-msgstr ""
-"在安装过程中无法交互式地选择另外一种桌面。但是，<emphasis>可以</emphasis>通过"
-"预置(见 <xref linkend=\"preseed-pkgsel\"/>)，或者启动安装程序的时候添加 "
-"<literal>desktop=kde</literal> 引导参数，让 &d-i; 安装 KDE 桌面环境而不是 "
-"GNOME。另外，轻量级的 Xfce 和 LXDE 桌面环境可以用 <literal>desktop=xfce</"
-"literal> 或 <literal>desktop=lxde</literal> 进行选择。"
-
-#. Tag: para
-#: using-d-i.xml:2575
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Some CD images (netinst and DVD) also allow selection of the desired "
-#| "desktop environment from the graphical boot menu. Select the "
-#| "<quote>Advanced options</quote> option in the main menu and look for "
-#| "<quote>Alternative desktop environments</quote>."
+#, no-c-format
 msgid ""
-"If you use the special GNOME-, KDE- or LXDE-variant of the first CD in the "
-"full CD set, the installer installs the respective desktop environment "
-"instead of the default. Some CD images (netinst and DVD) also allow "
-"selection of the desired desktop environment from the graphical boot menu. "
-"Select the <quote>Advanced options</quote> option in the main menu and look "
-"for <quote>Alternative desktop environments</quote>."
+"By default, &d-i; installs the <phrase arch=\"x86\">Gnome</phrase> <phrase "
+"arch=\"non-x86\">Xfce</phrase> desktop environment. It is possible to "
+"interactively select a different desktop environment during the "
+"installation. It is also possible to install multiple desktops, but some "
+"combinations of desktop may not be co-installable."
 msgstr ""
-"一些 CD 映象(netinst 和 DVD)可以从图形引导菜单中选择所需的桌面环境。选择主菜"
-"单里面的 <quote>Advanced options</quote>，再找到 <quote>Alternative desktop "
-"environments</quote>。"
 
 #. Tag: para
-#: using-d-i.xml:2586
+#: using-d-i.xml:2569
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Note that this will only work if the packages needed for the desired "
@@ -3996,26 +3962,16 @@ msgstr ""
 "Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
 
 #. Tag: para
-#: using-d-i.xml:2596
+#: using-d-i.xml:2579
 #, no-c-format
 msgid ""
-"The various server tasks will install software roughly as follows. DNS "
-"server: <classname>bind9</classname>; File server: <classname>samba</"
-"classname>, <classname>nfs</classname>; Mail server: <classname>exim4</"
-"classname>, <classname>spamassassin</classname>, <classname>uw-imap</"
-"classname>; Print server: <classname>cups</classname>; SQL database: "
-"<classname>postgresql</classname>; Web server: <classname>apache2</"
-"classname>."
+"The various server tasks will install software roughly as follows. Web "
+"server: <classname>apache2</classname>; Print server: <classname>cups</"
+"classname>; SSH server: <classname>openssh</classname>."
 msgstr ""
-"各种服务器任务大概会安装这些软件。DNS 服务器：<classname>bind9</classname>；"
-"文件服务器：<classname>samba</classname>、<classname>nfs</classname>；邮件服"
-"务器：<classname>exim4</classname>、<classname>spamassassin</classname>、"
-"<classname>uw-imap</classname>；打印服务器：<classname>cups</classname>；SQL "
-"数据库：<classname>postgresql</classname>；Web 服务器：<classname>apache2</"
-"classname>。"
 
 #. Tag: para
-#: using-d-i.xml:2607
+#: using-d-i.xml:2586
 #, no-c-format
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
@@ -4029,7 +3985,7 @@ msgstr ""
 "并需要一个最小化的系统，您应该让该任务选中。"
 
 #. Tag: para
-#: using-d-i.xml:2615
+#: using-d-i.xml:2594
 #, no-c-format
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
@@ -4046,7 +4002,7 @@ msgstr ""
 "(如果存在)还会安装该桌面对应的本地化软件包。"
 
 #. Tag: para
-#: using-d-i.xml:2625
+#: using-d-i.xml:2604
 #, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -4058,7 +4014,7 @@ msgstr ""
 "选中任务的软件包。假如某个程序需要用户输入信息，它将提示您指定。"
 
 #. Tag: para
-#: using-d-i.xml:2632
+#: using-d-i.xml:2611
 #, no-c-format
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
@@ -4073,7 +4029,7 @@ msgstr ""
 "间。一旦启动，安装软件包过程将无法取消。"
 
 #. Tag: para
-#: using-d-i.xml:2641
+#: using-d-i.xml:2620
 #, no-c-format
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
@@ -4088,13 +4044,13 @@ msgstr ""
 "新)；如果您安装的是测试版本，这会出现在使用旧映像安装时。"
 
 #. Tag: title
-#: using-d-i.xml:2656
+#: using-d-i.xml:2635
 #, no-c-format
 msgid "Making Your System Bootable"
 msgstr "创建启动系统"
 
 #. Tag: para
-#: using-d-i.xml:2658
+#: using-d-i.xml:2637
 #, no-c-format
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
@@ -4107,13 +4063,13 @@ msgstr ""
 "linkend=\"boot-dev-select-sun\"/>。</phrase>"
 
 #. Tag: title
-#: using-d-i.xml:2673
+#: using-d-i.xml:2652
 #, no-c-format
 msgid "Detecting other operating systems"
 msgstr "检测其他的操作系统"
 
 #. Tag: para
-#: using-d-i.xml:2675
+#: using-d-i.xml:2654
 #, no-c-format
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
@@ -4127,7 +4083,7 @@ msgstr ""
 "&debian; 一起，计算机也将配置为可以启动其他操作系统。"
 
 #. Tag: para
-#: using-d-i.xml:2683
+#: using-d-i.xml:2662
 #, no-c-format
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
@@ -4141,13 +4097,13 @@ msgstr ""
 "管理器的文档了解更多信息。"
 
 #. Tag: title
-#: using-d-i.xml:2701
+#: using-d-i.xml:2680
 #, no-c-format
 msgid "<command>palo</command>-installer"
 msgstr "<command>palo</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2702
+#: using-d-i.xml:2681
 #, no-c-format
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -4162,19 +4118,19 @@ msgstr ""
 "<command>PALO</command> 能真正地读 Linux 分区。"
 
 #. Tag: para
-#: using-d-i.xml:2711
+#: using-d-i.xml:2690
 #, no-c-format
 msgid "hppa FIXME ( need more info )"
 msgstr "hppa FIXME ( need more info )"
 
 #. Tag: title
-#: using-d-i.xml:2723
+#: using-d-i.xml:2702
 #, no-c-format
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
 
 #. Tag: para
-#: using-d-i.xml:2725
+#: using-d-i.xml:2704
 #, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -4185,7 +4141,7 @@ msgstr ""
 "定的 boot loader，它对新手和老手都是一个不错的缺省选择。"
 
 #. Tag: para
-#: using-d-i.xml:2731
+#: using-d-i.xml:2710
 #, no-c-format
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -4197,7 +4153,7 @@ msgstr ""
 "请参阅 grub 的手册。"
 
 #. Tag: para
-#: using-d-i.xml:2737
+#: using-d-i.xml:2716
 #, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -4208,13 +4164,13 @@ msgstr ""
 "用的任何 bootloader。"
 
 #. Tag: title
-#: using-d-i.xml:2750
+#: using-d-i.xml:2729
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
 
 #. Tag: para
-#: using-d-i.xml:2752
+#: using-d-i.xml:2731
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -4230,7 +4186,7 @@ msgstr ""
 "HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:2762
+#: using-d-i.xml:2741
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -4243,7 +4199,7 @@ msgstr ""
 "统。"
 
 #. Tag: para
-#: using-d-i.xml:2770
+#: using-d-i.xml:2749
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -4251,13 +4207,13 @@ msgid ""
 msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader："
 
 #. Tag: term
-#: using-d-i.xml:2777
+#: using-d-i.xml:2756
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr "主引导区(MBR)"
 
 #. Tag: para
-#: using-d-i.xml:2777
+#: using-d-i.xml:2756
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -4265,13 +4221,13 @@ msgid ""
 msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 
 #. Tag: term
-#: using-d-i.xml:2784
+#: using-d-i.xml:2763
 #, no-c-format
 msgid "new &debian; partition"
 msgstr "新 &debian; 分区"
 
 #. Tag: para
-#: using-d-i.xml:2784
+#: using-d-i.xml:2763
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -4282,13 +4238,13 @@ msgstr ""
 "新 &debian; 分区的起始位置，并能作为第二 boot loader。"
 
 #. Tag: term
-#: using-d-i.xml:2793
+#: using-d-i.xml:2772
 #, no-c-format
 msgid "Other choice"
 msgstr "其它选择"
 
 #. Tag: para
-#: using-d-i.xml:2793
+#: using-d-i.xml:2772
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -4301,7 +4257,7 @@ msgstr ""
 "filename> 或 <filename>/dev/sda</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2803
+#: using-d-i.xml:2782
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4315,13 +4271,13 @@ msgstr ""
 "录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;！"
 
 #. Tag: title
-#: using-d-i.xml:2819
+#: using-d-i.xml:2798
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2821
+#: using-d-i.xml:2800
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4346,7 +4302,7 @@ msgstr ""
 "和启动 Linux 内核的工作。"
 
 #. Tag: para
-#: using-d-i.xml:2837
+#: using-d-i.xml:2816
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4361,13 +4317,13 @@ msgstr ""
 "<emphasis>root</emphasis> 文件系统相同的磁盘。"
 
 #. Tag: title
-#: using-d-i.xml:2849
+#: using-d-i.xml:2828
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr "选择正确的分区！"
 
 #. Tag: para
-#: using-d-i.xml:2851
+#: using-d-i.xml:2830
 #, no-c-format
 msgid ""
 "The criterion for selecting a partition is that it must be a FAT format "
@@ -4383,13 +4339,13 @@ msgstr ""
 "容！"
 
 #. Tag: title
-#: using-d-i.xml:2866
+#: using-d-i.xml:2845
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr "EFI 分区内容"
 
 #. Tag: para
-#: using-d-i.xml:2868
+#: using-d-i.xml:2847
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4415,13 +4371,13 @@ msgstr ""
 "间，系统更新或重新配置，文件系统中也许会有其他文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2890
+#: using-d-i.xml:2869
 #, no-c-format
 msgid "elilo.conf"
 msgstr "elilo.conf"
 
 #. Tag: para
-#: using-d-i.xml:2891
+#: using-d-i.xml:2870
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -4432,13 +4388,13 @@ msgstr ""
 "filename> 的复制，其文件名重写成 EFI 分区上的文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2900
+#: using-d-i.xml:2879
 #, no-c-format
 msgid "elilo.efi"
 msgstr "elilo.efi"
 
 #. Tag: para
-#: using-d-i.xml:2901
+#: using-d-i.xml:2880
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4451,13 +4407,13 @@ msgstr ""
 "<quote>EFI Boot Manager</quote> 命令菜单。"
 
 #. Tag: filename
-#: using-d-i.xml:2911
+#: using-d-i.xml:2890
 #, no-c-format
 msgid "initrd.img"
 msgstr "initrd.img"
 
 #. Tag: para
-#: using-d-i.xml:2912
+#: using-d-i.xml:2891
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4470,13 +4426,13 @@ msgstr ""
 "filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2924
+#: using-d-i.xml:2903
 #, no-c-format
 msgid "readme.txt"
 msgstr "readme.txt"
 
 #. Tag: para
-#: using-d-i.xml:2925
+#: using-d-i.xml:2904
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -4487,13 +4443,13 @@ msgstr ""
 "任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
 
 #. Tag: filename
-#: using-d-i.xml:2935
+#: using-d-i.xml:2914
 #, no-c-format
 msgid "vmlinuz"
 msgstr "vmlinuz"
 
 #. Tag: para
-#: using-d-i.xml:2936
+#: using-d-i.xml:2915
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4506,13 +4462,13 @@ msgstr ""
 "<filename>/vmlinuz</filename> 指向的文件。"
 
 #. Tag: title
-#: using-d-i.xml:2956
+#: using-d-i.xml:2935
 #, no-c-format
 msgid "<command>arcboot</command>-installer"
 msgstr "<command>arcboot</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2957
+#: using-d-i.xml:2936
 #, no-c-format
 msgid ""
 "The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -4552,13 +4508,13 @@ msgstr ""
 "</screen></informalexample> ，然后键入 <command>boot</command>。"
 
 #. Tag: replaceable
-#: using-d-i.xml:2976
+#: using-d-i.xml:2955
 #, no-c-format
 msgid "scsi"
 msgstr "scsi"
 
 #. Tag: para
-#: using-d-i.xml:2977
+#: using-d-i.xml:2956
 #, no-c-format
 msgid ""
 "is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -4566,13 +4522,13 @@ msgid ""
 msgstr "是启动的 SCSI 总线，<userinput>0</userinput> 为板载控制器"
 
 #. Tag: replaceable
-#: using-d-i.xml:2985
+#: using-d-i.xml:2964
 #, no-c-format
 msgid "disk"
 msgstr "disk"
 
 #. Tag: para
-#: using-d-i.xml:2986
+#: using-d-i.xml:2965
 #, no-c-format
 msgid ""
 "is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -4581,13 +4537,13 @@ msgstr "硬盘的 SCSI ID，<command>arcboot</command> 安装在其上"
 
 # index.docbook:1643, index.docbook:1712
 #. Tag: replaceable
-#: using-d-i.xml:2994
+#: using-d-i.xml:2973
 #, no-c-format
 msgid "partnr"
 msgstr "partnr"
 
 #. Tag: para
-#: using-d-i.xml:2995
+#: using-d-i.xml:2974
 #, no-c-format
 msgid ""
 "is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4595,13 +4551,13 @@ msgid ""
 msgstr "分区号，<filename>/etc/arcboot.conf</filename> 处于该分区"
 
 #. Tag: replaceable
-#: using-d-i.xml:3003
+#: using-d-i.xml:2982
 #, no-c-format
 msgid "config"
 msgstr "config"
 
 #. Tag: para
-#: using-d-i.xml:3004
+#: using-d-i.xml:2983
 #, no-c-format
 msgid ""
 "is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4611,13 +4567,13 @@ msgstr ""
 "quote> 。"
 
 #. Tag: title
-#: using-d-i.xml:3025
+#: using-d-i.xml:3004
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr "安装 <command>Yaboot</command> 至硬盘"
 
 #. Tag: para
-#: using-d-i.xml:3026
+#: using-d-i.xml:3005
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4635,13 +4591,13 @@ msgstr ""
 "设为启动 &debian-gnu;。"
 
 #. Tag: title
-#: using-d-i.xml:3044
+#: using-d-i.xml:3023
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr "安装 <command>Quik</command> 至硬盘"
 
 #. Tag: para
-#: using-d-i.xml:3045
+#: using-d-i.xml:3024
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4654,13 +4610,13 @@ msgstr ""
 "以工作在 7200，7300 和 7600 Powermacs，以及一些 Power Computing 克隆。"
 
 #. Tag: title
-#: using-d-i.xml:3061
+#: using-d-i.xml:3040
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr "<command>zipl</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:3062
+#: using-d-i.xml:3041
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4675,13 +4631,13 @@ msgstr ""
 "Commands</quote>，它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
 
 #. Tag: title
-#: using-d-i.xml:3079
+#: using-d-i.xml:3058
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
 
 #. Tag: para
-#: using-d-i.xml:3081
+#: using-d-i.xml:3060
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4708,13 +4664,13 @@ msgstr ""
 "区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
 
 #. Tag: title
-#: using-d-i.xml:3106
+#: using-d-i.xml:3085
 #, no-c-format
 msgid "Making the system bootable with flash-kernel"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3107
+#: using-d-i.xml:3086
 #, no-c-format
 msgid ""
 "As there is no common firmware interface on all ARM platforms, the steps "
@@ -4727,7 +4683,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3118
+#: using-d-i.xml:3097
 #, no-c-format
 msgid ""
 "On devices which boot from internal NOR- or NAND-flash memory, flash-kernel "
@@ -4739,7 +4695,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3128
+#: using-d-i.xml:3107
 #, no-c-format
 msgid ""
 "For ARM systems that use u-boot as their system firmware and boot the kernel "
@@ -4749,13 +4705,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3144
+#: using-d-i.xml:3123
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr "不使用 boot loader 继续进行"
 
 #. Tag: para
-#: using-d-i.xml:3146
+#: using-d-i.xml:3125
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -4766,7 +4722,7 @@ msgstr ""
 "是因为不想要(比如，您想使用已经存在的 boot loader)"
 
 #. Tag: para
-#: using-d-i.xml:3153
+#: using-d-i.xml:3132
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -4785,13 +4741,13 @@ msgstr ""
 "filename> 到一个独立的分区，还需要 <filename>/boot</filename> 文件系统。"
 
 #. Tag: title
-#: using-d-i.xml:3170
+#: using-d-i.xml:3149
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr "完成安装"
 
 #. Tag: para
-#: using-d-i.xml:3171
+#: using-d-i.xml:3150
 #, no-c-format
 msgid ""
 "This is the last step in the &debian; installation process during which the "
@@ -4802,13 +4758,13 @@ msgstr ""
 "&d-i; 之后的清理。"
 
 #. Tag: title
-#: using-d-i.xml:3184
+#: using-d-i.xml:3163
 #, no-c-format
 msgid "Setting the System Clock"
 msgstr "设置系统时钟"
 
 #. Tag: para
-#: using-d-i.xml:3186
+#: using-d-i.xml:3165
 #, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4820,7 +4776,7 @@ msgstr ""
 "装程序依据是否有其他系统已经安装这类事情，来决定时钟要不要设为 UTC。"
 
 #. Tag: para
-#: using-d-i.xml:3193
+#: using-d-i.xml:3172
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
@@ -4836,7 +4792,7 @@ msgstr ""
 "常设为本地时间。如果您需要多重引导，请选择本地时间而不是 GMT。</phrase>"
 
 #. Tag: para
-#: using-d-i.xml:3204
+#: using-d-i.xml:3183
 #, no-c-format
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
@@ -4847,13 +4803,13 @@ msgstr ""
 "决于刚才的选择。"
 
 #. Tag: title
-#: using-d-i.xml:3219
+#: using-d-i.xml:3198
 #, no-c-format
 msgid "Reboot the System"
 msgstr "重新启动系统"
 
 #. Tag: para
-#: using-d-i.xml:3221
+#: using-d-i.xml:3200
 #, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4864,7 +4820,7 @@ msgstr ""
 "&debian; 系统。"
 
 #. Tag: para
-#: using-d-i.xml:3227
+#: using-d-i.xml:3206
 #, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
@@ -4876,13 +4832,13 @@ msgstr ""
 "上的 IPL &debian-gnu;，它在安装步骤第一步里被选做根文件系统。"
 
 #. Tag: title
-#: using-d-i.xml:3240
+#: using-d-i.xml:3219
 #, no-c-format
 msgid "Troubleshooting"
 msgstr "排除故障"
 
 #. Tag: para
-#: using-d-i.xml:3241
+#: using-d-i.xml:3220
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -4893,13 +4849,13 @@ msgstr ""
 "题。"
 
 #. Tag: title
-#: using-d-i.xml:3254
+#: using-d-i.xml:3233
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr "保存安装记录"
 
 #. Tag: para
-#: using-d-i.xml:3256
+#: using-d-i.xml:3235
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -4910,7 +4866,7 @@ msgstr ""
 "的 <filename>/var/log/installer/</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:3263
+#: using-d-i.xml:3242
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4924,13 +4880,13 @@ msgstr ""
 "其它系统上研究记录，或者用于报告的附件。"
 
 #. Tag: title
-#: using-d-i.xml:3283
+#: using-d-i.xml:3262
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr "使用 Shell 查看记录"
 
 #. Tag: para
-#: using-d-i.xml:3285
+#: using-d-i.xml:3264
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -4954,13 +4910,13 @@ msgstr ""
 "安装程序。"
 
 #. Tag: para
-#: using-d-i.xml:3303
+#: using-d-i.xml:3282
 #, no-c-format
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr "对于图形安装程序，请参阅 <xref linkend=\"gtk-using\"/>。"
 
 #. Tag: para
-#: using-d-i.xml:3307
+#: using-d-i.xml:3286
 #, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4975,7 +4931,7 @@ msgstr ""
 "到安装程序。"
 
 #. Tag: para
-#: using-d-i.xml:3315
+#: using-d-i.xml:3294
 #, no-c-format
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
@@ -4991,7 +4947,7 @@ msgstr ""
 "Bourne shell 的克隆，有一些如自动完成与历史纪录这样的好特性。"
 
 #. Tag: para
-#: using-d-i.xml:3324
+#: using-d-i.xml:3303
 #, no-c-format
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
@@ -5002,7 +4958,7 @@ msgstr ""
 "以在 <filename>/var/log</filename> 目录找到。"
 
 #. Tag: para
-#: using-d-i.xml:3331
+#: using-d-i.xml:3310
 #, no-c-format
 msgid ""
 "Although you can do basically anything in a shell that the available "
@@ -5013,7 +4969,7 @@ msgstr ""
 "题时进行调试。"
 
 #. Tag: para
-#: using-d-i.xml:3337
+#: using-d-i.xml:3316
 #, no-c-format
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
@@ -5025,13 +4981,13 @@ msgstr ""
 "该让安装程序激活交换分区，而不是在 shell 里面自己动手。"
 
 #. Tag: title
-#: using-d-i.xml:3353
+#: using-d-i.xml:3332
 #, no-c-format
 msgid "Installation Over the Network"
 msgstr "通过网络安装"
 
 #. Tag: para
-#: using-d-i.xml:3355
+#: using-d-i.xml:3334
 #, no-c-format
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
@@ -5046,7 +5002,7 @@ msgstr ""
 "先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
 
 #. Tag: para
-#: using-d-i.xml:3365
+#: using-d-i.xml:3344
 #, no-c-format
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
@@ -5066,7 +5022,7 @@ msgstr ""
 "SSH</guimenuitem>。"
 
 #. Tag: para
-#: using-d-i.xml:3378
+#: using-d-i.xml:3357
 #, no-c-format
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
@@ -5074,7 +5030,7 @@ msgid ""
 msgstr "在 &arch-title; 上安装，建立网络之后这是默认的方法。"
 
 #. Tag: para
-#: using-d-i.xml:3383
+#: using-d-i.xml:3362
 #, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -5093,7 +5049,7 @@ msgstr ""
 "fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
 
 #. Tag: para
-#: using-d-i.xml:3395
+#: using-d-i.xml:3374
 #, no-c-format
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
@@ -5104,7 +5060,7 @@ msgstr ""
 "他的组件。"
 
 #. Tag: para
-#: using-d-i.xml:3401
+#: using-d-i.xml:3380
 #, no-c-format
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -5132,7 +5088,7 @@ msgstr ""
 "确认是否正确。"
 
 #. Tag: para
-#: using-d-i.xml:3418
+#: using-d-i.xml:3397
 #, no-c-format
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
@@ -5153,7 +5109,7 @@ msgstr ""
 "接在安装过程中的哪一点断开，您在连接之后可能继续，也可能无法继续安装过程。"
 
 #. Tag: para
-#: using-d-i.xml:3431
+#: using-d-i.xml:3410
 #, no-c-format
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
@@ -5173,7 +5129,7 @@ msgstr ""
 "需要的时候采用。"
 
 #. Tag: para
-#: using-d-i.xml:3444
+#: using-d-i.xml:3423
 #, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
@@ -5195,7 +5151,7 @@ msgstr ""
 "footnote>，再重新来过。"
 
 #. Tag: para
-#: using-d-i.xml:3460
+#: using-d-i.xml:3439
 #, no-c-format
 msgid ""
 "After the login you will be presented with an initial screen where you have "
@@ -5212,7 +5168,7 @@ msgstr ""
 "的系统。在安装菜单只能打开一个 SSH 会话，但 shell 可以打开多个。"
 
 #. Tag: para
-#: using-d-i.xml:3470
+#: using-d-i.xml:3449
 #, no-c-format
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
@@ -5225,13 +5181,13 @@ msgstr ""
 "配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
 
 #. Tag: title
-#: using-d-i.xml:3489
+#: using-d-i.xml:3468
 #, no-c-format
 msgid "Loading Missing Firmware"
 msgstr "加载缺失的固件"
 
 #. Tag: para
-#: using-d-i.xml:3490
+#: using-d-i.xml:3469
 #, no-c-format
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -5244,7 +5200,7 @@ msgstr ""
 "强功能就无法使用。"
 
 #. Tag: para
-#: using-d-i.xml:3498
+#: using-d-i.xml:3477
 #, no-c-format
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
@@ -5260,7 +5216,7 @@ msgstr ""
 "序模块。"
 
 #. Tag: para
-#: using-d-i.xml:3508
+#: using-d-i.xml:3487
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -5276,7 +5232,7 @@ msgstr ""
 "phrase>"
 
 #. Tag: para
-#: using-d-i.xml:3518
+#: using-d-i.xml:3497
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -5287,7 +5243,7 @@ msgstr ""
 "固件。"
 
 #. Tag: para
-#: using-d-i.xml:3524
+#: using-d-i.xml:3503
 #, no-c-format
 msgid ""
 "&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -5301,13 +5257,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3538
+#: using-d-i.xml:3517
 #, no-c-format
 msgid "Preparing a medium"
 msgstr "准备介质"
 
 #. Tag: para
-#: using-d-i.xml:3539
+#: using-d-i.xml:3518
 #, no-c-format
 msgid ""
 "Official CD images do not include non-free firmware. The most common method "
@@ -5327,7 +5283,7 @@ msgstr ""
 "下。推荐使用 FAT 文件系统，因为在安装过程的早期阶段它肯定能被支持。"
 
 #. Tag: para
-#: using-d-i.xml:3552
+#: using-d-i.xml:3531
 #, no-c-format
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
@@ -5342,7 +5298,7 @@ msgstr ""
 "件系统里面。"
 
 #. Tag: para
-#: using-d-i.xml:3566
+#: using-d-i.xml:3545
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -5355,7 +5311,7 @@ msgstr ""
 "件。以下概要列出大多数固件软件包，但不保证完整，有些还是非固件软件包："
 
 #. Tag: para
-#: using-d-i.xml:3580
+#: using-d-i.xml:3559
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -5366,13 +5322,13 @@ msgstr ""
 "造商那里获得。"
 
 #. Tag: title
-#: using-d-i.xml:3589
+#: using-d-i.xml:3568
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr "固件和安装好的系统"
 
 #. Tag: para
-#: using-d-i.xml:3590
+#: using-d-i.xml:3569
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -5387,7 +5343,7 @@ msgstr ""
 "序不同的内核版本，有可能由于版本的偏差造成固件不能加载。"
 
 #. Tag: para
-#: using-d-i.xml:3599
+#: using-d-i.xml:3578
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5401,7 +5357,7 @@ msgstr ""
 "做的优点在于如果有固件的新版本存在会自动更新。"
 
 #. Tag: para
-#: using-d-i.xml:3607
+#: using-d-i.xml:3586
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -5412,7 +5368,7 @@ msgstr ""
 "安装好固件或软件包。"
 
 #. Tag: para
-#: using-d-i.xml:3614
+#: using-d-i.xml:3593
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5423,6 +5379,68 @@ msgstr ""
 "如果固件从不严格的固件文件加载，复制到安装好的系统的固件将<emphasis>不会</"
 "emphasis>自动更新，除非对应的固件软件包(如果有的话)在系统安装之后安装。"
 
+#, fuzzy
+#~| msgid ""
+#~| "It is not possible to interactively select a different desktop during "
+#~| "the installation. However, it <emphasis>is</emphasis> possible to get &d-"
+#~| "i; to install a KDE desktop environment instead of GNOME by using "
+#~| "preseeding (see <xref linkend=\"preseed-pkgsel\"/>) or by adding the "
+#~| "parameter <literal>desktop=kde</literal> at the boot prompt when "
+#~| "starting the installer. Alternatively the more lightweight Xfce and LXDE "
+#~| "desktop environments can be selected by using <literal>desktop=xfce</"
+#~| "literal> or <literal>desktop=lxde</literal>."
+#~ msgid ""
+#~ "By default, &d-i; installs the Xfce desktop environment. It is not "
+#~ "possible to interactively select a different desktop environment during "
+#~ "the installation, however, it <emphasis>is</emphasis> possible to have "
+#~ "the installer install a different desktop environment by using preseeding "
+#~ "(see <xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
+#~ "<literal>desktop=name_of_the_desktop_environment</literal> at the boot "
+#~ "prompt when starting the installer. Possible variants in this case are "
+#~ "<literal>desktop=gnome</literal>, <literal>desktop=kde</literal>, "
+#~ "<literal>desktop=lxde</literal> or <literal>desktop=xfce</literal>."
+#~ msgstr ""
+#~ "在安装过程中无法交互式地选择另外一种桌面。但是，<emphasis>可以</emphasis>"
+#~ "通过预置(见 <xref linkend=\"preseed-pkgsel\"/>)，或者启动安装程序的时候添"
+#~ "加 <literal>desktop=kde</literal> 引导参数，让 &d-i; 安装 KDE 桌面环境而不"
+#~ "是 GNOME。另外，轻量级的 Xfce 和 LXDE 桌面环境可以用 "
+#~ "<literal>desktop=xfce</literal> 或 <literal>desktop=lxde</literal> 进行选"
+#~ "择。"
+
+#, fuzzy
+#~| msgid ""
+#~| "Some CD images (netinst and DVD) also allow selection of the desired "
+#~| "desktop environment from the graphical boot menu. Select the "
+#~| "<quote>Advanced options</quote> option in the main menu and look for "
+#~| "<quote>Alternative desktop environments</quote>."
+#~ msgid ""
+#~ "If you use the special GNOME-, KDE- or LXDE-variant of the first CD in "
+#~ "the full CD set, the installer installs the respective desktop "
+#~ "environment instead of the default. Some CD images (netinst and DVD) also "
+#~ "allow selection of the desired desktop environment from the graphical "
+#~ "boot menu. Select the <quote>Advanced options</quote> option in the main "
+#~ "menu and look for <quote>Alternative desktop environments</quote>."
+#~ msgstr ""
+#~ "一些 CD 映象(netinst 和 DVD)可以从图形引导菜单中选择所需的桌面环境。选择主"
+#~ "菜单里面的 <quote>Advanced options</quote>，再找到 <quote>Alternative "
+#~ "desktop environments</quote>。"
+
+#~ msgid ""
+#~ "The various server tasks will install software roughly as follows. DNS "
+#~ "server: <classname>bind9</classname>; File server: <classname>samba</"
+#~ "classname>, <classname>nfs</classname>; Mail server: <classname>exim4</"
+#~ "classname>, <classname>spamassassin</classname>, <classname>uw-imap</"
+#~ "classname>; Print server: <classname>cups</classname>; SQL database: "
+#~ "<classname>postgresql</classname>; Web server: <classname>apache2</"
+#~ "classname>."
+#~ msgstr ""
+#~ "各种服务器任务大概会安装这些软件。DNS 服务器：<classname>bind9</"
+#~ "classname>；文件服务器：<classname>samba</classname>、<classname>nfs</"
+#~ "classname>；邮件服务器：<classname>exim4</classname>、"
+#~ "<classname>spamassassin</classname>、<classname>uw-imap</classname>；打印"
+#~ "服务器：<classname>cups</classname>；SQL 数据库：<classname>postgresql</"
+#~ "classname>；Web 服务器：<classname>apache2</classname>。"
+
 #~ msgid ""
 #~ "&d-i; supports several encryption methods. The default method is "
 #~ "<firstterm>dm-crypt</firstterm> (included in newer Linux kernels, able to "
-- 
cgit v1.2.3