po/zh_CN: translating locales

3 files changed, 34 insertions, 84 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index e12234800..a121460fa 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-01-18 00:44+0000\n"
-"PO-Revision-Date: 2009-11-21 13:31+0800\n"
+"PO-Revision-Date: 2010-01-18 18:22+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"
@@ -2296,7 +2296,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1050
-#, 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"
@@ -2345,9 +2345,6 @@ msgstr ""
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
-"# By default, packages that are only Recommended by packages installed "
-"using\n"
-"# pkgsel/include (as opposed to their dependencies) will not be installed.\n"
 "# Whether to upgrade packages after debootstrap.\n"
 "# Allowed values: none, safe-upgrade, full-upgrade\n"
 "#d-i pkgsel/upgrade select none\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 6464335ac..1d0dca9f1 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: 2009-12-28 01:10+0000\n"
-"PO-Revision-Date: 2009-11-21 13:34+0800\n"
+"PO-Revision-Date: 2010-01-18 18:21+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"
@@ -1319,7 +1319,7 @@ msgstr "网络的配置"
 
 #. Tag: para
 #: random-bits.xml:646
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "To configure networking, edit <filename>/etc/network/interfaces</"
 #| "filename>, <filename>/etc/resolv.conf</filename>, <filename>/etc/"
@@ -1440,12 +1440,9 @@ msgid ""
 "file into the desired order. Then during boot, each card will be associated "
 "with the interface name (eth0, eth1, etc.) that you expect."
 msgstr ""
-"要配置网络，请修改 <filename>/etc/network/interfaces</filename>、<filename>/"
-"etc/resolv.conf</filename>、<filename>/etc/hostname</filename> 和 <filename>/"
-"etc/hosts</filename>。<informalexample><screen>\n"
+"To configure networking, edit <filename>/etc/network/interfaces</filename>, <filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> and <filename>/etc/hosts</filename>. <informalexample><screen>\n"
 "# editor /etc/network/interfaces\n"
-"</screen></informalexample> 这里有一些来自 <filename>/usr/share/doc/ifupdown/"
-"examples</filename> 的简单例子: <informalexample><screen>\n"
+"</screen></informalexample> Here are some simple examples from <filename>/usr/share/doc/ifupdown/examples</filename>: <informalexample><screen>\n"
 "######################################################################\n"
 "# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)\n"
 "# See the interfaces(5) manpage for information on what options are\n"
@@ -1471,20 +1468,17 @@ msgstr ""
 "#     netmask 255.255.255.0\n"
 "#     broadcast 192.168.0.255\n"
 "#     gateway 192.168.0.1\n"
-"</screen></informalexample> 填入您的域名服务器和搜索指令到 <filename>/etc/"
-"resolv.conf</filename>：<informalexample><screen>\n"
+"</screen></informalexample> Enter your nameserver(s) and search directives in <filename>/etc/resolv.conf</filename>: <informalexample><screen>\n"
 "# editor /etc/resolv.conf\n"
-"</screen></informalexample> 这是一个简单例子 <filename>/etc/resolv.conf</"
-"filename>：<informalexample><screen>\n"
+"</screen></informalexample> A simple example <filename>/etc/resolv.conf</filename>: <informalexample><screen>\n"
 "search hqdom.local\n"
 "nameserver 10.1.1.36\n"
 "nameserver 192.168.9.100\n"
-"</screen></informalexample> 输入您系统的主机名(2 到 63 个字符)："
-"<informalexample><screen>\n"
+"</screen></informalexample> Enter your system's host name (2 to 63 characters): <informalexample><screen>\n"
 "# echo DebianHostName &gt; /etc/hostname\n"
-"</screen></informalexample> 以及一个支持 IPv6 的 <filename>/etc/hosts</"
-"filename>：<informalexample><screen>\n"
-"127.0.0.1 localhost DebianHostName\n"
+"</screen></informalexample> And a basic <filename>/etc/hosts</filename> with IPv6 support: <informalexample><screen>\n"
+"127.0.0.1 localhost\n"
+"127.0.1.1 DebianHostName\n"
 "\n"
 "# The following lines are desirable for IPv6 capable hosts\n"
 "::1     ip6-localhost ip6-loopback\n"
@@ -1493,9 +1487,7 @@ msgstr ""
 "ff02::1 ip6-allnodes\n"
 "ff02::2 ip6-allrouters\n"
 "ff02::3 ip6-allhosts\n"
-"</screen></informalexample> 如果您有多块网卡，在修改 <filename>/etc/modules</"
-"filename> 文件时，一定要按照期望的顺序排列驱动模块的名字。这样，系统启动时，"
-"每块网卡就能获得所预期的 interface 名称了(eth0、eth1 等等)。"
+"</screen></informalexample> If you have multiple network cards, you should arrange the names of driver modules in the <filename>/etc/modules</filename> file into the desired order. Then during boot, each card will be associated with the interface name (eth0, eth1, etc.) that you expect."
 
 #. Tag: title
 #: random-bits.xml:687
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 5d5cde65a..efb20c39a 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: 2010-01-18 00:44+0000\n"
-"PO-Revision-Date: 2009-11-21 13:42+0800\n"
+"PO-Revision-Date: 2010-01-18 18:21+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"
@@ -810,7 +810,7 @@ msgstr "选择地区选项"
 
 #. Tag: para
 #: using-d-i.xml:516
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "In most cases the first questions you will be asked concern the selection "
 #| "of localization options to be used both for the installation and for the "
@@ -821,9 +821,7 @@ msgid ""
 "localization options to be used both for the installation and for the "
 "installed system. The localization options consist of language, location and "
 "locales."
-msgstr ""
-"大多时候，您遇到的第一个问题是关于地区的选项，它用于安装过程和安装后的系统。"
-"地区选项由语言，国家和地点组成。"
+msgstr "大多时候，您遇到的第一个问题是关于地区的选项，将用于安装过程和安装后的系统。地区选项由语言、位置和地区组成。"
 
 #. Tag: para
 #: using-d-i.xml:523
@@ -839,7 +837,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The selected country will be used later in the installation process to "
 #| "pick the default timezone and a Debian mirror appropriate for your "
@@ -851,10 +849,7 @@ msgid ""
 "Debian mirror appropriate for that country. Language and country together "
 "will help determine the default locale for your system and select the "
 "correct keyboard layout."
-msgstr ""
-"在安装过程的后面，选择的国家还会被用于设置默认的时区和您所处地理位置的 "
-"Debian 镜像。语言和国家可以一起用来设置您系统默认的 locale，并帮助您选择键"
-"盘。"
+msgstr "在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时区和该国对应的 Debian 镜像。语言和国家合起来还有助于确定您系统默认的 locale，以及键盘布局。"
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -878,7 +873,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:550
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "If you selected a language that is recognized as an official language for "
 #| "more than one country<footnote> <para> In technical terms: where multiple "
@@ -897,11 +892,7 @@ msgid ""
 "not in that list, choose <guimenuitem>other</guimenuitem> (the last option). "
 "You will then be presented with a list of continents; selecting a continent "
 "will lead to a list of relevant countries on that continent."
-msgstr ""
-"如果您选择的语言被多个国家作为官方语言<footnote> <para> 技术范畴：一种语言针"
-"对不同国家代码有多个不同 locale 存在。</para> </footnote>，列表中只列出这些国"
-"家。如果想要选择列表之外的国家，选择 <guimenuitem>Other</guimenuitem>(最后一"
-"项)。您将看到大洲列表；选择洲之后会看到该大洲上的国家。"
+msgstr "接下来将要求您选择地理位置。如果您选择的语言被多个国家作为官方语言<footnote> <para> 科技术语：一种语言针对不同国家代码有多个不同 locale 存在。</para> </footnote>，列表中只列出这些国家。如果想要选择列表之外的国家，选择 <guimenuitem>other</guimenuitem>(最后一项)。您将看到大洲列表；选择洲之后会看到该大洲上的国家。"
 
 #. Tag: para
 #: using-d-i.xml:567
@@ -911,7 +902,7 @@ msgid ""
 "will be displayed for the continent or region the country belongs to, with "
 "that country selected as the default. Use the <guibutton>Go Back</guibutton> "
 "option to select countries on a different continent."
-msgstr ""
+msgstr "如果语言只对应一个国家，国家列表只显示该国所属的大洲和地区，并且该国被选中作为默认。使用 <guibutton>Go Back</guibutton> 选项可以选择其他大洲的国家。"
 
 #. Tag: para
 #: using-d-i.xml:574
@@ -920,7 +911,7 @@ msgid ""
 "It is important to select the country where you live or where you are "
 "located as it determines the time zone that will be configured for the "
 "installed system."
-msgstr ""
+msgstr "选择您居住的国家和地区非常重要，这将决定您安装好的系统所配置时区。"
 
 #. Tag: para
 #: using-d-i.xml:580
@@ -934,7 +925,7 @@ msgid ""
 "for the selected language (if there's more than one). </para> </footnote>. "
 "In all other cases a default locale will be selected based on the selected "
 "language and country."
-msgstr ""
+msgstr "如果您组合的语言和国家没有对应的 locale，而该语言有多个对应的 locale，安装程序允许您从中选择一个默认的 locale 用于安装完成的系统。<footnote> <para> 在 medium 和 low 优先级下，如果该语言有多个对应的 locale，您总是可以选择所需要的那个 locale。</para> </footnote>。其余情况下，默认会选择基于该语言和国家的 locale。"
 
 #. Tag: para
 #: using-d-i.xml:595
@@ -942,7 +933,7 @@ msgstr ""
 msgid ""
 "Any default locale selected as described in the previous paragraph will use "
 "<firstterm>UTF-8</firstterm> as character encoding."
-msgstr ""
+msgstr "前面章节选择的任何默认 locale 都将使用 <firstterm>UTF-8</firstterm> 作为字符编码。"
 
 #. Tag: para
 #: using-d-i.xml:600
@@ -956,7 +947,7 @@ msgid ""
 "footnote>, to be generated for the installed system; if you do, you will be "
 "asked which of the selected locales should be the default for the installed "
 "system."
-msgstr ""
+msgstr "如果您使用 low 优先级安装，您可以选择额外的 locale，包括那些称为<quote>传统</quote>的 locale <footnote> <para> 传统 locale 是那些没有使用 UTF-8 的 locale，它们使用旧的字符编码标准，比如 ISO&nbsp;8859-1 (西欧语言) 或 EUC-JP (日语)。</para> </footnote>，用于安装完成的系统； 如果这样选择，您将被询问使用哪种 locale 作为安装完成系统中的默认 locale。"
 
 #. Tag: title
 #: using-d-i.xml:624
@@ -1172,10 +1163,10 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:812
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Configuring the Clock"
 msgid "Configuring the Clock and Time Zone"
-msgstr "配置时钟"
+msgstr "配置时钟和时区"
 
 #. Tag: para
 #: using-d-i.xml:814
@@ -1200,7 +1191,7 @@ msgstr "在 s390 平台，安装程序不会修改系统时钟。"
 
 #. Tag: para
 #: using-d-i.xml:836
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Depending on the location selected earlier in the installation process, "
 #| "you may be shown a list of timezones relevant for that location. If your "
@@ -1211,9 +1202,7 @@ msgid ""
 "may be shown a list of time zones relevant for that location. If your "
 "location has only one time zone and you are doing a default installation, "
 "you will not be asked anything and the system will assume that time zone."
-msgstr ""
-"基于安装过程前面所选择的地理位置，您将看到系统只列出与其地点相关的时区列表。"
-"如果该地只对应一个时区，那么系统就不会询问而直接使用该时区。"
+msgstr "基于安装过程前面所选择的地理位置，您将看到系统只列出与其地点相关的时区列表。如果该地只对应一个时区并且是默认安装，那么系统就不会询问而直接使用该时区。"
 
 #. Tag: para
 #: using-d-i.xml:844
@@ -1222,7 +1211,7 @@ msgid ""
 "In expert mode or when installing at medium priority, you will have the "
 "additional option to select <quote>Coordinated Universal Time</quote> (UTC) "
 "as time zone."
-msgstr ""
+msgstr "expert 模式或者使用 medium 优先级安装，您可以通过额外的选项选择 <quote>Coordinated Universal Time</quote> (UTC) 作为时区。"
 
 #. Tag: para
 #: using-d-i.xml:850
@@ -1237,7 +1226,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:861
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The simplest option is to just select a different timezone after the "
 #| "installation has been completed and you've booted into the new system. "
@@ -1246,8 +1235,7 @@ msgid ""
 "The simplest option is to just select a different time zone after the "
 "installation has been completed and you've booted into the new system. The "
 "command to do this is:"
-msgstr ""
-"简易的方法是，在安装完成后重新启动进入新系统，选择一个不同的时区。该命令为："
+msgstr "最简单的方法，是在安装完成后重新启动，进入新系统，选择一个不同的时区。该命令为："
 
 #. Tag: screen
 #: using-d-i.xml:867
@@ -1272,14 +1260,14 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:887
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "For automated installations the time zone can also be set using "
 #| "preseeding."
 msgid ""
 "For automated installations the time zone can be set to any desired value "
 "using preseeding."
-msgstr "自动安装可以通过预置设置时区。"
+msgstr "自动安装可以通过预置设置任何所需的时区。"
 
 #. Tag: title
 #: using-d-i.xml:901
@@ -4859,30 +4847,3 @@ msgid ""
 msgstr ""
 "如果固件从不严格的固件文件加载，复制到安装好的系统的固件将<emphasis>不会</"
 "emphasis>自动更新，除非对应的固件软件包(如果有的话)在系统安装之后安装。"
-
-#~ msgid ""
-#~ "If the language has only one country associated with it, that country "
-#~ "will be selected automatically. In that case it is only possible to "
-#~ "select a different country by first lowering the debconf priority to "
-#~ "medium, followed by revisiting the language selection option in the main "
-#~ "menu of the installer."
-#~ msgstr ""
-#~ "如果此语言只对应一个国家，该国将会被自动选中。这种情况下如果要选择其他的国"
-#~ "家，首先要降低 debconf 优先级为 medium，然后在安装程序的主菜单中重新选择语"
-#~ "言。"
-
-#~| msgid ""
-#~| "A default locale will be selected based on the selected language and "
-#~| "country. If you are installing at medium or low priority, you will have "
-#~| "the option of selecting a different default locale and of selecting "
-#~| "additional locales to be generated for the installed system."
-#~ msgid ""
-#~ "A default locale will be selected based on the selected language and "
-#~ "country. If you are installing at medium or low priority, you will have "
-#~ "the option of selecting additional locales to be generated for the "
-#~ "installed system; if you do, you will be asked which locale should be the "
-#~ "default for the installed system."
-#~ msgstr ""
-#~ "默认 locale 的选择是基于先前所选的语言和国家。如果您以 medium 或 low 优先"
-#~ "级安装，可以有机会为安装后的系统选择生成额外的 locale；这时，您将会被要求"
-#~ "选择默认的 local。"