Update of POT and PO files for the manual

5 files changed, 123 insertions, 97 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 5fd6a2db6..0a187a684 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: 2006-10-19 11:20+0000\n"
+"POT-Creation-Date: 2006-10-26 16:20+0000\n"
 "PO-Revision-Date: 2006-10-25 20:57+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1888,11 +1888,11 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:831
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Nearly all x86-based (IA-32) processors still in use in personal computers "
 "are supported, including all varieties of Intel's \"Pentium\" series. This "
-"also includes 32-bits AMD and VIA (former Cyrix) processors, and new "
+"also includes 32-bit AMD and VIA (former Cyrix) processors, and new "
 "processors like the Athlon XP and Intel P4 Xeon."
 msgstr ""
 "几乎所有个人计算机中基于 x86(IA-32) 的处理器都支持，包括所有的 Intel "
@@ -1901,11 +1901,11 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:839
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If your system has a 64-bits AMD64, Intel EM64t or Intel Core 2 Duo "
+"If your system has a 64-bit AMD64, Intel EM64t or Intel Core 2 Duo "
 "processor, you will probably want to use the installer for the amd64 "
-"architecture instead of the installer for the (32-bits) i386 architecture."
+"architecture instead of the installer for the (32-bit) i386 architecture."
 msgstr ""
 "假如您的系统中有 64 位 AMD64、Intel EM64t 或者 Intel Core 2 Duo 处理器，要用 "
 "amd64 架构的安装程序替代 (32位) i386 架构的安装程序。"
@@ -3327,7 +3327,10 @@ msgid ""
 "to media, <xref linkend=\"install-methods\"/>, which lists the advantages "
 "and disadvantages of each media type. You may want to refer back to this "
 "page once you reach that section."
-msgstr "本章将助您选则安装 Debian 所采用的介质。例如，您的电脑上有一个软驱，就可以用来安装 Debian。这里有一整章专门用于说明介质：<xref linkend=\"install-methods\"/>，并列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回来参考本页。"
+msgstr ""
+"本章将助您选则安装 Debian 所采用的介质。例如，您的电脑上有一个软驱，就可以用"
+"来安装 Debian。这里有一整章专门用于说明介质：<xref linkend=\"install-methods"
+"\"/>，并列出了每种类型的优缺点。当您阅读那一章的时候，可能要返回来参考本页。"
 
 #. Tag: title
 #: hardware.xml:1862
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index e97884582..56bb59774 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: 2006-08-18 17:32+0000\n"
+"POT-Creation-Date: 2006-10-26 16:20+0000\n"
 "PO-Revision-Date: 2006-09-04 10:27+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1085,7 +1085,12 @@ msgid ""
 "to make it bootable with aboot. This means that the disk configured by the "
 "installer for use as the Debian boot disk will be inaccessible to the "
 "operating systems mentioned earlier."
-msgstr "除非您想在 Tru64 Unix 或者一个 free 4.4BSD-Lite 后续的系统下(FreeBSD, OpenBSD 或 NetBSD)使用这个磁盘，请 <emphasis>不要</emphasis> 建立包含<quote>整个磁盘</quote>的第三分区(如，起始和终止扇区扩展到整个磁盘)，这与让磁盘启动的工具 aboot 不兼容。意味着安装程序配置的 Debian 引导盘将无法被前面提到的操作系统访问。"
+msgstr ""
+"除非您想在 Tru64 Unix 或者一个 free 4.4BSD-Lite 后续的系统下(FreeBSD, "
+"OpenBSD 或 NetBSD)使用这个磁盘，请 <emphasis>不要</emphasis> 建立包含<quote>"
+"整个磁盘</quote>的第三分区(如，起始和终止扇区扩展到整个磁盘)，这与让磁盘启动"
+"的工具 aboot 不兼容。意味着安装程序配置的 Debian 引导盘将无法被前面提到的操作"
+"系统访问。"
 
 #. Tag: para
 #: partitioning.xml:648
@@ -1154,15 +1159,15 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:703
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you have an existing other operating system such as DOS or Windows and "
 "you want to preserve that operating system while installing Debian, you may "
 "need to resize its partition to free up space for the Debian installation. "
 "The installer supports resizing of both FAT and NTFS filesystems; when you "
 "get to the installer's partitioning step, select the option "
-"<guimenuitem>Manually edit partition table</guimenuitem> and then simply "
-"select an existing partition and change its size."
+"<guimenuitem>Manual</guimenuitem> and then simply select an existing "
+"partition and change its size."
 msgstr ""
 "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留"
 "它们，您应该重新设置分区大小，释放更多的空间给 Debian 安装程序。安装程序支持"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 5b8311d70..ef12cf8a3 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-08-16 18:10+0000\n"
+"POT-Creation-Date: 2006-10-26 16:20+0000\n"
 "PO-Revision-Date: 2006-08-10 11:14+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1634,17 +1634,17 @@ msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
 
 #. Tag: para
 #: preparing.xml:1093
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "One of the most common installations is onto a system that already contains "
 "DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me, NT, 2000, "
 "XP), or OS/2, and it is desired to put Debian onto the same disk without "
 "destroying the previous system. Note that the installer supports resizing of "
 "FAT and NTFS filesystems as used by DOS and Windows. Simply start the "
-"installer, select the option to <menuchoice> <guimenuitem>Manually edit "
-"partition table</guimenuitem> </menuchoice>, select the partition to resize, "
-"and specify its new size. So in most cases you should not need to use the "
-"method described below."
+"installer and when you get to the partitioning step, select the option for "
+"<menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice> partitioning, "
+"select the partition to resize, and specify its new size. So in most cases "
+"you should not need to use the method described below."
 msgstr ""
 "各常见的安装中，其中有一种就是希望在已经安装有 DOS(含 Windows 3.1)、Win32(如 "
 "Windows 95、98、Me、NT、2000、XP) 或者 OS/2 的系统上加装 Debian 到同一块硬盘"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 9f58e6692..e47984cd5 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: 2006-10-12 17:29+0000\n"
+"POT-Creation-Date: 2006-10-26 16:19+0000\n"
 "PO-Revision-Date: 2006-10-16 15:44+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -210,12 +210,12 @@ msgstr "限制"
 
 #. Tag: para
 #: preseed.xml:135
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Although most questions used by &d-i; can be preseeded using this method, "
 "there are some notable exceptions. You must (re)partition an entire disk or "
 "use available free space on a disk; it is not possible to use existing "
-"partitions. You currently cannot use preseeding to set up RAID."
+"partitions."
 msgstr ""
 "虽然使用这种方法能预先设置 &d-i; 的绝大多数问答，但还是有明显的例外。您必须"
 "(重新)分区整个硬盘，或者使用磁盘上的剩余空间; 但无法使用已经存在的分区。当前"
@@ -1071,15 +1071,14 @@ msgstr "分区"
 
 #. Tag: para
 #: preseed.xml:628
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is very much limited to what is "
 "supported by <classname>partman-auto</classname>. You can choose to either "
 "partition existing free space on a disk or a whole disk. The layout of the "
 "disk can be determined by using a predefined recipe, a custom recipe from a "
 "recipe file or a recipe included in the preconfiguration file. It is "
-"currently not possible to partition multiple disks using preseeding nor to "
-"set up RAID."
+"currently not possible to partition multiple disks using preseeding."
 msgstr ""
 "使用预置分区硬盘受限于 <classname>partman-auto</classname> 提供的支持。您可以"
 "选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定义配"
@@ -1087,7 +1086,7 @@ msgstr ""
 "立 RAID。"
 
 #. Tag: para
-#: preseed.xml:640
+#: preseed.xml:639
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1098,13 +1097,13 @@ msgstr ""
 "确的那一个。"
 
 #. Tag: screen
-#: preseed.xml:648
-#, no-c-format
+#: preseed.xml:647
+#, fuzzy, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# Note: this must be preseeded with a localized (translated) value.\n"
 "#d-i partman-auto/init_automatically_partition \\\n"
-"#      select Use the largest continuous free space\n"
+"#      select Guided - use the largest continuous free space\n"
 "\n"
 "# Alternatively, you can specify a disk to partition. The device name\n"
 "# can be given in either devfs or traditional non-devfs format.\n"
@@ -1137,7 +1136,8 @@ msgid ""
 "# 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 the preconfiguration file in one\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"
@@ -1193,7 +1193,8 @@ msgstr ""
 "#       select Separate /home, /usr, /var, and /tmp partitions\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe.txt.\n"
+"# The recipe format is documented in the file devel/partman-auto-recipe."
+"txt.\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"
@@ -1225,13 +1226,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:653
+#: preseed.xml:652
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "使用 RAID 分区"
 
 #. Tag: para
-#: preseed.xml:654
+#: preseed.xml:653
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1239,10 +1240,13 @@ msgid ""
 "specifying spare devices. If you are using RAID 1, you can preseed grub to "
 "install to all devices used in the array; see <xref linkend=\"preseed-"
 "bootloader\"/>."
-msgstr "您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1 和 5，建立降级阵列(degraded arrays)和指定额外设备。如果使用了 RAID 1，您可以预置 grub 来安装阵列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
+msgstr ""
+"您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1 和 5，建立降级阵列"
+"(degraded arrays)和指定额外设备。如果使用了 RAID 1，您可以预置 grub 来安装阵"
+"列中的所有设备；参见 <xref linkend=\"preseed-bootloader\"/>。"
 
 #. Tag: para
-#: preseed.xml:664
+#: preseed.xml:663
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also a very "
@@ -1250,19 +1254,24 @@ msgid ""
 "responsibility to get the various recipes right (so they make sense and "
 "don't conflict) lies with the user. Check <filename>/var/log/syslog</"
 "filename> if you run into problems."
-msgstr "这种自动分区方式很容易出错。它是一个非常新的模块，可能还有很多 bug 或者缺少错误的处理。让各种方案正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查一下 <filename>/var/log/syslog</filename>。"
+msgstr ""
+"这种自动分区方式很容易出错。它是一个非常新的模块，可能还有很多 bug 或者缺少错"
+"误的处理。让各种方案正确(有意义而不冲突)的责任在于用户。如果您遇到问题，检查"
+"一下 <filename>/var/log/syslog</filename>。"
 
 #. Tag: para
-#: preseed.xml:672
+#: preseed.xml:671
 #, no-c-format
 msgid ""
 "Note that only RAID 0 and RAID 1 have been tested by the developers of the "
 "component. RAID 5 is untested. Advanced RAID setup with degraded arrays or "
 "spare devices has only been tested lightly."
-msgstr "注意，该模块的开发人员只测试了 RAID 0 和 RAID 1。RAID 5 未经测试。高级的 RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
+msgstr ""
+"注意，该模块的开发人员只测试了 RAID 0 和 RAID 1。RAID 5 未经测试。高级的 "
+"RAID 设置像降级阵列或额外设备只经过了轻量级的测试。"
 
 #. Tag: screen
-#: preseed.xml:680
+#: preseed.xml:679
 #, no-c-format
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
@@ -1337,7 +1346,8 @@ msgstr ""
 "# used in the RAID setup. Remember to use the correct partition numbers\n"
 "# for logical partitions.\n"
 "# Parameters are:\n"
-"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;mountpoint&gt; \\\n"
+"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
+"mountpoint&gt; \\\n"
 "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
 "# RAID levels 0, 1 and 5 are supported; devices are separated using \"#\"\n"
 "#d-i partman-auto-raid/recipe string \\\n"
@@ -1359,13 +1369,13 @@ msgstr ""
 "d-i partman/confirm boolean true"
 
 #. Tag: title
-#: preseed.xml:685
+#: preseed.xml:684
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "时钟与时区设置"
 
 #. Tag: screen
-#: preseed.xml:687
+#: preseed.xml:686
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1383,13 +1393,13 @@ msgstr ""
 "d-i time/zone string US/Eastern"
 
 #. Tag: title
-#: preseed.xml:692
+#: preseed.xml:691
 #, no-c-format
 msgid "Apt setup"
 msgstr "设置 apt"
 
 #. Tag: para
-#: preseed.xml:693
+#: preseed.xml:692
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1402,7 +1412,7 @@ msgstr ""
 "仓库。"
 
 #. Tag: screen
-#: preseed.xml:701
+#: preseed.xml:700
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -1438,13 +1448,13 @@ msgstr ""
 "#d-i apt-setup/local0/key string http://local.server/key"
 
 #. Tag: title
-#: preseed.xml:706
+#: preseed.xml:705
 #, no-c-format
 msgid "Account setup"
 msgstr "帐号设置"
 
 #. Tag: para
-#: preseed.xml:707
+#: preseed.xml:706
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1455,7 +1465,7 @@ msgstr ""
 "或 MD5 <emphasis>hashes</emphasis> 值。"
 
 #. Tag: para
-#: preseed.xml:714
+#: preseed.xml:713
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1468,7 +1478,7 @@ msgstr ""
 "MD5 哈西表相对安全一些，但也会造成安全的假象，MD5 哈西表也可以被暴力破解。"
 
 #. Tag: screen
-#: preseed.xml:724
+#: preseed.xml:723
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1514,7 +1524,7 @@ msgstr ""
 "#d-i passwd/user-password-crypted password [MD5 hash]"
 
 #. Tag: para
-#: preseed.xml:726
+#: preseed.xml:725
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1531,26 +1541,26 @@ msgstr ""
 "root 登录(例如使用 SSH key 认证或 sudo)。"
 
 #. Tag: para
-#: preseed.xml:736
+#: preseed.xml:735
 #, no-c-format
 msgid ""
 "An MD5 hash for a password can be generated using the following command."
 msgstr "密码的 MD5 hash 可以用下面命令产生。"
 
 #. Tag: screen
-#: preseed.xml:740
+#: preseed.xml:739
 #, no-c-format
 msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
 
 #. Tag: title
-#: preseed.xml:746
+#: preseed.xml:745
 #, no-c-format
 msgid "Base system installation"
 msgstr "基本系统安装"
 
 #. Tag: para
-#: preseed.xml:747
+#: preseed.xml:746
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -1559,7 +1569,7 @@ msgid ""
 msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
 
 #. Tag: screen
-#: preseed.xml:754
+#: preseed.xml:753
 #, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1571,13 +1581,13 @@ msgstr ""
 "#d-i base-installer/kernel/linux/initramfs-generators string yaird"
 
 #. Tag: title
-#: preseed.xml:759
+#: preseed.xml:758
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "安装引导加载器"
 
 #. Tag: screen
-#: preseed.xml:761
+#: preseed.xml:760
 #, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1625,13 +1635,13 @@ msgstr ""
 "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 
 #. Tag: title
-#: preseed.xml:766
+#: preseed.xml:765
 #, no-c-format
 msgid "Package selection"
 msgstr "选择软件包"
 
 #. Tag: para
-#: preseed.xml:767
+#: preseed.xml:766
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -1639,73 +1649,73 @@ msgid ""
 msgstr "您可以选择安装存在的任务的组合。写这篇文章时已有的任务是："
 
 #. Tag: userinput
-#: preseed.xml:776
+#: preseed.xml:775
 #, no-c-format
 msgid "standard"
 msgstr "标准"
 
 #. Tag: userinput
-#: preseed.xml:779
+#: preseed.xml:778
 #, no-c-format
 msgid "desktop"
 msgstr "桌面"
 
 #. Tag: userinput
-#: preseed.xml:782
+#: preseed.xml:781
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome 桌面"
 
 #. Tag: userinput
-#: preseed.xml:785
+#: preseed.xml:784
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde 桌面"
 
 #. Tag: userinput
-#: preseed.xml:788
+#: preseed.xml:787
 #, no-c-format
 msgid "web-server"
 msgstr "web 服务器"
 
 #. Tag: userinput
-#: preseed.xml:791
+#: preseed.xml:790
 #, no-c-format
 msgid "print-server"
 msgstr "打印服务器"
 
 #. Tag: userinput
-#: preseed.xml:794
+#: preseed.xml:793
 #, no-c-format
 msgid "dns-server"
 msgstr "dns 服务器"
 
 #. Tag: userinput
-#: preseed.xml:797
+#: preseed.xml:796
 #, no-c-format
 msgid "file-server"
 msgstr "文件服务器"
 
 #. Tag: userinput
-#: preseed.xml:800
+#: preseed.xml:799
 #, no-c-format
 msgid "mail-server"
 msgstr "邮件服务器"
 
 #. Tag: userinput
-#: preseed.xml:803
+#: preseed.xml:802
 #, no-c-format
 msgid "sql-database"
 msgstr "SQL 数据库"
 
 #. Tag: userinput
-#: preseed.xml:806
+#: preseed.xml:805
 #, no-c-format
 msgid "laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: preseed.xml:810
+#: preseed.xml:809
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -1716,7 +1726,7 @@ msgstr ""
 "userinput> 任务。"
 
 #. Tag: para
-#: preseed.xml:816
+#: preseed.xml:815
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -1728,7 +1738,7 @@ msgstr ""
 "include</classname>。该参数的值可以用逗号或空格分开，便于在内核命令行上使用。"
 
 #. Tag: screen
-#: preseed.xml:826
+#: preseed.xml:825
 #, no-c-format
 msgid ""
 "tasksel tasksel/first multiselect standard, desktop\n"
@@ -1758,13 +1768,13 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:831
+#: preseed.xml:830
 #, no-c-format
 msgid "Finishing up the first stage install"
 msgstr "完成第一阶段安装"
 
 #. Tag: screen
-#: preseed.xml:833
+#: preseed.xml:832
 #, no-c-format
 msgid ""
 "# Avoid that last message about the install being complete.\n"
@@ -1782,13 +1792,13 @@ msgstr ""
 "#d-i cdrom-detect/eject boolean false"
 
 #. Tag: title
-#: preseed.xml:838
+#: preseed.xml:837
 #, no-c-format
 msgid "Mailer configuration"
 msgstr "邮件设置"
 
 #. Tag: para
-#: preseed.xml:839
+#: preseed.xml:838
 #, no-c-format
 msgid ""
 "During a normal install, exim asks only a few questions. Here's how to avoid "
@@ -1797,7 +1807,7 @@ msgstr ""
 "普通安装方式下，exim 会问一些问题。这里是避免的方法。也可以有更多的预置内容。"
 
 #. Tag: screen
-#: preseed.xml:846
+#: preseed.xml:845
 #, no-c-format
 msgid ""
 "exim4-config exim4/dc_eximconfig_configtype \\\n"
@@ -1813,13 +1823,13 @@ msgstr ""
 "exim4-config exim4/dc_postmaster string"
 
 #. Tag: title
-#: preseed.xml:851
+#: preseed.xml:850
 #, no-c-format
 msgid "X configuration"
 msgstr "设置 X"
 
 #. Tag: para
-#: preseed.xml:852
+#: preseed.xml:851
 #, no-c-format
 msgid ""
 "Preseeding Debian's X config is possible, but you probably need to know some "
@@ -1830,7 +1840,7 @@ msgstr ""
 "的 X 配置工具无法自动设置每一件事。"
 
 #. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:859
 #, no-c-format
 msgid ""
 "# X can detect the right driver for some cards, but if you're preseeding,\n"
@@ -1878,13 +1888,13 @@ msgstr ""
 "       select 1024x768 @ 60 Hz"
 
 #. Tag: title
-#: preseed.xml:865
+#: preseed.xml:864
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "预置其他的软件包"
 
 #. Tag: screen
-#: preseed.xml:867
+#: preseed.xml:866
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -1904,19 +1914,19 @@ msgstr ""
 "#   debconf-get-selections >> file"
 
 #. Tag: title
-#: preseed.xml:873
+#: preseed.xml:872
 #, no-c-format
 msgid "Advanced options"
 msgstr "高级选项"
 
 #. Tag: title
-#: preseed.xml:876
+#: preseed.xml:875
 #, no-c-format
 msgid "Shell commands"
 msgstr "shell 命令"
 
 #. Tag: screen
-#: preseed.xml:878
+#: preseed.xml:877
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1954,13 +1964,13 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:883
+#: preseed.xml:882
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr "预置文件链"
 
 #. Tag: para
-#: preseed.xml:884
+#: preseed.xml:883
 #, no-c-format
 msgid ""
 "It is possible to include other preconfiguration files from a "
@@ -1974,7 +1984,7 @@ msgstr ""
 "另外的文件里面。"
 
 #. Tag: screen
-#: preseed.xml:894
+#: preseed.xml:893
 #, no-c-format
 msgid ""
 "# More that one file can be listed, separated by spaces; all will be\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 7a87ccdbc..0b8bde624 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: 2006-10-17 08:26+0000\n"
+"POT-Creation-Date: 2006-10-26 16:20+0000\n"
 "PO-Revision-Date: 2006-10-25 20:54+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1164,8 +1164,8 @@ msgid ""
 "for a whole disk, you will first be asked to select the disk you want to "
 "use. Check that all your disks are listed and, if you have several disks, "
 "make sure you select the correct one. The order they are listed in may "
-"differ from what you are used to. The size of the disks may help to "
-"identify them."
+"differ from what you are used to. The size of the disks may help to identify "
+"them."
 msgstr ""
 "假如用向导式分区(经典方式或(加密)LVM)选择整个磁盘，您会首先被要求选择将要使用"
 "的磁盘。检查一下您所有的磁盘都被列出，如果您有多个磁盘，确认所选是您真正要使"
@@ -1826,11 +1826,11 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:1216
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example if "
 "you have three 200 GB hard drives dedicated to MD, each containing two 100 "
-"GB partitions, you can combine first partitions on all three disk into the "
+"GB partitions, you can combine first partitions on all three disks into the "
 "RAID0 (fast 300 GB video editing partition) and use the other three "
 "partitions (2 active and 1 spare) for RAID1 (quite reliable 100 GB partition "
 "for <filename>/home</filename>)."
@@ -2477,13 +2477,17 @@ msgid ""
 "volumes and optionally change the file system types if the defaults do not "
 "suit you."
 msgstr ""
-"返回主分区菜单后，您将看到所有的加密卷作为额外的分区，它们可以像其他的普通分区一样配置。下面例子中显示了两种不同的卷。第一个是使用 dm-crypt 加密的，第二个采用 loop-AES。<informalexample><screen>\n"
-"Encrypted volume (<replaceable>sda2_crypt</replaceable>) - 115.1 GB Linux device-mapper\n"
+"返回主分区菜单后，您将看到所有的加密卷作为额外的分区，它们可以像其他的普通分"
+"区一样配置。下面例子中显示了两种不同的卷。第一个是使用 dm-crypt 加密的，第二"
+"个采用 loop-AES。<informalexample><screen>\n"
+"Encrypted volume (<replaceable>sda2_crypt</replaceable>) - 115.1 GB Linux "
+"device-mapper\n"
 "     #1 115.1 GB  F ext3\n"
 "\n"
 "Loopback (<replaceable>loop0</replaceable>) - 515.2 MB AES256 keyfile\n"
 "     #1 515.2 MB  F ext3\n"
-"</screen></informalexample> 现在可以给卷设置挂载点，如果默认的文件系统类型对您不合适，可以进行修改。"
+"</screen></informalexample> 现在可以给卷设置挂载点，如果默认的文件系统类型对"
+"您不合适，可以进行修改。"
 
 #. Tag: para
 #: using-d-i.xml:1682
@@ -2496,7 +2500,11 @@ msgid ""
 "differences between ordinary boot process and boot process with encryption "
 "involved will be covered later in <xref linkend=\"mount-encrypted-volumes\"/"
 ">."
-msgstr "这里有一点要注意，即 parentheses 里的标识(本例中 <replaceable>sda2_crypt</replaceable> 和 <replaceable>loop0</replaceable>)以及您为每个加密卷所设置的加载点。当启动新系统的时候您会需要此信息。有关普通引导过程和使用加密后引导过程的差异，将在后面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
+msgstr ""
+"这里有一点要注意，即 parentheses 里的标识(本例中 <replaceable>sda2_crypt</"
+"replaceable> 和 <replaceable>loop0</replaceable>)以及您为每个加密卷所设置的加"
+"载点。当启动新系统的时候您会需要此信息。有关普通引导过程和使用加密后引导过程"
+"的差异，将在后面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
 
 #. Tag: para
 #: using-d-i.xml:1692