Refresh po and pot files after changings in en

1 files changed, 90 insertions, 81 deletions

diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index c0dfec81e..d1ccebcd8 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2014-08-26 20:40+0000\n"
 "PO-Revision-Date: 2010-10-26 21:00+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -247,24 +247,22 @@ msgstr "挂载加密卷"
 
 #. Tag: para
 #: boot-new.xml:147
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you created encrypted volumes during the installation and assigned "
+#| "them mount points, you will be asked to enter the passphrase for each of "
+#| "these volumes during the boot. The actual procedure differs slightly "
+#| "between dm-crypt and loop-AES."
 msgid ""
 "If you created encrypted volumes during the installation and assigned them "
 "mount points, you will be asked to enter the passphrase for each of these "
-"volumes during the boot. The actual procedure differs slightly between dm-"
-"crypt and loop-AES."
+"volumes during the boot."
 msgstr ""
 "假如您在安装的时候创建了加密卷并设置了挂载点，在启动的时候每个这样的卷将会要"
 "求输入密码。对于 dm-crypt 和 loop-AES 具体的过程稍有不同。"
 
-#. Tag: title
-#: boot-new.xml:157
-#, no-c-format
-msgid "dm-crypt"
-msgstr "dm-crypt"
-
 #. Tag: para
-#: boot-new.xml:159
+#: boot-new.xml:155
 #, no-c-format
 msgid ""
 "For partitions encrypted using dm-crypt you will be shown the following "
@@ -302,7 +300,7 @@ msgstr ""
 "到它。"
 
 #. Tag: para
-#: boot-new.xml:182
+#: boot-new.xml:178
 #, no-c-format
 msgid ""
 "The prompt may look somewhat different when an encrypted root file system is "
@@ -315,7 +313,7 @@ msgstr ""
 "classname> 生成的 initrd："
 
 #. Tag: screen
-#: boot-new.xml:189
+#: boot-new.xml:185
 #, no-c-format
 msgid ""
 "Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
@@ -327,7 +325,7 @@ msgstr ""
 "Enter LUKS passphrase:"
 
 #. Tag: para
-#: boot-new.xml:191 boot-new.xml:216
+#: boot-new.xml:187
 #, no-c-format
 msgid ""
 "No characters (even asterisks) will be shown while entering the passphrase. "
@@ -341,47 +339,19 @@ msgstr ""
 "\"crypto-troubleshooting\"/> 了解更多信息。"
 
 #. Tag: para
-#: boot-new.xml:199 boot-new.xml:224
+#: boot-new.xml:195
 #, no-c-format
 msgid "After entering all passphrases the boot should continue as usual."
 msgstr "输入密码之后，启动过程与通常情况相同。"
 
 #. Tag: title
-#: boot-new.xml:207
-#, no-c-format
-msgid "loop-AES"
-msgstr "loop-AES"
-
-#. Tag: para
-#: boot-new.xml:209
-#, no-c-format
-msgid ""
-"For partitions encrypted using loop-AES you will be shown the following "
-"prompt during the boot:"
-msgstr "使用 loop-AES 加密的分区，启动的时候将会有下面的提示信息："
-
-#. Tag: screen
-#: boot-new.xml:214
-#, no-c-format
-msgid ""
-"Checking loop-encrypted file systems.\n"
-"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
-"replaceable>)\n"
-"Password:"
-msgstr ""
-"Checking loop-encrypted file systems.\n"
-"Setting up /dev/loop<replaceable>X</replaceable> (/<replaceable>mountpoint</"
-"replaceable>)\n"
-"Password:"
-
-#. Tag: title
-#: boot-new.xml:232
+#: boot-new.xml:202
 #, no-c-format
 msgid "Troubleshooting"
 msgstr "故障处理"
 
 #. Tag: para
-#: boot-new.xml:234
+#: boot-new.xml:204
 #, no-c-format
 msgid ""
 "If some of the encrypted volumes could not be mounted because a wrong "
@@ -392,7 +362,7 @@ msgstr ""
 "况。"
 
 #. Tag: para
-#: boot-new.xml:243
+#: boot-new.xml:213
 #, no-c-format
 msgid ""
 "The first case concerns the root partition. When it is not mounted "
@@ -403,37 +373,31 @@ msgstr ""
 "动计算机再试一次。"
 
 #. Tag: para
-#: boot-new.xml:250
+#: boot-new.xml:220
 #, no-c-format
 msgid ""
 "The easiest case is for encrypted volumes holding data like <filename>/home</"
 "filename> or <filename>/srv</filename>. You can simply mount them manually "
-"after the boot. For loop-AES this is a one-step operation: "
-"<informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
-"userinput>\n"
-"<prompt>Password:</prompt>\n"
-"</screen></informalexample> where <replaceable>/mount_point</replaceable> "
-"should be replaced by the particular directory (e.g. <filename>/home</"
-"filename>). The only difference from an ordinary mount is that you will be "
-"asked to enter the passphrase for this volume."
-msgstr ""
-"最容易处理的情况是加密卷位于 <filename>/home</filename> 或 <filename>/srv</"
-"filename>。您在启动后可以很容易手动加载。对于 loop-AES 只需操作一步："
-"<informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
-"userinput>\n"
-"<prompt>Password:</prompt>\n"
-"</screen></informalexample> 其中 <replaceable>/mount_point</replaceable> 要替"
-"换为特定的目录(例如，<filename>/home</filename>)。它与普通的加载不同支持仅在"
-"于需要为该卷输入密码。"
+"after the boot."
+msgstr ""
 
 #. Tag: para
-#: boot-new.xml:264
-#, no-c-format
-msgid ""
-"For dm-crypt this is a bit trickier. First you need to register the volumes "
-"with <application>device mapper</application> by running: "
+#: boot-new.xml:226
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For dm-crypt this is a bit trickier. First you need to register the "
+#| "volumes with <application>device mapper</application> by running: "
+#| "<informalexample><screen>\n"
+#| "<prompt>#</prompt> <userinput>/etc/init.d/cryptdisks start</userinput>\n"
+#| "</screen></informalexample> This will scan all volumes mentioned in "
+#| "<filename>/etc/crypttab</filename> and will create appropriate devices "
+#| "under the <filename>/dev</filename> directory after entering the correct "
+#| "passphrases. (Already registered volumes will be skipped, so you can "
+#| "repeat this command several times without worrying.) After successful "
+#| "registration you can simply mount the volumes the usual way:"
+msgid ""
+"However for dm-crypt this is a bit tricky. First you need to register the "
+"volumes with <application>device mapper</application> by running: "
 "<informalexample><screen>\n"
 "<prompt>#</prompt> <userinput>/etc/init.d/cryptdisks start</userinput>\n"
 "</screen></informalexample> This will scan all volumes mentioned in "
@@ -452,7 +416,7 @@ msgstr ""
 "就可以按普通的方法加载这些卷："
 
 #. Tag: screen
-#: boot-new.xml:279
+#: boot-new.xml:241
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -462,7 +426,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: boot-new.xml:282
+#: boot-new.xml:244
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If any volume holding noncritical system files could not be mounted "
@@ -494,13 +458,13 @@ msgstr ""
 "令时按下 <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo>。"
 
 #. Tag: title
-#: boot-new.xml:300
+#: boot-new.xml:262
 #, no-c-format
 msgid "Log In"
 msgstr "登录"
 
 #. Tag: para
-#: boot-new.xml:302
+#: boot-new.xml:264
 #, no-c-format
 msgid ""
 "Once your system boots, you'll be presented with the login prompt. Log in "
@@ -511,7 +475,7 @@ msgstr ""
 "在您的系统就能使用了。"
 
 #. Tag: para
-#: boot-new.xml:308
+#: boot-new.xml:270
 #, no-c-format
 msgid ""
 "If you are a new user, you may want to explore the documentation which is "
@@ -523,7 +487,7 @@ msgstr ""
 "个文档系统，由不同类型的文档组成。这里是一些出发点。"
 
 #. Tag: para
-#: boot-new.xml:316
+#: boot-new.xml:278
 #, no-c-format
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
@@ -542,7 +506,7 @@ msgstr ""
 "<classname>apt-howto</classname> 软件包内。"
 
 #. Tag: para
-#: boot-new.xml:327
+#: boot-new.xml:289
 #, no-c-format
 msgid ""
 "In addition, there are some special folders within the <filename>/usr/share/"
@@ -558,7 +522,7 @@ msgstr ""
 "<filename>/usr/share/doc/HTML/index.html</filename> 文档索引。"
 
 #. Tag: para
-#: boot-new.xml:336
+#: boot-new.xml:298
 #, no-c-format
 msgid ""
 "One easy way to view these documents using a text based browser is to enter "
@@ -576,7 +540,7 @@ msgstr ""
 "录下的内容。"
 
 #. Tag: para
-#: boot-new.xml:346
+#: boot-new.xml:308
 #, no-c-format
 msgid ""
 "If you have a graphical desktop environment installed, you can also use its "
@@ -587,7 +551,7 @@ msgstr ""
 "览器，然后在地址栏内键入 <userinput>/usr/share/doc/</userinput>。"
 
 #. Tag: para
-#: boot-new.xml:352
+#: boot-new.xml:314
 #, no-c-format
 msgid ""
 "You can also type <userinput>info <replaceable>command</replaceable></"
@@ -608,3 +572,48 @@ msgstr ""
 "如果命令的结果滚动超出屏幕顶端，命令后面加上 <userinput>|&nbsp;more</"
 "userinput>，可以让输出在滚出顶端屏幕前暂停。查看某字母开始的所有可用命令，键"
 "入该字母，然后按两个 tab。"
+
+#~ msgid "dm-crypt"
+#~ msgstr "dm-crypt"
+
+#~ msgid "loop-AES"
+#~ msgstr "loop-AES"
+
+#~ msgid ""
+#~ "For partitions encrypted using loop-AES you will be shown the following "
+#~ "prompt during the boot:"
+#~ msgstr "使用 loop-AES 加密的分区，启动的时候将会有下面的提示信息："
+
+#~ msgid ""
+#~ "Checking loop-encrypted file systems.\n"
+#~ "Setting up /dev/loop<replaceable>X</replaceable> (/"
+#~ "<replaceable>mountpoint</replaceable>)\n"
+#~ "Password:"
+#~ msgstr ""
+#~ "Checking loop-encrypted file systems.\n"
+#~ "Setting up /dev/loop<replaceable>X</replaceable> (/"
+#~ "<replaceable>mountpoint</replaceable>)\n"
+#~ "Password:"
+
+#~ msgid ""
+#~ "The easiest case is for encrypted volumes holding data like <filename>/"
+#~ "home</filename> or <filename>/srv</filename>. You can simply mount them "
+#~ "manually after the boot. For loop-AES this is a one-step operation: "
+#~ "<informalexample><screen>\n"
+#~ "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</"
+#~ "replaceable></userinput>\n"
+#~ "<prompt>Password:</prompt>\n"
+#~ "</screen></informalexample> where <replaceable>/mount_point</replaceable> "
+#~ "should be replaced by the particular directory (e.g. <filename>/home</"
+#~ "filename>). The only difference from an ordinary mount is that you will "
+#~ "be asked to enter the passphrase for this volume."
+#~ msgstr ""
+#~ "最容易处理的情况是加密卷位于 <filename>/home</filename> 或 <filename>/"
+#~ "srv</filename>。您在启动后可以很容易手动加载。对于 loop-AES 只需操作一步："
+#~ "<informalexample><screen>\n"
+#~ "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</"
+#~ "replaceable></userinput>\n"
+#~ "<prompt>Password:</prompt>\n"
+#~ "</screen></informalexample> 其中 <replaceable>/mount_point</replaceable> "
+#~ "要替换为特定的目录(例如，<filename>/home</filename>)。它与普通的加载不同支"
+#~ "持仅在于需要为该卷输入密码。"