Refresh PO(T) files

1 files changed, 197 insertions, 300 deletions

diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c022f10f6..c1b30c3d2 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-10-29 05:56+0000\n"
 "PO-Revision-Date: 2010-10-27 23:00+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -27,20 +27,6 @@ msgstr "官方的 &debian-gnu; 光盘套装"
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official Debian "
-#| "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-#| "debian-cd-vendors;\">CD vendors page</ulink>). You may also download the "
-#| "CD-ROM images from a Debian mirror and make your own set, if you have a "
-#| "fast network connection and a CD burner (see the <ulink url=\"&url-debian-"
-#| "cd;\">Debian CD page</ulink> for detailed instructions). If you have a "
-#| "Debian CD set and CDs are bootable on your machine, you can skip right to "
-#| "<xref linkend=\"boot-installer\"/>; much effort has been expended to "
-#| "ensure the files most people need are there on the CD. Although a full "
-#| "set of binary packages requires several CDs, it is unlikely you will need "
-#| "packages on the third CD and above. You may also consider using the DVD "
-#| "version, which saves a lot of space on your shelf and you avoid the CD "
-#| "shuffling marathon."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
 "CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -54,23 +40,20 @@ msgid ""
 "packages requires several CDs, it is unlikely you will need packages on the "
 "third CD and above. You may also consider using the DVD version, which saves "
 "a lot of space on your shelf and you avoid the CD shuffling marathon."
-msgstr "目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。如果您有快速的网络连接和光盘刻录机的话，也可以从 &debian; 镜像站点下载 CD-ROM 映像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</ulink>)。如果您有一套 &debian; 的 CD 套件并且能在机器上引导这些 CD 盘，可以直接跳至 <xref linkend=\"boot-installer\"/>。我们已经做了很多努力来确保 CD 中已经包含了大多数人所需要的文件。尽管一整套预编译的二进制软件包需要好几张 CD 盘，但是您可能不会用到第三张 CD 盘以后的内容。也可以考虑使用 DVD 版本，这将为您的书架节约很多光盘存放空间，并且可以避免马拉松式地切换 CD。"
+msgstr ""
+"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从"
+"一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
+"ulink>)。如果您有快速的网络连接和光盘刻录机的话，也可以从 &debian; 镜像站点下"
+"载 CD-ROM 映像然后自行刻录光盘(具体参见 <ulink url=\"&url-debian-cd;"
+"\">Debian CD 页</ulink>)。如果您有一套 &debian; 的 CD 套件并且能在机器上引导"
+"这些 CD 盘，可以直接跳至 <xref linkend=\"boot-installer\"/>。我们已经做了很多"
+"努力来确保 CD 中已经包含了大多数人所需要的文件。尽管一整套预编译的二进制软件"
+"包需要好几张 CD 盘，但是您可能不会用到第三张 CD 盘以后的内容。也可以考虑使用 "
+"DVD 版本，这将为您的书架节约很多光盘存放空间，并且可以避免马拉松式地切换 CD。"
 
 #. Tag: para
 #: install-methods.xml:30
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the Debian network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
 msgid ""
 "If your machine doesn't support CD booting, but you do have a CD set, you "
 "can use an alternative strategy such as <phrase condition=\"supports-floppy-"
@@ -83,7 +66,15 @@ msgid ""
 "organization are identical. So when archive file paths are given below for "
 "particular files you need for booting, look for those files in the same "
 "directories and subdirectories on your CD."
-msgstr "如果您的机器不支持 CD 盘引导，但是您有一套 CD 光盘套件，可以使用其他的方法比如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、磁带仿真、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp\">网络引导，</phrase> 或者从 CD 中手工装载内核来初始化系统安装程序。CD 已经包含了通过其他方法引导所需要的文件; &debian; 的网络存档和 CD 的文件夹组织方式是一致的。因此如果后面有给出的用于引导的特定存档文件路径时，请在 CD 中同样的文件目录和子目录下查找它们。"
+msgstr ""
+"如果您的机器不支持 CD 盘引导，但是您有一套 CD 光盘套件，可以使用其他的方法比"
+"如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch="
+"\"s390\">磁带、磁带仿真、</phrase> <phrase condition=\"bootable-disk\">硬盘、"
+"</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase "
+"condition=\"supports-tftp\">网络引导，</phrase> 或者从 CD 中手工装载内核来初"
+"始化系统安装程序。CD 已经包含了通过其他方法引导所需要的文件; &debian; 的网络"
+"存档和 CD 的文件夹组织方式是一致的。因此如果后面有给出的用于引导的特定存档文"
+"件路径时，请在 CD 中同样的文件目录和子目录下查找它们。"
 
 #. Tag: para
 #: install-methods.xml:52
@@ -113,32 +104,28 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:83
 #, no-c-format
-#| msgid "Downloading Files from Debian Mirrors"
 msgid "Downloading Files from &debian; Mirrors"
 msgstr "从 &debian; 镜像服务器下载文件"
 
 #. Tag: para
 #: install-methods.xml:85
 #, no-c-format
-#| msgid ""
-#| "To find the nearest (and thus probably the fastest) mirror, see the "
-#| "<ulink url=\"&url-debian-mirrors;\">list of Debian mirrors</ulink>."
 msgid ""
 "To find the nearest (and thus probably the fastest) mirror, see the <ulink "
 "url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
-msgstr "选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-debian-mirrors;\">&debian; 镜像列表</ulink>。"
+msgstr ""
+"选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-"
+"debian-mirrors;\">&debian; 镜像列表</ulink>。"
 
 #. Tag: para
 #: install-methods.xml:90
 #, no-c-format
-#| msgid ""
-#| "When downloading files from a Debian mirror using FTP, be sure to "
-#| "download the files in <emphasis>binary</emphasis> mode, not text or "
-#| "automatic mode."
 msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
 "the files in <emphasis>binary</emphasis> mode, not text or automatic mode."
-msgstr "当使用 FTP 从 &debian; 镜像服务器下载文件的时候，请确认下载的文件是处于<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
+msgstr ""
+"当使用 FTP 从 &debian; 镜像服务器下载文件的时候，请确认下载的文件是处于"
+"<emphasis>二进制</emphasis>模式，而不是文本或者自动模式。"
 
 #. Tag: title
 #: install-methods.xml:98
@@ -149,19 +136,17 @@ msgstr "在哪里能找到安装映像"
 #. Tag: para
 #: install-methods.xml:100
 #, no-c-format
-#| msgid ""
-#| "The installation images are located on each Debian mirror in the "
-#| "directory <ulink url=\"&url-debian-installer;images\">debian/dists/"
-#| "&releasename;/main/installer-&architecture;/current/images/</ulink> "
-#| "&mdash; the <ulink url=\"&url-debian-installer;images/MANIFEST"
-#| "\">MANIFEST</ulink> lists each image and its purpose."
 msgid ""
 "The installation images are located on each &debian; mirror in the directory "
 "<ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/"
 "installer-&architecture;/current/images/</ulink> &mdash; the <ulink url="
 "\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> lists each image "
 "and its purpose."
-msgstr "安装映像位于每一个 &debian; 镜像的 <ulink url=\"&url-debian-installer;images\">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink> &mdash; <ulink url=\"&url-debian-installer;images/MANIFEST\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
+msgstr ""
+"安装映像位于每一个 &debian; 镜像的 <ulink url=\"&url-debian-installer;images"
+"\">debian/dists/&releasename;/main/installer-&architecture;/current/images/</"
+"ulink> &mdash; <ulink url=\"&url-debian-installer;images/MANIFEST"
+"\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
 
 #. Tag: title
 #: install-methods.xml:113
@@ -210,15 +195,13 @@ msgstr "GLAN Tank 安装文件"
 #. Tag: para
 #: install-methods.xml:139
 #, no-c-format
-#| msgid ""
-#| "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &glantank-firmware-img;."
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
 "on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
-msgstr "GLAN Tank 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这些映象可以从 &glantank-firmware-img; 获得。"
+msgstr ""
+"GLAN Tank 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这"
+"些映象可以从 &glantank-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:149
@@ -229,15 +212,13 @@ msgstr "Kurobox Pro 安装文件"
 #. Tag: para
 #: install-methods.xml:150
 #, no-c-format
-#| msgid ""
-#| "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
-#| "disk on which you intend to install Debian. These images can be obtained "
-#| "from &kuroboxpro-firmware-img;."
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
 "disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
-msgstr "Kurobox Pro 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。这些映象可以从 &kuroboxpro-firmware-img; 获得。"
+msgstr ""
+"Kurobox Pro 需要内核和 ramdisk，位于您打算安装 &debian; 的 ext2 磁盘分区上。"
+"这些映象可以从 &kuroboxpro-firmware-img; 获得。"
 
 #. Tag: title
 #: install-methods.xml:160
@@ -360,7 +341,12 @@ msgid ""
 "mode. This is required because these images are raw representations of the "
 "disk; it is required to do a <emphasis>sector copy</emphasis> of the data "
 "from the file onto the floppy."
-msgstr "软盘映像是一些包含完整的 <emphasis>raw</emphasis> 格式软盘内容的文件。类似 <filename>boot.img</filename> 这样的软盘映像不能直接复制到软盘中。有一个特殊的程序可以将它们按 <emphasis>raw</emphasis> 模式写入软盘。这是一个必须的步骤，因为这些映像文件是一些原始的磁盘保存方式。所以需要把文件的数据<emphasis>按扇区复制</emphasis>到软盘中。"
+msgstr ""
+"软盘映像是一些包含完整的 <emphasis>raw</emphasis> 格式软盘内容的文件。类似 "
+"<filename>boot.img</filename> 这样的软盘映像不能直接复制到软盘中。有一个特殊"
+"的程序可以将它们按 <emphasis>raw</emphasis> 模式写入软盘。这是一个必须的步"
+"骤，因为这些映像文件是一些原始的磁盘保存方式。所以需要把文件的数据<emphasis>"
+"按扇区复制</emphasis>到软盘中。"
 
 #. Tag: para
 #: install-methods.xml:285
@@ -376,19 +362,16 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:291
 #, no-c-format
-#| msgid ""
-#| "Before you can create the floppies, you will first need to download them "
-#| "from one of the Debian mirrors, as explained in <xref linkend="
-#| "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
-#| "installation CD-ROM or DVD, the floppy images may also be included on the "
-#| "CD/DVD.</phrase>"
 msgid ""
 "Before you can create the floppies, you will first need to download them "
 "from one of the &debian; mirrors, as explained in <xref linkend="
 "\"downloading-files\"/>. <phrase arch=\"i386\">If you already have an "
 "installation CD-ROM or DVD, the floppy images may also be included on the CD/"
 "DVD.</phrase>"
-msgstr "制作软盘之前，您首先需要从 &debian; 镜像下载这些文件，见 <xref linkend=\"downloading-files\"/>。<phrase arch=\"i386\">如果您已经有了安装 CD-ROM 或 DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
+msgstr ""
+"制作软盘之前，您首先需要从 &debian; 镜像下载这些文件，见 <xref linkend="
+"\"downloading-files\"/>。<phrase arch=\"i386\">如果您已经有了安装 CD-ROM 或 "
+"DVD，软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:299
@@ -492,7 +475,8 @@ msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
 "following programs to copy images to floppies."
-msgstr "如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
+msgstr ""
+"如果您能操作一台 i386 或 amd64 机器，可以使用如下方法之一往软盘复制映像文件。"
 
 #. Tag: para
 #: install-methods.xml:375
@@ -522,13 +506,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:389
 #, no-c-format
-#| msgid ""
-#| "These tools can be found on the Official Debian CD-ROMs under the "
-#| "<filename>/tools</filename> directory."
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
 "<filename>/tools</filename> directory."
-msgstr "这些工具可以在官方 &debian; 光盘中找到，位于 <filename>/tools</filename> 目录下。"
+msgstr ""
+"这些工具可以在官方 &debian; 光盘中找到，位于 <filename>/tools</filename> 目录"
+"下。"
 
 #. Tag: title
 #: install-methods.xml:402
@@ -539,15 +522,6 @@ msgstr "在 MacOS 上写磁盘映像"
 #. Tag: para
 #: install-methods.xml:403
 #, no-c-format
-#| msgid ""
-#| "An AppleScript, <application>Make Debian Floppy</application>, is "
-#| "available for burning floppies from the provided disk image files. It can "
-#| "be downloaded from <ulink url=\"ftp://ftp2.sourceforge.net/pub/"
-#| "sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink>. To use it, "
-#| "just unstuff it on your desktop, and then drag any floppy image file to "
-#| "it. You must have Applescript installed and enabled in your extensions "
-#| "manager. Disk Copy will ask you to confirm that you wish to erase the "
-#| "floppy and proceed to write the file image to it."
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
 "available for burning floppies from the provided disk image files. It can be "
@@ -557,7 +531,13 @@ msgid ""
 "Applescript installed and enabled in your extensions manager. Disk Copy will "
 "ask you to confirm that you wish to erase the floppy and proceed to write "
 "the file image to it."
-msgstr "这里有一个名为 <application>Make &debian; Floppy</application> 的 AppleSrcipt 可以用来从所提供的磁盘映像制作软盘。它可以从 <ulink url=\"ftp://ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit\"></ulink> 处下载。使用时只需要解压文件至桌面，然后向其拖入想刻录的映像文件。您必须已经安装了 Applescript 并在您的扩展管理器中开启它。Disk Copy 会要求您确认的确想要清空磁盘并写入磁盘映像。"
+msgstr ""
+"这里有一个名为 <application>Make &debian; Floppy</application> 的 "
+"AppleSrcipt 可以用来从所提供的磁盘映像制作软盘。它可以从 <ulink url=\"ftp://"
+"ftp2.sourceforge.net/pub/sourceforge/d/de/debian-imac/MakeDebianFloppy.sit"
+"\"></ulink> 处下载。使用时只需要解压文件至桌面，然后向其拖入想刻录的映像文"
+"件。您必须已经安装了 Applescript 并在您的扩展管理器中开启它。Disk Copy 会要求"
+"您确认的确想要清空磁盘并写入磁盘映像。"
 
 #. Tag: para
 #: install-methods.xml:414
@@ -581,17 +561,15 @@ msgstr "写磁盘映像：使用<command>Disk Copy</command>"
 #. Tag: para
 #: install-methods.xml:426
 #, no-c-format
-#| msgid ""
-#| "If you are creating the floppy image from files which were originally on "
-#| "the official &debian-gnu; CD, then the Type and Creator are already set "
-#| "correctly. The following <command>Creator-Changer</command> steps are "
-#| "only necessary if you downloaded the image files from a Debian mirror."
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
 "official &debian-gnu; CD, then the Type and Creator are already set "
 "correctly. The following <command>Creator-Changer</command> steps are only "
 "necessary if you downloaded the image files from a &debian; mirror."
-msgstr "假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 &debian; 镜像下载映像文件的情况。"
+msgstr ""
+"假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经"
+"设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 &debian; 镜像"
+"下载映像文件的情况。"
 
 #. Tag: para
 #: install-methods.xml:435
@@ -722,19 +700,15 @@ msgstr "为从 U 盘引导准备文件"
 #. Tag: para
 #: install-methods.xml:532
 #, no-c-format
-#| msgid ""
-#| "There are two installation methods possible when booting from USB stick. "
-#| "The 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."
 msgid ""
 "There are two installation methods possible when booting from USB stick. The "
 "first is to only use the USB stick to boot the installer, and then 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."
-msgstr "从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过网络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜像。"
+msgstr ""
+"从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序，然后完全通过网"
+"络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源，还可以结合其他镜像。"
 
 #. Tag: para
 #: install-methods.xml:540
@@ -772,11 +746,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:560
 #, no-c-format
-#| msgid ""
-#| "For the first installation method you'll need to download an installer "
-#| "image 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."
 msgid ""
 "To prepare a USB stick that only boots the installer, which then proceeds to "
 "install entirely from the network, you'll need to download the "
@@ -785,7 +754,11 @@ msgid ""
 "and write this file directly to the USB stick, overwriting its current "
 "contents. This method will work with very small USB sticks, only a few "
 "megabytes in size."
-msgstr "要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 <filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖里面的内容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
+msgstr ""
+"要制作一个仅启动安装程序的 U 盘，之后完全从网络安装，您需要从 "
+"<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象(它位"
+"于 <xref linkend=\"where-files\"/>)，然后将该文件直接写入 U 盘，覆盖里面的内"
+"容。此方法适用于容量很小的 U 盘，它只需要几 M 的字节。"
 
 #. Tag: para
 #: install-methods.xml:570
@@ -802,10 +775,14 @@ msgid ""
 "two partitions should now be visible on it. You should mount the second of "
 "the two partitions, and unpack the firmware onto it."
 msgstr ""
-"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件可以写如到一个 U 盘里面: <informalexample><screen>\n"
+"例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
+"可以写如到一个 U 盘里面: <informalexample><screen>\n"
 "# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
 "# sync\n"
-"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上面。"
+"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件"
+"文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
+"U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上"
+"面。"
 
 #. Tag: screen
 #: install-methods.xml:582
@@ -826,18 +803,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:584
 #, no-c-format
-#| msgid ""
-#| "Installation images for the second installation method can be found in "
-#| "the <filename>hd-media</filename> directory and either the <quote>easy "
-#| "way</quote> or the <quote>flexible way</quote> can be used to copy the "
-#| "image to the USB stick. For this installation method you will also need "
-#| "to download a CD image. The installation image and the CD image must be "
-#| "based on the same release of &d-i;. If they do not match you are likely "
-#| "to get errors<footnote> <para> The error message that is most likely to "
-#| "be displayed is that no kernel modules can be found. This means that the "
-#| "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."
 msgid ""
 "To prepare a USB stick that installs packages from a CD image included on "
 "the stick, use the installer images found in the <filename>hd-media</"
@@ -850,7 +815,13 @@ msgid ""
 "can be found. This means that the 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 "制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
+msgstr ""
+"制作包含 CD 映象软件包的 U 盘，需要使用的安装映象放在 <filename>hd-media</"
+"filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将它"
+"复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映象应该"
+"是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> <para> 错误信息"
+"大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内核模块 udeb 版本与"
+"正在运行的内核不符。</para> </footnote>。"
 
 #. Tag: para
 #: install-methods.xml:604
@@ -871,19 +842,17 @@ msgstr "复制文件 &mdash; 轻松的途径"
 #. Tag: para
 #: install-methods.xml:613
 #, 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) <phrase "
-#| "arch=\"x86\">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>"
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
 "contains all the installer files (including the kernel) <phrase arch="
 "\"x86\">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> 包含所有的安装程序文件(包括内核) <phrase arch=\"x86\">以及 <classname>syslinux</classname> 和对应的配置文件</phrase> <phrase arch=\"powerpc\">以及 <classname>yaboot</classname> 和对应的配置文件</phrase>。"
+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:622
@@ -934,15 +903,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 #. Tag: para
 #: install-methods.xml:646
 #, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
-#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
-#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a Debian netinst "
-#| "or businesscard ISO image to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -952,7 +912,14 @@ 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 "然后，挂载 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>) 就完成了。"
+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:663
@@ -990,18 +957,6 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 #. Tag: para
 #: install-methods.xml:685
 #, no-c-format
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> Debian package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -1014,9 +969,14 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> &debian; package."
 msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
+"化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
+"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
+"标记。</para> </footnote>，然后建立文件系统：<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</classname> 软件包中。"
+"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。"
+"<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</"
+"classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:704
@@ -1107,20 +1067,12 @@ msgstr ""
 "<quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序，您需要添加 "
-"<userinput>vga=788</userinput> 到第二行尾部。"
+"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</"
+"userinput> 到第二行尾部。"
 
 #. Tag: para
 #: install-methods.xml:768
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image<footnote> <para> You can use either a businesscard, a "
-#| "netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1129,24 +1081,16 @@ msgid ""
 "filename></quote> image is not usable for this purpose. </para> </footnote> "
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> 到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
+"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
+"<xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"<filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> "
+"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:792
 #, no-c-format
-#| msgid ""
-#| "Most USB sticks do not come pre-configured in such a way that Open "
-#| "Firmware can boot from them, so you will need to repartition the stick. "
-#| "On Mac systems, run <userinput>mac-fdisk /dev/<replaceable>sdX</"
-#| "replaceable></userinput>, initialise a new partition map using the "
-#| "<userinput>i</userinput> command, and create a new partition of type "
-#| "Apple_Bootstrap using the <userinput>C</userinput> command. (Note that "
-#| "the first \"partition\" will always be the partition map itself.) Then "
-#| "type <informalexample><screen>\n"
-#| "$ hformat /dev/<replaceable>sdX2</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>hformat</command> command is "
-#| "contained in the <classname>hfsutils</classname> Debian package."
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
 "can boot from them, so you will need to repartition the stick. On Mac "
@@ -1161,9 +1105,15 @@ msgid ""
 "for your USB stick. The <command>hformat</command> command is contained in "
 "the <classname>hfsutils</classname> &debian; package."
 msgstr ""
-"绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>，用 <userinput>i</userinput> 命令初始化新的分区映射，然后使用 <userinput>C</userinput> 命令创建一个新的类型为 Apple_Bootstrap 的分区。(要注意的是第一个\"分区\"总是分区映射本身。) 然后键入 <informalexample><screen>\n"
+"绝大多数 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> 软件包中。"
+"</screen></informalexample> 注意使用正确的 U 盘设备名称。<command>hformat</"
+"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
 
 #. Tag: para
 #: install-methods.xml:809
@@ -1287,17 +1237,15 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:878
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy a "
-#| "Debian ISO image (businesscard, netinst or full CD image; be sure to "
-#| "select one that fits) onto the stick. When you are done, unmount the USB "
-#| "memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy a "
 "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
 "select one that fits) onto the stick. When you are done, unmount the USB "
 "memory stick (<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映象"
+"(businesscard、netinst 或者完整的 CD 映象；确认适合的一种)到 U 盘上。然后，卸"
+"载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: title
 #: install-methods.xml:893
@@ -1417,15 +1365,13 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:960
 #, no-c-format
-#| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
-#| "filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
 "on your hard drive (note that LILO can not boot from files on an NTFS file "
 "system), for instance to <filename>/boot/newinstall/</filename>."
-msgstr "将以下文件从 &debian; 存档中复制到硬盘中比较方便的地方，比如 <filename>/boot/newinstall/</filename>。"
+msgstr ""
+"将以下文件从 &debian; 存档中复制到硬盘中比较方便的地方，比如 <filename>/boot/"
+"newinstall/</filename>。"
 
 #. Tag: para
 #: install-methods.xml:968
@@ -1450,40 +1396,32 @@ msgstr "最后，要配置 bootloader，请进入 <xref linkend=\"boot-initrd\"/
 #. Tag: title
 #: install-methods.xml:990
 #, no-c-format
-#| msgid ""
-#| "Hard disk installer booting using <command>LILO</command> or "
-#| "<command>GRUB</command>"
 msgid "Hard disk installer booting using <command>loadlin</command>"
 msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
 
 #. Tag: para
 #: install-methods.xml:991
 #, no-c-format
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
 "installer from DOS using <command>loadlin</command>."
-msgstr "本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
+msgstr ""
+"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
 
 #. Tag: para
 #: install-methods.xml:996
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "Copy the following files from the Debian archives to a convenient "
-#| "location on your hard drive, for instance to <filename>/boot/newinstall/</"
+#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
 #| "filename>."
 msgid ""
-"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"Copy the following directories from a &debian; CD image to <filename>c:\\</"
 "filename>."
 msgstr "从 &debian; CD 映象复制下列文件到 <filename>c:\\</filename>。"
 
 #. Tag: para
 #: install-methods.xml:1001
 #, no-c-format
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
@@ -1491,7 +1429,6 @@ msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
 #. Tag: para
 #: install-methods.xml:1006
 #, no-c-format
-#| msgid "<filename>boot.msg</filename> (optional boot message)"
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (loadlin 工具)"
 
@@ -1504,16 +1441,6 @@ msgstr "在 OldWorld Macs 上引导硬盘安装程序"
 #. Tag: para
 #: install-methods.xml:1020
 #, no-c-format
-#| msgid ""
-#| "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
-#| "application> to launch Linux installation, but <application>miBoot</"
-#| "application> cannot easily be used for hard disk booting. "
-#| "<application>BootX</application>, launched from MacOS, supports booting "
-#| "from files placed on the hard disk. <application>BootX</application> can "
-#| "also be used to dual-boot MacOS and Linux after your Debian installation "
-#| "is complete. For the Performa 6360, it appears that <command>quik</"
-#| "command> cannot make the hard disk bootable. So <application>BootX</"
-#| "application> is required on that model."
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
 "application> to launch Linux installation, but <application>miBoot</"
@@ -1524,23 +1451,18 @@ msgid ""
 "complete. For the Performa 6360, it appears that <command>quik</command> "
 "cannot make the hard disk bootable. So <application>BootX</application> is "
 "required on that model."
-msgstr "<filename>boot-floppy-hfs</filename> 软盘使用 <application>miBoot</application> 来启动 Linux 安装，但是 <application>miBoot</application> 不易用于从硬盘引导。运行于 MacOS 的 <application>BootX</application> 支持从硬盘上的文件进行引导。<application>BootX</application> 也能在安装完 &debian; 后用于 MacOS 和 Linux 的双重引导。对于 Performa 6360 来说，<command>quik</command> 看上去不能让硬盘可引导。因此 <application>BootX</application> 对于该型号来说是必须的。"
+msgstr ""
+"<filename>boot-floppy-hfs</filename> 软盘使用 <application>miBoot</"
+"application> 来启动 Linux 安装，但是 <application>miBoot</application> 不易用"
+"于从硬盘引导。运行于 MacOS 的 <application>BootX</application> 支持从硬盘上的"
+"文件进行引导。<application>BootX</application> 也能在安装完 &debian; 后用于 "
+"MacOS 和 Linux 的双重引导。对于 Performa 6360 来说，<command>quik</command> "
+"看上去不能让硬盘可引导。因此 <application>BootX</application> 对于该型号来说"
+"是必须的。"
 
 #. Tag: para
 #: install-methods.xml:1033
 #, no-c-format
-#| msgid ""
-#| "Download and unstuff the <application>BootX</application> distribution, "
-#| "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
-#| "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-#| "directory on Debian http/ftp mirrors and official Debian CDs. Use "
-#| "<application>Stuffit Expander</application> to extract it from its "
-#| "archive. Within the package, there is an empty folder called "
-#| "<filename>Linux Kernels</filename>. Download <filename>linux.bin</"
-#| "filename> and <filename>ramdisk.image.gz</filename> from the "
-#| "<filename>disks-powerpc/current/powermac</filename> folder, and place "
-#| "them in the <filename>Linux Kernels</filename> folder. Then place the "
-#| "<filename>Linux Kernels</filename> folder in the active System Folder."
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
 "available from <ulink url=\"&url-powerpc-bootx;\"></ulink>, or in the "
@@ -1553,7 +1475,17 @@ msgid ""
 "filename> folder, and place them in the <filename>Linux Kernels</filename> "
 "folder. Then place the <filename>Linux Kernels</filename> folder in the "
 "active System Folder."
-msgstr "请下载并且解压 <application>BootX</application> 发布版本。它可以从 <ulink url=\"&url-powerpc-bootx;\"></ulink>，或者 &debian; http/ftp 镜像以及官方 &debian; 光盘的 <filename>dists/woody/main/disks-powerpc/current/powermac</filename> 目录下得到。可以用 <application>Stuffit Expander</application> 来把它从打包档案中解开。在这个包中，有一个名为 <filename>Linux Kernels</filename> 的空文件夹。请下载 <filename>linux.bin</filename> 和 <filename>ramdisk.image.gz</filename> (位于 <filename>disks-powerpc/current/powermac</filename> 文件夹)，然后把他们放到 <filename>Linux Kernels</filename> 文件夹中，然后把 <filename>Linux Kernels</filename> 文件夹放到活动的系统文件夹中。"
+msgstr ""
+"请下载并且解压 <application>BootX</application> 发布版本。它可以从 <ulink "
+"url=\"&url-powerpc-bootx;\"></ulink>，或者 &debian; http/ftp 镜像以及官方 "
+"&debian; 光盘的 <filename>dists/woody/main/disks-powerpc/current/powermac</"
+"filename> 目录下得到。可以用 <application>Stuffit Expander</application> 来把"
+"它从打包档案中解开。在这个包中，有一个名为 <filename>Linux Kernels</"
+"filename> 的空文件夹。请下载 <filename>linux.bin</filename> 和 "
+"<filename>ramdisk.image.gz</filename> (位于 <filename>disks-powerpc/current/"
+"powermac</filename> 文件夹)，然后把他们放到 <filename>Linux Kernels</"
+"filename> 文件夹中，然后把 <filename>Linux Kernels</filename> 文件夹放到活动"
+"的系统文件夹中。"
 
 #. Tag: title
 #: install-methods.xml:1053
@@ -1582,17 +1514,15 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1065
 #, no-c-format
-#| msgid ""
-#| "<emphasis>Copy</emphasis> (not move) the following four files which you "
-#| "downloaded earlier from the Debian archives, onto the root level of your "
-#| "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
-#| "each file to the hard drive icon)."
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
 "downloaded earlier from the &debian; archives, onto the root level of your "
 "hard drive (this can be accomplished by <keycap>option</keycap>-dragging "
 "each file to the hard drive icon)."
-msgstr "<emphasis>复制</emphasis>(而非移动)您早先从 &debian; 存档下载的下列四个文件到您硬盘的根目录上(这个可以用按住 <keycap>option</keycap> 键然后拖动每个文件到硬盘图标的方法来完成)。"
+msgstr ""
+"<emphasis>复制</emphasis>(而非移动)您早先从 &debian; 存档下载的下列四个文件到"
+"您硬盘的根目录上(这个可以用按住 <keycap>option</keycap> 键然后拖动每个文件到"
+"硬盘图标的方法来完成)。"
 
 #. Tag: filename
 #: install-methods.xml:1075 install-methods.xml:1401
@@ -1703,13 +1633,12 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1152
 #, no-c-format
-#| msgid ""
-#| "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. "
-#| "There is an <classname>rbootd</classname> package available in Debian."
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
 "is an <classname>rbootd</classname> package available in &debian;."
-msgstr "一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。&debian; 里面有一个 <classname>rbootd</classname> 软件包。"
+msgstr ""
+"一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。&debian; 里面有一"
+"个 <classname>rbootd</classname> 软件包。"
 
 #. Tag: para
 #: install-methods.xml:1157
@@ -1974,37 +1903,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1273
 #, no-c-format
-#| msgid ""
-#| "To use CMU <command>bootpd</command>, you must first uncomment (or add) "
-#| "the relevant line in <filename>/etc/inetd.conf</filename>. On &debian-"
-#| "gnu;, you can run <userinput>update-inetd --enable bootps</userinput>, "
-#| "then <userinput>/etc/init.d/inetd reload</userinput> to do so. Just in "
-#| "case your BOOTP server does not run Debian, the line in question should "
-#| "look like: <informalexample><screen>\n"
-#| "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-#| "</screen></informalexample> Now, you must create an <filename>/etc/"
-#| "bootptab</filename> file. This has the same sort of familiar and cryptic "
-#| "format as the good old BSD <filename>printcap</filename>, "
-#| "<filename>termcap</filename>, and <filename>disktab</filename> files. See "
-#| "the <filename>bootptab</filename> manual page for more information. For "
-#| "CMU <command>bootpd</command>, you will need to know the hardware (MAC) "
-#| "address of the client. Here is an example <filename>/etc/bootptab</"
-#| "filename>: <informalexample><screen>\n"
-#| "client:\\\n"
-#| "  hd=/tftpboot:\\\n"
-#| "  bf=tftpboot.img:\\\n"
-#| "  ip=192.168.1.90:\\\n"
-#| "  sm=255.255.255.0:\\\n"
-#| "  sa=192.168.1.1:\\\n"
-#| "  ha=0123456789AB:\n"
-#| "</screen></informalexample> You will need to change at least the "
-#| "<quote>ha</quote> option, which specifies the hardware address of the "
-#| "client. The <quote>bf</quote> option specifies the file a client should "
-#| "retrieve via TFTP; see <xref linkend=\"tftp-images\"/> for more details. "
-#| "<phrase arch=\"mips\"> On SGI machines you can just enter the command "
-#| "monitor and type <userinput>printenv</userinput>. The value of the "
-#| "<userinput>eaddr</userinput> variable is the machine's MAC address. </"
-#| "phrase>"
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian-gnu;, you "
@@ -2036,9 +1934,20 @@ msgid ""
 "<userinput>printenv</userinput>. The value of the <userinput>eaddr</"
 "userinput> variable is the machine's MAC address. </phrase>"
 msgstr ""
-"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd.conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 <userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP 服务器不是运行在 &debian; 上，这行看起来应该像这样： <informalexample><screen>\n"
+"为了使用 CMU <command>bootpd</command>，您必须首先将 <filename>/etc/inetd."
+"conf</filename> 中相关的注释标记去掉(或者加入一些新行)。在 &debian-gnu; 里，"
+"您可以运行 <userinput>update-inetd --enable bootps</userinput>，然后执行 "
+"<userinput>/etc/init.d/inetd reload</userinput> 来实现此任务。万一您的 BOOTP "
+"服务器不是运行在 &debian; 上，这行看起来应该像这样： "
+"<informalexample><screen>\n"
 "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
-"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 <filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)地址。这里有一个示例 <filename>/etc/bootptab</filename>： <informalexample><screen>\n"
+"</screen></informalexample> 现在，您必须创建一个 <filename>/etc/bootptab</"
+"filename> 文件。它具有和一些经典的 BSD 文件很相似，并使用相同的加密格式。这些"
+"文件包括 <filename>printcap</filename>、<filename>termcap</filename> 和 "
+"<filename>disktab</filename>。参见 <filename>bootptab</filename> 的手册页以获"
+"得更多的信息。对于 CMU <command>bootpd</command>，您将需要知道客户机硬件(MAC)"
+"地址。这里有一个示例 <filename>/etc/bootptab</filename>： "
+"<informalexample><screen>\n"
 "client:\\\n"
 "  hd=/tftpboot:\\\n"
 "  bf=tftpboot.img:\\\n"
@@ -2046,7 +1955,12 @@ msgstr ""
 "  sm=255.255.255.0:\\\n"
 "  sa=192.168.1.1:\\\n"
 "  ha=0123456789AB:\n"
-"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 <userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 MAC 地址。</phrase>"
+"</screen></informalexample> 您至少需要修改 <quote>ha</quote> 选项，它指定了客"
+"户机的硬件地址。<quote>bf</quote> 选项则指定了一个客户机应该通过 TFTP 取得的"
+"文件名称。请从 <xref linkend=\"tftp-images\"/> 处获得更多的信息。<phrase "
+"arch=\"mips\"> 在 SGI 机器上，您可以仅在进入命令监视器后输入 "
+"<userinput>printenv</userinput>。<userinput>eaddr</userinput> 的值就是机器的 "
+"MAC 地址。</phrase>"
 
 #. Tag: para
 #: install-methods.xml:1306
@@ -2119,36 +2033,20 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1350
 #, no-c-format
-#| msgid ""
-#| "All <command>in.tftpd</command> alternatives available in Debian should "
-#| "log TFTP requests to the system logs by default. Some of them support a "
-#| "<userinput>-v</userinput> argument to increase verbosity. It is "
-#| "recommended to check these log messages in case of boot problems as they "
-#| "are a good starting point for diagnosing the cause of errors."
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
 "log TFTP requests to the system logs by default. Some of them support a "
 "<userinput>-v</userinput> argument to increase verbosity. It is recommended "
 "to check these log messages in case of boot problems as they are a good "
 "starting point for diagnosing the cause of errors."
-msgstr "&debian; 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
+msgstr ""
+"&debian; 中所有 <command>in.tftpd</command> 参数默认都会将 TFTP 请求记录到系"
+"统日志中。有些还支持 <userinput>-v</userinput> 选项增加详细程度。万一遇到引导"
+"问题，建议先检查这些日志信息，这对于分析错误是一个好的起始点。"
 
 #. Tag: para
 #: install-methods.xml:1358
 #, no-c-format
-#| msgid ""
-#| "If you intend to install Debian on an SGI machine and your TFTP server is "
-#| "a GNU/Linux box running Linux 2.4, you'll need to set the following on "
-#| "your server: <informalexample><screen>\n"
-#| "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-#| "</screen></informalexample> to turn off Path MTU discovery, otherwise the "
-#| "SGI's PROM can't download the kernel. Furthermore, make sure TFTP packets "
-#| "are sent from a source port no greater than 32767, or the download will "
-#| "stall after the first packet. Again, it's Linux 2.4.X tripping this bug "
-#| "in the PROM, and you can avoid it by setting <informalexample><screen>\n"
-#| "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-#| "</screen></informalexample> to adjust the range of source ports the Linux "
-#| "TFTP server uses."
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
 "a GNU/Linux box running Linux 2.4, you'll need to set the following on your "
@@ -2163,11 +2061,16 @@ msgid ""
 "</screen></informalexample> to adjust the range of source ports the Linux "
 "TFTP server uses."
 msgstr ""
-"如果您想要在一台 SGI 上安装 &debian; 并且您的 TFTP 服务器是一台运行 Linux 2.4 的 GNU/Linux 机器，需要对服务器进行如下设置： <informalexample><screen>\n"
+"如果您想要在一台 SGI 上安装 &debian; 并且您的 TFTP 服务器是一台运行 Linux "
+"2.4 的 GNU/Linux 机器，需要对服务器进行如下设置： <informalexample><screen>\n"
 "# echo 1 &gt; /proc/sys/net/ipv4/ip_no_pmtu_disc\n"
-"</screen></informalexample> 来关闭 Path MTU 查询，否则 SGI 的 PROM 不能下载内核。而且，您还要确保 TFTP 数据包是从一个不大于 32767 的端口送出，否则在第一包之后，下载将停止。重申一下，这是由于 Linux 2.4.X 触发了 PROM 里的一个 bug。您可以通过如下设置： <informalexample><screen>\n"
+"</screen></informalexample> 来关闭 Path MTU 查询，否则 SGI 的 PROM 不能下载内"
+"核。而且，您还要确保 TFTP 数据包是从一个不大于 32767 的端口送出，否则在第一包"
+"之后，下载将停止。重申一下，这是由于 Linux 2.4.X 触发了 PROM 里的一个 bug。您"
+"可以通过如下设置： <informalexample><screen>\n"
 "# echo \"2048 32767\" &gt; /proc/sys/net/ipv4/ip_local_port_range\n"
-"</screen></informalexample> 调整 Linux TFTP 服务器使用的源端口范围以避开这个错误。"
+"</screen></informalexample> 调整 Linux TFTP 服务器使用的源端口范围以避开这个"
+"错误。"
 
 #. Tag: title
 #: install-methods.xml:1380
@@ -2329,41 +2232,35 @@ msgstr "自动化安装"
 #. Tag: para
 #: install-methods.xml:1591
 #, no-c-format
-#| msgid ""
-#| "For installing on multiple computers it's possible to do fully automatic "
-#| "installations. Debian packages intended for this include <classname>fai</"
-#| "classname> (which uses an install server), <classname>replicator</"
-#| "classname>, <classname>systemimager</classname>, <classname>autoinstall</"
-#| "classname>, and the Debian Installer itself."
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
 "installations. &debian; packages intended for this include <classname>fai-"
 "quickstart</classname> (which can use an install server) and the &debian; "
 "Installer itself. Have a look at the <ulink url=\"http://fai-project.org"
 "\">FAI home page</ulink> for detailed information."
-msgstr "要同时安装多台计算机，可以使用完全自动方式安装。这方面的 &debian; 软件包包括 <classname>fai-quickstart</classname> (可以用来安装服务器) 和 &debian; 安装程序自己。参阅 <ulink url=\"http://fai-project.org\">FAI home page</ulink> 了解更多细节。"
+msgstr ""
+"要同时安装多台计算机，可以使用完全自动方式安装。这方面的 &debian; 软件包包括 "
+"<classname>fai-quickstart</classname> (可以用来安装服务器) 和 &debian; 安装程"
+"序自己。参阅 <ulink url=\"http://fai-project.org\">FAI home page</ulink> 了解"
+"更多细节。"
 
 #. Tag: title
 #: install-methods.xml:1603
 #, no-c-format
-#| msgid "Automatic Installation Using the Debian Installer"
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "使用 &debian; 安装程序进行自动安装"
 
 #. Tag: para
 #: install-methods.xml:1604
 #, no-c-format
-#| msgid ""
-#| "The Debian Installer supports automating installs via preconfiguration "
-#| "files. A preconfiguration file can be loaded from the network or from "
-#| "removable media, and used to fill in answers to questions asked during "
-#| "the installation process."
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
 "files. A preconfiguration file can be loaded from the network or from "
 "removable media, and used to fill in answers to questions asked during the "
 "installation process."
-msgstr "&debian; 安装程序支持使用预先配置的文件进行自动安装。预置文件可以从网络或移动介质上加载，并自动回答安装过程中的问题。"
+msgstr ""
+"&debian; 安装程序支持使用预先配置的文件进行自动安装。预置文件可以从网络或移动"
+"介质上加载，并自动回答安装过程中的问题。"
 
 #. Tag: para
 #: install-methods.xml:1611