Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

2 files changed, 213 insertions, 207 deletions

diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index c592a2e37..5b547cc44 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-08-03 23:21+0000\n"
+"POT-Creation-Date: 2018-08-31 23:21+0000\n"
 "PO-Revision-Date: 2017-06-11 22:15+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -72,54 +72,13 @@ msgstr ""
 "<command>reboot</command> 可以重启系统。"
 
 #. Tag: title
-#: post-install.xml:61
-#, no-c-format
-msgid "If You Are New to Unix"
-msgstr "如果您不熟悉 Unix"
-
-#. Tag: para
-#: post-install.xml:62
-#, no-c-format
-msgid ""
-"If you are new to Unix, you probably should go out and buy some books and do "
-"some reading. A lot of valuable information can also be found in the <ulink "
-"url=\"&url-debian-reference;\">Debian Reference</ulink>. This <ulink url="
-"\"&url-unix-faq;\">list of Unix FAQs</ulink> contains a number of UseNet "
-"documents which provide a nice historical reference."
-msgstr ""
-"如果不熟悉 Unix，您也许应该出去买些书来读。从 <ulink url=\"&url-debian-"
-"reference;\">Debian Reference</ulink> 还可以找到到大量有用的信息。<ulink url="
-"\"&url-unix-faq;\">Unix 常见问题解答</ulink>里面包含了大量的 UseNet 文档，它"
-"提供了很好的历史参考。"
-
-#. Tag: para
-#: post-install.xml:70
-#, no-c-format
-msgid ""
-"Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
-"Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
-"books relating to Linux. Most of these documents can be installed locally; "
-"just install the <classname>doc-linux-html</classname> package (HTML "
-"versions) or the <classname>doc-linux-text</classname> package (ASCII "
-"versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
-"International versions of the LDP HOWTOs are also available as &debian; "
-"packages."
-msgstr ""
-"Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</"
-"ulink> 收集了大量的 HOWTO 和 Linux 在线书籍。这些文档绝大部分可以在本地安装；"
-"只须安装 <classname>doc-linux-html</classname> 包(HTML 版本)，或者 "
-"<classname>doc-linux-text</classname>包(ASCII 版本)，然后在 <filename>/usr/"
-"share/doc/HOWTO</filename> 里面就能找到。在 &debian; 软件包里面也提供 LDP "
-"HOWTO 的国际化版本。"
-
-#. Tag: title
-#: post-install.xml:91
+#: post-install.xml:60
 #, no-c-format
 msgid "Orienting Yourself to &debian;"
 msgstr "让自己适应 &debian;"
 
 #. Tag: para
-#: post-install.xml:92
+#: post-install.xml:61
 #, no-c-format
 msgid ""
 "&debian; is a little different from other distributions. Even if you're "
@@ -135,13 +94,13 @@ msgstr ""
 "粗略的介绍。"
 
 #. Tag: title
-#: post-install.xml:103
+#: post-install.xml:72
 #, no-c-format
 msgid "&debian; Packaging System"
 msgstr "&debian; 软件包系统"
 
 #. Tag: para
-#: post-install.xml:104
+#: post-install.xml:73
 #, no-c-format
 msgid ""
 "The most important concept to grasp is the &debian; packaging system. In "
@@ -172,7 +131,7 @@ msgstr ""
 "command> 里面将软件包设置为 <quote>hold</quote>状态，以避免这种情况。"
 
 #. Tag: para
-#: post-install.xml:145
+#: post-install.xml:114
 #, fuzzy, no-c-format
 #| msgid ""
 #| "One of the best installation methods is apt. You can use the command line "
@@ -195,13 +154,13 @@ msgstr ""
 "限制的软件包。"
 
 #. Tag: title
-#: post-install.xml:159
+#: post-install.xml:128
 #, no-c-format
 msgid "Additional Software Available for &debian;"
 msgstr "用于 &debian; 的额外软件"
 
 #. Tag: para
-#: post-install.xml:160
+#: post-install.xml:129
 #, no-c-format
 msgid ""
 "There are official and unofficial software repositories that are not enabled "
@@ -216,13 +175,13 @@ msgstr ""
 "Release</ulink>。"
 
 #. Tag: title
-#: post-install.xml:172
+#: post-install.xml:141
 #, no-c-format
 msgid "Application Version Management"
 msgstr "应用程序版本管理"
 
 #. Tag: para
-#: post-install.xml:173
+#: post-install.xml:142
 #, no-c-format
 msgid ""
 "Alternative versions of applications are managed by update-alternatives. If "
@@ -233,13 +192,13 @@ msgstr ""
 "多个版本，请阅读 update-alternatives 的 man 手册。"
 
 #. Tag: title
-#: post-install.xml:183
+#: post-install.xml:152
 #, no-c-format
 msgid "Cron Job Management"
 msgstr "定时任务管理"
 
 #. Tag: para
-#: post-install.xml:184
+#: post-install.xml:153
 #, no-c-format
 msgid ""
 "Any jobs under the purview of the system administrator should be in "
@@ -256,7 +215,7 @@ msgstr ""
 "然后按照文件名的字典顺序依次运行。"
 
 #. Tag: para
-#: post-install.xml:193
+#: post-install.xml:162
 #, no-c-format
 msgid ""
 "On the other hand, if you have a cron job that (a) needs to run as a special "
@@ -271,7 +230,7 @@ msgstr ""
 "件可以包含一个额外的域，允许您指定运行该定时任务的用户帐户。"
 
 #. Tag: para
-#: post-install.xml:202
+#: post-install.xml:171
 #, no-c-format
 msgid ""
 "In either case, you just edit the files and cron will notice them "
@@ -284,13 +243,41 @@ msgstr ""
 "share/doc/cron/README.Debian</filename>。"
 
 #. Tag: title
-#: post-install.xml:217
+#: post-install.xml:186
 #, no-c-format
 msgid "Further Reading and Information"
 msgstr "更多信息"
 
 #. Tag: para
-#: post-install.xml:218
+#: post-install.xml:187
+#, no-c-format
+msgid ""
+"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
+"large quantity of documentation about &debian;. In particular, see the "
+"<ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> "
+"and the <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference"
+"\">Debian Reference</ulink>. An index of more &debian; documentation is "
+"available from the <ulink url=\"http://www.debian.org/doc/ddp\">Debian "
+"Documentation Project</ulink>. The &debian; community is self-supporting; to "
+"subscribe to one or more of the Debian mailing lists, see the <ulink url="
+"\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</"
+"ulink> page. Last, but not least, the <ulink url=\"http://lists.debian.org/"
+"\">Debian Mailing List Archives</ulink> contain a wealth of information on "
+"&debian;."
+msgstr ""
+"在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 "
+"&debian; 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/"
+"\">Debian GNU/Linux FAQ</ulink> 和 <ulink url=\"http://www.debian.org/doc/"
+"user-manuals#quick-reference\">Debian Reference</ulink>。更多的 &debian; 文档"
+"位于 <ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation "
+"Project</ulink>。&debian; 社区是靠用户自己的力量支撑起来的；如果您想要订阅 "
+"Debian 的邮件列表，请访问 <ulink url=\"http://www.debian.org/MailingLists/"
+"subscribe\"> Mail List Subscription</ulink> 页面。最后，相当重要的，<ulink "
+"url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> 包含了 "
+"&debian; 丰富的信息。"
+
+#. Tag: para
+#: post-install.xml:205
 #, no-c-format
 msgid ""
 "If you need information about a particular program, you should first try "
@@ -302,7 +289,7 @@ msgstr ""
 "replaceable></userinput>。"
 
 #. Tag: para
-#: post-install.xml:224
+#: post-install.xml:211
 #, no-c-format
 msgid ""
 "There is lots of useful documentation in <filename>/usr/share/doc</filename> "
@@ -320,35 +307,7 @@ msgstr ""
 "filename>。"
 
 #. Tag: para
-#: post-install.xml:235
-#, no-c-format
-msgid ""
-"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
-"large quantity of documentation about &debian;. In particular, see the "
-"<ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> "
-"and the <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference"
-"\">Debian Reference</ulink>. An index of more &debian; documentation is "
-"available from the <ulink url=\"http://www.debian.org/doc/ddp\">Debian "
-"Documentation Project</ulink>. The &debian; community is self-supporting; to "
-"subscribe to one or more of the Debian mailing lists, see the <ulink url="
-"\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</"
-"ulink> page. Last, but not least, the <ulink url=\"http://lists.debian.org/"
-"\">Debian Mailing List Archives</ulink> contain a wealth of information on "
-"&debian;."
-msgstr ""
-"在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 "
-"&debian; 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/"
-"\">Debian GNU/Linux FAQ</ulink> 和 <ulink url=\"http://www.debian.org/doc/"
-"user-manuals#quick-reference\">Debian Reference</ulink>。更多的 &debian; 文档"
-"位于 <ulink url=\"http://www.debian.org/doc/ddp\">Debian Documentation "
-"Project</ulink>。&debian; 社区是靠用户自己的力量支撑起来的；如果您想要订阅 "
-"Debian 的邮件列表，请访问 <ulink url=\"http://www.debian.org/MailingLists/"
-"subscribe\"> Mail List Subscription</ulink> 页面。最后，相当重要的，<ulink "
-"url=\"http://lists.debian.org/\">Debian Mailing List Archives</ulink> 包含了 "
-"&debian; 丰富的信息。"
-
-#. Tag: para
-#: post-install.xml:253
+#: post-install.xml:222
 #, no-c-format
 msgid ""
 "A general source of information on GNU/Linux is the <ulink url=\"http://www."
@@ -360,14 +319,43 @@ msgstr ""
 "org/\">Linux Documentation Project</ulink>。在那里您可以找到有关于 GNU/Linux "
 "系统各个部分的非常有价值的 HOWTO 文档以及其他指导。"
 
+#. Tag: para
+#: post-install.xml:229
+#, no-c-format
+msgid ""
+"Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
+"Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
+"books relating to Linux."
+msgstr ""
+
+#. Tag: para
+#: post-install.xml:236
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you are new to Unix, you probably should go out and buy some books and "
+#| "do some reading. A lot of valuable information can also be found in the "
+#| "<ulink url=\"&url-debian-reference;\">Debian Reference</ulink>. This "
+#| "<ulink url=\"&url-unix-faq;\">list of Unix FAQs</ulink> contains a number "
+#| "of UseNet documents which provide a nice historical reference."
+msgid ""
+"If you are new to Unix, you probably should go out and buy some books and do "
+"some reading. This <ulink url=\"&url-unix-faq;\">list of Unix FAQs</ulink> "
+"contains a number of UseNet documents which provide a nice historical "
+"reference."
+msgstr ""
+"如果不熟悉 Unix，您也许应该出去买些书来读。从 <ulink url=\"&url-debian-"
+"reference;\">Debian Reference</ulink> 还可以找到到大量有用的信息。<ulink url="
+"\"&url-unix-faq;\">Unix 常见问题解答</ulink>里面包含了大量的 UseNet 文档，它"
+"提供了很好的历史参考。"
+
 #. Tag: title
-#: post-install.xml:269
+#: post-install.xml:251
 #, no-c-format
 msgid "Setting Up Your System To Use E-Mail"
 msgstr "让您的系统使用 E-Mail"
 
 #. Tag: para
-#: post-install.xml:270
+#: post-install.xml:252
 #, no-c-format
 msgid ""
 "Today, email is an important part of many people's life. As there are many "
@@ -379,7 +367,7 @@ msgstr ""
 "多 &debian; 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
 
 #. Tag: para
-#: post-install.xml:277
+#: post-install.xml:259
 #, no-c-format
 msgid ""
 "There are three main functions that make up an e-mail system. First there is "
@@ -397,7 +385,7 @@ msgstr ""
 "的收件箱。"
 
 #. Tag: para
-#: post-install.xml:287
+#: post-install.xml:269
 #, no-c-format
 msgid ""
 "These three functions can be performed by separate programs, but they can "
@@ -408,7 +396,7 @@ msgstr ""
 "程序处理不同类型的邮件。"
 
 #. Tag: para
-#: post-install.xml:293
+#: post-install.xml:275
 #, no-c-format
 msgid ""
 "On Linux and Unix systems <command>mutt</command> is historically a very "
@@ -422,7 +410,7 @@ msgstr ""
 "command> 一起使用。"
 
 #. Tag: para
-#: post-install.xml:300
+#: post-install.xml:282
 #, fuzzy, no-c-format
 #| msgid ""
 #| "With the increasing popularity of graphical desktop systems, the use of "
@@ -452,13 +440,13 @@ msgstr ""
 "能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
 
 #. Tag: title
-#: post-install.xml:312
+#: post-install.xml:294
 #, no-c-format
 msgid "Default E-Mail Configuration"
 msgstr "默认的 E-Mail 配置"
 
 #. Tag: para
-#: post-install.xml:313
+#: post-install.xml:295
 #, no-c-format
 msgid ""
 "Even if you are planning to use a graphical mail program, it is important "
@@ -476,7 +464,7 @@ msgstr ""
 "footnote> 会通过邮件发送重要的提示通知系统管理员潜在的问题或变化。"
 
 #. Tag: para
-#: post-install.xml:328
+#: post-install.xml:310
 #, no-c-format
 msgid ""
 "For this reason the packages <classname>exim4</classname> and "
@@ -500,7 +488,7 @@ msgstr ""
 "会发送给 root 帐号。</para> </footnote>。"
 
 #. Tag: para
-#: post-install.xml:347
+#: post-install.xml:329
 #, no-c-format
 msgid ""
 "When system e-mails are delivered they are added to a file in <filename>/var/"
@@ -512,13 +500,13 @@ msgstr ""
 "<command>mutt</command> 读取。"
 
 #. Tag: title
-#: post-install.xml:357
+#: post-install.xml:339
 #, no-c-format
 msgid "Sending E-Mails Outside The System"
 msgstr "发送邮件到系统之外"
 
 #. Tag: para
-#: post-install.xml:358
+#: post-install.xml:340
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed &debian; system is only set up to handle "
@@ -529,7 +517,7 @@ msgstr ""
 "收其他系统的邮件。"
 
 #. Tag: para
-#: post-install.xml:364
+#: post-install.xml:346
 #, no-c-format
 msgid ""
 "If you would like <classname>exim4</classname> to handle external e-mail, "
@@ -540,7 +528,7 @@ msgstr ""
 "可以使用的基本配置选项。确认邮件可以正确地发送和接收。"
 
 #. Tag: para
-#: post-install.xml:370
+#: post-install.xml:352
 #, no-c-format
 msgid ""
 "If you intend to use a graphical mail program and use a mail server of your "
@@ -555,7 +543,7 @@ msgstr ""
 "(配置方法超出了本手册的范围)。"
 
 #. Tag: para
-#: post-install.xml:379
+#: post-install.xml:361
 #, no-c-format
 msgid ""
 "However, in that case you may need to configure individual utilities to "
@@ -569,7 +557,7 @@ msgstr ""
 "应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
 
 #. Tag: para
-#: post-install.xml:387
+#: post-install.xml:369
 #, no-c-format
 msgid ""
 "To correctly set up <command>reportbug</command> to use an external mail "
@@ -582,13 +570,13 @@ msgstr ""
 "<quote>no</quote>。您接着将会被问到使用哪个 SMTP 服务器来提交 bug 报告。"
 
 #. Tag: title
-#: post-install.xml:398
+#: post-install.xml:380
 #, no-c-format
 msgid "Configuring the Exim4 Mail Transport Agent"
 msgstr "配置 Exim4 MTA"
 
 #. Tag: para
-#: post-install.xml:399
+#: post-install.xml:381
 #, no-c-format
 msgid ""
 "If you would like your system to also handle external e-mail, you will need "
@@ -601,13 +589,13 @@ msgstr ""
 "MTA/MDA。</para> </footnote>："
 
 #. Tag: screen
-#: post-install.xml:411
+#: post-install.xml:393
 #, no-c-format
 msgid "# dpkg-reconfigure exim4-config"
 msgstr "# dpkg-reconfigure exim4-config"
 
 #. Tag: para
-#: post-install.xml:413
+#: post-install.xml:395
 #, no-c-format
 msgid ""
 "After entering that command (as root), you will be asked if you want split "
@@ -618,7 +606,7 @@ msgstr ""
 "不准，就选择默认选项。"
 
 #. Tag: para
-#: post-install.xml:419
+#: post-install.xml:401
 #, no-c-format
 msgid ""
 "Next you will be presented with several common mail scenarios. Choose the "
@@ -626,13 +614,13 @@ msgid ""
 msgstr "接着您将看到几个常见的邮件方案，请选择一个最近似您需求的那个。"
 
 #. Tag: term
-#: post-install.xml:428
+#: post-install.xml:410
 #, no-c-format
 msgid "internet site"
 msgstr "internet site"
 
 #. Tag: para
-#: post-install.xml:429
+#: post-install.xml:411
 #, no-c-format
 msgid ""
 "Your system is connected to a network and your mail is sent and received "
@@ -644,13 +632,13 @@ msgstr ""
 "会询问您一些基本问题，如：您的机器的邮件名称、您接受或转发邮件的域等等。"
 
 #. Tag: term
-#: post-install.xml:440
+#: post-install.xml:422
 #, no-c-format
 msgid "mail sent by smarthost"
 msgstr "mail sent by smarthost"
 
 #. Tag: para
-#: post-install.xml:441
+#: post-install.xml:423
 #, no-c-format
 msgid ""
 "In this scenario your outgoing mail is forwarded to another machine, called "
@@ -666,7 +654,7 @@ msgstr ""
 "载邮件。"
 
 #. Tag: para
-#: post-install.xml:451
+#: post-install.xml:433
 #, no-c-format
 msgid ""
 "In a lot of cases the smarthost will be your ISP's mail server, which makes "
@@ -677,13 +665,13 @@ msgstr ""
 "司的邮件服务器，或是您自己网络中的另外一台机器。"
 
 #. Tag: term
-#: post-install.xml:461
+#: post-install.xml:443
 #, no-c-format
 msgid "mail sent by smarthost; no local mail"
 msgstr "mail sent by smarthost; no local mail"
 
 #. Tag: para
-#: post-install.xml:462
+#: post-install.xml:444
 #, no-c-format
 msgid ""
 "This option is basically the same as the previous one except that the system "
@@ -694,25 +682,25 @@ msgstr ""
 "mail domain。在本系统上的邮件(比如，给系统管理员的)还是会被处理。"
 
 #. Tag: term
-#: post-install.xml:473
+#: post-install.xml:455
 #, no-c-format
 msgid "local delivery only"
 msgstr "local delivery only"
 
 #. Tag: para
-#: post-install.xml:474
+#: post-install.xml:456
 #, no-c-format
 msgid "This is the option your system is configured for by default."
 msgstr "本选项是系统默认的配置。"
 
 #. Tag: term
-#: post-install.xml:482
+#: post-install.xml:464
 #, no-c-format
 msgid "no configuration at this time"
 msgstr "no configuration at this time"
 
 #. Tag: para
-#: post-install.xml:483
+#: post-install.xml:465
 #, no-c-format
 msgid ""
 "Choose this if you are absolutely convinced you know what you are doing. "
@@ -725,7 +713,7 @@ msgstr ""
 "工具发来的重要信息。"
 
 #. Tag: para
-#: post-install.xml:494
+#: post-install.xml:476
 #, no-c-format
 msgid ""
 "If none of these scenarios suits your needs, or if you need a finer grained "
@@ -743,7 +731,7 @@ msgstr ""
 "classname> 配置方面的细节，并说明从哪里找到更多的文档。"
 
 #. Tag: para
-#: post-install.xml:505
+#: post-install.xml:487
 #, no-c-format
 msgid ""
 "Note that sending mail directly to the Internet when you don't have an "
@@ -761,13 +749,13 @@ msgstr ""
 "filename>。"
 
 #. Tag: title
-#: post-install.xml:523
+#: post-install.xml:505
 #, no-c-format
 msgid "Compiling a New Kernel"
 msgstr "编译新内核"
 
 #. Tag: para
-#: post-install.xml:524
+#: post-install.xml:506
 #, no-c-format
 msgid ""
 "Why would someone want to compile a new kernel? It is most probably not "
@@ -776,7 +764,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:530
+#: post-install.xml:512
 #, no-c-format
 msgid ""
 "If you want to compile your own kernel nevertheless, this is of course "
@@ -786,13 +774,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:545
+#: post-install.xml:527
 #, no-c-format
 msgid "Recovering a Broken System"
 msgstr "修复损坏的系统"
 
 #. Tag: para
-#: post-install.xml:546
+#: post-install.xml:528
 #, no-c-format
 msgid ""
 "Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -808,7 +796,7 @@ msgstr ""
 "一个可以工作的系统，rescue 模式正好用于此目的。"
 
 #. Tag: para
-#: post-install.xml:556
+#: post-install.xml:538
 #, no-c-format
 msgid ""
 "To access rescue mode, select <userinput>rescue</userinput> from the boot "
@@ -828,7 +816,7 @@ msgstr ""
 "大的硬件探测能力，确保修复系统的时候硬盘，网络设备等等可以使用。"
 
 #. Tag: para
-#: post-install.xml:573
+#: post-install.xml:555
 #, no-c-format
 msgid ""
 "Instead of the partitioning tool, you should now be presented with a list of "
@@ -842,7 +830,7 @@ msgstr ""
 "创建一样。"
 
 #. Tag: para
-#: post-install.xml:581
+#: post-install.xml:563
 #, no-c-format
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
@@ -858,7 +846,7 @@ msgstr ""
 "userinput> 完成。</phrase>"
 
 #. Tag: para
-#: post-install.xml:593
+#: post-install.xml:575
 #, no-c-format
 msgid ""
 "If the installer cannot run a usable shell in the root file system you "
@@ -874,13 +862,13 @@ msgstr ""
 "统将挂载到 <filename>/target</filename> 目录。"
 
 #. Tag: para
-#: post-install.xml:602
+#: post-install.xml:584
 #, no-c-format
 msgid "In either case, after you exit the shell, the system will reboot."
 msgstr "无论哪种情况，退出 shell 之后，系统将重启。"
 
 #. Tag: para
-#: post-install.xml:606
+#: post-install.xml:588
 #, no-c-format
 msgid ""
 "Finally, note that repairing broken systems can be difficult, and this "
@@ -890,6 +878,26 @@ msgstr ""
 "最后，要注意修复一个损坏的系统可能非常困难，在这份手册里面不会列举所有的情况"
 "和修复方法。如果您遇到困难，请咨询专家。"
 
+#~ msgid "If You Are New to Unix"
+#~ msgstr "如果您不熟悉 Unix"
+
+#~ msgid ""
+#~ "Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
+#~ "Documentation Project (LDP)</ulink> collects a number of HOWTOs and "
+#~ "online books relating to Linux. Most of these documents can be installed "
+#~ "locally; just install the <classname>doc-linux-html</classname> package "
+#~ "(HTML versions) or the <classname>doc-linux-text</classname> package "
+#~ "(ASCII versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
+#~ "International versions of the LDP HOWTOs are also available as &debian; "
+#~ "packages."
+#~ msgstr ""
+#~ "Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</"
+#~ "ulink> 收集了大量的 HOWTO 和 Linux 在线书籍。这些文档绝大部分可以在本地安"
+#~ "装；只须安装 <classname>doc-linux-html</classname> 包(HTML 版本)，或者 "
+#~ "<classname>doc-linux-text</classname>包(ASCII 版本)，然后在 <filename>/"
+#~ "usr/share/doc/HOWTO</filename> 里面就能找到。在 &debian; 软件包里面也提供 "
+#~ "LDP HOWTO 的国际化版本。"
+
 #~ msgid ""
 #~ "Why would someone want to compile a new kernel? It is often not necessary "
 #~ "since the default kernel shipped with &debian; handles most "
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index fe7b356e6..9f52f8d52 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-07-07 09:56+0000\n"
+"POT-Creation-Date: 2018-08-31 23:21+0000\n"
 "PO-Revision-Date: 2017-06-11 21:21+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -144,20 +144,6 @@ msgstr ""
 #: welcome.xml:89
 #, no-c-format
 msgid ""
-"The <ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) is a "
-"project aimed at standardizing the basic GNU/Linux system, which will enable "
-"third-party software and hardware developers to easily design programs and "
-"device drivers for Linux-in-general, rather than for a specific GNU/Linux "
-"distribution."
-msgstr ""
-"<ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) 是一个针对 "
-"GNU/Linux 系统标准化的项目，它将使第三方软件和硬件开发者能更容易的为“普通”的 "
-"Linux 设计程序和设备驱动，而不仅仅是为某个特定的 GNU/Linux 发行版进行开发。"
-
-#. Tag: para
-#: welcome.xml:99
-#, no-c-format
-msgid ""
 "The <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> "
 "(FHS) is an effort to standardize the layout of the Linux file system. The "
 "FHS will allow software developers to concentrate their efforts on designing "
@@ -169,7 +155,7 @@ msgstr ""
 "程序，而不需要担心软件包在不同的 GNU/Linux 发行版的安装。"
 
 #. Tag: para
-#: welcome.xml:109
+#: welcome.xml:99
 #, no-c-format
 msgid ""
 "<ulink url=\"&url-debian-jr;\">Debian Jr.</ulink> is an internal project, "
@@ -179,7 +165,7 @@ msgstr ""
 "Debian 能向年幼的用户提供一些有用的东西。"
 
 #. Tag: para
-#: welcome.xml:118
+#: welcome.xml:108
 #, no-c-format
 msgid ""
 "For more general information about Debian, see the <ulink url=\"&url-debian-"
@@ -189,13 +175,13 @@ msgstr ""
 "ulink>。"
 
 #. Tag: title
-#: welcome.xml:133
+#: welcome.xml:123
 #, no-c-format
 msgid "What is GNU/Linux?"
 msgstr "什么是 GNU/Linux？"
 
 #. Tag: para
-#: welcome.xml:134
+#: welcome.xml:124
 #, no-c-format
 msgid ""
 "Linux is an operating system: a series of programs that let you interact "
@@ -205,7 +191,7 @@ msgstr ""
 "程序。"
 
 #. Tag: para
-#: welcome.xml:139
+#: welcome.xml:129
 #, no-c-format
 msgid ""
 "An operating system consists of various fundamental programs which are "
@@ -227,7 +213,7 @@ msgstr ""
 "表达人们通常所说的 <quote>Linux</quote>。"
 
 #. Tag: para
-#: welcome.xml:153
+#: welcome.xml:143
 #, no-c-format
 msgid ""
 "Linux is modelled on the Unix operating system. From the start, Linux was "
@@ -243,7 +229,7 @@ msgstr ""
 "Linux，其大部分开发工作都是由无偿的志愿者完成的。"
 
 #. Tag: para
-#: welcome.xml:162
+#: welcome.xml:152
 #, no-c-format
 msgid ""
 "Development of what later became GNU/Linux began in 1984, when the <ulink "
@@ -254,7 +240,7 @@ msgstr ""
 "fsf;\">自由软件基金会</ulink> 开始研发被称为 GNU 的自由的类 Unix 操作系统。"
 
 #. Tag: para
-#: welcome.xml:168
+#: welcome.xml:158
 #, no-c-format
 msgid ""
 "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a "
@@ -270,7 +256,7 @@ msgstr ""
 "辑工作)的各种任务。"
 
 #. Tag: para
-#: welcome.xml:178
+#: welcome.xml:168
 #, no-c-format
 msgid ""
 "While many groups and individuals have contributed to Linux, the largest "
@@ -283,7 +269,7 @@ msgstr ""
 "提供了理论和社会基础。"
 
 #. Tag: para
-#: welcome.xml:185
+#: welcome.xml:175
 #, no-c-format
 msgid ""
 "The <ulink url=\"&url-kernel-org;\">Linux kernel</ulink> first appeared in "
@@ -299,7 +285,7 @@ msgstr ""
 "ulink>。"
 
 #. Tag: para
-#: welcome.xml:194
+#: welcome.xml:184
 #, no-c-format
 msgid ""
 "Linus Torvalds continues to coordinate the work of several hundred "
@@ -316,7 +302,7 @@ msgstr ""
 "到。"
 
 #. Tag: para
-#: welcome.xml:204
+#: welcome.xml:194
 #, no-c-format
 msgid ""
 "Linux users have immense freedom of choice in their software. For example, "
@@ -330,7 +316,7 @@ msgstr ""
 "想过命令行和桌面其实是可以更换的。"
 
 #. Tag: para
-#: welcome.xml:213
+#: welcome.xml:203
 #, no-c-format
 msgid ""
 "Linux is also less likely to crash, better able to run more than one program "
@@ -344,13 +330,13 @@ msgstr ""
 "庭和商业用户中变得越来越流行。"
 
 #. Tag: title
-#: welcome.xml:231
+#: welcome.xml:221
 #, no-c-format
 msgid "What is &debian; GNU/Linux?"
 msgstr "什么是 &debian; GNU/Linux?"
 
 #. Tag: para
-#: welcome.xml:232
+#: welcome.xml:222
 #, no-c-format
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
@@ -372,7 +358,7 @@ msgstr ""
 "确保问题被及时发现和修复。"
 
 #. Tag: para
-#: welcome.xml:246
+#: welcome.xml:236
 #, no-c-format
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
@@ -385,7 +371,7 @@ msgstr ""
 "可以轻松胜任。"
 
 #. Tag: para
-#: welcome.xml:253
+#: welcome.xml:243
 #, no-c-format
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
@@ -398,7 +384,7 @@ msgstr ""
 "非常通用的标准。"
 
 #. Tag: para
-#: welcome.xml:260
+#: welcome.xml:250
 #, no-c-format
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
@@ -410,7 +396,7 @@ msgstr ""
 "非常容易。而且它还是第一个可以不用重新安装就能升级的 Linux 发行版。"
 
 #. Tag: para
-#: welcome.xml:267
+#: welcome.xml:257
 #, no-c-format
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
@@ -422,7 +408,7 @@ msgstr ""
 "范例 &mdash; 即使是用于创建和维护一个完整操作系统这样复杂的任务。"
 
 #. Tag: para
-#: welcome.xml:274
+#: welcome.xml:264
 #, no-c-format
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
@@ -439,7 +425,7 @@ msgstr ""
 "些软件是您自己编译的以及它们所需要的依赖关系。"
 
 #. Tag: para
-#: welcome.xml:285
+#: welcome.xml:275
 #, no-c-format
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
@@ -457,7 +443,7 @@ msgstr ""
 "装。"
 
 #. Tag: para
-#: welcome.xml:295
+#: welcome.xml:285
 #, no-c-format
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
@@ -475,13 +461,13 @@ msgstr ""
 "单。"
 
 #. Tag: title
-#: welcome.xml:318
+#: welcome.xml:308
 #, no-c-format
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "什么是 &debian; GNU/Hurd?"
 
 #. Tag: para
-#: welcome.xml:320
+#: welcome.xml:310
 #, no-c-format
 msgid ""
 "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
@@ -489,7 +475,7 @@ msgstr ""
 "&debian; GNU/kFreeBSD 是一种 &debian; GNU 系统，它采用了 kFreeBSD 内核。"
 
 #. Tag: para
-#: welcome.xml:324
+#: welcome.xml:314
 #, no-c-format
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
@@ -499,7 +485,7 @@ msgstr ""
 "系。"
 
 #. Tag: para
-#: welcome.xml:329
+#: welcome.xml:319
 #, no-c-format
 msgid ""
 "Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
@@ -509,7 +495,7 @@ msgstr ""
 "息并不适用于它。"
 
 #. Tag: para
-#: welcome.xml:334
+#: welcome.xml:324
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
@@ -521,13 +507,13 @@ msgstr ""
 "debian.org</email> 邮件列表。"
 
 #. Tag: title
-#: welcome.xml:353
+#: welcome.xml:343
 #, no-c-format
 msgid "What is &debian; GNU/Hurd?"
 msgstr "什么是 &debian; GNU/Hurd?"
 
 #. Tag: para
-#: welcome.xml:355
+#: welcome.xml:345
 #, no-c-format
 msgid ""
 "&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
@@ -537,7 +523,7 @@ msgstr ""
 "GNU Mach 未内核上的服务。"
 
 #. Tag: para
-#: welcome.xml:360
+#: welcome.xml:350
 #, no-c-format
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
@@ -549,7 +535,7 @@ msgstr ""
 "发，当系统稳定之后也会移植到其他的体系。"
 
 #. Tag: para
-#: welcome.xml:368
+#: welcome.xml:358
 #, no-c-format
 msgid ""
 "Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
@@ -559,7 +545,7 @@ msgstr ""
 "不适用于它。"
 
 #. Tag: para
-#: welcome.xml:373
+#: welcome.xml:363
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
@@ -571,13 +557,13 @@ msgstr ""
 "org</email> 邮件列表。"
 
 #. Tag: title
-#: welcome.xml:390
+#: welcome.xml:380
 #, no-c-format
 msgid "Getting &debian;"
 msgstr "获得 &debian;"
 
 #. Tag: para
-#: welcome.xml:392
+#: welcome.xml:382
 #, no-c-format
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
@@ -592,7 +578,7 @@ msgstr ""
 "&debian; 官方镜像，您可以很容易找到最近的一个。"
 
 #. Tag: para
-#: welcome.xml:401
+#: welcome.xml:391
 #, no-c-format
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
@@ -603,13 +589,13 @@ msgstr ""
 "可以在安装之后立即进行升级。"
 
 #. Tag: title
-#: welcome.xml:416
+#: welcome.xml:406
 #, no-c-format
 msgid "Getting the Newest Version of This Document"
 msgstr "获得本文档最新版本"
 
 #. Tag: para
-#: welcome.xml:418
+#: welcome.xml:408
 #, no-c-format
 msgid ""
 "This document is constantly being revised. Be sure to check the <ulink url="
@@ -624,13 +610,13 @@ msgstr ""
 "</ulink>得到。"
 
 #. Tag: title
-#: welcome.xml:436
+#: welcome.xml:426
 #, no-c-format
 msgid "Organization of This Document"
 msgstr "文档的组织"
 
 #. Tag: para
-#: welcome.xml:438
+#: welcome.xml:428
 #, no-c-format
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
@@ -642,7 +628,7 @@ msgstr ""
 "量少的假设，但我们还是设想您对计算机硬件如何工作有一个基本的了解。"
 
 #. Tag: para
-#: welcome.xml:445
+#: welcome.xml:435
 #, no-c-format
 msgid ""
 "Expert users may also find interesting reference information in this "
@@ -654,7 +640,7 @@ msgstr ""
 "程序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
 
 #. Tag: para
-#: welcome.xml:452
+#: welcome.xml:442
 #, no-c-format
 msgid ""
 "In general, this manual is arranged in a linear fashion, walking you through "
@@ -666,7 +652,7 @@ msgstr ""
 "装 &debian-gnu; 的步骤，以及每步相关的章节："
 
 #. Tag: para
-#: welcome.xml:460
+#: welcome.xml:450
 #, no-c-format
 msgid ""
 "Determine whether your hardware meets the requirements for using the "
@@ -675,7 +661,7 @@ msgstr ""
 "确定您的硬件是否满足安装系统的要求，位于<xref linkend=\"hardware-req\"/>。"
 
 #. Tag: para
-#: welcome.xml:466
+#: welcome.xml:456
 #, no-c-format
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
@@ -687,7 +673,7 @@ msgstr ""
 "\"preparing\"/>。如果需要多重引导系统，您可能需要为 &debian; 创建分区空间。"
 
 #. Tag: para
-#: welcome.xml:474
+#: welcome.xml:464
 #, no-c-format
 msgid ""
 "In <xref linkend=\"install-methods\"/>, you will obtain the necessary "
@@ -697,7 +683,7 @@ msgstr ""
 "件。"
 
 #. Tag: para
-#: welcome.xml:480
+#: welcome.xml:470
 #, fuzzy, no-c-format
 #| msgid ""
 #| "describes booting into the installation system. This chapter also "
@@ -710,7 +696,7 @@ msgid ""
 msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这步操作中会遇到的问题。"
 
 #. Tag: para
-#: welcome.xml:487
+#: welcome.xml:477
 #, no-c-format
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
@@ -728,7 +714,7 @@ msgstr ""
 "知识位于<xref linkend=\"partitioning\"/>。)"
 
 #. Tag: para
-#: welcome.xml:500
+#: welcome.xml:490
 #, no-c-format
 msgid ""
 "Boot into your newly installed base system, from <xref linkend=\"boot-new\"/"
@@ -736,7 +722,7 @@ msgid ""
 msgstr "从您新安装的基本系统启动，<xref linkend=\"boot-new\"/>。"
 
 #. Tag: para
-#: welcome.xml:508
+#: welcome.xml:498
 #, no-c-format
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
@@ -747,7 +733,7 @@ msgstr ""
 "寻找更多有关 Unix 和 &debian; 的信息，以及如何替换您的内核。"
 
 #. Tag: para
-#: welcome.xml:518
+#: welcome.xml:508
 #, no-c-format
 msgid ""
 "Finally, information about this document and how to contribute to it may be "
@@ -757,13 +743,13 @@ msgstr ""
 "\"/>。"
 
 #. Tag: title
-#: welcome.xml:528
+#: welcome.xml:518
 #, no-c-format
 msgid "Your Documentation Help is Welcome"
 msgstr "欢迎给文档提供帮助"
 
 #. Tag: para
-#: welcome.xml:530
+#: welcome.xml:520
 #, no-c-format
 msgid ""
 "Any help, suggestions, and especially, patches, are greatly appreciated. "
@@ -776,7 +762,7 @@ msgstr ""
 "语言与硬件体系版本的列表。"
 
 #. Tag: para
-#: welcome.xml:537
+#: welcome.xml:527
 #, no-c-format
 msgid ""
 "Source is also available publicly; look in <xref linkend=\"administrivia\"/> "
@@ -791,13 +777,13 @@ msgstr ""
 "是否已经被报告过)。"
 
 #. Tag: title
-#: welcome.xml:553
+#: welcome.xml:543
 #, no-c-format
 msgid "About Copyrights and Software Licenses"
 msgstr "关于版权与软件协议"
 
 #. Tag: para
-#: welcome.xml:556
+#: welcome.xml:546
 #, no-c-format
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
@@ -818,7 +804,7 @@ msgstr ""
 "<emphasis>自由软件</emphasis>。"
 
 #. Tag: para
-#: welcome.xml:569
+#: welcome.xml:559
 #, no-c-format
 msgid ""
 "Calling software <emphasis>free</emphasis> doesn't mean that the software "
@@ -835,7 +821,7 @@ msgstr ""
 "样发布。"
 
 #. Tag: para
-#: welcome.xml:580
+#: welcome.xml:570
 #, no-c-format
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
@@ -854,7 +840,7 @@ msgstr ""
 "Debian FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
 
 #. Tag: para
-#: welcome.xml:594
+#: welcome.xml:584
 #, no-c-format
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
@@ -879,7 +865,7 @@ msgstr ""
 "在 &debian; 系统中得到。"
 
 #. Tag: para
-#: welcome.xml:613
+#: welcome.xml:603
 #, no-c-format
 msgid ""
 "There are several other forms of copyright statements and software licenses "
@@ -894,7 +880,7 @@ msgstr ""
 "包安装到系统后就存在了。"
 
 #. Tag: para
-#: welcome.xml:623
+#: welcome.xml:613
 #, no-c-format
 msgid ""
 "For more information about licenses and how &debian; determines whether "
@@ -905,7 +891,7 @@ msgstr ""
 "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>。"
 
 #. Tag: para
-#: welcome.xml:629
+#: welcome.xml:619
 #, no-c-format
 msgid ""
 "The most important legal notice is that this software comes with "
@@ -920,3 +906,15 @@ msgstr ""
 "的是使社群受益，而不能保证软件适用于任何特定用途。但是，因为软件是自由的，您"
 "可以修改此软件以使其能适用于您的需要 &mdash; 并享用其他人采用这种途径扩展后的"
 "修改成果。"
+
+#~ msgid ""
+#~ "The <ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) is a "
+#~ "project aimed at standardizing the basic GNU/Linux system, which will "
+#~ "enable third-party software and hardware developers to easily design "
+#~ "programs and device drivers for Linux-in-general, rather than for a "
+#~ "specific GNU/Linux distribution."
+#~ msgstr ""
+#~ "<ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) 是一个针对 "
+#~ "GNU/Linux 系统标准化的项目，它将使第三方软件和硬件开发者能更容易的为“普"
+#~ "通”的 Linux 设计程序和设备驱动，而不仅仅是为某个特定的 GNU/Linux 发行版进"
+#~ "行开发。"