Update chinese po/zh_CN translations

1 files changed, 28 insertions, 52 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 2f8f1bedf..f67dd0e45 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: 2012-06-26 13:45+0000\n"
-"PO-Revision-Date: 2011-01-16 23:42+0800\n"
+"PO-Revision-Date: 2012-07-25 22:54+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "Language: \n"
@@ -163,7 +163,7 @@ msgstr "硬盘 <phrase condition=\"bootable-usb\">(包括 U 盘)</phrase>"
 #: preseed.xml:96 preseed.xml:101
 #, no-c-format
 msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
-msgstr ""
+msgstr "yes<footnoteref linkend=\"apx-ps-net\"/>"
 
 #. Tag: entry
 #: preseed.xml:98
@@ -386,7 +386,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:285
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Note that <filename>preseed/url</filename> can be shortened to just "
 #| "<filename>url</filename> and <filename>preseed/file</filename> to just "
@@ -397,10 +397,7 @@ msgid ""
 "<filename>file</filename> and <filename>preseed/file/checksum</filename> to "
 "just <filename>preseed-md5</filename> when they are passed as boot "
 "parameters."
-msgstr ""
-"注意，在作为引导参数的时候，<filename>preseed/url</filename> 可以简写为 "
-"<filename>url</filename>，<filename>preseed/file</filename> 简写为 "
-"<filename>file</filename>。"
+msgstr "注意，作为引导参数时 <filename>preseed/url</filename> 可以缩写为 <filename>url</filename>、<filename>preseed/file</filename> 缩写为 <filename>file</filename>、<filename>preseed/file/checksum</filename> 缩写为 <filename>preseed-md5</filename>。"
 
 #. Tag: title
 #: preseed.xml:296
@@ -1035,7 +1032,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:599
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "For debconf variables (templates) used in the installer itself, the owner "
 #| "should be set to <quote>d-i</quote>; to preseed variables used in the "
@@ -1050,11 +1047,7 @@ msgid ""
 "debconf template should be used. Only variables that have their owner set to "
 "something other than <quote>d-i</quote> will be propagated to the debconf "
 "database for the installed system."
-msgstr ""
-"对于安装程序自己使用的 debconf 变量(模板)，owner 应该设置为 <quote>d-i</"
-"quote>；要在安装后的系统里面预置变量，应该使用名称中包含对应 debconf 模板的软"
-"件包。只有那些 owner 为非 <quote>d-i</quote> 的变量将被保存到安装后系统的 "
-"debconf 数据库里面。"
+msgstr "只在安装程序自己使用的 debconf 变量(模板)，owner 应该设置为 <quote>d-i</quote>; 要在安装后的系统里面预置变量，应该使用名称中包含对应 debconf 模板的软件包。只有那些 owner 为非 <quote>d-i</quote> 的变量将被保存到安装后系统的 debconf 数据库里面。"
 
 #. Tag: para
 #: preseed.xml:607
@@ -1253,7 +1246,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:729
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# Preseeding only locale sets language, country and locale.\n"
 #| "d-i debian-installer/locale string en_US\n"
@@ -1283,11 +1276,11 @@ msgstr ""
 "#d-i debian-installer/country string NL\n"
 "#d-i debian-installer/locale string en_GB.UTF-8\n"
 "# Optionally specify additional locales to be generated.\n"
-"#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
+"#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8"
 
 #. Tag: para
 #: preseed.xml:731
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Keyboard configuration consists of selecting a keyboard architecture and "
 #| "a keymap."
@@ -1295,11 +1288,11 @@ msgid ""
 "Keyboard configuration consists of selecting a keymap and (for non-latin "
 "keymaps) a toggle key to switch between the non-latin keymap and the US "
 "keymap."
-msgstr "键盘设置由键盘体系和 keymap 组成。"
+msgstr "键盘配置包括选择的 keymap 和(对于非拉丁 keymap)切换键，该键用于非拉丁和 US keymap 来回切换。"
 
 #. Tag: screen
 #: preseed.xml:736
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "# Keyboard selection.\n"
 "# keymap is an alias for keyboard-configuration/xkb-keymap\n"
@@ -1308,8 +1301,8 @@ msgid ""
 msgstr ""
 "# Keyboard selection.\n"
 "# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select cn\n"
-"# d-i keyboard-configuration/toggle select No toggling\n"
+"d-i keymap select us\n"
+"# d-i keyboard-configuration/toggle select No toggling"
 
 #. Tag: para
 #: preseed.xml:738
@@ -1382,7 +1375,7 @@ msgstr "下面的 debconf 变量与网络配置相关。"
 
 #. Tag: screen
 #: preseed.xml:783
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# Disable network configuration entirely. This is useful for cdrom\n"
 #| "# installations on non-networked devices where the network questions,\n"
@@ -1503,6 +1496,10 @@ msgstr ""
 "# To pick a particular interface instead:\n"
 "#d-i netcfg/choose_interface select eth1\n"
 "\n"
+"# To set a different link detection timeout (default is 3 seconds).\n"
+"# Values are interpreted as seconds.\n"
+"#di netcfg/link_detection_timeout string 10\n"
+"\n"
 "# If you have a slow dhcp server and the installer times out waiting for\n"
 "# it, this might be useful.\n"
 "#d-i netcfg/dhcp_timeout string 60\n"
@@ -1838,7 +1835,7 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:899
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The examples below only provide basic information on the use of recipes. "
 #| "For detailed information see the files <filename>partman-auto-recipe.txt</"
@@ -1855,13 +1852,7 @@ msgid ""
 "available from the <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source "
 "repository</ulink>. Note that the supported functionality may change between "
 "releases."
-msgstr ""
-"下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 "
-"<filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-"
-"recipe.txt</filename>，它们包含在 <classname>debian-installer</classname> 软"
-"件包内。这两个文件也可以从 <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/"
-"devel/\">&d-i; source repository</ulink> 获取。注意不同发布版支持的功能会有所"
-"改变。"
+msgstr "下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 <filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-recipe.txt</filename>，它们含在 <classname>debian-installer</classname> 软件包里。这两个文件也可以从 <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source repository</ulink>获取。注意不同发布版支持的功能会有所改变。"
 
 #. Tag: para
 #: preseed.xml:913
@@ -2256,7 +2247,7 @@ msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内
 
 #. Tag: screen
 #: preseed.xml:998
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# Configure APT to not install recommended packages by default. Use of "
 #| "this\n"
@@ -2290,13 +2281,7 @@ msgstr ""
 "# experienced users.\n"
 "#d-i base-installer/install-recommends boolean false\n"
 "\n"
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
-"tools\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 string &kernelpackage;-2.6-486"
 
@@ -2528,7 +2513,7 @@ msgstr "安装 bootloader"
 
 #. Tag: screen
 #: preseed.xml:1084
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
 #| "If you want lilo installed\n"
@@ -2622,29 +2607,20 @@ msgid ""
 "# Note: options passed to the installer will be added automatically.\n"
 "#d-i debian-installer/add-kernel-opts string nousb"
 msgstr ""
-"<phrase arch=\"linux-any\"># 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</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
-"this\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"
@@ -2895,7 +2871,7 @@ msgid ""
 "<classname>DEBCONF_DEBUG=5</classname>. This will cause <classname>debconf</"
 "classname> to print much more detail about the current settings of each "
 "variable and about its progress through each package's installation scripts."
-msgstr ""
+msgstr "获得更多的调试信息，需使用引导参数 <classname>DEBCONF_DEBUG=5</classname>。这将让 <classname>debconf</classname> 打印更多的细节，包括当前变量设置和每个软件包安装脚本的进度。"
 
 #. Tag: title
 #: preseed.xml:1173