unfuzzy

6 files changed, 48 insertions, 103 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 1b8ceb98a..64e070375 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2006-09-24 09:06+0000\n"
-"PO-Revision-Date: 2006-08-10 10:05+0800\n"
+"PO-Revision-Date: 2006-09-29 14:09+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"
@@ -499,7 +499,7 @@ msgstr "用 TFTP 引导"
 
 #. Tag: para
 #: boot-installer.xml:284
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "In SRM, Ethernet interfaces are named with the <userinput>ewa</userinput> "
 "prefix, and will be listed in the output of the <userinput>show dev</"
@@ -517,21 +517,16 @@ msgid ""
 "</screen></informalexample> You can get a listing of valid modes with "
 "<userinput>&gt;&gt;&gt;set ewa0_mode</userinput>."
 msgstr ""
-"在 SRM 上，以太网界面名字带有 <userinput>ewa</userinput> 前缀，可以用 "
-"<userinput>ewa</userinput> 前缀，并可以用 <userinput>show dev</userinput> 命"
-"令列出，类似如下显示(可能有一点不同)： <informalexample><screen>\n"
+"在 SRM 上，以太网界面名字带有 <userinput>ewa</userinput> 前缀，并可以用 <userinput>show dev</userinput> 命令列出，类似如下显示(可能有一点不同)： <informalexample><screen>\n"
 "&gt;&gt;&gt; show dev\n"
 "ewa0.0.0.9.0               EWA0              08-00-2B-86-98-65\n"
 "ewb0.0.0.11.0              EWB0              08-00-2B-86-98-54\n"
 "ewc0.0.0.2002.0            EWC0              00-06-2B-01-32-B0\n"
-"</screen></informalexample> 您首先需要设置引导协议： "
-"<informalexample><screen>\n"
+"</screen></informalexample> 您首先需要设置引导协议： <informalexample><screen>\n"
 "&gt;&gt;&gt; set ewa0_protocol bootp\n"
-"</screen></informalexample> 然后检查媒介类型是否正确： "
-"<informalexample><screen>\n"
+"</screen></informalexample> 然后检查媒介类型是否正确： <informalexample><screen>\n"
 "&gt;&gt;&gt; set ewa0_mode <replaceable>mode</replaceable>\n"
-"</screen></informalexample> 您可以获得一个有效模式的列表 <userinput>&gt;&gt;"
-"&gt;set ewa0_mode</userinput>。"
+"</screen></informalexample> 获得一个有效模式的列表 <userinput>&gt;&gt;&gt;set ewa0_mode</userinput>。"
 
 #. Tag: para
 #: boot-installer.xml:302
@@ -3696,9 +3691,9 @@ msgstr ""
 
 #. Tag: term
 #: boot-installer.xml:2985
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "debian-installer/theme"
-msgstr "debian-installer/framebuffer"
+msgstr "debian-installer/theme"
 
 #. Tag: para
 #: boot-installer.xml:2986
@@ -3710,7 +3705,7 @@ msgid ""
 "designed for visually impaired users. Set the theme by booting with "
 "parameter <userinput>debian-installer/theme=<replaceable>dark</replaceable></"
 "userinput> or <userinput>theme=<replaceable>dark</replaceable></userinput>."
-msgstr ""
+msgstr "theme 决定安装程序用户界面的外观(颜色，图标等。)。不同的前端(frontend)有不同的 theme。当前 newt 和 gtk 前端只有一个 <quote>dark</quote> theme 提供给视觉受损的用户。them 可以在启动的时候通过 <userinput>debian-installer/theme=<replaceable>dark</replaceable></userinput> 或 <userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
 
 #. Tag: term
 #: boot-installer.xml:2999
@@ -3858,7 +3853,7 @@ msgstr "如果您在使用 2.2.x 内核，也许需要设置 &ramdisksize;。"
 #: boot-installer.xml:3091
 #, no-c-format
 msgid "directfb/hw-accel"
-msgstr ""
+msgstr "directfb/hw-accel"
 
 #. Tag: para
 #: boot-installer.xml:3092
@@ -3867,7 +3862,7 @@ msgid ""
 "For the gtk frontend (graphical installer), hardware acceleration in "
 "directfb is disabled by default. To enable it, set this parameter to "
 "<userinput>true</userinput> when booting the installer."
-msgstr ""
+msgstr "对于 gtk 前端(图形界面安装程序)，默认时 directfb 的图形加速关闭。要打开它，可以在启动安装程序的时候设置参数为 <userinput>true</userinput>。"
 
 #. Tag: term
 #: boot-installer.xml:3102
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 7e4560a4b..fd400e996 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: 2006-09-08 22:58+0000\n"
-"PO-Revision-Date: 2006-09-04 10:00+0800\n"
+"PO-Revision-Date: 2006-09-29 14:09+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"
@@ -69,13 +69,11 @@ msgstr "支持的体系"
 
 #. Tag: para
 #: hardware.xml:42
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Debian &release; supports twelve major architectures and several variations "
 "of each architecture known as <quote>flavors</quote>."
-msgstr ""
-"Debian &release; 支持十一种主要的体系和一些称为 <quote>flavors</quote> 的变"
-"种。"
+msgstr "Debian &release; 支持十二种主要的体系和一些称为 <quote>flavors</quote> 的变种。"
 
 #. Tag: entry
 #: hardware.xml:53
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index e305c7f65..4be2509f0 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: 2006-08-16 18:10+0000\n"
-"PO-Revision-Date: 2006-08-10 11:03+0800\n"
+"PO-Revision-Date: 2006-09-29 14:12+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"
@@ -357,7 +357,7 @@ msgstr "安装"
 
 #. Tag: para
 #: installation-howto.xml:211
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Once the installer starts, you will be greeted with an initial screen. Press "
 "&enterkey; to boot, or read the instructions for other boot methods and "
@@ -366,13 +366,7 @@ msgid ""
 "<prompt>boot:</prompt> prompt. <footnote><para> The 2.6 kernel is the "
 "default for most boot methods, but is not available when booting from a "
 "floppy. </para></footnote> </phrase>"
-msgstr ""
-"一旦安装套件开始运行后，会有一个初始画面迎接您。要启动的话，请按 &enterkey;；"
-"或者先看一下其它的启动方式以及各种参数(参阅 <xref linkend=\"boot-parms\"/>)。"
-"<phrase arch=\"x86\"> 如果您打算使用 2.4 的内核，在 <prompt>boot:</prompt> 提"
-"示符之后键入 <userinput>linux24</userinput>。<footnote><para> 在多数启动方式"
-"下，默认使用 2.6 内核，但用软盘启动时 2.6 内核不可用。</para></footnote> </"
-"phrase>"
+msgstr "一旦安装程序运行，会有一个初始画面迎接您。按 &enterkey; 启动系统；或者先看一下其它的启动方式以及各种参数(参阅 <xref linkend=\"boot-parms\"/>)。<phrase arch=\"i386\"> 如果您打算使用 2.4 的内核，在 <prompt>boot:</prompt> 提示符之后键入 <userinput>install24</userinput>。<footnote><para> 在多数启动方式下，默认使用 2.6 内核，但用软盘启动时不可用。</para></footnote> </phrase>"
 
 #. Tag: para
 #: installation-howto.xml:227
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 61e025fe7..91030584b 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.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: 2006-09-28 13:02+0000\n"
-"PO-Revision-Date: 2006-09-04 10:41+0800\n"
+"PO-Revision-Date: 2006-09-29 13:56+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"
@@ -503,21 +503,14 @@ msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
 
 #. Tag: para
 #: post-install.xml:361
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "To compile a kernel the Debian way, you need some packages: "
 "<classname>fakeroot</classname>, <classname>kernel-package</classname>, "
 "<classname>linux-source-2.6</classname> and a few others which are probably "
 "already installed (see <filename>/usr/share/doc/kernel-package/README.gz</"
 "filename> for the complete list)."
-msgstr ""
-"为了以 Debian 的方式编译内核，您需要一些软件包： <classname>fakeroot</"
-"classname>，<classname>kernel-package</classname>，<phrase condition="
-"\"classic-kpkg\"><classname>kernel-source-&kernelversion;</classname>(此文档"
-"写作时最新的版本)</phrase> <phrase condition=\"common-kpkg"
-"\"><classname>linux-source-2.6</classname></phrase> 以及其它一些您可能已经安"
-"装过的软件包(完整的列表请参阅 <filename>/usr/share/doc/kernel-package/README."
-"gz</filename>)。"
+msgstr "为了以 Debian 的方式编译内核，您需要一些软件包： <classname>fakeroot</classname>，<classname>kernel-package</classname>，<classname>linux-source-2.6</classname> 以及其它一些可能已经安装过的软件包(完整的列表请参阅 <filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
 
 #. Tag: para
 #: post-install.xml:370
@@ -534,7 +527,7 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:378
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Note that you don't <emphasis>have</emphasis> to compile your kernel the "
 "<quote>Debian way</quote>; but we find that using the packaging system to "
@@ -542,13 +535,7 @@ msgid ""
 "kernel sources right from Linus instead of <classname>linux-source-2.6</"
 "classname>, yet still use the <classname>kernel-package</classname> "
 "compilation method."
-msgstr ""
-"注意您不一定<emphasis>要</emphasis>以 <quote>Debian 方式</quote>编译内核；但"
-"我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，您可以"
-"直接从 Linus 那里而非 <phrase condition=\"classic-kpkg\"><classname>kernel-"
-"source-&kernelversion;</classname>，</phrase> <phrase condition=\"common-kpkg"
-"\"><classname>linux-source-2.6</classname>,</phrase> 得到内核源码，并仍使用 "
-"<classname>kernel-package</classname> 的编译方法。"
+msgstr "注意，您不一定<emphasis>要</emphasis>以 <quote>Debian 方式</quote>编译内核；但我们发现使用软件包系统来管理您的内核，确实可以更加安全和易用。事实上，您可以直接从 Linus 那里而非 <classname>linux-source-2.6</classname> 得到内核源码，并仍使用 <classname>kernel-package</classname> 的编译方法。"
 
 #. Tag: para
 #: post-install.xml:387
@@ -564,7 +551,7 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:394
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hereafter, we'll assume you have free rein over your machine and will "
 "extract your kernel source to somewhere in your home directory<footnote> "
@@ -576,18 +563,7 @@ msgid ""
 "linux-source-&kernelversion;.tar.bz2</userinput> and change to the directory "
 "<filename>linux-source-&kernelversion;</filename> that will have been "
 "created."
-msgstr ""
-"此后，我们假设您具有操作您机器的权力，可以将内核源码解压到您的 home 目录"
-"<footnote> <para> 可以在其他目录解开内核源码并编译自定义内核，但是不需要额外"
-"的权限是最简单的方式。</para> </footnote>。我们还假设您的内核版本是 "
-"\"&kernelversion;。确定您处于打算解开内核源码的目录，然后使用 <phrase "
-"condition=\"classic-kpkg\"><userinput>tar xjf /usr/src/kernel-source-"
-"&kernelversion;.tar.bz2</userinput></phrase> <phrase condition=\"common-kpkg"
-"\"><userinput>tar xjf /usr/src/linux-source-&kernelversion;.tar.bz2</"
-"userinput></phrase> 解压，并进入 <phrase condition=\"classic-kpkg"
-"\"><filename>kernel-source-&kernelversion;</filename></phrase> <phrase "
-"condition=\"common-kpkg\"><filename>linux-source-&kernelversion;</filename></"
-"phrase> 刚才创建的目录。"
+msgstr "此后，我们假设您具有操作您机器的权力，可以将内核源码解压到您的 home 目录<footnote> <para> 可以在其他目录解开内核源码并编译自定义内核，但是不需要额外的权限是最简单的方式。</para> </footnote>。我们还假设您的内核版本是 \"&kernelversion;。确定您处于打算解开内核源码的目录，然后使用 <userinput>tar xjf /usr/src/linux-source-&kernelversion;.tar.bz2</userinput> 解压，并进入 <filename>linux-source-&kernelversion;</filename> 刚才创建的目录。"
 
 #. Tag: para
 #: post-install.xml:414
@@ -644,7 +620,7 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:444
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Once the compilation is complete, you can install your custom kernel like "
 "any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-"
@@ -659,21 +635,7 @@ msgid ""
 "configuration set. Your new kernel package is also clever enough to "
 "automatically update your boot loader to use the new kernel. If you have "
 "created a modules package, you'll need to install that package as well."
-msgstr ""
-"一旦编译完成，您就可以像安装其它软件包一样安装定制的内核。以 root 身份，执行 "
-"<phrase condition=\"classic-kpkg\"> <userinput>dpkg -i ../kernel-image-"
-"&kernelversion;-<replaceable>subarchitecture</"
-"replaceable>_custom.1.0_&architecture;.deb</userinput>。</phrase> <phrase "
-"condition=\"common-kpkg\"> <userinput>dpkg -i ../linux-image-&kernelversion;-"
-"<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</"
-"userinput>。</phrase> 其中 <replaceable>subarchitecture</replaceable> 部分是"
-"一个可选的子结构，<phrase arch=\"i386\">例如 <quote>686</quote>，</phrase>这"
-"取决于您所设置的内核选项。<userinput>dpkg -i</userinput> 将安装内核以及其它的"
-"一些支持文件。例如，<filename>System.map</filename> 可能会被安装(用来辅助调试"
-"内核问题)，<filename>/boot/config-&kernelversion;</filename> 也将被安装，它包"
-"含了您当前的配置。新的内核软件包将会自动地更新您的系统上的启动引导器，让它使"
-"用新内核。如果您创建了一个模块软件包，<phrase condition=\"classic-kpkg\">例"
-"如 PCMCIA，</phrase>您也要同时安装该软件包。"
+msgstr "一旦编译完成，您就可以像安装其它软件包一样安装定制的内核。以 root 身份，执行 <userinput>dpkg -i ../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>。其中 <replaceable>subarchitecture</replaceable> 部分是一个可选的子结构，<phrase arch=\"i386\">例如 <quote>686</quote>，</phrase>这取决于您所设置的内核选项。<userinput>dpkg -i</userinput> 将安装内核以及其它的一些支持文件。例如，<filename>System.map</filename> 可能会被安装(用来辅助调试内核问题)，<filename>/boot/config-&kernelversion;</filename> 也将被安装，它包含了您当前的配置。新的内核软件包将会自动地更新系统上的启动引导器，让它使用新内核。如果您创建了一个模块软件包，也要同时安装该软件包。"
 
 #. Tag: para
 #: post-install.xml:464
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index d6f67e3bb..7bf031c19 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: 2006-09-07 13:39+0000\n"
-"PO-Revision-Date: 2006-09-04 10:27+0800\n"
+"PO-Revision-Date: 2006-09-29 14:14+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"
@@ -640,14 +640,12 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:435
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Most questions need to be preseeded using the values valid in English and "
 "not the translated values. However, there are some questions (for example in "
 "<classname>partman</classname>) where the translated values need to be used."
-msgstr ""
-"大多数问题需要使用有效的英文预置值，而不是翻译过的值。但有些问题(例如 "
-"<classname>partman</classname>，需要使用翻译过的值。"
+msgstr "大多数问题需要使用有效的英文预置值，而不是翻译过的值。但有些问题(例如 <classname>partman</classname>)，需要使用翻译过的值。"
 
 #. Tag: para
 #: preseed.xml:441
@@ -1099,7 +1097,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:648
-#, 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"
@@ -1168,14 +1166,18 @@ msgstr ""
 "#      select Use the largest continuous free space\n"
 "\n"
 "# Alternatively, you can specify a disk to partition. The device name can\n"
-"# be given in either devfs or traditional non-devfs format.\n"
-"# For example, to use the first disk devfs knows of:\n"
+"# be given in either devfs or traditional non-devfs format. If the method\n"
+"# supports it, you can specify several disks separated by spaces.\n"
+"# For example, to use the first disk:\n"
 "d-i partman-auto/disk string /dev/discs/disc0/disc\n"
-"# Or, if you want to use LVM:\n"
-"#d-i partman-auto-lvm/disk string /dev/discs/disc0/disc\n"
-"# Or, LVM with more than one disk:\n"
-"#d-i partman-auto-lvm/disk string /dev/discs/disc0/disc /dev/discs/disc1/"
-"disc\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"
+"\n"
+"# If one of the disks that are going to be automatically partitioned\n"
+"# contains an old LVM configuration, the user will normally receive a\n"
+"# warning. This can be preseeded away...\n"
+"d-i partman-auto/purge_lvm_from_device boolean true\n"
 "\n"
 "# You can choose from any of the predefined partitioning recipes.\n"
 "# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1187,8 +1189,7 @@ 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"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index e640c3488..bffcb87a6 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: 2006-09-28 13:02+0000\n"
-"PO-Revision-Date: 2006-08-10 11:16+0800\n"
+"PO-Revision-Date: 2006-09-29 13:58+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"
@@ -1228,7 +1228,7 @@ msgstr "内核的安装"
 
 #. Tag: para
 #: random-bits.xml:583
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a Linux kernel and a "
 "boot loader. Identify available pre-packaged kernels with "
@@ -1236,22 +1236,17 @@ msgid ""
 "# apt-cache search linux-image\n"
 "</screen></informalexample> Then install your choice using its package name."
 msgstr ""
-"若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面"
-"指令找到那些预先打包的内核 <informalexample><screen>\n"
-"# apt-cache search <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
-"condition=\"common-kpkg\">linux</phrase>-image\n"
+"若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面指令找到那些预先打包的内核 <informalexample><screen>\n"
+"# apt-cache search linux-image\n"
 "</screen></informalexample> 接下来使用所选包名来安装。"
 
 #. Tag: screen
 #: random-bits.xml:592
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
 "replaceable>"
-msgstr ""
-"# aptitude install <phrase condition=\"classic-kpkg\">kernel</phrase><phrase "
-"condition=\"common-kpkg\">linux</phrase>-image-<replaceable>&kernelversion;-"
-"arch-etc</replaceable>"
+msgstr "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>"
 
 #. Tag: title
 #: random-bits.xml:598