po/zh_CN: translate network mirror

5 files changed, 65 insertions, 195 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index b2b1eb3fd..aaa6fe114 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.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-10-22 00:09+0000\n"
-"PO-Revision-Date: 2007-10-09 14:40+0800\n"
+"PO-Revision-Date: 2007-10-28 09:34+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"
@@ -3465,7 +3465,7 @@ msgstr ""
 #: hardware.xml:1934
 #, no-c-format
 msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
-msgstr ""
+msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
 
 #. Tag: para
 #: hardware.xml:1938
@@ -4431,78 +4431,3 @@ msgid ""
 "blade systems."
 msgstr ""
 "<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
-
-#~ msgid "<entry>RiscPC</entry>"
-#~ msgstr "<entry>RiscPC</entry>"
-
-#~ msgid "<entry>rpc</entry>"
-#~ msgstr "<entry>rpc</entry>"
-
-#~ msgid "<entry>sun4m</entry>"
-#~ msgstr "<entry>sun4m</entry>"
-
-#~ msgid "sparc32"
-#~ msgstr "sparc32"
-
-#~ msgid "<term>RiscPC</term>"
-#~ msgstr "<term>RiscPC</term>"
-
-#~ msgid ""
-#~ "This machine is the oldest supported hardware but support for it in our "
-#~ "new installer is incomplete. It has RISC OS in ROM, Linux can be booted "
-#~ "from that OS using linloader. The RiscPC has a modular CPU card and "
-#~ "typically has a 30MHz 610, 40MHz 710 or 233MHz Strongarm 110 CPU fitted. "
-#~ "The mainboard has integrated IDE, SVGA video, parallel port, single "
-#~ "serial port, PS/2 keyboard and proprietary mouse port. The proprietary "
-#~ "module expansion bus allows for up to eight expansion cards to be fitted "
-#~ "depending on configuration, several of these modules have Linux drivers."
-#~ msgstr ""
-#~ "该机器是最早支持的硬件，但在我们新的安装程序里对它的支持还没有完成。它在 "
-#~ "ROM 里面包含 RISC OS，Linux 可以使用 linloader 从该 OS 启动。RiscPC 有一种"
-#~ "模块化的 CPU 卡，典型的安装有 30MHz 610、40MHz 710 或 233MHz Strongarm "
-#~ "110 CPU。主板集成了 IDE、SVGA 视频、并口、单串口、PS/2 键盘和专有的鼠标"
-#~ "口。依据不同的配置，专有的模块扩充总线允许最多安装八块扩展卡，其中的一些模"
-#~ "块有 Linux 驱动程序。"
-
-#~ msgid "sun4, sun4c, sun4d"
-#~ msgstr "sun4, sun4c, sun4d"
-
-#~ msgid ""
-#~ "These subarchitectures include some very old 32-bit machines, which are "
-#~ "no longer supported. For a complete list please consult the <ulink url="
-#~ "\"http://en.wikipedia.org/wiki/SPARCstation\">Wikipedia SPARCstation "
-#~ "page</ulink>."
-#~ msgstr ""
-#~ "这些子体系包含一些非常老的 32 位机器，它们不再获得支持。完整的列表，请查"
-#~ "阅 <ulink url=\"http://en.wikipedia.org/wiki/SPARCstation\">Wikipedia "
-#~ "SPARCstation page</ulink>。"
-
-#~ msgid "<term>sun4m</term>"
-#~ msgstr "<term>sun4m</term>"
-
-#~ msgid ""
-#~ "sun4m is the only 32-bit subarchitecture (sparc32) that is currently "
-#~ "supported. The most popular machines belonging to this class are "
-#~ "Sparcstation 4, 5, 10 and 20."
-#~ msgstr ""
-#~ "sun4m 是当前惟一被支持的 32 位子体系(sparc32)。属于此类的流行机器有 "
-#~ "Sparcstation 4、5、10 和 20。"
-
-#~ msgid ""
-#~ "Note that symmetric multiprocessing (SMP) &mdash; the ability to run "
-#~ "processes on multiple processors &mdash; is not supported on this "
-#~ "hardware, due to stability problems with such configurations. The "
-#~ "available uniprocessor (UP) sparc32 kernel will boot fine on "
-#~ "multiprocessor machines, although it will activate and use only the first "
-#~ "CPU."
-#~ msgstr ""
-#~ "注意，symmetric multiprocessing (SMP) &mdash; 进程运行在多处理器上的能力 "
-#~ "&mdash; 因为该配置下稳定性的问题，在此硬件上不被支持。现有的 uniprocessor "
-#~ "(UP) sparc32 内核可以在多处理器机器上引导，但只激活和使用第一个 CPU。"
-
-#~ msgid ""
-#~ "IDE/ATAPI CD-ROMs are supported on all ARM machines. <phrase condition="
-#~ "\"etch\">On RiscPCs, SCSI CD-ROMs are also supported.</phrase>"
-#~ msgstr ""
-#~ "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。<phrase condition=\"etch\">在 "
-#~ "RiscPC 上，SCSI CD-ROM 也被支持。</phrase>"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 90032e615..460c479c2 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: 2007-10-22 00:09+0000\n"
-"PO-Revision-Date: 2007-03-30 12:43+0800\n"
+"PO-Revision-Date: 2007-10-28 09:34+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"
@@ -2341,17 +2341,3 @@ msgid ""
 msgstr ""
 "在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档，并有一些可"
 "以使用的例子供您修改。"
-
-#~ msgid "RiscPC Installation Files"
-#~ msgstr "RiscPC 的安装文件"
-
-#~ msgid ""
-#~ "The RiscPC installer is booted initially from RISC OS. All the necessary "
-#~ "files are provided in one Zip archive, &rpc-install-kit;. Download this "
-#~ "file onto the RISC OS machine, copy the <filename>linloader.!Boot</"
-#~ "filename> components into place, and run <filename>!dInstall</filename>."
-#~ msgstr ""
-#~ "RiscPC 安装程序最初是从 RiSC OS 引导的。所有必需的文件都由一个名为 &rpc-"
-#~ "install-kit; 的档案所提供，请将此文件下载到 RISC OS 机器中，将 "
-#~ "<filename>linloader.!Boot</filename> 拷贝到合适的位置，然后运行 "
-#~ "<filename>!dInstall</filename>。"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index abb0cccf9..fd0eb5855 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: 2007-10-22 00:09+0000\n"
-"PO-Revision-Date: 2007-10-09 14:40+0800\n"
+"PO-Revision-Date: 2007-10-28 09:32+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"
@@ -1366,7 +1366,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:765
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
 "#d-i mirror/protocol string ftp\n"
@@ -1381,10 +1381,8 @@ msgid ""
 "#d-i mirror/udeb/suite string testing"
 msgstr ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
-"#d-i mirror/protocol string ftp<phrase condition=\"etch\">\n"
-"d-i mirror/country string enter information manually</phrase><phrase "
-"condition=\"lenny\">\n"
-"d-i mirror/country string manual</phrase>\n"
+"#d-i mirror/protocol string ftp\n"
+"d-i mirror/country string manual\n"
 "d-i mirror/http/hostname string &archive-mirror;\n"
 "d-i mirror/http/directory string /debian\n"
 "d-i mirror/http/proxy string\n"
@@ -1429,7 +1427,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:790
-#, 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"
@@ -1502,19 +1500,13 @@ msgstr ""
 "#d-i partman-auto/init_automatically_partition \\\n"
 "#      select Guided - use the largest continuous free space\n"
 "\n"
-"<phrase condition=\"etch\"># Alternatively, you can specify a disk to "
-"partition. The device name\n"
-"# can be given in either devfs or traditional non-devfs format.\n"
-"# For example, to use the first disk:\n"
-"d-i partman-auto/disk string /dev/discs/disc0/disc</phrase><phrase condition="
-"\"lenny\">\n"
 "# Alternatively, you can specify a disk to partition. The device name must\n"
 "# be given in traditional non-devfs format.\n"
 "# For example, to use the first SCSI/SATA hard disk:\n"
 "d-i partman-auto/disk string /dev/sda\n"
 "# Note: If you want to use whatever disk is available, no matter\n"
 "# what its device name, comment the line above out. This will only work if\n"
-"# the system only has one disk.</phrase>\n"
+"# the system only has one disk.\n"
 "# In addition, you'll need to specify the method to use.\n"
 "# The presently available methods are: \"regular\", \"lvm\" and \"crypto\"\n"
 "d-i partman-auto/method string lvm\n"
@@ -1536,14 +1528,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"
@@ -1720,7 +1710,7 @@ msgstr "时钟与时区设置"
 
 #. Tag: screen
 #: preseed.xml:829
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
 "d-i clock-setup/utc boolean true\n"
@@ -1739,13 +1729,12 @@ msgstr ""
 "\n"
 "# You may set this to any valid setting for $TZ; see the contents of\n"
 "# /usr/share/zoneinfo/ for valid values.\n"
-"d-i time/zone string US/Eastern<phrase condition=\"lenny\">\n"
+"d-i time/zone string US/Eastern\n"
 "\n"
 "# Controls whether to use NTP to set the clock during the install\n"
 "d-i clock-setup/ntp boolean true\n"
 "# NTP server to use. The default is almost always fine here.\n"
-"#d-i clock-setup/ntp-server ntp.example.com\n"
-"</phrase>"
+"#d-i clock-setup/ntp-server ntp.example.com"
 
 #. Tag: title
 #: preseed.xml:834
@@ -1779,7 +1768,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:852
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
 "# use sudo).\n"
@@ -1829,11 +1818,11 @@ msgstr ""
 "# or encrypted using an MD5 hash.\n"
 "#d-i passwd/user-password-crypted password [MD5 hash]\n"
 "# Create the first user with the specified UID instead of the default.\n"
-"#d-i passwd/user-uid string 1010<phrase condition=\"lenny\">\n"
+"#d-i passwd/user-uid string 1010\n"
 "\n"
 "# The user account will be added to some standard initial groups. To\n"
 "# override that, use this.\n"
-"#d-i passwd/user-default-groups string audio cdrom video</phrase>"
+"#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
 #: preseed.xml:854
@@ -1882,7 +1871,7 @@ msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内
 
 #. Tag: screen
 #: preseed.xml:882
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# Select the initramfs generator used to generate the initrd for 2.6 "
 "kernels.\n"
@@ -1893,15 +1882,12 @@ msgid ""
 "# kernel is to be installed.\n"
 "#d-i base-installer/kernel/image linux-image-2.6-486"
 msgstr ""
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase "
-"condition=\"lenny\">\n"
+"# Select the initramfs generator used to generate the initrd for 2.6 kernels.\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string yaird\n"
 "\n"
-"# The kernel image (meta) package to be installed; \"none\" can be used if "
-"no\n"
+"# The kernel image (meta) package to be installed; \"none\" can be used if no\n"
 "# kernel is to be installed.\n"
-"#d-i base-installer/kernel/image linux-image-2.6-486</phrase>"
+"#d-i base-installer/kernel/image linux-image-2.6-486"
 
 #. Tag: title
 #: preseed.xml:887
@@ -1924,7 +1910,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:896
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
@@ -1957,15 +1943,12 @@ msgstr ""
 "#d-i apt-setup/non-free boolean true\n"
 "#d-i apt-setup/contrib boolean true\n"
 "# Uncomment this if you don't want to use a network mirror.\n"
-"#d-i apt-setup/use_mirror boolean false<phrase condition=\"etch\">\n"
-"# Uncomment this to avoid adding security sources, or\n"
-"# add a hostname to use a different server than security.debian.org.\n"
-"#d-i apt-setup/security_host string</phrase><phrase condition=\"lenny\">\n"
+"#d-i apt-setup/use_mirror boolean false\n"
 "# Select which update services to use; define the mirrors to be used.\n"
 "# Values shown below are the normal defaults.\n"
 "#d-i apt-setup/services-select multi-select security, volatile\n"
 "#d-i apt-setup/security_host string security.debian.org\n"
-"#d-i apt-setup/volatile_host string volatile.debian.org</phrase>\n"
+"#d-i apt-setup/volatile_host string volatile.debian.org\n"
 "\n"
 "# Additional repositories, local[0-9] available\n"
 "#d-i apt-setup/local0/repository string \\\n"
@@ -2090,7 +2073,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:961
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
 "# If the desktop task is selected, install the kde and xfce desktops\n"
@@ -2106,13 +2089,10 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server<phrase condition="
-"\"lenny\">\n"
+"#tasksel tasksel/first multiselect standard, web-server\n"
 "# If the desktop task is selected, install the kde and xfce desktops\n"
 "# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce</phrase><phrase condition="
-"\"etch\">\n"
-"#tasksel tasksel/first multiselect standard, kde-desktop</phrase>\n"
+"#tasksel tasksel/desktop multiselect kde, xfce\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2131,7 +2111,7 @@ msgstr "安装引导加载器"
 
 #. Tag: screen
 #: preseed.xml:968
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2160,18 +2140,16 @@ msgid ""
 msgstr ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
-"#d-i grub-installer/skip boolean true<phrase condition=\"lenny\">\n"
+"#d-i grub-installer/skip boolean true\n"
 "# To also skip installing lilo, and install no bootloader, uncomment this\n"
 "# too:\n"
-"#d-i lilo-installer/skip boolean true</phrase>\n"
+"#d-i lilo-installer/skip boolean true\n"
 "\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
 "# if no other operating system is detected on the machine.\n"
 "d-i grub-installer/only_debian boolean true\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
+"# This one makes grub-installer install to the MBR if it also finds some other\n"
 "# OS, which is less safe as it might not be able to boot that other OS.\n"
 "d-i grub-installer/with_other_os boolean true\n"
 "\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index f7e0af4f3..5212bf216 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: 2007-10-22 00:09+0000\n"
-"PO-Revision-Date: 2007-07-31 14:16+0800\n"
+"PO-Revision-Date: 2007-10-28 12:33+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"
@@ -777,7 +777,7 @@ msgid ""
 "installation. You should also keep in mind that this procedure only gives "
 "the basic steps to set up a system. Additional installation and/or "
 "configuration steps may be needed."
-msgstr ""
+msgstr "由于绝大多数操作都是手动进行，应该记住这将需要您自己对系统做大量地基本配置，并且要具有比常规安装更多的 Debian 和 Linux 知识。不要期望这种执行的结果与常规安装完全相同。您还应该明白这一过程只是建立一个系统的基本步骤。可能还需要额外的安装、或者配置步骤。"
 
 #. Tag: title
 #: random-bits.xml:373
@@ -1022,7 +1022,7 @@ msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 #: random-bits.xml:525
 #, no-c-format
 msgid "Create device files"
-msgstr ""
+msgstr "创建设备文件"
 
 #. Tag: para
 #: random-bits.xml:526
@@ -1035,19 +1035,19 @@ msgid ""
 "whether you intend to use a modular kernel or not, and on whether you intend "
 "to use dynamic (e.g. using <classname>udev</classname>) or static device "
 "files for the new system."
-msgstr ""
+msgstr "此时，<filename>/dev/</filename> 只含有非常基本的设备文件。安装的后续步骤可能还需要更多的设备文件。使用什么样的文件和方法，取决于安装使用的系统、是否采用内核模块，以及在新系统中采用动态 (比如，使用 <classname>udev</classname>) 或静态设备文件。"
 
 #. Tag: para
 #: random-bits.xml:536
 #, no-c-format
 msgid "A few of the available options are:"
-msgstr ""
+msgstr "可以使用的选项有："
 
 #. Tag: para
 #: random-bits.xml:541
 #, no-c-format
 msgid "create a default set of static device files using"
-msgstr ""
+msgstr "创建默认的静态设备文件，使用"
 
 #. Tag: screen
 #: random-bits.xml:544
@@ -1056,13 +1056,15 @@ msgid ""
 "# cd /dev\n"
 "# MAKEDEV generic"
 msgstr ""
+"# cd /dev\n"
+"# MAKEDEV generic"
 
 #. Tag: para
 #: random-bits.xml:547
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
-msgstr ""
+msgstr "手动创建指定的设备文件，使用 <command>MAKEDEV</command>"
 
 #. Tag: para
 #: random-bits.xml:552
@@ -1071,7 +1073,7 @@ msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
 "note that the postinst scripts of some packages may try to create device "
 "files, so this option should only be used with care"
-msgstr ""
+msgstr "将 host 系统上加载的 /dev 绑定到 target 系统的 /dev；注意，有些软件包的 postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
 #: random-bits.xml:565
@@ -1562,7 +1564,7 @@ msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
 "been created. There are alternative methods to install <command>grub</"
 "command>, but those are outside the scope of this appendix."
-msgstr ""
+msgstr "注意，这里假设已经创建了 <filename>/dev/hda</filename> 设备文件。另外一种方法是安装 <command>grub</command>，但本附录中不讨论。"
 
 #. Tag: para
 #: random-bits.xml:775
@@ -1572,7 +1574,7 @@ msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子
 
 #. Tag: screen
 #: random-bits.xml:779
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
 "root=/dev/<replaceable>hda6</replaceable>\n"
@@ -1589,6 +1591,7 @@ msgstr ""
 "delay=20\n"
 "lba32\n"
 "image=/vmlinuz\n"
+"initrd=/initrd.img\n"
 "label=Debian"
 
 #. Tag: para
@@ -2190,7 +2193,7 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1160
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "It is also available as a special <quote>mini</quote> ISO image<footnote id="
 "\"gtk-miniiso\"> <para> The mini ISO image can be downloaded from a Debian "
@@ -2199,18 +2202,11 @@ msgid ""
 "mainly useful for testing; in this case the image is booted just using "
 "<userinput>install</userinput>. There is no graphical installer image that "
 "can be netbooted."
-msgstr ""
-"还有一个特殊的 <quote>mini</quote> ISO 映像<footnote id=\"gtk-miniiso\"> "
-"<para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 里面的 "
-"Debian 镜像下载，名为 <phrase condition=\"etch\"><filename>gtk-miniiso</"
-"filename></phrase> <phrase condition=\"lenny\"><filename>netboot/gtk/mini."
-"iso</filename></phrase>。 </para> </footnote>，主要用于测试；这种情况下它只能"
-"使用 <userinput>install</userinput> 来引导。还没有图形安装程序映像可以使用网"
-"络启动。"
+msgstr "还有一个特殊的 <quote>mini</quote> ISO 映像<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 Debian 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。 </para> </footnote>，主要用于测试；这种情况下它只能使用 <userinput>install</userinput> 来引导。当前还没有可以使用网络启动的图形安装程序映像。"
 
 #. Tag: para
 #: random-bits.xml:1175
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
 "image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image "
@@ -2218,13 +2214,7 @@ msgid ""
 "\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. "
 "</para> </footnote>. It should work on almost all PowerPC systems that have "
 "an ATI graphical card, but is unlikely to work on other systems."
-msgstr ""
-"对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用"
-"<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend="
-"\"downloading-files\"/> 里面的 Debian 镜像下载，名为 <phrase condition=\"etch"
-"\"><filename>gtk-miniiso</filename></phrase> <phrase condition=\"lenny"
-"\"><filename>netboot/gtk/mini.iso</filename></phrase>。</para> </footnote>。"
-"它可以工作在所有使用 ATI 图形卡的 PowerPC 系统上，但其它的则不行。"
+msgstr "对于 &arch-title;，当前只有一个实验性的 <quote>mini</quote> ISO 映像可用<footnote id=\"gtk-miniiso\"> <para> 该 mini ISO 映像可以从 <xref linkend=\"downloading-files\"/> 中的一个 Debian 镜像下载，名为 <filename>netboot/gtk/mini.iso</filename>。</para> </footnote>。它可以工作在所有使用 ATI 图形卡的 PowerPC 系统上，其它的则不行。"
 
 #. Tag: para
 #: random-bits.xml:1189
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index b65b3c001..88e690e0f 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: 2007-10-24 00:09+0000\n"
-"PO-Revision-Date: 2007-07-31 14:23+0800\n"
+"PO-Revision-Date: 2007-10-28 13:34+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"
@@ -2874,16 +2874,13 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:1971
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<command>apt</command> must be configured so that it knows from where to "
 "retrieve packages. The results of this configuration are written to the file "
 "<filename>/etc/apt/sources.list</filename>. You can examine and edit this "
 "file to your liking after the installation is complete."
-msgstr ""
-"您必须设置 <command>apt</command>，使它明白该从哪里获取软件包。安装程序会根据"
-"您的安装介质最大程度上自动处理。设置的结果写入到 <filename>/etc/apt/sources."
-"list</filename> 文件里面，安装完成后您可以检查它并编辑成自己喜欢的地方。"
+msgstr "您必须设置 <command>apt</command>，使它明白该从哪里获取软件包。设置的结果写入到 <filename>/etc/apt/sources.list</filename> 文件里面，安装完成后您可以检查并编辑成自己喜欢的地方。"
 
 #. Tag: para
 #: using-d-i.xml:1978
@@ -2895,7 +2892,7 @@ msgid ""
 "In most cases the installer will automatically add a security mirror and, if "
 "you are installing the stable distribution, a mirror for the "
 "<quote>volatile</quote> update service."
-msgstr ""
+msgstr "如果您在默认优先级下进行安装，安装程序会自动处理大部分配置，它是根据您使用的安装方法以及在安装开始时所做的选择。如果您安装的是稳定版，大多数情况下安装程序程序会自动加上安全镜像，它是 <quote>volatile</quote> 更新服务的镜像。"
 
 #. Tag: para
 #: using-d-i.xml:1987
@@ -2906,13 +2903,13 @@ msgid ""
 "the security and/or volatile update services, and you can choose to add "
 "packages from the <quote>contrib</quote> and <quote>non-free</quote> "
 "sections of the archive."
-msgstr ""
+msgstr "如果您采用较低的优先级安装 (比如，expert 模式)，就要自己做更多的判定。您可以选择是否使用安全、或者 volatile 更新服务，并能选择从 <quote>contrib</quote> 和 <quote>non-free</quote> 软件仓库里面添加软件包。"
 
 #. Tag: title
 #: using-d-i.xml:1998
 #, no-c-format
 msgid "Using a network mirror"
-msgstr ""
+msgstr "使用网络镜像"
 
 #. Tag: para
 #: using-d-i.xml:2000
@@ -2921,7 +2918,7 @@ msgid ""
 "One question that will be asked in most cases is whether or not to use a "
 "network mirror as a source for packages. In most cases the default answer "
 "should be fine, but there are some exceptions."
-msgstr ""
+msgstr "经常会有一个问题被问到，是否需要使用网络镜像作为软件包的源。多数情况下默认答案会很好，但还是有一些例外。"
 
 #. Tag: para
 #: using-d-i.xml:2006
@@ -2933,7 +2930,7 @@ msgid ""
 "have a limited Internet connection it is best <emphasis>not</emphasis> to "
 "select the <literal>desktop</literal> task in the next step of the "
 "installation."
-msgstr ""
+msgstr "如果<emphasis>没有</emphasis>使用完整版的 CD 或 DVD，或者完整版的 CD/DVD 映像，您就应该使用网络镜像，否则只能得到一个有限的系统。然而，假如您有互联网连接限制，在安装过程的下一步最好<emphasis>不要</emphasis>选择 <literal>desktop</literal> 任务。"
 
 #. Tag: para
 #: using-d-i.xml:2015
@@ -2949,7 +2946,7 @@ msgid ""
 "installation using only what's available on the CD and install additional "
 "packages after the installation (i.e. after you have rebooted into the new "
 "system)."
-msgstr ""
+msgstr "如果您是从完整的 CD 或 CD 映像(非 DVD)安装，虽然添加网络镜像并不是必须的，但仍建议您采用，这是因为单张 CD 所能容纳的软件包数量是有限的。安装程序当前还不支持使用多 CD 或 DVD 映像方式进行安装<footnote> <para> 这项功能已列入计划。</para> </footnote>。假如您有互联网连接限制，这里最好<emphasis>不要</emphasis>选择网络镜像，只在安装以后(比如，重新启动到新系统)完成 CD 上所具有的以及额外的软件包。"
 
 #. Tag: para
 #: using-d-i.xml:2033
@@ -2962,7 +2959,7 @@ msgid ""
 "another language than English: a number of font and localization packages "
 "are known to be on the second DVD. So, if you have a reasonable Internet "
 "connection it is still advisable to use a network mirror."
-msgstr ""
+msgstr "如果您使用 DVD 或 DVD 映像安装，使用网络镜像的需求就不那么大，但在下一步的任务选择中，仍然会有一些软件包没有包含在第一张 DVD 里面。特别是您安装了非英语的其他语言：一些字体和本地化软件包都放在第二张 DVD 上面。所以，如果您有互联网连接可用，最好还是使用网络镜像。"
 
 #. Tag: para
 #: using-d-i.xml:2043
@@ -2980,7 +2977,7 @@ msgid ""
 "<filename>/etc/apt/sources.list</filename>. Also adding a network mirror has "
 "the advantage that it will make updates of packages in point releases of the "
 "distribution available for installation. </para> </footnote>."
-msgstr ""
+msgstr "在安装完成之后去装额外的软件包，您有两种选择：<orderedlist> <listitem><para> 如果您有附加的 CD/DVD 映像(与所使用的 CD/DVD 属于同一套)，可以使用 <command>apt-cdrom</command> 将它们加入 <filename>sources.list</filename>；</para></listitem> <listitem><para> 使用编辑器手动添加镜像到 <filename>sources.list</filename>。</para></listitem> </orderedlist> 之后您可以使用一种软件包管理前端工具选择安装额外的软件包<footnote> <para> 也可以把附加 CD 或 DVD <emphasis>和</emphasis> 网络镜像都加到 <filename>/etc/apt/sources.list</filename>。增加网络镜像的优势是可以安装已经更新的发布版本软件包。</para> </footnote>。"
 
 #. Tag: para
 #: using-d-i.xml:2077
@@ -2993,7 +2990,7 @@ msgid ""
 "depends on a) the tasks you select in the next step of the installation, b) "
 "which packages are needed for those tasks, and c) which of those packages "
 "are present on the CD/DVD."
-msgstr ""
+msgstr "总结：除非您不具备良好的互联网连接，选择网络镜像通常是一个好方法。如果 CD/DVD 上有软件包当前的版本，安装程序总会从这里安装。如果您选择了镜像，需要下载的数据量取决于 a) 安装时下一步选择的任务，b) 这些任务所需要的软件包 和 c) 这些软件包有哪些在 CD/DVD 上。"
 
 #. Tag: para
 #: using-d-i.xml:2087
@@ -3002,7 +2999,7 @@ msgid ""
 "Note that even if you choose not to use a network mirror, some packages may "
 "still be downloaded from the Internet if there is a security or volatile "
 "update available for them and those services have been configured."
-msgstr ""
+msgstr "注意，即使您没有选择使用网络镜像，如果配置了安全检测服务，并且软件包有安全或 volatile 更新，仍然会从互联网下载更新后的软件包。"
 
 #. Tag: title
 #: using-d-i.xml:2102
@@ -3410,19 +3407,13 @@ msgstr "其它选择"
 
 #. Tag: para
 #: using-d-i.xml:2389
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
 "somewhere else. In this case you will be asked for desired location. You can "
 "use traditional device names such as <filename>/dev/hda</filename> or "
 "<filename>/dev/sda</filename>."
-msgstr ""
-"对于高级用户，想把 <command>LILO</command> 安装到其它地方很有用。这种方式下，"
-"您会被问到需要安装的位置。您可以采用<phrase condition=\"etch\"> devfs 风格的"
-"名称，比如名字开头是 <filename>/dev/ide</filename>、<filename>/dev/scsi</"
-"filename> 和 <filename>/dev/discs</filename>，以及传统的名字</phrase> "
-"<phrase condition=\"lenny\">传统的设备命名</phrase>，如 <filename>/dev/hda</"
-"filename> 或 <filename>/dev/sda</filename>。"
+msgstr "对于高级用户，把 <command>LILO</command> 安装到其它地方会很有用。这种方式下，您会被问到需要安装的位置。您可以采用传统的设备命名，如 <filename>/dev/hda</filename> 或 <filename>/dev/sda</filename>。"
 
 #. Tag: para
 #: using-d-i.xml:2399