Refresh po|pot files after changings in en

1 files changed, 59 insertions, 40 deletions

diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index c427b94de..4968bcc87 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-04-15 20:29+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\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"
@@ -2135,10 +2135,10 @@ msgstr ""
 "        #5 logical    6.0 GB    f ext4       /\n"
 "        #6 logical    1.0 GB    f ext3       /var\n"
 "        #7 logical  498.8 MB      ext3\n"
-"</screen></informalexample> 本例中有两块 硬盘，它们分别被分割成了几个分"
-"区。第一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标"
-"志、文件系统和挂载点(如果有的话)。注意：导引式分区方式不能创建这些特殊的设"
-"置，但使用手动方式分区的结果会有所不同。"
+"</screen></informalexample> 本例中有两块 硬盘，它们分别被分割成了几个分区。第"
+"一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标志、文件"
+"系统和挂载点(如果有的话)。注意：导引式分区方式不能创建这些特殊的设置，但使用"
+"手动方式分区的结果会有所不同。"
 
 #. Tag: para
 #: using-d-i.xml:1394
@@ -2223,9 +2223,8 @@ msgstr ""
 "否显示由分区的使用方式决定。如果您不喜欢预选的缺省设置的话，尽可按照自己的喜"
 "好更改。比如说，选中 <guimenuitem>Use as:</guimenuitem> 选项，然后您可以让这"
 "个分区改用其他的文件系统，把它用作交换分区<phrase arch=\"linux-any\">、软 "
-"RAID、LVM</phrase>，或者根本就放着不用。"
-"一旦您对新分区的设置感到满意了，就可以选择 "
-"<guimenuitem>Done setting up the partition</guimenuitem>，然后退回到 "
+"RAID、LVM</phrase>，或者根本就放着不用。一旦您对新分区的设置感到满意了，就可"
+"以选择 <guimenuitem>Done setting up the partition</guimenuitem>，然后退回到 "
 "<command>partman</command> 的主界面。"
 
 #. Tag: para
@@ -3074,9 +3073,9 @@ msgid ""
 "alternatives only when you need to ensure compatibility with some previously "
 "installed system that is not able to use newer algorithms."
 msgstr ""
-"与其替代者比较，默认的 <userinput>xts-plain64</userinput> 是当前已知的具"
-"有最少的攻击漏洞。您只有在需要保持与以前安装的系统兼容，而它们无法使用新的算"
-"法时，才使用其他的算法。"
+"与其替代者比较，默认的 <userinput>xts-plain64</userinput> 是当前已知的具有最"
+"少的攻击漏洞。您只有在需要保持与以前安装的系统兼容，而它们无法使用新的算法"
+"时，才使用其他的算法。"
 
 #. Tag: term
 #: using-d-i.xml:2029
@@ -3423,19 +3422,34 @@ msgstr "配置 apt"
 
 #. Tag: para
 #: using-d-i.xml:2262
-#, no-c-format
-msgid ""
-"One of the tools used to install packages on a &debian-gnu; system is a "
-"program called <command>apt-get</command>, from the <classname>apt</"
-"classname> package<footnote> <para> Note that the program which actually "
-"installs the packages is called <command>dpkg</command>. However, this "
-"program is more of a low-level tool. <command>apt-get</command> is a higher-"
-"level tool, which will invoke <command>dpkg</command> as appropriate. It "
-"knows how to retrieve packages from your CD, the network, or wherever. It is "
-"also able to automatically install other packages which are required to make "
-"the package you're trying to install work correctly. </para> </footnote>. "
-"Other front-ends for package management, like <command>aptitude</command> "
-"and <command>synaptic</command>, are also in use. These front-ends are "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "One of the tools used to install packages on a &debian-gnu; system is a "
+#| "program called <command>apt-get</command>, from the <classname>apt</"
+#| "classname> package<footnote> <para> Note that the program which actually "
+#| "installs the packages is called <command>dpkg</command>. However, this "
+#| "program is more of a low-level tool. <command>apt-get</command> is a "
+#| "higher-level tool, which will invoke <command>dpkg</command> as "
+#| "appropriate. It knows how to retrieve packages from your CD, the network, "
+#| "or wherever. It is also able to automatically install other packages "
+#| "which are required to make the package you're trying to install work "
+#| "correctly. </para> </footnote>. Other front-ends for package management, "
+#| "like <command>aptitude</command> and <command>synaptic</command>, are "
+#| "also in use. These front-ends are recommended for new users, since they "
+#| "integrate some additional features (package searching and status checks) "
+#| "in a nice user interface."
+msgid ""
+"One of the tools used to install packages on a &debian-gnu; system is the "
+"program <command>apt</command>, from the <classname>apt</classname> "
+"package<footnote> <para> Note that the program which actually installs the "
+"packages is called <command>dpkg</command>. However, this program is more of "
+"a low-level tool. <command>apt</command> is a higher-level tool, which will "
+"invoke <command>dpkg</command> as appropriate. It knows how to retrieve "
+"packages from your CD, the network, or wherever. It is also able to "
+"automatically install other packages which are required to make the package "
+"you're trying to install work correctly. </para> </footnote>. Other front-"
+"ends for package management, like <command>aptitude</command> and "
+"<command>synaptic</command>, are also in use. These front-ends are "
 "recommended for new users, since they integrate some additional features "
 "(package searching and status checks) in a nice user interface."
 msgstr ""
@@ -3488,8 +3502,8 @@ msgid ""
 "sections of the archive."
 msgstr ""
 "如果您采用较低的优先级安装 (比如，expert 模式)，就要自己做更多的判定。您可以"
-"选择是否使用安全、或者 stable-updates 更新服务，并能选择从 <quote>contrib</quote> "
-"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
+"选择是否使用安全、或者 stable-updates 更新服务，并能选择从 <quote>contrib</"
+"quote> 和 <quote>non-free</quote> 软件仓库里面添加软件包。"
 
 #. Tag: title
 #: using-d-i.xml:2312
@@ -3770,10 +3784,11 @@ msgid ""
 "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 ""
-"另一种选择是手动选取镜像，指定 <quote>httpredir.debian.org</quote> 作为您的镜像服"
-"务器。 <quote>httpredir.debian.org</quote> 并不是一个物理镜像，而是一个重定向服"
-"务，也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考虑到您"
-"连接所采用的协议，比如使用 IPv6，它将自动将您引到最近的 IPv6 镜像服务器。"
+"另一种选择是手动选取镜像，指定 <quote>httpredir.debian.org</quote> 作为您的镜"
+"像服务器。 <quote>httpredir.debian.org</quote> 并不是一个物理镜像，而是一个重"
+"定向服务，也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考"
+"虑到您连接所采用的协议，比如使用 IPv6，它将自动将您引到最近的 IPv6 镜像服务"
+"器。"
 
 #. Tag: title
 #: using-d-i.xml:2495
@@ -4414,11 +4429,13 @@ msgid ""
 "After arcboot has been installed, the system can be booted from hard disk by "
 "setting some firmware environment variables entering "
 "<informalexample><screen>\n"
-"<userinput> setenv SystemPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(0)</userinput>\n"
-"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(<replaceable>partnr</"
-"replaceable>)</userinput>\n"
+"<userinput> setenv SystemPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</replaceable>)rdisk(0)partition(0)</"
+"userinput>\n"
+"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</"
+"replaceable>)rdisk(0)partition(<replaceable>partnr</replaceable>)</"
+"userinput>\n"
 "<userinput> setenv OSLoader arcboot</userinput>\n"
 "<userinput> setenv OSLoadFilename <replaceable>config</replaceable></"
 "userinput>\n"
@@ -4431,11 +4448,13 @@ msgstr ""
 "<filename>/etc/arcboot.conf</filename> 里建立。每个设置有单独的名称，安装程序"
 "创建的默认设置为 <quote>linux</quote>。arcboot 安装之后，系统可以从硬盘启动，"
 "这需要固件提示时设置一些固件环境变量 <informalexample><screen>\n"
-"<userinput> setenv SystemPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(0)</userinput>\n"
-"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(<replaceable>partnr</"
-"replaceable>)</userinput>\n"
+"<userinput> setenv SystemPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</replaceable>)rdisk(0)partition(0)</"
+"userinput>\n"
+"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</"
+"replaceable>)rdisk(0)partition(<replaceable>partnr</replaceable>)</"
+"userinput>\n"
 "<userinput> setenv OSLoader arcboot</userinput>\n"
 "<userinput> setenv OSLoadFilename <replaceable>config</replaceable></"
 "userinput>\n"