po/zh_CN: unfuzzy install-methods.

2 files changed, 66 insertions, 177 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index c0701aeb7..146910ecf 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-10-17 00:09+0000\n"
-"PO-Revision-Date: 2008-10-23 10:31+0800\n"
+"PO-Revision-Date: 2008-10-29 13:43+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1332,7 +1332,7 @@ msgstr ""
 #: boot-installer.xml:978
 #, no-c-format
 msgid "Booting from USB Memory Stick"
-msgstr "从 USB 闪盘引导"
+msgstr "从 U 盘引导"
 
 #. Tag: para
 #: boot-installer.xml:979
@@ -3175,7 +3175,7 @@ msgstr ""
 #: boot-installer.xml:2534
 #, no-c-format
 msgid "Booting from USB memory stick"
-msgstr "从 USB 闪盘引导"
+msgstr "从 U 盘引导"
 
 #. Tag: para
 #: boot-installer.xml:2535
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index b8b2d160f..d8d5c1c1c 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2008-10-17 00:09+0000\n"
-"PO-Revision-Date: 2008-09-11 23:43+0800\n"
+"PO-Revision-Date: 2008-10-29 13:42+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -118,16 +118,14 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:90
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "When downloading files from a Debian mirror, be sure to download the "
 #| "files in <emphasis>binary</emphasis> mode, not text or automatic mode."
 msgid ""
 "When downloading files from a Debian mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
-msgstr ""
-"当从 Debian 镜像服务器下载文件的时候，请确认下载的文件是处于<emphasis>二进制"
-"</emphasis>模式，而不是文本或者自动模式。"
+msgstr "当使用 FTP 从 Debian 镜像服务器下载文件的时候，请确认下载的文件是处于<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
 
 #. Tag: title
 #: install-methods.xml:98
@@ -837,7 +835,7 @@ msgstr ""
 #: install-methods.xml:634
 #, no-c-format
 msgid "Preparing Files for USB Memory Stick Booting"
-msgstr "为从 USB 闪盘引导准备文件"
+msgstr "为从 U 盘引导准备文件"
 
 #. Tag: para
 #: install-methods.xml:636
@@ -847,7 +845,7 @@ msgid ""
 "first is to install completely from the network. The second is to also copy "
 "a CD image onto the USB stick and use that as a source for packages, "
 "possibly in combination with a mirror. This second method is the more common."
-msgstr ""
+msgstr "从 U 盘启动安装系统有两种方式。第一种是完全通过网络安装。第二种是将 CD 映象复制到 U 盘作为软件包的源，并可以结合其他镜像。第二种方式更常用一些。"
 
 #. Tag: para
 #: install-methods.xml:644
@@ -857,7 +855,7 @@ msgid ""
 "from the <filename>netboot</filename> directory (at the location mentioned "
 "in <xref linkend=\"where-files\"/>) and use the <quote>flexible way</quote> "
 "explained below to copy the files to the USB stick."
-msgstr ""
+msgstr "对于第一种安装方式，您需要从 <filename>netboot</filename> 目录(在 <xref linkend=\"where-files\"/> 里面提到位置)下载安装映象，并按照下面所说的<quote>灵活方法</quote>复制文件到 U 盘。"
 
 #. Tag: para
 #: install-methods.xml:652
@@ -874,11 +872,11 @@ msgid ""
 "version of the kernel module udebs included on the CD image is different "
 "from the version of the running kernel. </para> </footnote> during the "
 "installation."
-msgstr ""
+msgstr "第二种安装方式的安装映象放在 <filename>hd-media</filename> 目录，可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
 
 #. Tag: para
 #: install-methods.xml:671
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "To prepare the USB stick, you will need a system where GNU/Linux is "
 #| "already running and where USB is supported. You should ensure that the "
@@ -896,15 +894,11 @@ msgid ""
 "should be able to see to which device the USB stick was mapped by running "
 "the command <command>dmesg</command> after inserting it. To write to your "
 "stick, you may have to turn off its write protection switch."
-msgstr ""
-"为了准备 USB 闪盘，您需要一台支持 USB 的运行的 GNU/Linux 系统。应确定 usb-"
-"storage 内核模块已经被加载(<userinput>modprobe usb-storage</userinput>)，然后"
-"找出 USB 闪盘被映射到的哪个 SCSI 设备(此处以 <filename>/dev/sda</filename> 为"
-"例)。为了写入闪盘，您可能需要关闭它的写保护开关。"
+msgstr "为了准备 U 盘，您需要一台运行的支持 USB 的 GNU/Linux 系统。当前的 GNU/Linux 系统会在您插入 U 盘的时候自动识别。如果没有，您应该确认 usb-storage 内核模块是否已经被加载。U 盘插入后，它将被映射到名为 <filename>/dev/sdX</filename> 的设备，其中的 <quote>X</quote> 是 a-z 的字母。您可以通过运行 <command>dmesg</command> 在插入 U 盘后确认是否被正确映射。要写入信息，请要先打开它上面的写保护开关。"
 
 #. Tag: para
 #: install-methods.xml:685
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Using this method will destroy anything already on the device. Make sure "
 #| "that you use the correct device name for your USB stick."
@@ -913,8 +907,7 @@ msgid ""
 "the device! Make very sure that you use the correct device name for your USB "
 "stick. If you use the wrong device the result could be that all information "
 "on for example a hard disk could be lost."
-msgstr ""
-"采用这种方法将销毁设备上的任何内容。请确保您使用了 USB 闪盘的正确设备名。"
+msgstr "采用这种方法将销毁设备上已有的任何内容！请确认您使用了正确的 U 盘设备名。如果搞错，比如写成硬盘，将造成该设备上的所有信息丢失。"
 
 #. Tag: para
 #: install-methods.xml:693
@@ -922,9 +915,7 @@ msgstr ""
 msgid ""
 "Note that the USB stick should be at least 256 MB in size (smaller setups "
 "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
-msgstr ""
-"注意，USB 闪盘至少要有 256MB 的容量(更小的尺寸安装也是可能的，请参阅 <xref "
-"linkend=\"usb-copy-flexible\"/>)。"
+msgstr "注意，U 盘至少要有 256MB 的容量(更小的尺寸安装也是可能的，请参阅 <xref linkend=\"usb-copy-flexible\"/>)。"
 
 #. Tag: title
 #: install-methods.xml:701
@@ -934,7 +925,7 @@ msgstr "复制文件 &mdash; 轻松的途径"
 
 #. Tag: para
 #: install-methods.xml:702
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
 #| "which contains all the installer files (including the kernel) as well as "
@@ -946,10 +937,7 @@ msgid ""
 "\">as well as <classname>syslinux</classname> and its configuration file.</"
 "phrase> <phrase arch=\"powerpc\">as well as <classname>yaboot</classname> "
 "and its configuration file.</phrase>"
-msgstr ""
-"这里有一个合集文件 <filename>hd-media/boot.img.gz</filename>，其中包含了所有"
-"的安装程序文件(包括内核)，以及 <command>SYSLINUX</command> 和它的配置文件。只"
-"须把它直接解压到您的 USB 闪盘内即可："
+msgstr "有一个文件合集 <filename>hd-media/boot.img.gz</filename> 包含所有的安装程序文件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应的配置文件。</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</classname> 和对应的配置文件。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:711
@@ -962,25 +950,25 @@ msgid ""
 "ever want to use it for some different purpose. A second disadvantage is "
 "that you cannot copy a full CD image onto the USB stick, but only the "
 "smaller businesscard or netinst CD images."
-msgstr ""
+msgstr "需要注意的是，虽然方便，但该方法有一个主要的缺点： 即使 U 盘很大，设备的逻辑尺寸还是限制在 256 MB。如果您要将该 U 盘用作其他用途，需要为它重新分区，为其余容量创建一个新的文件系统。次要的缺点是您无法复制完整的 CD 映象到 U 盘，只能使用较小的 businesscard 或 netinst CD 映象。"
 
 #. Tag: para
 #: install-methods.xml:721
 #, no-c-format
 msgid ""
 "To use this image you only have to extract it directly to your USB stick:"
-msgstr ""
+msgstr "使用该映象只须将它直接解压到 U 盘："
 
 #. Tag: screen
 #: install-methods.xml:725
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
-msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
+msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:727
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> "
 #| "which contains all the installer files (including the kernel) as well as "
@@ -992,22 +980,18 @@ msgid ""
 "Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
 "<command>mac-fdisk</command>'s <userinput>C</userinput> command and extract "
 "the image directly to that:"
-msgstr ""
-"这里有一个合集文件 <filename>hd-media/boot.img.gz</filename>，其中包含了所有"
-"的安装程序文件(包括内核)，以及 <command>yaboot</command> 和它的配置文件。您可"
-"以使用 <command>mac-fdisk</command> 的 <userinput>C</userinput> 命令在您的 "
-"USB 闪盘上创建一个类型为 \"Apple_Bootstrap\" 的分区，然后直接解开映像文件到："
+msgstr "在 U 盘上创建 \"Apple_Bootstrap\" 分区类型使用 <command>mac-fdisk</command> 的 <userinput>C</userinput> 命令，并直接解压映象："
 
 #. Tag: screen
 #: install-methods.xml:733
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
-msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
+msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:735
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "After that, mount the USB memory stick (<userinput>mount <replaceable "
 #| "arch=\"x86\">/dev/sda</replaceable> <replaceable arch=\"powerpc\">/dev/"
@@ -1025,13 +1009,7 @@ msgid ""
 "filesystem</phrase> on it, and copy a Debian netinst or businesscard ISO "
 "image to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
 "are done."
-msgstr ""
-"然后，挂载 USB 闪盘(<userinput>mount <replaceable arch=\"x86\">/dev/sda</"
-"replaceable> <replaceable arch=\"powerpc\">/dev/sda2</replaceable> /mnt</"
-"userinput>)，它上面应该已经有<phrase arch=\"x86\">一个 FAT 文件系统</phrase> "
-"<phrase arch=\"powerpc\">一个 HFS 文件系统</phrase> ，再将一个 Debian "
-"netinst 或 businesscard ISO 映像拷贝到盘上(见 <xref linkend=\"usb-add-iso\"/"
-">)。卸载闪盘(<userinput>umount /mnt</userinput>)后结束。"
+msgstr "然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>)，</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>)，</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，复制 Debian netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
 
 #. Tag: title
 #: install-methods.xml:752
@@ -1041,7 +1019,7 @@ msgstr "复制文件 &mdash; 灵活的方法"
 
 #. Tag: para
 #: install-methods.xml:753
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you like more flexibility or just want to know what's going on, you "
 #| "should use the following method to put the files on your stick."
@@ -1051,16 +1029,14 @@ msgid ""
 "advantage of using this method is that &mdash; if the capacity of your USB "
 "stick is large enough &mdash; you have the option of copying a full CD ISO "
 "image to it."
-msgstr ""
-"如果您需要更多的灵活性，或者只是想了解其间发生了什么，应该使用如下的方法来把"
-"文件放到您的闪盘。"
+msgstr "如果您需要更多的灵活性，或者只是想了解其间发生了什么，应该使用如下的方法来把文件放到 U 盘。"
 
 #. Tag: title
 #: install-methods.xml:768 install-methods.xml:865
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Booting the USB stick"
 msgid "Partitioning the USB stick"
-msgstr "从 USB 闪盘启动"
+msgstr "给 U 盘分区"
 
 #. Tag: para
 #: install-methods.xml:769
@@ -1068,11 +1044,11 @@ msgstr "从 USB 闪盘启动"
 msgid ""
 "We will show how to set up the memory stick to use the first partition, "
 "instead of the entire device."
-msgstr "我们将展示如何使用闪盘的第一个分区，而不是整个设备。"
+msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设备。"
 
 #. Tag: para
 #: install-methods.xml:774
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Since most USB sticks come pre-configured with a single FAT16 partition, "
 #| "you probably won't have to repartition or reformat the stick. If you have "
@@ -1094,16 +1070,13 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> Debian package."
 msgstr ""
-"由于大多数 USB 闪盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者"
-"格式化 USB 闪盘。如果必须这么做，请使用 <command>cfdisk</command> 或者其他的"
-"分区工具来创建一个 FAT16 分区，建立文件系统使用：<informalexample><screen>\n"
-"# mkdosfs /dev/<replaceable>sda1</replaceable>\n"
-"</screen></informalexample> 注意使用正确的 USB 盘设备名称。<command>mkdosfs</"
-"command> 命令包含在 <classname>dosfstools</classname> Debian 软件包中。"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区，然后建立文件系统：<informalexample><screen>\n"
+"# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
+"</screen></informalexample> 注意，请使用正确的 U 盘设备名称。<command>mkdosfs</command> 命令包含在 Debian 的 <classname>dosfstools</classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:788
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "In order to start the kernel after booting from the USB stick, we will "
 #| "put a boot loader on the stick. Although any boot loader (e.g. "
@@ -1119,16 +1092,11 @@ msgid ""
 "classname>, since it uses a FAT16 partition and can be reconfigured by just "
 "editing a text file. Any operating system which supports the FAT file system "
 "can be used to make changes to the configuration of the boot loader."
-msgstr ""
-"为了在 USB 闪盘引导后启动内核，我们要在 USB 闪盘上放入一个 boot loader。尽管"
-"任何 boot loader (比如 <command>LILO</command>)都应该可以胜任，不过还是使用 "
-"<command>SYSLINUX</command> 更方便。主要原因是它可以使用 FAT16 分区，而且只需"
-"要编辑一个文本文件就能对其进行配置。任何支持 FAT 文件系统的操作系统都可以用来"
-"改变 boot loader 的配置文件。"
+msgstr "为了在 U 盘引导后启动内核，我们要在 U 盘上放入一个 boot loader。尽管任何 boot loader (比如 <classname>lilo</classname>)都应该可以胜任，不过还是使用 <classname>syslinux</classname> 更方便。主要原因是它可以使用 FAT16 分区，而且只需要编辑一个文本文件就能对其进行配置。任何支持 FAT 文件系统的操作系统都可以用来改变 boot loader 的配置文件。"
 
 #. Tag: para
 #: install-methods.xml:798
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "To put <command>SYSLINUX</command> on the FAT16 partition on your USB "
 #| "stick, install the <classname>syslinux</classname> and <classname>mtools</"
@@ -1150,25 +1118,20 @@ msgid ""
 "the file <filename>ldlinux.sys</filename> which contains the boot loader "
 "code."
 msgstr ""
-"为了把 <command>SYSLINUX</command> 放到 USB 闪盘的 FAT16 分区上，请在您的系统"
-"中安装 <classname>syslinux</classname> 和 <classname>mtools</classname> 包，"
-"然后执行： <informalexample><screen>\n"
-"# syslinux /dev/<replaceable>sda1</replaceable>\n"
-"</screen></informalexample> 再提醒一次，请确认您使用的是正确的设备名称。还"
-"有，一定不能在启动 <command>SYSLINUX</command> 的时候挂载该分区，因为在操作过"
-"程中会向分区的引导扇区写入数据，并且创建包含 boot loader 代码的 "
-"<filename>ldlinux.sys</filename> 文件。"
+"为了把 <classname>syslinux</classname> 放到 U 盘的 FAT16 分区上，请在您的系统中安装 <classname>syslinux</classname> 和 <classname>mtools</classname> 软件包，然后执行： <informalexample><screen>\n"
+"# syslinux /dev/<replaceable>sdX1</replaceable>\n"
+"</screen></informalexample> 再提醒一次，请确认您使用的是正确的设备名称。启动 <command>syslinux</command> 的时候该分区不能被挂载，因为该过程会向分区的引导扇区写入数据，并且创建包含 boot loader 代码的 <filename>ldlinux.sys</filename> 文件。"
 
 #. Tag: title
 #: install-methods.xml:815 install-methods.xml:912
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Adding an ISO image"
 msgid "Adding the installer image"
-msgstr "添加 ISO 映像"
+msgstr "添加安装程序映像"
 
 #. Tag: para
 #: install-methods.xml:816
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Mount the partition (<userinput>mount /dev/sda1 /mnt</userinput>) and "
 #| "copy the following files from the Debian archives to the stick: "
@@ -1189,15 +1152,7 @@ msgid ""
 "latter can be found in the <filename>gtk</filename> subdirectory. If you "
 "want to rename the files, please note that <classname>syslinux</classname> "
 "can only process DOS (8.3) file names."
-msgstr ""
-"接下来就是挂载分区(<userinput>mount /dev/sda1 /mnt</userinput>)，以及将下列文"
-"件从 Debian 文件库拷贝到闪盘上： <itemizedlist> <listitem><para> "
-"<filename>vmlinuz</filename> (内核二进制文件) </para></listitem> "
-"<listitem><para> <filename>initrd.gz</filename> (初始化内存映像) </para></"
-"listitem> <listitem><para> <filename>syslinux.cfg</filename> (SYSLINUX 配置文"
-"件) </para></listitem> <listitem><para> 可选的内核模块 </para></listitem> </"
-"itemizedlist> 如果您想给这些文件改名，请注意 <command>SYSLINUX</command> 只能"
-"处理 DOS (8.3) 格式的文件名。"
+msgstr "挂载分区 (<userinput>mount /dev/<replaceable>sdX1</replaceable> /mnt</userinput>) 并复制下面的安装程序映象文件到 U 盘：<itemizedlist> <listitem><para> <filename>vmlinuz</filename> (kernel binary) </para></listitem> <listitem><para> <filename>initrd.gz</filename> (initial ramdisk image) </para></listitem> </itemizedlist> 您可以选择使用文本界面或者图形安装界面安装程序。后者可以从 <filename>gtk</filename> 子目录获得。假如您需要改文件名，请注意 <classname>syslinux</classname> 只遵循 DOS (8.3) 命名方式。"
 
 #. Tag: para
 #: install-methods.xml:840
@@ -1211,6 +1166,10 @@ msgid ""
 "</screen></informalexample> For the graphical installer you should add "
 "<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line."
 msgstr ""
+"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要包含下面两行： <informalexample><screen>\n"
+"default vmlinuz\n"
+"append initrd=initrd.gz\n"
+"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>video=vesa:ywrap,mtrr vga=788</userinput> 到第二行尾部。"
 
 #. Tag: para
 #: install-methods.xml:850 install-methods.xml:952
@@ -1220,11 +1179,11 @@ msgid ""
 "Debian ISO image (businesscard, netinst or full CD image; be sure to select "
 "one that fits) onto the stick. When you are done, unmount the USB memory "
 "stick (<userinput>umount /mnt</userinput>)."
-msgstr ""
+msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 Debian ISO 映象(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:866
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Most USB sticks do not come pre-configured in such a way that Open "
 #| "Firmware can boot from them, so you will need to repartition the stick. "
@@ -1251,14 +1210,9 @@ msgid ""
 "for your USB stick. The <command>hformat</command> command is contained in "
 "the <classname>hfsutils</classname> Debian package."
 msgstr ""
-"绝大多数 USB 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为闪"
-"盘重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/sda</userinput>，"
-"用 <userinput>i</userinput> 命令初始化新的分区映射，然后使用 <userinput>C</"
-"userinput> 命令创建一个新的类型为 Apple_Bootstrap 的分区。(要注意的是第一个分"
-"区总是分区映射本身。)然后键入 <informalexample><screen>\n"
-"$ hformat /dev/<replaceable>sda2</replaceable>\n"
-"</screen></informalexample> 注意使用正确的 USB 盘设备名称。<command>hformat</"
-"command> 命令包含在 <classname>hfsutils</classname> Debian 包中。"
+"绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>，用 <userinput>i</userinput> 命令初始化新的分区映射，然后使用 <userinput>C</userinput> 命令创建一个新的类型为 Apple_Bootstrap 的分区。(要注意的是第一个\"分区\"总是分区映射本身。) 然后键入 <informalexample><screen>\n"
+"$ hformat /dev/<replaceable>sdX2</replaceable>\n"
+"</screen></informalexample> 注意使用正确的 U 盘设备名称。<command>hformat</command> 命令包含在 Debian 的 <classname>hfsutils</classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:883
@@ -1269,15 +1223,11 @@ msgid ""
 "installed on an HFS filesystem and can be reconfigured by just editing a "
 "text file. Any operating system which supports the HFS file system can be "
 "used to make changes to the configuration of the boot loader."
-msgstr ""
-"为了能在 USB 闪盘引导后启动内核，我们要在 USB 闪盘上放入一个启动引导程序。"
-"<command>yaboot</command> 启动引导器可以被安装到 HFS 文件系统上，而且只需要编"
-"辑一个文本文件就能对其重新进行配置。任何支持 HFS 文件系统的操作系统可以用来改"
-"变启动引导器的配置文件。"
+msgstr "为了能在 U 盘引导后启动内核，我们要在 U 盘上放入一个启动引导程序。<command>yaboot</command> 启动引导器可以被安装到 HFS 文件系统上，而且只需要编辑一个文本文件就能对其重新进行配置。任何支持 HFS 文件系统的操作系统可以用来改变启动引导器的配置文件。"
 
 #. Tag: para
 #: install-methods.xml:892
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The normal <command>ybin</command> tool that comes with <command>yaboot</"
 #| "command> does not yet understand USB storage devices, so you will have to "
@@ -1311,32 +1261,24 @@ msgid ""
 "done this, the rest of the USB stick may be prepared using the normal Unix "
 "utilities."
 msgstr ""
-"常用的 <command>ybin</command> 工具(随 <command>yaboot</command> 附带)并不能"
-"识别 USB 存储设备，因此您不得不手动安装 <command>yaboot</command>，这可以通"
-"过 <classname>hfsutils</classname> 工具来完成。用法如下： "
-"<informalexample><screen>\n"
-"$ hmount /dev/sda2\n"
+"常用的 <command>ybin</command> 工具(随 <command>yaboot</command> 附带)并不能识别 USB 存储设备，因此您不得不手动安装 <command>yaboot</command>，这可以通过 <classname>hfsutils</classname> 工具来完成。用法如下： <informalexample><screen>\n"
+"$ hmount /dev/<replaceable>sdX2</replaceable>\n"
 "$ hcopy -r /usr/lib/yaboot/yaboot :\n"
 "$ hattrib -c UNIX -t tbxi :yaboot\n"
 "$ hattrib -b :\n"
 "$ humount\n"
-"</screen></informalexample> 再提醒一次，请确认您使用的是正确的设备名称。操作"
-"过程中一定不能挂载此分区。程序会向分区中写入启动引导器，并使用 HFS 工具向其添"
-"加标记，最终使得 Open Fireware 可以启动它。完成以上操作之后，USB 盘的其他部分"
-"就可以用普通的 Unix 工具来处理了。"
+"</screen></informalexample> 再提醒一次，请确认您使用的是正确的设备名称。操作过程中一定不能挂载此分区。程序会向分区中写入 boot loader，并使用 HFS 工具向其添加标记，最终使得 Open Fireware 可以启动它。完成以上操作之后，U 盘的其他部分就可以用普通的 Unix 工具来处理了。"
 
 #. Tag: para
 #: install-methods.xml:913
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and "
 #| "copy the following files from the Debian archives to the stick:"
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
 "mnt</userinput>) and copy the following installer image files to the stick:"
-msgstr ""
-"接下来就是挂接分区(<userinput>mount /dev/sda2 /mnt</userinput>)以及将下列文件"
-"从 Debian 文件库拷贝到闪盘上："
+msgstr "接下来就是挂载分区(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>)，然后复制下面的安装程序映象文件到 U 盘："
 
 #. Tag: para
 #: install-methods.xml:920
@@ -1402,7 +1344,7 @@ msgstr ""
 #: install-methods.xml:967
 #, no-c-format
 msgid "Booting the USB stick"
-msgstr "从 USB 闪盘启动"
+msgstr "从 U 盘启动"
 
 #. Tag: para
 #: install-methods.xml:968
@@ -1411,17 +1353,14 @@ msgid ""
 "If your system refuses to boot from the memory stick, the stick may contain "
 "an invalid master boot record (MBR). To fix this, use the <command>install-"
 "mbr</command> command from the package <classname>mbr</classname>:"
-msgstr ""
-"如果您的系统拒绝从 USB 闪盘引导，那么可能是因为它含有无效的主引导扇区记录"
-"(MBR)。您可以使用 <command>install-mbr</command> 命令来修复这个问题，该命令来"
-"自 <classname>mbr</classname> 软件包："
+msgstr "如果您的系统拒绝从 U 盘引导，那么可能是因为它含有无效的主引导扇区记录(MBR)。您可以使用 <command>install-mbr</command> 命令来修复这个问题，该命令来自 <classname>mbr</classname> 软件包："
 
 #. Tag: screen
 #: install-methods.xml:975
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "# install-mbr /dev/<replaceable>sda</replaceable>"
 msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
-msgstr "# install-mbr /dev/<replaceable>sda</replaceable>"
+msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"
 
 #. Tag: title
 #: install-methods.xml:986
@@ -2495,53 +2434,3 @@ msgid ""
 msgstr ""
 "在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档，并有一些可"
 "以使用的例子供您修改。"
-
-# index.docbook:645, index.docbook:739
-#~ msgid "USB stick partitioning on &arch-title;"
-#~ msgstr "在 &arch-title; 上为 USB 闪盘分区"
-
-#~ msgid ""
-#~ "The <filename>syslinux.cfg</filename> configuration file should contain "
-#~ "the following two lines:"
-#~ msgstr "<filename>syslinux.cfg</filename> 配置文件应包含以下两行："
-
-#~ msgid ""
-#~ "default vmlinuz\n"
-#~ "append initrd=initrd.gz"
-#~ msgstr ""
-#~ "default vmlinuz\n"
-#~ "append initrd=initrd.gz"
-
-#~ msgid "Optional kernel modules"
-#~ msgstr "可选的内核模块"
-
-#~ msgid ""
-#~ "The installer will look for a Debian ISO image on the stick as its source "
-#~ "for additional data needed for the installation. So your next step is to "
-#~ "copy a Debian ISO image (businesscard, netinst or even a full CD image) "
-#~ "onto your stick (be sure to select one that fits). The file name of the "
-#~ "image must end in <filename>.iso</filename>."
-#~ msgstr ""
-#~ "安装程序将在盘上寻找一个 Debian ISO 映像作为安装其他数据的源。因此您下一步"
-#~ "是复制一个 Debian ISO 映像(businesscard、netinst 或者甚至是完全版)到您的 "
-#~ "USB 闪盘内(确定选择适合的那个)。映像文件的后缀名必须是 <filename>.iso</"
-#~ "filename>。"
-
-#~ msgid ""
-#~ "If you want to install over the network, without using an ISO image, you "
-#~ "will of course skip the previous step. Moreover you will have to use the "
-#~ "initial ramdisk from the <filename>netboot</filename> directory instead "
-#~ "of the one from <filename>hd-media</filename>, because <filename>hd-media/"
-#~ "initrd.gz</filename> does not have network support."
-#~ msgstr ""
-#~ "如果您想直接通过网络安装而不使用 ISO 映像，当然就可以跳过上述步骤。并且您"
-#~ "必须要使用 <filename>netboot</filename> 目录中的初始化内存映像来取代来自 "
-#~ "<filename>hd-media</filename> 的相同文件。这是因为 <filename>hd-media/"
-#~ "initrd.gz</filename> 并不包含网络支持。"
-
-#~ msgid ""
-#~ "When you are done, unmount the USB memory stick (<userinput>umount /mnt</"
-#~ "userinput>) and activate its write protection switch."
-#~ msgstr ""
-#~ "当您完成后，卸载 USB 闪盘(<userinput>umount /mnt</userinput>)，并打开写保"
-#~ "护开关。"