1 files changed, 5 insertions, 28 deletions
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 0b77e4b9b..5d0ce8818 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-06-16 09:12+0000\n"
-"PO-Revision-Date: 2011-01-17 00:39+0800\n"
+"PO-Revision-Date: 2012-07-25 14:07+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "Language: \n"
@@ -1131,7 +1131,7 @@ 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>, "
@@ -1152,14 +1152,7 @@ msgid ""
 "<computeroutput>Wireless ESSID</computeroutput> and a <computeroutput>WEP "
 "key</computeroutput> or <computeroutput>WPA/WPA2 passphrase</"
 "computeroutput>. Fill in the answers from <xref linkend=\"needed-info\"/>."
-msgstr ""
-"手动配置网络会依次询问一些您网络的问题，值得注意的是 <computeroutput>IP 地址"
-"</computeroutput>、<computeroutput>网络掩码</computeroutput>、"
-"<computeroutput>网关</computeroutput>、<computeroutput>域名服务器地址</"
-"computeroutput>和<computeroutput>主机名</computeroutput>。此外，如果您有无线"
-"网络接口，会被要求提供您的 <computeroutput>无线 ESSID</computeroutput> 和一"
-"个 <computeroutput>WEP 密钥</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>无线 ESSID(Wireless ESSID)</computeroutput> 和 <computeroutput> WEP 密钥(WEP key)</computeroutput> 或者 <computeroutput>WPA/WPA2 密码(WPA/WPA2 passphrase)</computeroutput>。填写答案 <xref linkend=\"needed-info\"/>。"
 
 #. Tag: para
 #: using-d-i.xml:769
@@ -5050,7 +5043,7 @@ msgstr "准备介质"
 
 #. Tag: para
 #: using-d-i.xml:3448
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Although in some cases the firmware can also be loaded from a partition "
 #| "on a hard disk, the most common method to load firmware will be from some "
@@ -5069,11 +5062,7 @@ msgid ""
 "named <filename>/firmware</filename> of the file system on the medium. The "
 "recommended file system to use is FAT as that is most certain to be "
 "supported during the early stages of the installation."
-msgstr ""
-"虽然有些情况下固件可以从硬盘的某个分区加载，但常用的方法是从移动的介质，比如"
-"软盘或 U 盘加载固件。固件文件或者软件包必须放在该介质文件系统的根目录，或者名"
-"为 <filename>/firmware</filename> 的目录下。推荐的文件系统是 FAT，它是安装过"
-"程最初阶段最可能支持的文件系统。"
+msgstr "官方的 CD 映像不含商用的固件。这些固件通常是从移动介质，比如 U 盘来加载。另外，包含这些商用固件的非官方的 CD 位于 <ulink url=\"&url-firmware-cds;\"></ulink>。制作这种 U 盘(或者其他的介质，比如硬盘分区或者软盘)时，固件文件或软件包必须放置在文件系统的根目录或者名为 <filename>/firmware</filename> 的目录下。推荐使用 FAT 文件系统，因为在安装过程的早期阶段它肯定能被支持。"
 
 #. Tag: para
 #: using-d-i.xml:3461
@@ -5171,15 +5160,3 @@ msgid ""
 msgstr ""
 "如果固件从不严格的固件文件加载，复制到安装好的系统的固件将<emphasis>不会</"
 "emphasis>自动更新，除非对应的固件软件包(如果有的话)在系统安装之后安装。"
-
-#~ msgid ""
-#~ "Support for loading firmware is still relatively basic and is likely to "
-#~ "be improved in future releases of the installer. Currently &d-i; will for "
-#~ "example not display any warning if you choose to load missing firmware, "
-#~ "but the requested firmware is not found. Please report any issues you "
-#~ "encounter by filing an installation report (see <xref linkend=\"submit-bug"
-#~ "\"/>)."
-#~ msgstr ""
-#~ "加载固件的支持相对简单，在以后的安装程序版本中会得到加强。例如，当前 &d-"
-#~ "i; 中如果选择加载缺失的固件，但固件却无法找到，不会显示任何警告。请您填写"
-#~ "安装报告反应遇到的任何问题(参阅 <xref linkend=\"submit-bug\"/>)。"