Update Chinese po/zh_CN translations

1 files changed, 19 insertions, 54 deletions

diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 6d48e532a..87732ed77 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: 2012-10-24 19:53+0000\n"
-"PO-Revision-Date: 2012-07-25 14:07+0800\n"
+"PO-Revision-Date: 2012-11-26 15:04+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -981,7 +981,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:636
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Move the highlight to the keyboard selection you desire and press "
 #| "&enterkey;. Use the arrow keys to move the highlight &mdash; they are in "
@@ -994,10 +994,7 @@ msgid ""
 "&enterkey;. Use the arrow keys to move the highlight &mdash; they are in the "
 "same place in all national language keyboard layouts, so they are "
 "independent of the keyboard configuration."
-msgstr ""
-"将高亮显示部分移到您期望键盘选择，然后按下 &enterkey;。用箭头健移到高亮显示 "
-"&mdash; 它们位于所有国家键盘布局相同的地方，因此独立于键盘配置。'扩展的'键盘"
-"具有 <keycap>F1</keycap> 到 <keycap>F10</keycap> 健，与顶端平行。"
+msgstr "将高亮显示部分移到您期望键盘选择，然后按下 &enterkey;。用箭头健移到高亮显示 &mdash; 它们位于所有国家键盘布局相同的地方，因此独立于键盘配置。"
 
 #. Tag: title
 #: using-d-i.xml:663
@@ -1101,11 +1098,11 @@ msgstr ""
 #: using-d-i.xml:732
 #, no-c-format
 msgid "Automatic network configuration"
-msgstr ""
+msgstr "自动网络配置"
 
 #. Tag: para
 #: using-d-i.xml:733
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "By default, &d-i; tries to configure your computer's network "
 #| "automatically via DHCP. If the DHCP probe succeeds, you are done. If the "
@@ -1127,22 +1124,17 @@ msgid ""
 "in their responses, so if you are sure everything is in place, simply start "
 "the autoconfiguration attempt again. If autoconfiguration fails repeatedly, "
 "you can instead choose the manual network setup."
-msgstr ""
-"默认情况下，&d-i; 会试着用 DHCP 自动配置您的计算机网络。如果侦测 DHCP 成功，"
-"这一步就完成。如果失败，造成的原因会有多种因素，从没有接网线到错误设置的 "
-"DHCP，或者您的局域网里面根本就没有 DHCP 服务器。检查第四个控制台上的错误信"
-"息，了解更多的说明。不管怎样，您都会被要求选择是再试一次，还是手动配置。DHCP "
-"服务器有时候响应很慢，如果您确定都正常，请再试一次。"
+msgstr "默认情况下，&d-i; 会尽力自动配置您的计算机网络。如果自动配置失败，会有多种因素造成，从没有插好网线到错误的自动配置环境都有。要了解更多的出错原因，请检查第四控制台上的信息。不管是什么情况，都会要求您再试一次，或者让您选择手动设置。有时用于网络自动配置的网络服务器响应比较慢，假如您确信都配置正确，可以简单地再重新进行一次自动配置。要是自动配置还是失败，您可以换成手动网络设置方式。"
 
 #. Tag: title
 #: using-d-i.xml:752
 #, no-c-format
 msgid "Manual network configuration"
-msgstr ""
+msgstr "手动网络配置"
 
 #. Tag: para
 #: using-d-i.xml:753
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "The manual network setup in turn asks you a number of questions about "
 #| "your network, notably <computeroutput>IP address</computeroutput>, "
@@ -1164,16 +1156,7 @@ msgid ""
 "name</quote>) and a <computeroutput>WEP key</computeroutput> or "
 "<computeroutput>WPA/WPA2 passphrase</computeroutput>. Fill in the answers "
 "from <xref linkend=\"needed-info\"/>."
-msgstr ""
-"手动配置网络会依次询问一些网络问题，特别是 <computeroutput>IP 地址(IP "
-"address)</computeroutput>、<computeroutput>网络掩码(Netmask)</"
-"computeroutput>、<computeroutput>网关(Gateway)</computeroutput>、"
-"<computeroutput>域名服务器地址(Name server addresses)</computeroutput>，以及"
-"<computeroutput>主机名(Hostname)</computeroutput>。另外，如果您有无线网卡，会"
-"被要求提供<computeroutput>无线 ESSID(Wireless ESSID)</computeroutput> 和 "
-"<computeroutput> WEP 密钥(WEP key)</computeroutput> 或者 <computeroutput>WPA/"
-"WPA2 密码(WPA/WPA2 passphrase)</computeroutput>。填写答案 <xref linkend="
-"\"needed-info\"/>。"
+msgstr "手动配置网络会依次询问一些网络问题，特别是 <computeroutput>IP 地址(IP address)</computeroutput>、<computeroutput>网络掩码(Netmask)</computeroutput>、<computeroutput>网关(Gateway)</computeroutput>、<computeroutput>域名服务器地址(Name server addresses)</computeroutput>，以及<computeroutput>主机名(Hostname)</computeroutput>。另外，如果您有无线网卡，会被要求提供<computeroutput>Wireless ESSID</computeroutput> (<quote>无线网络名</quote>) 和 <computeroutput> WEP 密钥(WEP key)</computeroutput> 或者 <computeroutput>WPA/WPA2 密码(WPA/WPA2 passphrase)</computeroutput>。填写答案 <xref linkend=\"needed-info\"/>。"
 
 #. Tag: para
 #: using-d-i.xml:769
@@ -1198,7 +1181,7 @@ msgstr ""
 #: using-d-i.xml:784
 #, no-c-format
 msgid "IPv4 and IPv6"
-msgstr ""
+msgstr "IPv4 和 IPv6"
 
 #. Tag: para
 #: using-d-i.xml:785
@@ -1207,7 +1190,7 @@ msgid ""
 "From &debian-gnu; 7.0 (<quote>Wheezy</quote>) onwards, &d-i; supports IPv6 "
 "as well as the <quote>classic</quote> IPv4. All combinations of IPv4 and "
 "IPv6 (IPv4-only, IPv6-only and dual-stack configurations) are supported."
-msgstr ""
+msgstr "从 &debian-gnu; 7.0 (<quote>Wheezy</quote>) 以后，&d-i; 将同时支持 IPv6 和 <quote>经典的</quote> IPv4。IPv4 和 IPv6 的各种组合(仅 IPv4、仅 IPv6 和双栈(dual-stack)配置)都将支持。"
 
 #. Tag: para
 #: using-d-i.xml:791
@@ -1219,7 +1202,7 @@ msgid ""
 "(RDNSS) assignment), stateful autoconfiguration via DHCPv6 and mixed "
 "stateless/stateful autoconfiguration (address configuration via NDP, "
 "additional parameters via DHCPv6)."
-msgstr ""
+msgstr "IPv4 通过 DHCP (Dynamic Host Configuration Protocol)进行自动配置。自动配置 IPv6 使用 NDP (Neighbor Discovery Protocol，包括 recursive DNS server (RDNSS) 设置) 支持无状态自动配置，有状态自动配置通过 DHCPv6 和混合自动配置(地址配置使用 NDP，额外参数使用 DHCPv6)。"
 
 #. Tag: title
 #: using-d-i.xml:837
@@ -3708,10 +3691,10 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:2488
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Using a network mirror"
 msgid "Choosing a network mirror"
-msgstr "使用网络镜像"
+msgstr "选择网络镜像"
 
 #. Tag: para
 #: using-d-i.xml:2489
@@ -3722,7 +3705,7 @@ msgid ""
 "presented with a list of geographically nearby (and therefore hopefully "
 "fast) network mirrors, based upon your country selection earlier in the "
 "installation process. Choosing the offered default is usually fine."
-msgstr ""
+msgstr "如果在安装过程中选择网络镜像(CD/DVD 安装时为选项，netboot 为必须)，根据安装步骤签名进行的国家选择，您将看到根据就近地理位置(也希望速度最快)列出的网络镜像列表。通常选择默认的就行。"
 
 #. Tag: para
 #: using-d-i.xml:2497
@@ -3739,7 +3722,7 @@ msgid ""
 "<quote>ftp.ipv6.debian.org</quote> as the mirror name, which is an alias for "
 "a mirror available via IPv6, although it will probably not be the fastest "
 "possible one."
-msgstr ""
+msgstr "如果您的计算机处于仅有 IPv6 的网络(大多数用户不会遇到这种情况)，使用所属国家默认的镜像可能无法正常工作。列出的网络镜像全部可以使用 IPv4 访问，但只有其中的某些可以通过 IPv6 访问。由于个别镜像连接的状况会不断更新，此信息可能在安装程序里面失效。如果还没有 IPv6 连接到所在国家的默认镜像，您可以试试其他的镜像，或者选择<quote>手动输入信息</quote>选项。您可以指定 <quote>ftp.ipv6.debian.org</quote> 作为镜像名，这是 IPv6 上的一个镜像别名，它有可能不是速度最快的哪个。"
 
 #. Tag: para
 #: using-d-i.xml:2511
@@ -3751,7 +3734,7 @@ msgid ""
 "automatically refers your system to a real mirror near you in terms of "
 "network topology. It takes into account by which protocol you connect to it, "
 "i.e. if you use IPv6, it will refer you to an IPv6-capable mirror near you."
-msgstr ""
+msgstr "另一种选择是手动选取镜像，指定 <quote>http.debian.net</quote> 作为您的镜像服务器。 <quote>http.debian.net</quote> 并不是一个物理镜像，而是一个重定向服务，也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考虑到您连接所采用的协议，比如使用 IPv6，它将自动将您引到最近的 IPv6 镜像服务器。"
 
 #. Tag: title
 #: using-d-i.xml:2530
@@ -3854,7 +3837,7 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2597
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Some CD images (businesscard, netinst and DVD) also allow selection of "
 #| "the desired desktop environment from the graphical boot menu. Select the "
@@ -3865,10 +3848,7 @@ msgid ""
 "environment from the graphical boot menu. Select the <quote>Advanced "
 "options</quote> option in the main menu and look for <quote>Alternative "
 "desktop environments</quote>."
-msgstr ""
-"一些 CD 映象(businesscard, netinst 和 DVD)可以从图形引导菜单中选择所需的桌面"
-"环境。选择主菜单里面的 <quote>Advanced options</quote> 选项，再找到 "
-"<quote>Alternative desktop environments</quote>。"
+msgstr "一些 CD 映象(netinst 和 DVD)可以从图形引导菜单中选择所需的桌面环境。选择主菜单里面的 <quote>Advanced options</quote>，再找到 <quote>Alternative desktop environments</quote>。"
 
 #. Tag: para
 #: using-d-i.xml:2604
@@ -5257,18 +5237,3 @@ msgid ""
 msgstr ""
 "如果固件从不严格的固件文件加载，复制到安装好的系统的固件将<emphasis>不会</"
 "emphasis>自动更新，除非对应的固件软件包(如果有的话)在系统安装之后安装。"
-
-#~ msgid ""
-#~ "There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us "
-#~ "(Apple USB) layout will place the Alt function on the <keycap>Command/"
-#~ "Apple</keycap> key (in the keyboard position next to the <keycap>space</"
-#~ "keycap> key similar to <keycap>Alt</keycap> on PC keyboards), while the "
-#~ "qwerty/us (Standard) layout will place the Alt function on the "
-#~ "<keycap>Option</keycap> key (engraved with 'alt' on most Mac keyboards). "
-#~ "In other respects the two layouts are similar."
-#~ msgstr ""
-#~ "有两种 US 键盘布局；qwerty/mac-usb-us (Apple USB) 将 Alt 功能放在 "
-#~ "<keycap>Command/Apple</keycap> 健 (处于键盘的 <keycap>空格</keycap> 健旁，"
-#~ "类似于 PC 键盘的 <keycap>Alt</keycap> )，另外 qwerty/us (Standard) 布局将 "
-#~ "Alt 功能放在 <keycap>Option</keycap> 健上(在大多数 Mac 键盘上标明 'alt')。"
-#~ "其余地方这两种布局相似。"