update to r11969, and finish translation of final packages until m4

zh_CN/chapter08/acl.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-17 12:44+0800\n"
+"POT-Creation-Date: 2020-06-21 14:05+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -98,8 +98,7 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:53
 #, fuzzy, no-wrap
 msgid ""
-"<userinput remap=\"configure\">\n"
-"./configure --prefix=/usr         \\\n"
+"<userinput remap=\"configure\">./configure --prefix=/usr         \\\n"
 "            --disable-static      \\\n"
 "            --libexecdir=/usr/lib \\\n"
 "            --docdir=/usr/share/doc/acl-&acl-version;</userinput>"
@@ -110,18 +109,18 @@ msgstr ""
 "            --docdir=/usr/share/doc/acl-&acl-version;</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:59
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:58
 msgid "Compile the package:"
 msgstr "编译该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:61
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:60
 #, no-wrap
 msgid "<userinput remap=\"make\">make</userinput>"
 msgstr "<userinput remap=\"make\">make</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:63
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:62
 msgid ""
 "The Acl tests need to be run on a filesystem that supports access controls "
 "after <application>Coreutils</application> has been built with the Acl "
@@ -135,18 +134,18 @@ msgstr ""
 "check</command>。"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:69
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:68
 msgid "Install the package:"
 msgstr "安装该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:71
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:70
 #, no-wrap
 msgid "<userinput remap=\"install\">make install</userinput>"
 msgstr "<userinput remap=\"install\">make install</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:73
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:72
 msgid ""
 "The shared library needs to be moved to <filename class=\"directory\">/lib</"
 "filename>, and as a result the <filename class=\"extension\">.so</filename> "
@@ -158,7 +157,7 @@ msgstr ""
 "\"extension\">.so</filename> 符号链接需要重新建立："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:78
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:77
 #, no-wrap
 msgid ""
 "<userinput remap=\"install\">mv -v /usr/lib/libacl.so.* /lib\n"
@@ -168,107 +167,107 @@ msgstr ""
 "ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:84
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:83
 msgid "Contents of Acl"
 msgstr "Acl 的内容"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:87
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:86
 msgid "Installed programs"
 msgstr "安装的程序"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:88
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:87
 msgid "Installed library"
 msgstr "安装的库"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:89
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:88
 msgid "Installed directories"
 msgstr "安装的目录"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:92
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:91
 msgid "chacl, getfacl, and setfacl"
 msgstr "chacl, getfacl, 以及 setfacl"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:93
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:92
 msgid "libacl.so"
 msgstr "libacl.so"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:94
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:93
 msgid "/usr/include/acl and /usr/share/doc/acl-&acl-version;"
 msgstr "/usr/include/acl 和 /usr/share/doc/acl-&acl-version;"
 
 #. type: Content of: <sect1><sect2><variablelist><bridgehead>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:99
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:98
 msgid "Short Descriptions"
 msgstr "简要描述"
 
 #. type: Content of: <sect1><sect2><variablelist>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:100
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:99
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:104
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:103
 msgid "<command>chacl</command>"
 msgstr "<command>chacl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:106
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:105
 msgid "Changes the access control list of a file or directory"
 msgstr "修改文件或目录的访问控制列表"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:109
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:108
 msgid "chacl"
 msgstr "chacl"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:115
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:114
 msgid "<command>getfacl</command>"
 msgstr "<command>getfacl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:117
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:116
 msgid "Gets file access control lists"
 msgstr "获取文件访问控制列表"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:119
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:118
 msgid "getfacl"
 msgstr "getfacl"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:125
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:124
 msgid "<command>setfacl</command>"
 msgstr "<command>setfacl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:127
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:126
 msgid "Sets file access control lists"
 msgstr "设定文件访问控制列表"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:129
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:128
 msgid "setfacl"
 msgstr "setfacl"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:135
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:134
 msgid "<filename class=\"libraryfile\">libacl</filename>"
 msgstr "<filename class=\"libraryfile\">libacl</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:137
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:136
 msgid "Contains the library functions for manipulating Access Control Lists"
 msgstr "包含操作访问控制列表的库函数"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:139
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:138
 msgid "libacl"
 msgstr "libacl"

zh_CN/chapter08/bzip2.po

@@ -58,15 +58,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bzip2.xml:36
-#, fuzzy
 msgid "&bzip2-fin-sbu;"
-msgstr "&bzip2-ch6-sbu;"
+msgstr "&bzip2-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bzip2.xml:37
-#, fuzzy
 msgid "&bzip2-fin-du;"
-msgstr "&bzip2-ch6-du;"
+msgstr "&bzip2-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bzip2.xml:44
@@ -246,6 +244,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bzip2.xml:123

zh_CN/chapter08/expat.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-17 12:44+0800\n"
+"POT-Creation-Date: 2020-06-21 14:05+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,22 +70,11 @@ msgstr "安装 Expat"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:44
-msgid "First fix a problem with the regression tests in the LFS environment:"
-msgstr "首先修正 LFS 环境中退化测试的一个问题："
-
-#. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:46
-#, fuzzy, no-wrap
-msgid "<userinput remap=\"pre\">sed -i 's:usr/bin/env :bin/:' run.sh.in</userinput>"
-msgstr "<userinput remap=\"pre\">sed -i 's|usr/bin/env |bin/|' run.sh.in</userinput>"
-
-#. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:48
 msgid "Prepare Expat for compilation:"
 msgstr "准备编译 Expat："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:50
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:46
 #, no-wrap
 msgid ""
 "<userinput remap=\"configure\">./configure --prefix=/usr    \\\n"
@@ -97,119 +86,127 @@ msgstr ""
 "            --docdir=/usr/share/doc/expat-&expat-version;</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:54
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:50
 msgid "Compile the package:"
 msgstr "编译该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:56
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:52
 #, no-wrap
 msgid "<userinput remap=\"make\">make</userinput>"
 msgstr "<userinput remap=\"make\">make</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:58
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:54
 msgid "To test the results, issue:"
 msgstr "运行以下命令以测试编译结果："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:60
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:56
 #, no-wrap
 msgid "<userinput remap=\"test\">make check</userinput>"
 msgstr "<userinput remap=\"test\">make check</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:62
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:58
 msgid "Install the package:"
 msgstr "安装该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:64
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:60
 #, no-wrap
 msgid "<userinput remap=\"install\">make install</userinput>"
 msgstr "<userinput remap=\"install\">make install</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:66
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:62
 msgid "If desired, install the documentation:"
 msgstr "如果需要，安装该软件包的文档："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:68
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:64
 #, no-wrap
 msgid "<userinput remap=\"install\">install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput>"
 msgstr "<userinput remap=\"install\">install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:73
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:69
 msgid "Contents of Expat"
 msgstr "Expat 的内容"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:76
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:72
 msgid "Installed program"
 msgstr "安装的程序"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:77
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:73
 msgid "Installed libraries"
 msgstr "安装的库"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:78
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:74
 msgid "Installed directory"
 msgstr "安装的目录"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:81
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:98
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:77
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:94
 msgid "xmlwf"
 msgstr "xmlwf"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:82
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:78
 msgid "libexpat.so"
 msgstr "libexpat.so"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:83
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:79
 msgid "/usr/share/doc/expat-&expat-version;"
 msgstr "/usr/share/doc/expat-&expat-version;"
 
 #. type: Content of: <sect1><sect2><variablelist><bridgehead>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:88
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:84
 msgid "Short Descriptions"
 msgstr "简要描述"
 
 #. type: Content of: <sect1><sect2><variablelist>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:89
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:85
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:93
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:89
 msgid "<command>xmlwf </command>"
 msgstr "<command>xmlwf </command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:95
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:91
 msgid ""
 "Is a non-validating utility to check whether or not XML documents are well "
 "formed"
 msgstr "是一个用于检验 XML 文档是否良好的非验证性工具"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:104
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:100
 msgid "<filename class=\"libraryfile\">libexpat</filename>"
 msgstr "<filename class=\"libraryfile\">libexpat</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:106
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:102
 msgid "Contains API functions for parsing XML"
 msgstr "包含解析 XML 文档的 API 函数"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:108
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/expat.xml:104
 msgid "libexpat"
 msgstr "libexpat"
+
+#~ msgid ""
+#~ "First fix a problem with the regression tests in the LFS environment:"
+#~ msgstr "首先修正 LFS 环境中退化测试的一个问题："
+
+#, fuzzy, no-wrap
+#~ msgid "<userinput remap=\"pre\">sed -i 's:usr/bin/env :bin/:' run.sh.in</userinput>"
+#~ msgstr "<userinput remap=\"pre\">sed -i 's|usr/bin/env |bin/|' run.sh.in</userinput>"

zh_CN/chapter08/file.po

@@ -55,15 +55,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/file.xml:34
-#, fuzzy
 msgid "&file-fin-sbu;"
-msgstr "&file-ch6-sbu;"
+msgstr "&file-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/file.xml:35
-#, fuzzy
 msgid "&file-fin-du;"
-msgstr "&file-ch6-du;"
+msgstr "&file-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/file.xml:42
@@ -150,6 +148,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/file.xml:82

zh_CN/chapter08/intltool.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-17 12:44+0800\n"
+"POT-Creation-Date: 2020-06-21 14:05+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,7 +84,7 @@ msgstr "<userinput remap=\"pre\">sed -i 's:\\\\\\${:\\\\\\$\\\\{:' intltool-upda
 #. type: Content of: <sect1><sect2><note><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/intltool.xml:48
 msgid ""
-"The above regular expression looks unusual because of all the baxkslashes.  "
+"The above regular expression looks unusual because of all the backslashes.  "
 "What it does is add a backslash before the right brace character in the "
 "sequence '\\${' resulting in '\\$\\{'."
 msgstr ""

zh_CN/chapter08/m4.po

@@ -53,15 +53,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:33
-#, fuzzy
 msgid "&m4-fin-sbu;"
-msgstr "&m4-ch6-sbu;"
+msgstr "&m4-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:34
-#, fuzzy
 msgid "&m4-fin-du;"
-msgstr "&m4-ch6-du;"
+msgstr "&m4-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:41
@@ -70,9 +68,8 @@ msgstr "安装 M4"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:43
-#, fuzzy
 msgid "First, make some fixes required by glibc-2.28 and later:"
-msgstr "首先，进行 glibc-2.28 要求的一些修补："
+msgstr "首先，进行 Glibc-2.28 及更新版本要求的一些修补："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:45
@@ -154,6 +151,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:84
@@ -162,7 +160,6 @@ msgstr "<command>m4 </command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/m4.xml:86
-#, fuzzy
 msgid ""
 "Copies the given files while expanding the macros that they contain. These "
 "macros are either built-in or user-defined and can take any number of "
@@ -172,7 +169,7 @@ msgid ""
 "<command>m4</command> program can be used either as a front-end to a "
 "compiler or as a macro processor in its own right."
 msgstr ""
-"复制给定文件，并展开它们包含的宏 [这些宏可能是内置或用户定义的，可以接受任意"
+"复制给定文件，并展开它们包含的宏 这些宏可能是内置或用户定义的，可以接受任意"
 "个参数。除了展开宏外，<command>m4</command> 还包含用于包含指定文件、 运行 "
 "Unix 命令、进行整数运算、处理文本、 递归执行等功能的内建函数。<command>m4</"
-"command> 程序可以被用作编译器前端，也可以被单独用作宏处理器。]"
+"command> 程序可以被用作编译器前端，也可以被单独用作宏处理器。"

zh_CN/chapter08/readline.po

@@ -55,15 +55,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:34
-#, fuzzy
 msgid "&readline-fin-sbu;"
-msgstr "&readline-ch6-sbu;"
+msgstr "&readline-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:35
-#, fuzzy
 msgid "&readline-fin-du;"
-msgstr "&readline-ch6-du;"
+msgstr "&readline-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:42
@@ -99,7 +97,7 @@ msgstr "准备编译 Readline："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:54
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"configure\">./configure --prefix=/usr    \\\n"
 "            --disable-static \\\n"
@@ -108,19 +106,18 @@ msgid ""
 msgstr ""
 "<userinput remap=\"configure\">./configure --prefix=/usr    \\\n"
 "            --disable-static \\\n"
+"            --with-curses    \\\n"
 "            --docdir=/usr/share/doc/readline-&readline-version;</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:60
-#, fuzzy
 msgid "The meaning of the configure option:"
-msgstr "make 命令选项的含义"
+msgstr "配置选项的含义"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:63
-#, fuzzy
 msgid "<parameter>--with-curses\"</parameter>"
-msgstr "<parameter>SHLIB_LIBS=\"-L/tools/lib -lncursesw\"</parameter>"
+msgstr "<parameter>--with-curses\"</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:65
@@ -129,6 +126,8 @@ msgid ""
 "the curses library, rather than a separate termcap library. It allows "
 "generating a correct <filename>readline.pc</filename> file."
 msgstr ""
+"该选项告诉 Readline 它可以在 curses 库中查找 termcap 库函数，而不是单独的"
+"termcap 库。这样就能生成正确的 <filename>readline.pc</filename> 文件。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:74
@@ -137,9 +136,9 @@ msgstr "编译该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:76
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"make\">make SHLIB_LIBS=\"-lncursesw\"</userinput>"
-msgstr "<userinput remap=\"make\">make SHLIB_LIBS=\"-L/tools/lib -lncursesw\"</userinput>"
+msgstr "<userinput remap=\"make\">make SHLIB_LIBS=\"-lncursesw\"</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:79
@@ -148,9 +147,8 @@ msgstr "make 命令选项的含义"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:82
-#, fuzzy
 msgid "<parameter>SHLIB_LIBS=\"-lncursesw\"</parameter>"
-msgstr "<parameter>SHLIB_LIBS=\"-L/tools/lib -lncursesw\"</parameter>"
+msgstr "<parameter>SHLIB_LIBS=\"-lncursesw\"</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:84
@@ -173,9 +171,9 @@ msgstr "安装该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:95
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"install\">make SHLIB_LIBS=\"-lncursesw\" install</userinput>"
-msgstr "<userinput remap=\"install\">make SHLIB_LIBS=\"-L/tools/lib -lncursesw\" install</userinput>"
+msgstr "<userinput remap=\"install\">make SHLIB_LIBS=\"-lncursesw\" install</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:97
@@ -244,6 +242,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/readline.xml:131

zh_CN/chapter08/xz.po

@@ -61,15 +61,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/xz.xml:37
-#, fuzzy
 msgid "&xz-fin-sbu;"
-msgstr "&xz-ch6-sbu;"
+msgstr "&xz-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/xz.xml:38
-#, fuzzy
 msgid "&xz-fin-du;"
-msgstr "&xz-ch6-du;"
+msgstr "&xz-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/xz.xml:45
@@ -193,6 +191,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/xz.xml:120

zh_CN/chapter08/zlib.po

@@ -55,15 +55,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zlib.xml:34
-#, fuzzy
 msgid "&zlib-fin-sbu;"
-msgstr "&zlib-ch6-sbu;"
+msgstr "&zlib-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zlib.xml:35
-#, fuzzy
 msgid "&zlib-fin-du;"
-msgstr "&zlib-ch6-du;"
+msgstr "&zlib-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zlib.xml:42
@@ -161,6 +159,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zlib.xml:87

zh_CN/chapter08/zstd.po

@@ -59,15 +59,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zstd.xml:35
-#, fuzzy
 msgid "&zstd-fin-sbu;"
-msgstr "&zstd-ch6-sbu;"
+msgstr "&zstd-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zstd.xml:36
-#, fuzzy
 msgid "&zstd-fin-du;"
-msgstr "&zstd-ch6-du;"
+msgstr "&zstd-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zstd.xml:43
@@ -164,6 +162,7 @@ msgstr "简要描述"
 msgid ""
 "<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 msgstr ""
+"<?dbfo list-presentation=\"list\"?> <?dbhtml list-presentation=\"table\"?>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/zstd.xml:92

zh_CN/part3intro/toolchaintechnotes.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-19 11:48+0800\n"
+"POT-Creation-Date: 2020-06-21 14:05+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -577,32 +577,34 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/part3intro/toolchaintechnotes.xml:311
 msgid ""
 "As said above, the standard C++ library is compiled next, followed in <xref "
-"linkend=\"chapter-cross-tools\"/> by all the programs that need themselves "
-"to be built. The install step of libstdc++ uses the <envar>DESTDIR</envar> "
-"variable to have the programs land into the LFS filesystem."
+"linkend=\"chapter-cross-tools\"/> by all the programs that need "
+"themselves to be built. The install step of all those packages uses the "
+"<envar>DESTDIR</envar> variable to have the programs land into the LFS "
+"filesystem."
 msgstr ""
-"正如前文所述，在<xref linkend=\"chapter-cross-tools\"/>中，构建所有需要自身才能构建的程序后，编译 C++ 标准"
-"库。在安装 libstdc++ 时使用 <envar>DESTDIR</envar> 变量，将它安装到 LFS 文件"
-"系统中。"
+"正如前文所述，在<xref linkend=\"chapter-cross-tools\"/>中，构建所有需要自身才"
+"能构建的程序后，编译 C++ 标准库。在安装 libstdc++ 时使用 <envar>DESTDIR</"
+"envar> 变量，将它安装到 LFS 文件系统中。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/part3intro/toolchaintechnotes.xml:317
 msgid ""
-"In <xref linkend=\"chapter-temporary-tools\"/> the native lfs compiler is "
-"built. First binutils-pass2, with the same <envar>DESTDIR</envar> install as "
-"the other programs is built, and then the second pass of GCC is constructed, "
-"omitting libstdc++ and other non-important libraries.  Due to some weird "
-"logic in GCC's configure script, <envar>CC_FOR_TARGET</envar> ends up as "
-"<command>cc</command> when the host is the same as the target, but is "
-"different from the build system. This is why <parameter>CC_FOR_TARGET="
-"$LFS_TGT-gcc</parameter> is put explicitely into the configure options."
+"At the end of <xref linkend=\"chapter-temporary-tools\"/> the native lfs "
+"compiler is installed. First binutils-pass2 is built, with the same "
+"<envar>DESTDIR</envar> install as the other programs, then the second pass "
+"of GCC is constructed, omitting libstdc++ and other non-important "
+"libraries.  Due to some weird logic in GCC's configure script, "
+"<envar>CC_FOR_TARGET</envar> ends up as <command>cc</command> when the host "
+"is the same as the target, but is different from the build system. This is "
+"why <parameter>CC_FOR_TARGET=$LFS_TGT-gcc</parameter> is put explicitely "
+"into the configure options."
 msgstr ""
-"在 <xref linkend=\"chapter-temporary-tools\"/>中，构建 lfs 本地编译器。首先使用和其他程序相同的 <envar>DESTDIR</"
-"envar> 第二次构建 binutils，然后第二次构建 GCC，构建时忽略 libstdc++ 和其他不"
-"重要的库。由于 GCC 配置脚本的一些奇怪逻辑，<envar>CC_FOR_TARGET</envar> 变量"
-"在 host 系统和 target 相同，但与 build 不同时，被设定为 <command>cc</"
-"command>。因此我们必须显式地在配置选项中指定 <parameter>CC_FOR_TARGET="
-"$LFS_TGT-gcc</parameter>。"
+"在<xref linkend=\"chapter-temporary-tools\"/>一节的末尾，构建 lfs 本地编译器。首先使"
+"用和其他程序相同的 <envar>DESTDIR</envar> 第二次构建 binutils，然后第二次构"
+"建 GCC，构建时忽略 libstdc++ 和其他不重要的库。由于 GCC 配置脚本的一些奇怪逻"
+"辑，<envar>CC_FOR_TARGET</envar> 变量在 host 系统和 target 相同，但与 build "
+"不同时，被设定为 <command>cc</command>。因此我们必须显式地在配置选项中指定 "
+"<parameter>CC_FOR_TARGET=$LFS_TGT-gcc</parameter>。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/part3intro/toolchaintechnotes.xml:328