Unfuzzy po/zh_CN

6 files changed, 43 insertions, 81 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 1e524961d..4bbf7224a 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: 2007-06-10 22:49+0000\n"
-"PO-Revision-Date: 2007-03-30 12:44+0800\n"
+"PO-Revision-Date: 2007-06-23 19: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"
@@ -3653,7 +3653,7 @@ msgstr ""
 #: boot-installer.xml:2973
 #, no-c-format
 msgid "lowmem"
-msgstr ""
+msgstr "lowmem"
 
 #. Tag: para
 #: boot-installer.xml:2974
@@ -3662,7 +3662,7 @@ msgid ""
 "Can be used to force the installer to a lowmem level higher than the one the "
 "installer sets by default based on available memory. Possible values are 1 "
 "and 2. See also <xref linkend=\"lowmem\"/>."
-msgstr ""
+msgstr "可以强制安装程序设置高于安装程序根据实际内存默认的 lomem 等级。该值可设为 1 和 2。参阅 <xref linkend=\"lowmem\"/>。"
 
 #. Tag: term
 #: boot-installer.xml:2984
@@ -4750,7 +4750,7 @@ msgstr "在装入 USB 模块时系统停止"
 
 #. Tag: para
 #: boot-installer.xml:3672
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The kernel normally tries to install USB modules and the USB keyboard driver "
 "in order to support some non-standard USB keyboards. However, there are some "
@@ -4758,11 +4758,7 @@ msgid ""
 "may be disabling the USB controller in your mainboard BIOS setup. Another "
 "option is passing the <userinput>nousb</userinput> parameter at the boot "
 "prompt."
-msgstr ""
-"内核正常情况下会尝试安装 USB 模块以及 USB 键盘驱动来支持一些非标准的 USB 键"
-"盘。但是，有些不完整的 USB 系统会在驱动程序装入时死机。一个可能的解决方法是"
-"在 BIOS 设置内禁止您的 USB 控制器。或者在引导提示符处传递 <userinput>debian-"
-"installer/probe/usb=false</userinput> 参数，这将阻止此模块加载。"
+msgstr "内核正常情况下会尝试安装 USB 模块以及 USB 键盘驱动来支持一些非标准的 USB 键盘。但是，有些不完整的 USB 系统会在驱动程序装入时死机。一个可能的解决方法是设置主板的 BIOS 禁止 USB 控制器。另一种选择是在引导提示符处传入 <userinput>nousb</userinput>false</userinput> 参数。"
 
 #. Tag: para
 #: boot-installer.xml:3686
@@ -5042,13 +5038,3 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告内，请说明问题所在，包括内核挂起后最后"
 "见到的内核消息。描述进入问题状态所进行的步骤。"
-
-#~ msgid "debian-installer/probe/usb"
-#~ msgstr "debian-installer/probe/usb"
-
-#~ msgid ""
-#~ "Set to <userinput>false</userinput> to prevent probing for USB on boot, "
-#~ "if that causes problems."
-#~ msgstr ""
-#~ "设置成 <userinput>false</userinput> 可以阻止在引导的时候进行 USB 探测，如"
-#~ "果这会引起的问题话。"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index fc0f10c58..a12cde881 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-05-05 22:00+0000\n"
-"PO-Revision-Date: 2007-04-19 21:16+0800\n"
+"PO-Revision-Date: 2007-06-23 19:10+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"
@@ -3532,12 +3532,11 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1973
-#, fuzzy, no-c-format
+#, no-c-format
 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。在 RiscPC 上，SCSI CD-ROM 也被支持。"
+msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。<phrase condition=\"etch\">在 RiscPC 上，SCSI CD-ROM 也被支持。</phrase>"
 
 #. Tag: para
 #: hardware.xml:1978
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 59786a507..dfb3cb89e 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-05-10 19:09+0000\n"
-"PO-Revision-Date: 2007-04-08 18:44+0800\n"
+"PO-Revision-Date: 2007-06-23 19: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"
@@ -2678,7 +2678,7 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1809
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The OpenFirmware on OldWorld Beige G3 machines, OF versions 2.0f1 and 2.4, "
 "is broken. These machines will most likely not be able to boot from the hard "
@@ -2688,13 +2688,7 @@ msgid ""
 "SystemDisk2.3.1.smi.bin\"></ulink>. After unpacking the utility in MacOS, "
 "and launching it, select the <guibutton>Save</guibutton> button to have the "
 "firmware patches installed to nvram."
-msgstr ""
-"运行在 OldWorld Beige G3 机器上的 OF 版本 2.0f1 和 2.4 的 OpenFirmware 是坏"
-"的。这些机器如果没有打固件补丁，就不能够从硬盘启动。固件的补丁包含在 "
-"<application>System Disk 2.3.1</application> 工具里面，位于 Apple 的 <ulink "
-"url=\"ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1."
-"smi.bin\"></ulink>。在 MacOS 上解包并运行它，选择保存按钮使固件补丁安装到 "
-"nvram。"
+msgstr "运行在 OldWorld Beige G3 机器上的 OF 版本 2.0f1 和 2.4 的 OpenFirmware 是坏的。这些机器如果没有打固件补丁，就不能够从硬盘启动。固件的补丁包含在 <application>System Disk 2.3.1</application> 工具包里面，它位于 Apple 的 <ulink url=\"ftp://ftp.apple.com/developer/macosxserver/utilities/SystemDisk2.3.1.smi.bin\"></ulink>。在 MacOS 上解包并运行，选择 <guibutton>Save</guibutton> 按钮使固件补丁安装到 nvram。"
 
 #. Tag: title
 #: preparing.xml:1829
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 295770662..b7b214636 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-05-19 14:20+0000\n"
-"PO-Revision-Date: 2007-03-01 09:27+0800\n"
+"PO-Revision-Date: 2007-06-23 19: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"
@@ -2023,7 +2023,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:955
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server<phrase condition="
 "\"lenny\">\n"
@@ -2042,9 +2042,11 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"tasksel tasksel/first multiselect standard, desktop\n"
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"#tasksel tasksel/first multiselect standard, kde-desktop\n"
+"#tasksel tasksel/first multiselect standard, web-server<phrase condition=\"lenny\">\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-desktop, xfce-desktop</phrase><phrase condition=\"etch\">\n"
+"#tasksel tasksel/first multiselect standard, kde-desktop</phrase>\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2063,7 +2065,7 @@ msgstr "安装引导加载器"
 
 #. Tag: screen
 #: preseed.xml:962
-#, 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"
@@ -2092,15 +2094,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\n"
+"#d-i grub-installer/skip boolean true<phrase condition=\"lenny\">\n"
+"# To also skip installing lilo, and install no bootloader, uncomment this\n"
+"# too:\n"
+"#d-i lilo-installer/skip boolean true</phrase>\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 6c704fe34..dac9da561 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-05-10 19:09+0000\n"
-"PO-Revision-Date: 2007-03-04 12:08+0800\n"
+"PO-Revision-Date: 2007-06-23 19:17+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"
@@ -531,7 +531,7 @@ msgstr "便携机"
 
 #. Tag: para
 #: random-bits.xml:255
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "There is some overlap of the Laptop task with the Destop environment task. "
 "If you install both, the Laptop task will only require a few MB additional "
@@ -2186,7 +2186,7 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1152
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
 "need to know. To expand a collapsed list (used for example for the selection "
@@ -2195,12 +2195,7 @@ msgid ""
 "selected (e.g. task selection), you first need to tab to the &BTN-CONT; "
 "button after making your selections; hitting enter will toggle a selection, "
 "not activate &BTN-CONT;."
-msgstr ""
-"如果您喜欢用键盘替代鼠标，有两件事需要知道。要展开一个层级列表(比如用从大洲里"
-"面选择国家)，可以使用 <keycap>+</keycap> 和 <keycap>-</keycap> 键。对于多项选"
-"择(例如，选择任务)，您首先需要在选中后用 tab 跳到 <guibutton>Continue</"
-"guibutton> 按钮，按回车键切换选择，而不是激活 <guibutton>Continue</"
-"guibutton>。"
+msgstr "如果您喜欢用键盘替代鼠标，有两件事需要知道。要展开一个层级列表(比如用从大洲里面选择国家)，可以使用 <keycap>+</keycap> 和 <keycap>-</keycap> 键。对于多项选择(例如，选择任务)，您首先需要在选中后用 tab 跳到 &BTN-CONT; 按钮；按回车键切换选择，而不是激活 &BTN-CONT; 。"
 
 #. Tag: para
 #: random-bits.xml:1162
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 363213d24..92807ac36 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-06-10 22:49+0000\n"
-"PO-Revision-Date: 2007-04-08 18:40+0800\n"
+"PO-Revision-Date: 2007-06-23 19: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"
@@ -221,12 +221,11 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:128
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You can get to the main menu by selecting the &BTN-GOBACK; button repeatedly "
 "to back all the way out of the currently running component."
-msgstr ""
-"您可以通过不断地按<quote>返回</quote>按钮，从当前运行的组件回到主菜单。"
+msgstr "您可以通过不断地按 &BTN-GOBACK; 按钮，从当前运行的组件回到主菜单。"
 
 #. Tag: term
 #: using-d-i.xml:137
@@ -765,7 +764,7 @@ msgid ""
 "It is possible to force the installer to use a higher lowmem level than the "
 "one based on available memory by using the boot parameter <quote>lowmem</"
 "quote> as described in <xref linkend=\"installer-args\"/>."
-msgstr ""
+msgstr "可以通过引导参数 <quote>lowmem</quote> 强制安装程序使用比实际内存更高的 lowmem 等级，说明见 <xref linkend=\"installer-args\"/>。"
 
 #. Tag: title
 #: using-d-i.xml:497
@@ -2961,7 +2960,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2042
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "It is possible to get the installer to install KDE by using preseeding (see "
 "<xref linkend=\"preseed-pkgsel\"/>) or by adding <literal>tasks=\"standard, "
@@ -2975,12 +2974,7 @@ msgid ""
 "downloaded from a mirror as KDE packages are not included on the first full "
 "CD; installing KDE this way should work fine if you are using a DVD image or "
 "any other installation method."
-msgstr ""
-"安装程序可以使用预置(参阅 <xref linkend=\"preseed-pkgsel\"/>)来安装 KDE，或者"
-"在启动安装程序时添加 <literal>tasks=\"standard, kde-desktop\"</literal> 到引"
-"导参数。然而，这只在 KDE 所需的软件包存在时才工作。如果您通过完整的 CD 映像安"
-"装，因为 CD 上没有 KDE 的软件包，它们需要从镜像网站下载。如果您使用的是 DVD "
-"映像或其他安装方法，安装 KDE 就没有问题。"
+msgstr "安装程序可以使用预置(参阅 <xref linkend=\"preseed-pkgsel\"/>)来安装 KDE，或者在启动安装程序时添加 <literal>tasks=\"standard, kde-desktop\"</literal> 到引导参数<footnote> <para> 更轻量级的 Xfce 桌面环境可以用 <literal>xfce-desktop</literal> 替换 <literal>kde-desktop</literal> 来选择。如果安装到便携机上，您还可以添加 <literal>laptop</literal> 任务。</para> </footnote>。然而，这只在 KDE 所需的软件包存在时才工作。如果您通过完整的 CD 映像安装，因为 CD 上没有 KDE 的软件包，它们需要从镜像网站下载。如果您使用的是 DVD 映像或其他安装方法，安装 KDE 就没有问题。"
 
 #. Tag: para
 #: using-d-i.xml:2062
@@ -3002,14 +2996,12 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2074
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
 "<command>aptitude</command> will install the packages that are part of the "
 "tasks you've selected."
-msgstr ""
-"一旦您确定了任务，请选择 <guibutton>OK</guibutton>。此时，<command>aptitude</"
-"command> 将安装选中的软件包。"
+msgstr "一旦您确定了任务，请选择 &BTN-CONT;。此时，<command>aptitude</command> 将安装选中的软件包。"
 
 #. Tag: para
 #: using-d-i.xml:2081
@@ -3175,14 +3167,12 @@ msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
 
 #. Tag: para
 #: using-d-i.xml:2208
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
 "flexible and robust boot loader and a good default choice for new users and "
 "old hands alike."
-msgstr ""
-"&architecture; 上主要的 boot loader 是 <quote>grub</quote>。Grub 是个灵活和稳"
-"定的 boot loader，它对新手来说是个不错的缺省选择。对老鸟来说，它也同样适合。"
+msgstr "&architecture; 上主要的 boot loader 是 <quote>grub</quote>。Grub 是个灵活和稳定的 boot loader，它对新手和老手都是一个不错的缺省选择。"
 
 #. Tag: para
 #: using-d-i.xml:2214
@@ -3198,14 +3188,12 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2220
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
 "the main menu, and from there select whatever bootloader you would like to "
 "use."
-msgstr ""
-"如果您并不想安装 grub，请使用返回按钮回到主菜单，并从中选择您想要使用的任何 "
-"bootloader。"
+msgstr "如果您并不想安装 grub，请使用 &BTN-GOBACK; 按钮回到主菜单，并从中选择您想要使用的任何 bootloader。"
 
 #. Tag: title
 #: using-d-i.xml:2233
@@ -3978,17 +3966,14 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2792
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
 "Shell</guimenuitem> item on the main menu that can be used to start a shell. "
 "You can get to the main menu from most dialogs by using the &BTN-GOBACK; "
 "button one or more times. Type <userinput>exit</userinput> to close the "
 "shell and return to the installer."
-msgstr ""
-"如果您无法切换控制台，还可以在主菜单上执行 <guimenuitem>Execute a Shell</"
-"guimenuitem> 选项，它可以启动一个 shell。回到安装程序，键入 <userinput>exit</"
-"userinput> 关闭 shell。"
+msgstr "如果您无法切换控制台，还可以在主菜单上执行 <guimenuitem>Execute a Shell</guimenuitem> 选项，它可以启动一个 shell。您可以使用一次或多次 &BTN-GOBACK; 按钮从大多数对话框返回主菜单。键入 <userinput>exit</userinput> 关闭 shell 并回到安装程序。"
 
 #. Tag: para
 #: using-d-i.xml:2800