Update of POT and PO files for the manual

7 files changed, 119 insertions, 60 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 57f7e6e64..c949325ac 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: 2006-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-08-02 18:39+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -917,11 +917,11 @@ msgstr "从 CD 光盘上引导"
 #. Tag: para
 #: boot-installer.xml:546 boot-installer.xml:716 boot-installer.xml:1126
 #: boot-installer.xml:1947 boot-installer.xml:2287 boot-installer.xml:2641
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The easiest route for most people will be to use a set of Debian CDs. If you "
 "have a CD set, and if your machine supports booting directly off the CD, "
-"great! Simply <phrase arch=\"i386\"> configure your system for booting off a "
+"great! Simply <phrase arch=\"x86\"> configure your system for booting off a "
 "CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> insert "
 "your CD, reboot, and proceed to the next chapter."
 msgstr ""
@@ -3686,7 +3686,12 @@ msgid ""
 "those with ATI graphical cards. If you see display problems in the "
 "installer, you can try booting with parameter <userinput>debian-installer/"
 "framebuffer=true</userinput> or <userinput>fb=true</userinput> for short."
-msgstr "由于某些系统上显示有问题，framebuffer 的支持在 &arch-title; 上<emphasis>默认是禁止的</emphasis>。这让能良好支持 framebuffer 的系统显示得很丑陋，比如那些采用 ATI 图形卡的系统。如果您在安装程序中遇到显示问题，可以试着在引导时使用参数 <userinput>debian-installer/framebuffer=true</userinput> 或简写为 <userinput>fb=true</userinput>。"
+msgstr ""
+"由于某些系统上显示有问题，framebuffer 的支持在 &arch-title; 上<emphasis>默认"
+"是禁止的</emphasis>。这让能良好支持 framebuffer 的系统显示得很丑陋，比如那些"
+"采用 ATI 图形卡的系统。如果您在安装程序中遇到显示问题，可以试着在引导时使用参"
+"数 <userinput>debian-installer/framebuffer=true</userinput> 或简写为 "
+"<userinput>fb=true</userinput>。"
 
 #. Tag: term
 #: boot-installer.xml:2985
@@ -3953,11 +3958,11 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:3158
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Often, problems can be solved by removing add-ons and peripherals, and then "
-"trying booting again. <phrase arch=\"i386\">Internal modems, sound cards, "
-"and Plug-n-Play devices can be especially problematic.</phrase>"
+"trying booting again. <phrase arch=\"x86\">Internal modems, sound cards, and "
+"Plug-n-Play devices can be especially problematic.</phrase>"
 msgstr ""
 "通常，可以通过移除外挂硬件或者外围设备来解决问题，然后再次重新引导。<phrase "
 "arch=\"i386\">内置调制解调器，声卡以及即插即用的设备通常很容易引起问题。</"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index e7a596f2e..1a12785cc 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: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-05-21 18:25+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -840,11 +840,11 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:633
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "After that, mount the USB memory stick (<userinput>mount <replaceable arch="
-"\"i386\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/sda2</"
-"replaceable> /mnt</userinput>), which will now have <phrase arch=\"i386\">a "
+"\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/sda2</"
+"replaceable> /mnt</userinput>), which will now have <phrase arch=\"x86\">a "
 "FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS filesystem</phrase> "
 "on it, and copy a Debian netinst or businesscard ISO image to it. Please "
 "note that the file name must end in <filename>.iso</filename>. Unmount the "
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index c41ed6bcd..d42fcbe62 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-06-07 23:10+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -129,9 +129,9 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:79
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"i386"
+"Download whichever type you prefer and burn it to a CD. <phrase arch=\"x86"
 "\">To boot the CD, you may need to change your BIOS configuration, as "
 "explained in <xref linkend=\"bios-setup\"/>.</phrase> <phrase arch=\"powerpc"
 "\"> To boot a PowerMac from CD, press the <keycap>c</keycap> key while "
@@ -331,7 +331,7 @@ msgstr "从硬盘启动"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
@@ -339,7 +339,7 @@ msgid ""
 "filename>, and a Debian CD image to the top-level directory of the hard "
 "disk. Make sure that the CD image has a filename ending in <literal>.iso</"
 "literal>. Now it's just a matter of booting linux with the initrd. <phrase "
-"arch=\"i386\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
+"arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
 "phrase>"
 msgstr ""
 "除了从移动介质启动安装套件，其实从手中现有的安装了其它操作系統的硬盘启动也是"
@@ -357,11 +357,11 @@ msgstr "安装"
 
 #. Tag: para
 #: installation-howto.xml:211
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Once the installer starts, you will be greeted with an initial screen. Press "
 "&enterkey; to boot, or read the instructions for other boot methods and "
-"parameters (see <xref linkend=\"boot-parms\"/>). <phrase arch=\"i386\"> If "
+"parameters (see <xref linkend=\"boot-parms\"/>). <phrase arch=\"x86\"> If "
 "you want a 2.4 kernel, type <userinput>install24</userinput> at the "
 "<prompt>boot:</prompt> prompt. <footnote><para> The 2.6 kernel is the "
 "default for most boot methods, but is not available when booting from a "
@@ -479,11 +479,11 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:280
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The last step is to install a boot loader. If the installer detects other "
 "operating systems on your computer, it will add them to the boot menu and "
-"let you know. <phrase arch=\"i386\">By default GRUB will be installed to the "
+"let you know. <phrase arch=\"x86\">By default GRUB will be installed to the "
 "master boot record of the first harddrive, which is generally a good choice. "
 "You'll be given the opportunity to override that choice and install it "
 "elsewhere. </phrase>"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index d2183fd5e..e705f4341 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-07-30 15:28+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-08-02 19:13+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -356,7 +356,11 @@ msgid ""
 "filename>, <filename>/lib</filename> and <filename>/dev</filename>, "
 "otherwise you won't be able to boot. Typically 150&ndash;250MB is needed for "
 "the root partition."
-msgstr "根分区 <filename>/</filename> 必须总是物理地包含 <filename>/etc</filename>、<filename>/bin</filename>、<filename>/sbin</filename>、<filename>/lib</filename> 和 <filename>/dev</filename>，否则您将不能启动系统。典型的根分区需要 150&ndash;250MB 大小空间。"
+msgstr ""
+"根分区 <filename>/</filename> 必须总是物理地包含 <filename>/etc</filename>、"
+"<filename>/bin</filename>、<filename>/sbin</filename>、<filename>/lib</"
+"filename> 和 <filename>/dev</filename>，否则您将不能启动系统。典型的根分区需"
+"要 150&ndash;250MB 大小空间。"
 
 #. Tag: para
 #: partitioning.xml:161
@@ -369,7 +373,12 @@ msgid ""
 "of disk space. This amount should be increased depending on the number and "
 "type of packages you plan to install. A generous workstation or server "
 "installation should allow 4&ndash;6GB."
-msgstr "<filename>/usr</filename>：包含所有的用户程序(<filename>/usr/bin</filename>)，库文件(<filename>/usr/lib</filename>)，文档(<filename>/usr/share/doc</filename>)，等等。这是文件系统中耗费空间最多的部分。您需要提供至少 500MB 磁盘空间。总容量会依据您要安装的软件包数量和类型增长。大的工作站或服务器安装应该需要 4&ndash;6GB。"
+msgstr ""
+"<filename>/usr</filename>：包含所有的用户程序(<filename>/usr/bin</"
+"filename>)，库文件(<filename>/usr/lib</filename>)，文档(<filename>/usr/share/"
+"doc</filename>)，等等。这是文件系统中耗费空间最多的部分。您需要提供至少 "
+"500MB 磁盘空间。总容量会依据您要安装的软件包数量和类型增长。大的工作站或服务"
+"器安装应该需要 4&ndash;6GB。"
 
 #. Tag: para
 #: partitioning.xml:174
@@ -386,7 +395,15 @@ msgid ""
 "followed by text stuff, then X, ...), you can get away with 300&ndash;500 "
 "MB. If hard drive space is at a premium and you don't plan on doing major "
 "system updates, you can get by with as little as 30 or 40 MB."
-msgstr "<filename>/var</filename>：所有的可变数据，如新的文章，电子邮件，网站，数据库，软件包系统的缓存等等，将被放入这个目录。这个目录的大小取决于您计算机的用途，但是对于大多数人来说将主要用在软件包系统的管理工具。如果您准备一次性地做一个完整的安装，包含 Debian 提供的所有程序，<filename>/var</filename> 下面 2 或 3GB 的空间应该满足需求。如果您准备逐个安装(也就是说，安装服务程序和工具，然后是文本处理工具，然后是 X，...)，您可以在 <filename>/var</filename> 下准备 300&ndash;500 MB。如果硬盘空间很紧张，并且不准备做主要的系统升级，您可以为其配置 30 或 40MB 大小。"
+msgstr ""
+"<filename>/var</filename>：所有的可变数据，如新的文章，电子邮件，网站，数据"
+"库，软件包系统的缓存等等，将被放入这个目录。这个目录的大小取决于您计算机的用"
+"途，但是对于大多数人来说将主要用在软件包系统的管理工具。如果您准备一次性地做"
+"一个完整的安装，包含 Debian 提供的所有程序，<filename>/var</filename> 下面 2 "
+"或 3GB 的空间应该满足需求。如果您准备逐个安装(也就是说，安装服务程序和工具，"
+"然后是文本处理工具，然后是 X，...)，您可以在 <filename>/var</filename> 下准"
+"备 300&ndash;500 MB。如果硬盘空间很紧张，并且不准备做主要的系统升级，您可以为"
+"其配置 30 或 40MB 大小。"
 
 #. Tag: para
 #: partitioning.xml:190
@@ -398,7 +415,12 @@ msgid ""
 "and multimedia software &mdash; may use <filename>/tmp</filename> to "
 "temporarily store image files. If you plan to use such applications, you "
 "should adjust the space available in <filename>/tmp</filename> accordingly."
-msgstr "<filename>/tmp</filename>: 程序创建的临时数据大都存到这个目录。通常 40&ndash;100 MB 应该足够。一些应用程序 &mdash; 包括档案处理器，CD/DVD 制作工具，和多媒体软件 &mdash; 可能会使用 <filename>/tmp</filename> 临时保存映像文件。如果您要使用这些程序，应该相应地调整 <filename>/tmp</filename> 目录的大小。"
+msgstr ""
+"<filename>/tmp</filename>: 程序创建的临时数据大都存到这个目录。通常 "
+"40&ndash;100 MB 应该足够。一些应用程序 &mdash; 包括档案处理器，CD/DVD 制作工"
+"具，和多媒体软件 &mdash; 可能会使用 <filename>/tmp</filename> 临时保存映像文"
+"件。如果您要使用这些程序，应该相应地调整 <filename>/tmp</filename> 目录的大"
+"小。"
 
 #. Tag: para
 #: partitioning.xml:201
@@ -411,7 +433,11 @@ msgid ""
 "user, but adapt this value to your needs. Reserve a lot more space if you "
 "plan to save a lot of multimedia files (pictures, MP3, movies) in your home "
 "directory."
-msgstr "<filename>/home</filename>：每个用户将放置他的个人数据到这个目录的子目录下。其大小取决于将有多少用户使用系统，以及有什么文件放在他们的目录下。根据规划的用途，您应该为每个用户准备 100MB 空间，不过应该按您的需求调整。假如您在 home 目录下计划保存大量的多媒体文件(图片、MP3、电影)，该预备更多的空间。"
+msgstr ""
+"<filename>/home</filename>：每个用户将放置他的个人数据到这个目录的子目录下。"
+"其大小取决于将有多少用户使用系统，以及有什么文件放在他们的目录下。根据规划的"
+"用途，您应该为每个用户准备 100MB 空间，不过应该按您的需求调整。假如您在 home "
+"目录下计划保存大量的多媒体文件(图片、MP3、电影)，该预备更多的空间。"
 
 #. Tag: title
 #: partitioning.xml:222
@@ -461,7 +487,14 @@ msgid ""
 "good to have a separate, large <filename>/home</filename> partition. In "
 "general, the partitioning situation varies from computer to computer "
 "depending on its uses."
-msgstr "假如您计划安装许多不是 Debian 分发版本的程序的时候，也许需要一个独立的 <filename>/usr/local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/var/mail</filename> 建立一个独立的分区。通常情况下，<filename>/tmp</filename> 放在它自己独立的分区，比如 20&ndash;50MB 是一个好主意。如果您要创建一个带有多个用户的服务器，通常需要一个独立的、大的 <filename>/home</filename> 分区。一般来说，分区状况对每台计算机都有所不同，这取决于他们的用途。"
+msgstr ""
+"假如您计划安装许多不是 Debian 分发版本的程序的时候，也许需要一个独立的 "
+"<filename>/usr/local</filename> 分区。如果您的机器是一个邮件服务器，也许需要"
+"为 <filename>/var/mail</filename> 建立一个独立的分区。通常情况下，<filename>/"
+"tmp</filename> 放在它自己独立的分区，比如 20&ndash;50MB 是一个好主意。如果您"
+"要创建一个带有多个用户的服务器，通常需要一个独立的、大的 <filename>/home</"
+"filename> 分区。一般来说，分区状况对每台计算机都有所不同，这取决于他们的用"
+"途。"
 
 #. Tag: para
 #: partitioning.xml:252
@@ -800,10 +833,10 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:484
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Recommended partitioning tool in Debian. This Swiss army knife can also "
-"resize partitions, create filesystems <phrase arch=\"i386\"> (<quote>format</"
+"resize partitions, create filesystems <phrase arch=\"x86\"> (<quote>format</"
 "quote> in Windows speak)</phrase> and assign them to the mountpoints."
 msgstr ""
 "推荐的 Debian 分区工具。这个小而全的工具可以修改分区大小，创建文件系统 "
@@ -831,7 +864,10 @@ msgid ""
 "<command>fdisk</command> represents them (or not) can make the device names "
 "differ. See the <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</"
 "ulink>."
-msgstr "请注意，如果您的机器上有一个 FreeBSD 分区。安装内核包括这些分区的支持，但是 <command>fdisk</command> 表示他们的设备名称方式可能有所不同(也可能不是)。参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
+msgstr ""
+"请注意，如果您的机器上有一个 FreeBSD 分区。安装内核包括这些分区的支持，但是 "
+"<command>fdisk</command> 表示他们的设备名称方式可能有所不同(也可能不是)。参"
+"阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
 
 #. Tag: command
 #: partitioning.xml:512
@@ -942,7 +978,7 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:582
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you will be working with more than 20 partitions on your ide disk, you "
 "will need to create devices for partitions 21 and beyond. The next step of "
@@ -961,7 +997,7 @@ msgid ""
 "# mknod hda21 b 3 21\n"
 "# chgrp disk hda21\n"
 "# chmod 660 hda21\n"
-"</screen></informalexample> <phrase arch=\"i386\">Remember to mark your boot "
+"</screen></informalexample> <phrase arch=\"x86\">Remember to mark your boot "
 "partition as <quote>Bootable</quote>.</phrase>"
 msgstr ""
 "如果您的 ide 磁盘上超过 20 个分区，您将需要为 21 以上的分区创建设备。除非有正"
@@ -1017,7 +1053,12 @@ msgid ""
 "&architecture;, but if your disk has an existing DOS partition table the "
 "existing partitions will need to be deleted before <command>partman</"
 "command> can convert it to use a disk label."
-msgstr "从 SRM 控制台引导 Debian (惟一能被 &releasename; 支持的启动方法)要求您的启动盘上有 BSD disk label，而不是 DOS 分区。(注意，SRM 引导块不和 MS-DOS 分区兼容 &mdash; 参阅 <xref linkend=\"alpha-firmware\"/>。)因此，<command>partman</command> 在 &architecture; 上运行时会创建 BSD disk label，如果您的磁盘上已经存在一个 DOS 分区表，在 partman 转换到 disk label 前需要将它删除。"
+msgstr ""
+"从 SRM 控制台引导 Debian (惟一能被 &releasename; 支持的启动方法)要求您的启动"
+"盘上有 BSD disk label，而不是 DOS 分区。(注意，SRM 引导块不和 MS-DOS 分区兼"
+"容 &mdash; 参阅 <xref linkend=\"alpha-firmware\"/>。)因此，<command>partman</"
+"command> 在 &architecture; 上运行时会创建 BSD disk label，如果您的磁盘上已经"
+"存在一个 DOS 分区表，在 partman 转换到 disk label 前需要将它删除。"
 
 #. Tag: para
 #: partitioning.xml:629
@@ -1126,7 +1167,12 @@ msgid ""
 "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."
-msgstr "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留它们，您应该重新设置分区大小，释放更多的空间给 Debian 安装程序。安装程序支持修改 FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 <guimenuitem>Manually edit partition table</guimenuitem>选项，然后只需选择该分区，并更改其尺寸。"
+msgstr ""
+"如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留"
+"它们，您应该重新设置分区大小，释放更多的空间给 Debian 安装程序。安装程序支持"
+"修改 FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 "
+"<guimenuitem>Manually edit partition table</guimenuitem>选项，然后只需选择该"
+"分区，并更改其尺寸。"
 
 #. Tag: para
 #: partitioning.xml:712
@@ -1269,7 +1315,10 @@ msgid ""
 "points to ensure that the disks and filesystems are properly configured for "
 "a successful installation. It actually uses <command>parted</command> to do "
 "the on-disk partitioning."
-msgstr "<command>partman</command> 是安装程序的缺省分区工具。它管理一系列分区以及挂载点，对于一个成功的安装确保磁盘和文件系统有合适的配置。实际上它使用的是 <command>parted</command> 来进行磁盘分区的。"
+msgstr ""
+"<command>partman</command> 是安装程序的缺省分区工具。它管理一系列分区以及挂载"
+"点，对于一个成功的安装确保磁盘和文件系统有合适的配置。实际上它使用的是 "
+"<command>parted</command> 来进行磁盘分区的。"
 
 #. Tag: title
 #: partitioning.xml:811
@@ -1287,7 +1336,12 @@ msgid ""
 "<command>cfdisk</command>, you should only use <ulink url=\"parted.txt\"> "
 "<command>parted</command></ulink> because only it can manage both GPT and MS-"
 "DOS tables correctly."
-msgstr "IA64 EFI 固件支持 GPT 和 MS-DOS 两种分区表(或者 disk label)格式。MS-DOS 格式通常用在 i386 PC 上，对于 IA64 已经不建议使用。尽管安装程序同时提供了 <command>cfdisk</command>，您应该只采用 <ulink url=\"parted.txt\"> <command>parted</command></ulink>，因为只有它能够同时正确地管理 GPT 和 MS-DOS 分区表。"
+msgstr ""
+"IA64 EFI 固件支持 GPT 和 MS-DOS 两种分区表(或者 disk label)格式。MS-DOS 格式"
+"通常用在 i386 PC 上，对于 IA64 已经不建议使用。尽管安装程序同时提供了 "
+"<command>cfdisk</command>，您应该只采用 <ulink url=\"parted.txt\"> "
+"<command>parted</command></ulink>，因为只有它能够同时正确地管理 GPT 和 MS-"
+"DOS 分区表。"
 
 #. Tag: para
 #: partitioning.xml:824
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 2b7a292e4..1e46d229f 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2006-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-05-13 15:18+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -609,7 +609,7 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:419
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Once the compilation is complete, you can install your custom kernel like "
 "any package. As root, do <phrase condition=\"classic-kpkg\"> <userinput>dpkg "
@@ -618,7 +618,7 @@ msgid ""
 "condition=\"common-kpkg\"> <userinput>dpkg -i ../linux-image-&kernelversion;-"
 "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</"
 "userinput>. </phrase> The <replaceable>subarchitecture</replaceable> part is "
-"an optional sub-architecture, <phrase arch=\"i386\"> such as <quote>i586</"
+"an optional sub-architecture, <phrase arch=\"x86\"> such as <quote>i586</"
 "quote>, </phrase> depending on what kernel options you set. <userinput>dpkg -"
 "i</userinput> will install the kernel, along with some other nice supporting "
 "files. For instance, the <filename>System.map</filename> will be properly "
@@ -731,11 +731,11 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
 "file system you selected, which you can use to perform any necessary "
-"repairs. <phrase arch=\"i386\"> For example, if you need to reinstall the "
+"repairs. <phrase arch=\"x86\"> For example, if you need to reinstall the "
 "GRUB boot loader into the master boot record of the first hard disk, you "
 "could enter the command <userinput>grub-install '(hd0)'</userinput> to do "
 "so. </phrase>"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 75f222cc5..9a1fa1686 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-07-25 21:39+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-07-10 11:07+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1207,18 +1207,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:804
-#, no-c-format
-msgid ""
-"If you already have an operating system on your system <phrase arch=\"i386"
-"\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, "
-"&hellip;) </phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, "
-"Windows NT, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
-"OS/390, &hellip;) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac "
-"OS, &hellip;) </phrase> and want to stick Linux on the same disk, you will "
-"need to repartition the disk. Debian requires its own hard disk partitions. "
-"It cannot be installed on Windows or MacOS partitions. It may be able to "
-"share some partitions with other Linux systems, but that's not covered here. "
-"At the very least you will need a dedicated partition for the Debian root."
+#, fuzzy, no-c-format
+msgid ""
+"If you already have an operating system on your system <phrase arch=\"x86\"> "
+"(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
+"phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, "
+"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
+"&hellip;) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, "
+"&hellip;) </phrase> and want to stick Linux on the same disk, you will need "
+"to repartition the disk. Debian requires its own hard disk partitions. It "
+"cannot be installed on Windows or MacOS partitions. It may be able to share "
+"some partitions with other Linux systems, but that's not covered here. At "
+"the very least you will need a dedicated partition for the Debian root."
 msgstr ""
 "如果您已经在您的机器中安装有操作系统 <phrase arch=\"i386\"> (Windows 9x, "
 "Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
@@ -1232,10 +1232,10 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "You can find information about your current partition setup by using a "
-"partitioning tool for your current operating system<phrase arch=\"i386\">, "
+"partitioning tool for your current operating system<phrase arch=\"x86\">, "
 "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as "
 "Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as "
 "HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as "
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index ab9bb7aa5..54c08c19b 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-08-02 19:07+0000\n"
+"POT-Creation-Date: 2006-08-07 22:39+0000\n"
 "PO-Revision-Date: 2006-08-02 19:37+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2511,13 +2511,13 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:1717
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
 "set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are "
 "normally set to local time. If you want to dual-boot, select local time "
-"instead of GMT.</phrase> <phrase arch=\"i386\">Systems that (also) run Dos "
-"or Windows are normally set to local time. If you want to dual-boot, select "
+"instead of GMT.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or "
+"Windows are normally set to local time. If you want to dual-boot, select "
 "local time instead of GMT.</phrase>"
 msgstr ""
 "在 expert 模式下，您总是可以选择时钟是否设为 UTC。<phrase arch=\"m68k;powerpc"