po/zh_CN: replace Debian with &debian;

1 files changed, 19 insertions, 38 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 295affa40..6ddab53af 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: 2010-10-10 12:35+0000\n"
-"PO-Revision-Date: 2010-04-07 12:22+0800\n"
+"PO-Revision-Date: 2010-10-27 23:49+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "Language: \n"
@@ -298,7 +298,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:252
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "For the other preseeding methods you need to tell the installer what file "
 #| "to use when you boot it. This is normally done by passing the kernel a "
@@ -316,14 +316,11 @@ msgid ""
 "the kernel.</phrase><phrase arch=\"hurd-any\">(e.g. <filename>grub.cfg</"
 "filename>) and adding the parameter to the end of the <filename>gnumach.gz</"
 "filename> line.</phrase>"
-msgstr ""
-"其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递"
-"引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件(如: "
-"<filename>syslinux.cfg</filename>)，并在内核的附加行后面添加参数。"
+msgstr "其他的预置方法，您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递引导参数完成，可以在启动时手动指定，或者编辑 bootloader 的配置文件<phrase arch=\"linux-any\">(如: <filename>syslinux.cfg</filename>)，并在内核的附加行后面添加参数。</phrase></phrase><phrase arch=\"kfreebsd-any\">(如: <filename>grub.cfg</filename>)，并为内核添加一个新<literal>设置</literal>行。</phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>)，并在 <filename>gnumach.gz</filename> 行后添加参数。</phrase>"
 
 #. Tag: para
 #: preseed.xml:265
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you do specify the preconfiguration file in the bootloader "
 #| "configuration, you might change the configuration so you don't need to "
@@ -336,10 +333,7 @@ msgid ""
 "the timeout to <literal>1</literal> in <filename>syslinux.cfg</filename>.</"
 "phrase><phrase arch=\"kfrebsd-any;hurd-any\">For grub this means setting the "
 "timeout to <literal>0</literal> in <filename>grub.cfg</filename>.</phrase>"
-msgstr ""
-"如果在 bootloader 设置里指定预置文件，可以修改配置让您不再需要键入回车启动安"
-"装程序。对于 syslinux，这意味着在 <filename>syslinux.cfg</filename> 里面设置 "
-"timeout 为 1。"
+msgstr "如果在 bootloader 设置里指定预置文件，可以修改配置让您不再需要键入回车启动安装程序。<phrase arch=\"linux-any\">对于 syslinux，这意味着在 <filename>syslinux.cfg</filename> 里面设置 timeout 为 <literal>1</literal>。</phrase><phrase arch=\"kfrebsd-any;hurd-any\">对于 grub 则设置 timeout 为 <literal>0</literal> 到 <filename>grub.cfg</filename> 文件。</phrase>"
 
 #. Tag: para
 #: preseed.xml:274
@@ -540,7 +534,7 @@ msgstr "auto 模式"
 
 #. Tag: para
 #: preseed.xml:381
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "There are several features of Debian Installer that combine to allow "
 #| "fairly simple command lines at the boot prompt to result in arbitrarily "
@@ -569,15 +563,9 @@ msgid ""
 "in the preseed file being retrieved from <literal>http://autoserver.example."
 "com/d-i/&releasename;/./preseed.cfg</literal>."
 msgstr ""
-"Debian 安装程序提供了一些特性，可以组合引导提示符后面的简单命令行，达到复杂的"
-"自动安装效果。为了表达清楚，这里有一些例子，可以用在引导提示符后面："
-"<informalexample><screen>\n"
+"&debian; 安装程序提供了一些特性，可以组合引导提示符后面的简单命令行，达到复杂的自动安装效果。为了表达清楚，这里有一些例子，可以用在引导提示符后面：<informalexample><screen>\n"
 "auto url=autoserver\n"
-"</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 "
-"<literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 "
-"<literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 "
-"<literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</"
-"literal> 获得。"
+"</screen></informalexample> 这需要一个 DHCP 服务器能找到并且 DNS 可以解析 <literal>autoserver</literal>，或许要加上 DHCP 提供的本地域名。 如果域名是 <literal>example.com</literal>，并有相应的 DHCP 设置，那么预置文件将从 <literal>http://autoserver.example.com/d-i/&releasename;/./preseed.cfg</literal> 获得。"
 
 #. Tag: para
 #: preseed.xml:398
@@ -933,7 +921,7 @@ msgstr "使用 DHCP 服务器指定预置文件"
 
 #. Tag: para
 #: preseed.xml:537
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "It's also possible to use DHCP to specify a preconfiguration file to "
 #| "download from the network. DHCP allows specifying a filename. Normally "
@@ -950,11 +938,7 @@ msgid ""
 "it as a preconfiguration file. Here is an example of how to set it up in the "
 "dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
-msgstr ""
-"还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
-"netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下"
-"载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服"
-"务器第 3 版(Debian 里面是 dhcp3-server 软件包)。"
+msgstr "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
 
 #. Tag: screen
 #: preseed.xml:548
@@ -983,7 +967,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "A good way to use the DHCP preseeding is to only preseed values specific "
 #| "to your network, such as the Debian mirror to use. This way installs on "
@@ -996,10 +980,7 @@ msgid ""
 "network will automatically get a good mirror selected, but the rest of the "
 "installation can be performed interactively. Using DHCP preseeding to fully "
 "automate &debian; installs should only be done with care."
-msgstr ""
-"使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 Debian 镜像。这"
-"种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互进"
-"行。使用 DHCP 预置进行完整的 Debian 自动安装应该特别小心。"
+msgstr "使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 &debian; 镜像。这种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
 
 #. Tag: title
 #: preseed.xml:571
@@ -2449,7 +2430,7 @@ msgstr "安装 bootloader"
 
 #. Tag: screen
 #: preseed.xml:1084
-#, 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"
@@ -2540,25 +2521,25 @@ msgid ""
 "# Note: options passed to the installer will be added automatically.\n"
 "#d-i debian-installer/add-kernel-opts string nousb"
 msgstr ""
-"# Grub is the default boot loader (for x86). If you want lilo installed\n"
+"<phrase arch=\"linux-any\"># 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"
 "# To also skip installing lilo, and install no bootloader, uncomment this\n"
 "# too:\n"
-"#d-i lilo-installer/skip boolean true\n"
+"#d-i lilo-installer/skip boolean true</phrase>\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
+"#d-i grub-installer/skip boolean true</phrase>\n"
 "\n"
 "# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
 "# default. If you need GRUB Legacy for some particular reason, then\n"
 "# uncomment this:\n"
 "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\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"