po/zh_CN: unfuzzy and translate using-d-i

5 files changed, 73 insertions, 162 deletions

diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 235107fcb..b96f5f050 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.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: 2007-12-31 01:09+0000\n"
-"PO-Revision-Date: 2007-02-26 14:28+0800\n"
+"PO-Revision-Date: 2008-01-14 10:14+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"
@@ -420,7 +420,7 @@ msgid ""
 "to contact a time server on the Internet to ensure the clock is set "
 "correcty. The time zone is based on the country selected earlier and the "
 "installer will only ask to select one if a country has multiple zones."
-msgstr ""
+msgstr "下一步是建立您的时区和时间。安装程序将试着连接互联网上的时间服务器来校准时间。时区是基于前面所选的国家，假如一个国家有多个时区，安装程序会要您选择其中的一个。"
 
 #. Tag: para
 #: installation-howto.xml:248
@@ -502,15 +502,12 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:290
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Partitioning is followed by setting up user accounts. By default you will "
 "need to provide a password for the <quote>root</quote> (administrator) "
 "account and information necessary to create one regular user account."
-msgstr ""
-"下一步是建立您的时区和时间。安装程序会试着自动选择正确的设定，不成功再询问。"
-"接着是建立用户帐号。默认情况下，您需要为 <quote>root</quote> (管理员) 帐号设"
-"置密码，并建立一个普通用户帐号。"
+msgstr "分区之后是建立用户帐号。默认情况下，您需要为 <quote>root</quote> (管理员) 帐号设置密码，并建立一个普通用户帐号。"
 
 #. Tag: para
 #: installation-howto.xml:296
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 498733503..fc40b8220 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.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: 2007-12-26 01:09+0000\n"
-"PO-Revision-Date: 2007-07-31 13:42+0800\n"
+"PO-Revision-Date: 2008-01-14 10:24+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"
@@ -1254,7 +1254,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:847
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If your machine has only one hard disk, and you would like to completely "
 "replace the current operating system with &debian;, you also can wait to "
@@ -1267,14 +1267,7 @@ msgid ""
 "successful the first time around. At the least in this case, you should have "
 "some alternate means of reviving your machine like the original system's "
 "installation tapes or CDs."
-msgstr ""
-"若是您的机器只有一块硬盘，而且您愿意把原来的操作系统全盘替换成 &debian;，那么"
-"可以在启动安装系统后，待到安装时再进行分区(<xref linkend=\"partman\"/>)。但"
-"是，只有当您使用存储于磁带、CD-ROM 或者联网的机器上的安装系统，并从它们启动安"
-"装程序时，上面的话才适用于您的情形。试想一下：假如您用放在硬盘上的文件启动，"
-"再在安装系统中对同一块硬盘进行分区，这就会擦除那些启动文件，这时恐怕您只能祈"
-"求上苍保佑第一次就安装成功吧。在这种情况下，若要让您的机器恢复正常，至少您还"
-"可以有几个办法可选，比如原先系统的安装磁带或 CD。"
+msgstr "若是您的机器只有一块硬盘，而且您愿意把原来的操作系统全盘替换成 &debian;，那么可以在启动安装系统后，待到安装时再进行分区(<xref linkend=\"di-partition\"/>)。但是，只有当您使用存储于磁带、CD-ROM 或者联网的机器上的安装系统，并从它们启动安装程序时，上面的话才适用于您的情形。试想一下：假如您用放在硬盘上的文件启动，再在安装系统中对同一块硬盘进行分区，这就会擦除那些启动文件，这时恐怕您只能祈求上苍保佑第一次就安装成功吧。在这种情况下，若要让您的机器恢复正常，至少您还可以有几个办法可选，比如原先系统的安装磁带或 CD。"
 
 #. Tag: para
 #: preparing.xml:862
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index ca21f4cf7..bb439ffbe 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.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-01-04 01:10+0000\n"
-"PO-Revision-Date: 2007-12-08 20:32+0800\n"
+"PO-Revision-Date: 2008-01-14 10:25+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1461,7 +1461,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:797
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1563,14 +1563,12 @@ msgstr ""
 "#       select Separate /home, /usr, /var, and /tmp partitions\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe."
-"txt.\n"
+"# The recipe format is documented in the file devel/partman-auto-recipe.txt.\n"
 "# If you have a way to get a recipe file into the d-i environment, you can\n"
 "# just point at it.\n"
 "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
 "\n"
-"# If not, you can put an entire recipe into the preconfiguration file in "
-"one\n"
+"# If not, you can put an entire recipe into the preconfiguration file in one\n"
 "# (logical) line. This example creates a small /boot partition, suitable\n"
 "# swap, and uses the rest of the space for the root partition:\n"
 "#d-i partman-auto/expert_recipe string                         \\\n"
@@ -1590,7 +1588,8 @@ msgstr ""
 "#                      method{ swap } format{ }                \\\n"
 "#              .\n"
 "\n"
-"# This makes partman automatically partition without confirmation.\n"
+"# This makes partman automatically partition without confirmation, provided\n"
+"# that you told it what to do using one of the methods above.\n"
 "d-i partman/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition \\\n"
 "       select Finish partitioning and write changes to disk\n"
@@ -2170,9 +2169,9 @@ msgstr ""
 
 #. Tag: title
 #: preseed.xml:973
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Finishing up the installation"
-msgstr "完成第一阶段安装"
+msgstr "完成安装"
 
 #. Tag: screen
 #: preseed.xml:975
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index fc015119f..f6395f5a8 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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-01-02 01:09+0000\n"
-"PO-Revision-Date: 2007-10-28 12:33+0800\n"
+"PO-Revision-Date: 2008-01-21 10: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"
@@ -1355,7 +1355,7 @@ msgstr "配置 Apt"
 
 #. Tag: para
 #: random-bits.xml:663
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1368,15 +1368,12 @@ msgid ""
 "</screen></informalexample> Make sure to run <userinput>aptitude update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
-"debootstrap 会创建一个非常基本的 <filename>/etc/apt/sources.list</filename> "
-"文件来安装额外的软件包。但您可以增加一些其他的源，比如源码包和安全更新："
-"<informalexample><screen>\n"
-"deb-src http://ftp.us.debian.org/debian etch main\n"
+"debootstrap 会创建一个非常基本的 <filename>/etc/apt/sources.list</filename> 文件用于安装额外的软件包。但您还可以增加一些其他的源，比如源码包和安全更新：<informalexample><screen>\n"
+"deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ etch/updates main\n"
-"deb-src http://security.debian.org/ etch/updates main\n"
-"</screen></informalexample> 修改源列表之后一定要执行 <userinput>aptitude "
-"update</userinput>。"
+"deb http://security.debian.org/ &releasename;/updates main\n"
+"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"</screen></informalexample> 修改源列表之后一定要执行 <userinput>aptitude update</userinput>。"
 
 #. Tag: title
 #: random-bits.xml:679
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 2242dd7a3..7d5ca833e 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.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-01-09 01:10+0000\n"
-"PO-Revision-Date: 2007-10-28 13:34+0800\n"
+"PO-Revision-Date: 2008-01-21 15:52+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"
@@ -380,11 +380,11 @@ msgstr "clock-setup"
 
 #. Tag: para
 #: using-d-i.xml:230
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Updates the system clock and determines whether the clock is set to UTC or "
 "not."
-msgstr "决定时钟是否使用 UTC。"
+msgstr "更新系统时钟，并决定时钟是否使用 UTC。"
 
 #. Tag: term
 #: using-d-i.xml:239
@@ -1004,7 +1004,7 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:677
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Configuring the Network"
 msgstr "配置网络"
 
@@ -1103,19 +1103,17 @@ msgid ""
 "time and date obtained from the system clock when the installation system "
 "was booted are correct. It is not possible to manually set the system time "
 "during the installation process."
-msgstr ""
+msgstr "安装程序首先尝试连接互联网上的时间服务器 (使用 <firstterm>NTP</firstterm> 协议) 来校准系统时间。如果没有成功，安装程序假设启动时获得的时间和日期是正确的。在安装过程中没法手动对系统时间进行设置。"
 
 #. Tag: para
 #: using-d-i.xml:781
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Depending on the location selected earlier in the installation process, you "
 "may be shown a list of timezones relevant for that location. If your "
 "location has only one time zone, you will not be asked anything and the "
 "system will assume that time zone."
-msgstr ""
-"基于安装开始时选择的地理位置，您将看到系统只列出与该位置相关的时区列表。如果"
-"您的位置只对应一个时区，那么系统就不会询问而直接使用该时区。"
+msgstr "基于安装过程前面所选择的地理位置，您将看到系统只列出与其地点相关的时区列表。如果该地只对应一个时区，那么系统就不会询问而直接使用该时区。"
 
 #. Tag: para
 #: using-d-i.xml:788
@@ -1124,7 +1122,7 @@ msgid ""
 "If for some reason you wish to set a time zone for the installed system that "
 "does <emphasis>not</emphasis> match the selected location, there are two "
 "options."
-msgstr ""
+msgstr "如果出于某些因素您<emphasis>不想</emphasis>设置时区为所选择的地点，这里有两个选项。"
 
 #. Tag: para
 #: using-d-i.xml:799
@@ -1133,13 +1131,13 @@ msgid ""
 "The simplest option is to just select a different timezone after the "
 "installation has been completed and you've booted into the new system. The "
 "command to do this is:"
-msgstr ""
+msgstr "简易的方法是，在安装完成后重新启动进入新系统，选择一个不同的时区。该命令为："
 
 #. Tag: screen
 #: using-d-i.xml:805
 #, no-c-format
 msgid "# dpkg-reconfigure tzdata"
-msgstr ""
+msgstr "# dpkg-reconfigure tzdata"
 
 #. Tag: para
 #: using-d-i.xml:811
@@ -1150,14 +1148,14 @@ msgid ""
 "zone=<replaceable>value</replaceable></userinput> when you boot the "
 "installation system. The value should of course be a valid time zone, for "
 "example <userinput>Europe/London</userinput> or <userinput>UTC</userinput>."
-msgstr ""
+msgstr "另外一种方法是，时区可以在安装启动后的安装程序最初阶段通过传入参数 <userinput>time/zone=<replaceable>value</replaceable></userinput> 进行设置。其中的 value 当然要求是一个有效的时区，例如 <userinput>Europe/London</userinput> 或 <userinput>UTC</userinput>。"
 
 #. Tag: para
 #: using-d-i.xml:825
 #, no-c-format
 msgid ""
 "For automated installations the time zone can also be set using preseeding."
-msgstr ""
+msgstr "自动安装可以通过预置设置时区。"
 
 #. Tag: title
 #: using-d-i.xml:838
@@ -1167,7 +1165,7 @@ msgstr "分区与选择挂载点"
 
 #. Tag: para
 #: using-d-i.xml:839
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "At this time, after hardware detection has been executed a final time, &d-i; "
 "should be at its full strength, customized for the user's needs and ready to "
@@ -1175,20 +1173,15 @@ msgid ""
 "the next few components lies in partitioning your disks, creating "
 "filesystems, assigning mountpoints and optionally configuring closely "
 "related options like RAID, LVM or encrypted devices."
-msgstr ""
-"现在，经过最后的硬件检测，&d-i; 已经充满活力，按照用户定制，准备就绪。正如本"
-"节标题指明，接下来组件的主要任务是为您的硬盘分区，创建文件系统，安排挂载点，"
-"并为近似选项进行配置，比如 LVM 或 RAID 设备。"
+msgstr "现在，经过最后的硬件检测，&d-i; 已经充满活力，按照用户定制，准备就绪。正如本节标题指明，接下来组件的主要任务是为您的硬盘分区，创建文件系统，安排挂载点，并为近似选项进行配置，比如 RAID、LVM 或加密设备。"
 
 #. Tag: para
 #: using-d-i.xml:860
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you are uncomfortable with partitioning, or just want to know more "
 "details, see <xref linkend=\"partitioning\"/>."
-msgstr ""
-"现在是时候对您的硬盘进行分区了。要是您对分区还有心存疑虑，或者只是想了解 更多"
-"的细节，请参阅 <xref linkend=\"partitioning\"/>。"
+msgstr "要是您对分区还有心存疑虑，或者只是想多了解一些细节，请参阅 <xref linkend=\"partitioning\"/>。"
 
 #. Tag: para
 #: using-d-i.xml:866
@@ -1225,9 +1218,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:889
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Guided Partitioning"
-msgstr "分区方式"
+msgstr "导引式分区"
 
 #. Tag: para
 #: using-d-i.xml:890
@@ -1239,11 +1232,7 @@ msgid ""
 "LVM<footnote> <para> The installer will encrypt the LVM volume group using a "
 "256 bit AES key and makes use of the kernel's <quote>dm-crypt</quote> "
 "support. </para> </footnote>."
-msgstr ""
-"如果您选择向导式分区，可以有三种选择：直接在硬盘上创建分区(经典方式)，或使用"
-"逻辑卷管理(LVM)，或使用加密 LVM。<footnote><para> 安装程序将使用 256 位的 "
-"AES 密钥加密 LVM 卷组，并使用内核的 <quote>dm-crypt</quote> 支持。</para> </"
-"footnote>"
+msgstr "如果您选择导引式分区，可以有三种选择：直接在硬盘上创建分区(经典方式)，或使用逻辑卷管理(LVM)，或使用加密 LVM。<footnote><para> 安装程序将使用 256 位的 AES 密钥加密 LVM 卷组，并使用内核的 <quote>dm-crypt</quote> 支持。</para> </footnote>"
 
 #. Tag: para
 #: using-d-i.xml:905
@@ -1290,10 +1279,7 @@ msgid ""
 "currently on the selected hard disk and you will not be able to undo them "
 "later. However, the installer will ask you to confirm these changes before "
 "they are written to disk."
-msgstr ""
-"假如您用向导式分区选择 LVM 或加密 LVM，在 LVM 建立的时候，分区表中的一些变更"
-"需要写入到所选的磁盘。这些变更会删除当前硬盘上的数据，以后将无法撤销。当然，"
-"安装程序会在写入磁盘之前让您确认。"
+msgstr "假如您用导引式分区选择 LVM 或加密 LVM，在 LVM 建立的时候，分区表中的一些变更需要写入到所选的磁盘。这些变更会删除当前硬盘上的数据，以后将无法撤销。当然，安装程序会在写入磁盘之前让您确认。"
 
 #. Tag: para
 #: using-d-i.xml:938
@@ -1305,10 +1291,7 @@ msgid ""
 "make sure you select the correct one. The order they are listed in may "
 "differ from what you are used to. The size of the disks may help to identify "
 "them."
-msgstr ""
-"假如用向导式分区(经典方式或(加密)LVM)选择整个磁盘，您会首先被要求选择将要使用"
-"的磁盘。检查一下您所有的磁盘都被列出，如果有多个磁盘，确认所选是您真正要使用"
-"的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
+msgstr "假如用导引式分区(经典方式或(加密)LVM)选择整个磁盘，您会首先被要求选择将要使用的磁盘。检查一下您所有的磁盘都被列出，如果有多个磁盘，确认所选是您真正要使用的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
 
 #. Tag: para
 #: using-d-i.xml:947
@@ -1334,11 +1317,7 @@ msgid ""
 "mind that guided partitioning needs a certain minimal amount of free space "
 "to operate with. If you don't give it at least about 1GB of space (depends "
 "on chosen scheme), guided partitioning will fail."
-msgstr ""
-"下来，您将从下表所列的几个方式中进行选择。每个方式都各有利弊，其中的一些讨论"
-"见 <xref linkend=\"partitioning\"/>。如果没有把握，就选择第一个选项。有一点要"
-"记住，就是使用向导式分区至少需要一定大小的空闲空间才能正常运作。如果没有给它 "
-"1GB 以上的空间(具体大小视所选的方式而不同)，那么向导式分区将以失败告终。"
+msgstr "下来，您将从下表所列的几个方式中进行选择。每个方式都各有利弊，其中的一些讨论见 <xref linkend=\"partitioning\"/>。如果没有把握，就选择第一个选项。有一点要记住，就是使用导引式分区至少需要一定大小的空闲空间才能正常运作。如果没有给它 1GB 以上的空间(具体大小视所选的方式而不同)，那么导引式分区将以失败告终。"
 
 #. Tag: entry
 #: using-d-i.xml:971
@@ -1424,9 +1403,7 @@ msgid ""
 "also create a separate <filename>/boot</filename> partition. The other "
 "partitions, including the swap partition, will be created inside the LVM "
 "partition."
-msgstr ""
-"如果您选择使用(加密) LVM 向导式分区，安装程序还会创建一个单独的 <filename>/"
-"boot</filename> 分区。其他的分区，除了交换分区，都会建在 LVM 分区之内。"
+msgstr "如果您选择使用(加密) LVM 导引式分区，安装程序还会创建一个单独的 <filename>/boot</filename> 分区。其他的分区，除了交换分区，都会建在 LVM 分区之内。"
 
 #. Tag: para
 #: using-d-i.xml:1006
@@ -1436,10 +1413,7 @@ msgid ""
 "additional partition, formatted as a FAT16 bootable filesystem, for the EFI "
 "boot loader. There is also an additional menu item in the formatting menu to "
 "manually set up a partition as an EFI boot partition."
-msgstr ""
-"倘若您为 IA-64 系统选择了向导式分区，就会有一个额外的分区，该分区格式化为 "
-"FAT16 可引导文件系统，用于 EFI boot loader。同时，菜单里也会加一项，让您可以"
-"手动把某个分区作为 EFI 引导分区。"
+msgstr "倘若您为 IA-64 系统选择了导引式分区，就会有一个额外的分区，该分区格式化为 FAT16 可引导文件系统，用于 EFI boot loader。同时，菜单里也会加一项，让您可以手动把某个分区作为 EFI 引导分区。"
 
 #. Tag: para
 #: using-d-i.xml:1014
@@ -1448,9 +1422,7 @@ msgid ""
 "If you choose guided partitioning for your Alpha system, an additional, "
 "unformatted partition will be allocated at the beginning of your disk to "
 "reserve this space for the aboot boot loader."
-msgstr ""
-"如果您为 Alpha 系统选择向导式分区，一个额外的、未格式化的分区将分配在磁盘的开"
-"始处，为 aboot boot loader 的保留空间。"
+msgstr "如果您为 Alpha 系统选择导引式分区，一个额外的、未格式化的分区将分配在磁盘的开始处，为 aboot boot loader 的保留空间。"
 
 #. Tag: para
 #: using-d-i.xml:1020
@@ -1506,10 +1478,7 @@ msgstr ""
 "        #7 logical  498.8 MB      ext3\n"
 "        #8 logical  551.5 MB      swap       swap\n"
 "        #9 logical   65.8 GB      ext2\n"
-"</screen></informalexample> 本例中有两块 IDE 硬盘，它们分别被分割成了几个分"
-"区。第一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标"
-"志、文件系统和挂载点(如果有的话)。注意：向导式分区方式不能创建这些特殊的设"
-"置，但使用手动方式分区的结果会有所不同。"
+"</screen></informalexample> 本例中有两块 IDE 硬盘，它们分别被分割成了几个分区。第一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标志、文件系统和挂载点(如果有的话)。注意：导引式分区方式不能创建这些特殊的设置，但使用手动方式分区的结果会有所不同。"
 
 #. Tag: para
 #: using-d-i.xml:1039
@@ -1522,18 +1491,13 @@ msgid ""
 "happy, you can choose to <guimenuitem>Undo changes to partitions</"
 "guimenuitem> and run guided partitioning again, or modify the proposed "
 "changes as described below for manual partitioning."
-msgstr ""
-"接下来，向导式分区就要完成了。如果您对上面生成的分区信息表感到满意，那么请在"
-"菜单中选择 <guimenuitem>Finish partitioning and write changes to disk</"
-"guimenuitem> 一项来创建新分区表(本节末将会对此进行解释)。如果您认为分区设置不"
-"如愿，那么可以选择 <guimenuitem>Undo changes to partitions</guimenuitem>，然"
-"后再次运行向导式分区，或者按照下面的介绍进行手动分区。"
+msgstr "接下来，导引式分区就要完成了。如果您对上面生成的分区信息表感到满意，那么请在菜单中选择 <guimenuitem>Finish partitioning and write changes to disk</guimenuitem> 一项来创建新分区表(本节末将会对此进行解释)。如果您认为分区设置不如愿，那么可以选择 <guimenuitem>Undo changes to partitions</guimenuitem>，然后再次运行导引式分区，或者按照下面的介绍进行手动分区。"
 
 #. Tag: title
 #: using-d-i.xml:1053
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Manual Partitioning"
-msgstr "分区方式"
+msgstr "手动分区"
 
 #. Tag: para
 #: using-d-i.xml:1054
@@ -1544,11 +1508,7 @@ msgid ""
 "and without the mount points. How to manually setup your partition table and "
 "the usage of partitions by your new Debian system will be covered in the "
 "remainder of this section."
-msgstr ""
-"如果您选择手动分区的话，它的界面和上面介绍的向导式分区大体上相同。不同之处在"
-"于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动"
-"设置您的分区表，以及新安装的 Debian 系统将如何使用这些分区，将会在本节的后面"
-"谈到。"
+msgstr "如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动设置您的分区表，以及新安装的 Debian 系统将如何使用这些分区，将会在本节的后面谈到。"
 
 #. Tag: para
 #: using-d-i.xml:1062
@@ -1675,7 +1635,7 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:1153
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr "配置多磁盘设备(软 RAID)"
 
@@ -2721,7 +2681,7 @@ msgid ""
 "After the base system has been installed, the installer will allow you to "
 "set up the <quote>root</quote> account and/or an account for the first user. "
 "Other user accounts can be created after the installation has been completed."
-msgstr ""
+msgstr "系统安装之后，安装程序要求您创建 <quote>root</quote> 帐号和/或第一个用户帐号。其他的用户帐号可以在安装完成之后创建。"
 
 #. Tag: title
 #: using-d-i.xml:1890
@@ -2833,16 +2793,13 @@ msgstr "安装额外的软件"
 
 #. Tag: para
 #: using-d-i.xml:1960
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "At this point you have a usable but limited system. Most users will want to "
 "install additional software on the system to tune it to their needs, and the "
 "installer allows you do so. This step can take even longer than installing "
 "the base system if you have a slow computer or network connection."
-msgstr ""
-"基本系统安装后，您拥有了一个可用但有限的系统。大多数用户会安装额外的软件，并"
-"根据他们的需求进行调整，安装程序允许您这么做。如果您的电脑或网络比较慢，这一"
-"步或许比安装基本系统还要花时间。"
+msgstr "现在，您拥有了一个可用但有限的系统。大多数用户会安装额外的软件，并根据他们的需求进行调整，安装程序允许您这么做。如果您的电脑或网络比较慢，这一步或许比安装基本系统还要花时间。"
 
 #. Tag: title
 #: using-d-i.xml:1975
@@ -4024,22 +3981,22 @@ msgstr "完成安装"
 
 #. Tag: para
 #: using-d-i.xml:2835
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "This is the last step in the Debian installation process during which the "
 "installer will do any last minute tasks. It mostly consists of tidying up "
 "after the &d-i;."
-msgstr "这是在您启动新系统之前的最后一些工作。主要进行一些 &d-i; 之后的清理。"
+msgstr "这是在您 Debian 安装过程的最后一步。在这最后的几分钟工作里，主要进行一些 &d-i; 之后的清理。"
 
 #. Tag: title
 #: using-d-i.xml:2848
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Setting the System Clock"
-msgstr "建立系统"
+msgstr "设置系统时钟"
 
 #. Tag: para
 #: using-d-i.xml:2850
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
 "this question is avoided if possible and the installer tries to work out "
@@ -4051,7 +4008,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2857
-#, fuzzy, no-c-format
+#, 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 "
@@ -4072,37 +4029,32 @@ msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
 "system's hardware clock. This will be done either in UTC or local time, "
 "depending on the selection that was just made."
-msgstr ""
+msgstr "此时，&d-i; 将保存当前的时间到系统的硬件时钟。它可以是 UTC 或者本地时间，这取决于刚才的选择。"
 
 #. Tag: title
 #: using-d-i.xml:2883
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Reboot the System"
-msgstr "建立系统"
+msgstr "重新启动系统"
 
 #. Tag: para
 #: using-d-i.xml:2885
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
 "used to boot the installer. After that the system will be rebooted into your "
 "new Debian system."
-msgstr ""
-"这是安装 Debian 进程的最后一步。您会被提醒拿出用于安装启动的媒介(CD，软盘"
-"等)。安装程序将做最后几分钟的工作，然后启动到您的新 Debian 系统。"
+msgstr "您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 Debian 系统。"
 
 #. Tag: para
 #: using-d-i.xml:2891
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
 "supported on &arch-title;. You then need to IPL &debian; from the DASD which "
 "you selected for the root filesystem during the first steps of the "
 "installation."
-msgstr ""
-"选择 <guimenuitem>完成安装</guimenuitem> 菜单项，它用来关闭系统。因为在这种情"
-"况下，重启不被 &arch-title; 支持。您需要使用来自 DASD 的 IPL GNU/Linux，它在"
-"安装步骤第一步里选做根文件系统。"
+msgstr "最后一个提示信息后，由于重启不被 &arch-title; 支持，系统将关机。您需要 DASD 上的 IPL &debian;，它在安装步骤第一步里被选做根文件系统。"
 
 #. Tag: title
 #: using-d-i.xml:2904
@@ -4369,7 +4321,7 @@ msgid ""
 "installed. Depending on at which point of the installation the connection "
 "was lost, you may or may not be able to resume the installation after "
 "reconnecting."
-msgstr ""
+msgstr "安装程序中的 <command>ssh</command> 服务器使用的是默认的配置，并不发送 keep-alive 包。原则上，已安装系统的连接应该无限期的保持打开。但是，某些情况下 &mdash; 由您的局域网设置决定 &mdash; 一段时间的不活动，连接将会断开。这种情况常发生在客户端和系统上安装有 Network Address Translation (NAT) 的地方。基于连接在安装过程中的哪一点断开，您在连接之后可能继续，也可能无法继续安装过程。"
 
 #. Tag: para
 #: using-d-i.xml:3090
@@ -4383,11 +4335,11 @@ msgid ""
 "connection to be dropped (for example if keep-alive packets are sent during "
 "a brief network outage, from which <command>ssh</command> would otherwise "
 "have recovered), so it should only be used when needed."
-msgstr ""
+msgstr "您可以通过在启动 <command>ssh</command> 连接时添加 <userinput>-o&nbsp;ServerAliveInterval=<replaceable>value</replaceable></userinput> 选项来避免断开，或者把它加到 <command>ssh</command> 的配置文件里面。注意，某些情况下添加该选项反而会<emphasis>造成</emphasis>断开(例如，如果 keep-alive 包在网络故障(brief network outage)期间送出，<command>ssh</command> 将会恢复)，因此它只在需要的时候采用。"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
 "address or hostname, <command>ssh</command> will refuse to connect to such "
@@ -4398,11 +4350,7 @@ msgid ""
 "entry for a host: <command>ssh-keygen -R &lt;<replaceable>hostname</"
 "replaceable>|<replaceable>IP&nbsp;address</replaceable>&gt;</command>. </"
 "para> </footnote> and try again."
-msgstr ""
-"如果您依次安装多台电脑，他们碰巧使用相同的 IP 地址或主机名，那么 ssh 将拒绝连"
-"接。造成的原因是它具有不同的 fingerprint，这通常是欺骗攻击的标志。如果您确信"
-"不是那种情况，需要删除 <filename>~/.ssh/known_hosts</filename> 里面相关的行，"
-"再重新来过。"
+msgstr "如果您依次安装多台电脑，他们碰巧使用相同的 IP 地址或主机名，那么 <command>ssh</command> 将拒绝连接。造成的原因是它具有不同的 fingerprint，这通常是欺骗攻击的标志。如果您确信不是那种情况，需要删除 <filename>~/.ssh/known_hosts</filename> 里面相关的行<footnote> <para> 下面的命令将删除一个主机的已有记录: <command>ssh-keygen -R &lt;<replaceable>hostname</replaceable>|<replaceable>IP&nbsp;address</replaceable>&gt;</command>. </para> </footnote>，再重新来过。"
 
 #. Tag: para
 #: using-d-i.xml:3119
@@ -4443,26 +4391,3 @@ msgid ""
 msgstr ""
 "另外，如果您在 X 终端下运行 ssh 会话，也不要改变窗口大小，它可能会造成连接中"
 "止。"
-
-#~ msgid "Partitioning Your Disks"
-#~ msgstr "硬盘的分区"
-
-#~ msgid ""
-#~ "After partitioning the installer asks a few more questions that will be "
-#~ "used to set up the system it is about to install."
-#~ msgstr "分区之后，安装程序还会询问一些问题用于建立系统。"
-
-#~ msgid "Configuring Your Time Zone"
-#~ msgstr "配置您的时区"
-
-#~ msgid ""
-#~ "Note that the installer does not currently allow you to actually set the "
-#~ "time in the computer's clock. You can set the clock to the current time "
-#~ "after you have installed, if it is incorrect or if it was previously not "
-#~ "set to UTC."
-#~ msgstr ""
-#~ "注意，安装程序当前并不允许您设定计算机的时钟。但在安装完之后，如果时间不正"
-#~ "确或者以前没有设为 UTC 时，您可以设置时钟到当前的时间。"
-
-#~ msgid "Finish the Installation and Reboot"
-#~ msgstr "完成安装并重启"