update to r12007

zh_CN/chapter01/whatsnew.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-07-16 13:22+0800\n"
+"POT-Creation-Date: 2020-08-05 04:39+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"
@@ -48,6 +48,11 @@ msgstr "Automake-&automake-version;"
 msgid "Bc &bc-version;"
 msgstr "Bc &bc-version;"
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter01/whatsnew.xml:52
+msgid "Binutils-&binutils-version;"
+msgstr "Binutils-&binutils-version;"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter01/whatsnew.xml:55
 msgid "Bison-&bison-version;"

zh_CN/chapter03/patches.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-08-05 04:39+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"
@@ -43,25 +43,6 @@ msgstr "下载地址：<ulink url=\"&patches-root;&bash-fixes-patch;\"/>"
 msgid "MD5 sum: <literal>&bash-fixes-patch-md5;</literal>"
 msgstr "MD5 校验和：<literal>&bash-fixes-patch-md5;</literal>"
 
-#. type: Content of: <sect1><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:31
-msgid ""
-"Binutils Fix for gold Test Suite Patch - <token>&binutils-gold-test-patch-"
-"size;</token>:"
-msgstr ""
-"Binutils 对 gold 测试套件的修复补丁 - <token>&binutils-gold-test-patch-"
-"size;</token>:"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:33
-msgid "Download: <ulink url=\"&patches-root;&binutils-gold-test-patch;\"/>"
-msgstr "下载地址：<ulink url=\"&patches-root;&binutils-gold-test-patch;\"/>"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:34
-msgid "MD5 sum: <literal>&binutils-gold-test-patch-md5;</literal>"
-msgstr "MD5 校验和：<literal>&binutils-gold-test-patch-md5;</literal>"
-
 #. type: Content of: <sect1><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:39
 msgid "Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:"
@@ -109,21 +90,6 @@ msgstr "下载地址：<ulink url=\"&patches-root;&glibc-fhs-patch;\"/>"
 msgid "MD5 sum: <literal>&glibc-fhs-patch-md5;</literal>"
 msgstr "MD5 校验和：<literal>&glibc-fhs-patch-md5;</literal>"
 
-#. type: Content of: <sect1><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:63
-msgid "GCC Cross Build Fix Patch - <token>&gcc-cross-patch-size;</token>:"
-msgstr "GCC 交叉构建补丁 - <token>&gcc-cross-patch-size;</token>:"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:65
-msgid "Download: <ulink url=\"&patches-root;&gcc-cross-patch;\"/>"
-msgstr "下载地址：<ulink url=\"&patches-root;&gcc-cross-patch;\"/>"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:66
-msgid "MD5 sum: <literal>&gcc-cross-patch-md5;</literal>"
-msgstr "MD5 校验和：<literal>&gcc-cross-patch-md5;</literal>"
-
 #. type: Content of: <sect1><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:71
 msgid ""
@@ -143,44 +109,60 @@ msgstr "MD5 校验和：<literal>&kbd-backspace-patch-md5;</literal>"
 #. type: Content of: <sect1><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:79
 msgid ""
+"Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:"
+msgstr ""
+"Libpipeline 测试补丁 - <token>&libpipeline-checks-patch-size;</token>:"
+
+#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:81
+msgid "Download: <ulink url=\"&patches-root;&libpipeline-checks-patch;\"/>"
+msgstr "下载地址：<ulink url=\"&patches-root;&libpipeline-checks-patch;\"/>"
+
+#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:82
+msgid "MD5 sum: <literal>&libpipeline-checks-patch-md5;</literal>"
+msgstr "MD5 校验和：<literal>&libpipeline-checks-patch-md5;</literal>"
+
+#. type: Content of: <sect1><variablelist><varlistentry><term>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:87
+msgid ""
 "Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</"
 "token>:"
 msgstr ""
 "Sysvinit 累积更新补丁 - <token>&sysvinit-consolidated-patch-size;</token>:"
 
 #. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:81
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:89
 msgid "Download: <ulink url=\"&patches-root;&sysvinit-consolidated-patch;\"/>"
 msgstr "下载地址：<ulink url=\"&patches-root;&sysvinit-consolidated-patch;\"/>"
 
 #. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:82
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:90
 msgid "MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal>"
 msgstr "MD5 校验和：<literal>&sysvinit-consolidated-patch-md5;</literal>"
 
 #. type: Content of: <sect1><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:87
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:95
 msgid "Systemd GCC-10 Patch - <token>&systemd-gcc10-patch-size;</token>:"
-msgstr ""
-"Systemd GCC-10 补丁 - <token>&systemd-gcc10-patch-size;</token>:"
+msgstr "Systemd GCC-10 补丁 - <token>&systemd-gcc10-patch-size;</token>:"
 
 #. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:89
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:97
 msgid "Download: <ulink url=\"&patches-root;&systemd-gcc10-patch;\"/>"
 msgstr "下载地址：<ulink url=\"&patches-root;&systemd-gcc10-patch;\"/>"
 
 #. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:90
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:98
 msgid "MD5 sum: <literal>&systemd-gcc10-patch-md5;</literal>"
 msgstr "MD5 校验和：<literal>&systemd-gcc10-patch-md5;</literal>"
 
 #. type: Content of: <sect1><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:96
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:104
 msgid "Total size of these patches: about <returnvalue/>"
 msgstr "以上补丁的总大小：约 <returnvalue/>"
 
 #. type: Content of: <sect1><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:98
+#: /home/xry111/svn-repos/LFS-BOOK/chapter03/patches.xml:106
 msgid ""
 "In addition to the above required patches, there exist a number of optional "
 "patches created by the LFS community. These optional patches solve minor "

zh_CN/chapter04/creatingminlayout.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-08-05 04:39+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"
@@ -12,22 +12,22 @@ msgstr ""
 
 #. type: Content of: <sect1><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter04/creatingminlayout.xml:11
-msgid "Creating the Minimal directory layout in LFS filesystem"
-msgstr "在 LFS 文件系统中创建最小目录布局"
+msgid "Creating a limited directory layout in LFS filesystem"
+msgstr "在 LFS 文件系统中创建有限目录布局"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter04/creatingminlayout.xml:13
 msgid ""
-"The first task performed in the LFS partition is to create a minimal "
-"directory hierarchy so that programs compiled in <xref "
-"linkend=\"chapter-temporary-tools\"/> may be installed in their final "
-"location. This is needed so that those temporary programs be overwritten "
-"when rebuilding them in <xref linkend=\"chapter-building-system\"/>."
+"The first task performed in the LFS partition is to create a limited "
+"directory hierarchy so that programs compiled in <xref linkend=\"chapter-"
+"temporary-tools\"/> may be installed in their final location. This is needed "
+"so that those temporary programs be overwritten when rebuilding them in "
+"<xref linkend=\"chapter-building-system\"/>."
 msgstr ""
-"在 LFS 分区中需要进行的第一项任务是，创建一个最小目录树，使得在"
-"<xref linkend=\"chapter-temporary-tools\"/>中编译的程序可以被安装到它们"
-"的最终位置。这样，在<xref linkend=\"chapter-building-system\"/>中重新构建"
-"它们时，就能直接覆盖这些临时程序。"
+"在 LFS 分区中需要进行的第一项任务是，创建一个有限的目录树，使得在<xref linkend="
+"\"chapter-temporary-tools\"/>中编译的程序可以被安装到它们的最终位置。这样，在"
+"<xref linkend=\"chapter-building-system\"/>中重新构建它们时，就能直接覆盖这些"
+"临时程序。"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter04/creatingminlayout.xml:19
@@ -35,19 +35,19 @@ msgid ""
 "Create the required directory layout by running the following as <systemitem "
 "class=\"username\">root</systemitem>:"
 msgstr ""
-"以 <systemitem class=\"username\">root</systemitem> 身份，"
-"执行以下命令创建所需的目录布局："
+"以 <systemitem class=\"username\">root</systemitem> 身份，执行以下命令创建所"
+"需的目录布局："
 
 #. type: Content of: <sect1><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter04/creatingminlayout.xml:22
 #, no-wrap
 msgid ""
-"<userinput>mkdir -pv $LFS/{usr,lib,var,etc,bin,sbin}\n"
+"<userinput>mkdir -pv $LFS/{bin,etc,lib,sbin,usr,var}\n"
 "case $(uname -m) in\n"
 "  x86_64) mkdir -pv $LFS/lib64 ;;\n"
 "esac</userinput>"
 msgstr ""
-"<userinput>mkdir -pv $LFS/{usr,lib,var,etc,bin,sbin}\n"
+"<userinput>mkdir -pv $LFS/{bin,etc,lib,sbin,usr,var}\n"
 "case $(uname -m) in\n"
 "  x86_64) mkdir -pv $LFS/lib64 ;;\n"
 "esac</userinput>"
@@ -56,16 +56,14 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter04/creatingminlayout.xml:27
 msgid ""
 "Programs in <xref linkend=\"chapter-temporary-tools\"/> will be compiled "
-"with a cross-compiler (more details in section <xref "
-"linkend=\"ch-tools-toolchaintechnotes\"/>). In order to separate this "
-"cross-compiler from the other programs, it will be installed in a special "
-"directory. Create this directory with:"
+"with a cross-compiler (more details in section <xref linkend=\"ch-tools-"
+"toolchaintechnotes\"/>). In order to separate this cross-compiler from the "
+"other programs, it will be installed in a special directory. Create this "
+"directory with:"
 msgstr ""
-"在 <xref linkend=\"chapter-temporary-tools\"/> 中，"
-"会使用交叉编译器编译程序 (细节参见"
-"<xref linkend=\"ch-tools-toolchaintechnotes\"/>一节)。"
-"为了将这个交叉编译器和其他程序分离，它会被安装在一个专门的目录。"
-"执行以下命令创建该目录："
+"在 <xref linkend=\"chapter-temporary-tools\"/> 中，会使用交叉编译器编译程序 "
+"(细节参见<xref linkend=\"ch-tools-toolchaintechnotes\"/>一节)。为了将这个交叉"
+"编译器和其他程序分离，它会被安装在一个专门的目录。执行以下命令创建该目录："
 
 #. type: Content of: <sect1><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter04/creatingminlayout.xml:33

zh_CN/chapter06/gcc-pass2.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-08-05 04:39+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"
@@ -72,8 +72,8 @@ msgid ""
 "As in the first build of GCC, the GMP, MPFR, and MPC packages are required. "
 "Unpack the tarballs and move them into the required directory names:"
 msgstr ""
-"就像第一次构建 GCC 时一样，它需要 GMP、MPFR 和 MPC 三个包。解压它们的源码"
-"包，并将它们移动到 GCC 要求的目录名："
+"就像第一次构建 GCC 时一样，它需要 GMP、MPFR 和 MPC 三个包。解压它们的源码包，"
+"并将它们移动到 GCC 要求的目录名："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:50
@@ -117,17 +117,6 @@ msgstr ""
 "  ;;\n"
 "esac</userinput>"
 
-#. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:66
-msgid "Fix an issue with GCC-10.1 when building with a cross compiler:"
-msgstr "修复 GCC-10.1 在使用交叉编译器构建时出现的问题："
-
-#. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:69
-#, no-wrap
-msgid "<userinput remap=\"pre\">patch -Np1 -i ../&gcc-cross-patch;</userinput>"
-msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&gcc-cross-patch;</userinput>"
-
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:71
 msgid "Create a separate build directory again:"
@@ -147,8 +136,7 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:76
 msgid ""
 "Create a symlink that allows libgcc to be built with posix threads support:"
-msgstr ""
-"创建一个符号链接，以允许 libgcc 在构建时启用 POSIX 线程支持："
+msgstr "创建一个符号链接，以允许 libgcc 在构建时启用 POSIX 线程支持："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:79
@@ -232,11 +220,11 @@ msgid ""
 "location. This switch is needed to have them find the needed files in "
 "<filename class=\"directory\">$LFS</filename>, and not on the host."
 msgstr ""
-"通常，使用 <parameter>--host</parameter> 即可保证使用交叉编译器构建 GCC，"
-"这个交叉编译器知道它应该在 <filename class=\"directory\">$LFS</filename> "
-"中查找头文件和库。但是，GCC 构建系统使用其他一些工具，它们不知道这个位置。"
-"因此需要该选项告诉它们在 <filename class=\"directory\">$LFS</filename> "
-"中查找需要的文件，而不是在宿主系统中查找。"
+"通常，使用 <parameter>--host</parameter> 即可保证使用交叉编译器构建 GCC，这个"
+"交叉编译器知道它应该在 <filename class=\"directory\">$LFS</filename> 中查找头"
+"文件和库。但是，GCC 构建系统使用其他一些工具，它们不知道这个位置。因此需要该"
+"选项告诉它们在 <filename class=\"directory\">$LFS</filename> 中查找需要的文"
+"件，而不是在宿主系统中查找。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:122
@@ -250,8 +238,8 @@ msgid ""
 "native compiler on x86. But here, we build with a cross compiler, so we need "
 "to explicitely set this option."
 msgstr ""
-"该选项在使用 x86 本地编译器构建另一个本地编译器时自动启用。"
-"然而我们使用交叉编译器进行编译，因此必须显式启用它。"
+"该选项在使用 x86 本地编译器构建另一个本地编译器时自动启用。然而我们使用交叉编"
+"译器进行编译，因此必须显式启用它。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:132
@@ -286,9 +274,9 @@ msgid ""
 "install:"
 msgstr ""
 "最后，还需要创建一个符号链接。许多程序和脚本运行 <command>cc</command> 而不"
-"是 <command>gcc</command>，因为前者能够保证程序的通用性，使它可以在所有 "
-"UNIX 系统上使用，无论是否安装了 GNU C 编译器。运行 <command>cc</command> 可"
-"以将安装哪种 C 编译器的选择权留给系统管理员："
+"是 <command>gcc</command>，因为前者能够保证程序的通用性，使它可以在所有 UNIX "
+"系统上使用，无论是否安装了 GNU C 编译器。运行 <command>cc</command> 可以将安"
+"装哪种 C 编译器的选择权留给系统管理员："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter06/gcc-pass2.xml:147

zh_CN/chapter07/creatingdirs.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-07-22 14:15+0800\n"
+"POT-Creation-Date: 2020-08-05 04:39+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"
@@ -18,47 +18,80 @@ msgstr "创建目录"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:13
+msgid "It is time to create the full structure in the LFS file system."
+msgstr ""
+"现在可以在 LFS 文件系统中创建完整的目录结构。"
+
+#. type: Content of: <sect1><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:15
+msgid ""
+"Create some root-level directories that are not in the limited set required "
+"in the previous chapters by issuing the following command:"
+msgstr "首先，执行命令，创建一些位于根目录中的目录，"
+"它们不属于之前章节需要的有限目录结构："
+
+#. type: Content of: <sect1><note><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:18
+msgid ""
+"Some of the directories below have already been created earlier with "
+"explicit instructions or when installing some packages.  They are repeated "
+"below for completeness."
+msgstr ""
+"下面给出的一些目录已经在之前使用命令创建，或者在安装一些软件包时被创建。"
+"这里出于内容完整性的考虑，仍然给出它们。"
+
+#. type: Content of: <sect1><screen>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:22
+#, no-wrap
+msgid "<userinput>mkdir -pv /{boot,home,mnt,opt,srv}</userinput>"
+msgstr "<userinput>mkdir -pv /{boot,home,mnt,opt,srv}</userinput>"
+
+#. type: Content of: <sect1><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:24
 msgid ""
-"It is time to create the full structure in the LFS file system. Create a "
-"standard directory tree by issuing the following commands:"
+"Create the required set of subdirectories below the root-level by issuing "
+"the following commands:"
 msgstr ""
-"现在可以在 LFS 文件系统中创建完整的目录结构。执行以下命令，创建一棵标准目录"
-"树："
+"执行以下命令，为这些直接位于根目录中的目录创建次级目录结构："
 
 #. type: Content of: <sect1><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:16
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:27
 #, no-wrap
 msgid ""
-"<userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib/firmware,mnt,opt}\n"
-"mkdir -pv /{media/{floppy,cdrom},srv,var}\n"
+"<userinput>mkdir -pv /etc/{opt,sysconfig}\n"
+"mkdir -pv /lib/firmware\n"
+"mkdir -pv /media/{floppy,cdrom}\n"
 "mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}\n"
 "mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}\n"
 "mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}\n"
 "mkdir -pv /usr/{,local/}share/man/man{1..8}\n"
-"install -dv -m 0750 /root\n"
-"install -dv -m 1777 /tmp /var/tmp\n"
+"mkdir -pv /var/{cache,local,log,mail,opt,spool}\n"
+"mkdir -pv /var/lib/{color,misc,locate}\n"
+"\n"
+"ln -sfv /run /var/run\n"
+"ln -sfv /run/lock /var/lock\n"
 "\n"
-"mkdir -v /var/{log,mail,spool}\n"
-"ln -sv /run /var/run\n"
-"ln -sv /run/lock /var/lock\n"
-"mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput>"
+"install -dv -m 0750 /root\n"
+"install -dv -m 1777 /tmp /var/tmp</userinput>"
 msgstr ""
-"<userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib/firmware,mnt,opt}\n"
-"mkdir -pv /{media/{floppy,cdrom},srv,var}\n"
+"<userinput>mkdir -pv /etc/{opt,sysconfig}\n"
+"mkdir -pv /lib/firmware\n"
+"mkdir -pv /media/{floppy,cdrom}\n"
 "mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}\n"
 "mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}\n"
 "mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}\n"
 "mkdir -pv /usr/{,local/}share/man/man{1..8}\n"
-"install -dv -m 0750 /root\n"
-"install -dv -m 1777 /tmp /var/tmp\n"
+"mkdir -pv /var/{cache,local,log,mail,opt,spool}\n"
+"mkdir -pv /var/lib/{color,misc,locate}\n"
 "\n"
-"mkdir -v /var/{log,mail,spool}\n"
-"ln -sv /run /var/run\n"
-"ln -sv /run/lock /var/lock\n"
-"mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput>"
+"ln -sfv /run /var/run\n"
+"ln -sfv /run/lock /var/lock\n"
+"\n"
+"install -dv -m 0750 /root\n"
+"install -dv -m 1777 /tmp /var/tmp</userinput>"
 
 #. type: Content of: <sect1><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:30
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:43
 msgid ""
 "Directories are, by default, created with permission mode 755, but this is "
 "not desirable for all directories. In the commands above, two changes are "
@@ -70,7 +103,7 @@ msgstr ""
 "systemitem> 的主目录，另一个是包含临时文件的目录。"
 
 #. type: Content of: <sect1><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:36
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:49
 msgid ""
 "The first mode change ensures that not just anybody can enter the <filename "
 "class=\"directory\">/root</filename> directory&mdash;the same as a normal "
@@ -89,12 +122,12 @@ msgstr ""
 "的最高位 (1) 阻止这样做。"
 
 #. type: Content of: <sect1><sect2><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:46
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:59
 msgid "FHS Compliance Note"
 msgstr "FHS 兼容性注记"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:48
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/creatingdirs.xml:61
 msgid ""
 "The directory tree is based on the Filesystem Hierarchy Standard (FHS) "
 "(available at <ulink url=\"https://refspecs.linuxfoundation.org/fhs.shtml\"/"

zh_CN/chapter08/binutils.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-07-25 20:30+0800\n"
+"POT-Creation-Date: 2020-08-05 04:39+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"
@@ -114,32 +114,24 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:60
-msgid ""
-"Now remove one test that prevents the tests from running to completion, and "
-"fix other tests in the gold test suite, which need to be adjusted for GCC 10:"
+msgid "Now remove one test that prevents the tests from running to completion:"
 msgstr ""
-"删除一项导致测试套件无法完成的测试，并且修复 gold 测试套件中的一些需要为 GCC "
-"10 进行调整的其他测试："
+"删除一项导致测试套件无法完成的测试："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:64
-#, no-wrap
-msgid ""
-"<userinput remap=\"pre\">sed -i '/@\\tincremental_copy/d' gold/testsuite/Makefile.in\n"
-"patch -Np1 -i ../binutils-&binutils-version;-gcc10_gold_test_fix-1.patch</userinput>"
-msgstr ""
-"<userinput remap=\"pre\">sed -i '/@\\tincremental_copy/d' gold/testsuite/Makefile.in\n"
-"patch -Np1 -i ../binutils-&binutils-version;-gcc10_gold_test_fix-1.patch</userinput>"
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:63
+msgid "<userinput remap=\"pre\">sed -i '/@\\tincremental_copy/d' gold/testsuite/Makefile.in</userinput>"
+msgstr "<userinput remap=\"pre\">sed -i '/@\\tincremental_copy/d' gold/testsuite/Makefile.in</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:67
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:65
 msgid ""
 "The Binutils documentation recommends building Binutils in a dedicated build "
 "directory:"
 msgstr "Binutils 文档推荐在一个专用的构建目录中构建 Binutils："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:70
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:68
 #, no-wrap
 msgid ""
 "<userinput remap=\"pre\">mkdir -v build\n"
@@ -149,12 +141,12 @@ msgstr ""
 "cd       build</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:73
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:71
 msgid "Prepare Binutils for compilation:"
 msgstr "准备编译 Binutils："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:75
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:73
 #, no-wrap
 msgid ""
 "<userinput remap=\"configure\">../configure --prefix=/usr       \\\n"
@@ -176,51 +168,51 @@ msgstr ""
 "             --with-system-zlib</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:84
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:82
 msgid "The meaning of the configure parameters:"
 msgstr "配置选项的含义："
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:87
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:85
 msgid "<parameter>--enable-gold</parameter>"
 msgstr "<parameter>--enable-gold</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:89
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:87
 msgid ""
 "Build the gold linker and install it as ld.gold (along side the default "
 "linker)."
 msgstr "构建 gold 链接器，并且将它 (和默认链接器一起) 安装为 ld.gold。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:95
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:93
 msgid "<parameter>--enable-ld=default</parameter>"
 msgstr "<parameter>--enable-ld=default</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:97
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:95
 msgid ""
 "Build the original bfd linker and install it as both ld (the default linker) "
 "and ld.bfd."
 msgstr "构建传统的 bfd 链接器，并且将它安装为 ld (默认链接器) 和 ld.bfd。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:103
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:101
 msgid "<parameter>--enable-plugins</parameter>"
 msgstr "<parameter>--enable-plugins</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:105
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:103
 msgid "Enables plugin support for the linker."
 msgstr "启用链接器插件支持。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:110
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:108
 msgid "<parameter>--enable-64-bit-bfd</parameter>"
 msgstr "<parameter>--enable-64-bit-bfd</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:112
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:110
 msgid ""
 "Enables 64-bit support (on hosts with narrower word sizes).  May not be "
 "needed on 64-bit systems, but does no harm."
@@ -228,39 +220,39 @@ msgstr ""
 "(在字长较小的宿主平台上) 启用 64 位支持。在 64 位平台上可能不需要，但无害。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:118
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:116
 msgid "<parameter>--with-system-zlib</parameter>"
 msgstr "<parameter>--with-system-zlib</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:120
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:118
 msgid ""
 "Use the installed zlib library rather than building the included version."
 msgstr "使用安装好的 zlib 库，而不是构建附带的版本。"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:127
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:125
 msgid "Compile the package:"
 msgstr "编译该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:129
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:127
 #, no-wrap
 msgid "<userinput remap=\"make\">make tooldir=/usr</userinput>"
 msgstr "<userinput remap=\"make\">make tooldir=/usr</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:132
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:130
 msgid "The meaning of the make parameter:"
 msgstr "make 命令选项的含义："
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:135
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:133
 msgid "<parameter>tooldir=/usr</parameter>"
 msgstr "<parameter>tooldir=/usr</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:137
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:135
 msgid ""
 "Normally, the tooldir (the directory where the executables will ultimately "
 "be located) is set to <filename class=\"directory\">$(exec_prefix)/"
@@ -282,7 +274,7 @@ msgstr ""
 "录。"
 
 #. type: Content of: <sect1><sect2><important><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:154
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:152
 msgid ""
 "The test suite for Binutils in this section is considered critical.  Do not "
 "skip it under any circumstances."
@@ -290,49 +282,49 @@ msgstr ""
 "本节中，Binutils 的测试套件被认为是十分关键的，在任何情况下都不能跳过。"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:158
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:156
 msgid "Test the results:"
 msgstr "测试编译结果："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:160
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:158
 #, no-wrap
 msgid "<userinput remap=\"test\">make -k check</userinput>"
 msgstr "<userinput remap=\"test\">make -k check</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:164
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:162
 msgid "Install the package:"
 msgstr "安装该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:166
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:164
 #, no-wrap
 msgid "<userinput remap=\"install\">make tooldir=/usr install</userinput>"
 msgstr "<userinput remap=\"install\">make tooldir=/usr install</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:171
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:169
 msgid "Contents of Binutils"
 msgstr "Binutils 的内容"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:174
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:172
 msgid "Installed programs"
 msgstr "安装的程序"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:175
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:173
 msgid "Installed libraries"
 msgstr "安装的库"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:176
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:174
 msgid "Installed directory"
 msgstr "安装的目录"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:179
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:177
 msgid ""
 "addr2line, ar, as, c++filt, dwp, elfedit, gprof, ld, ld.bfd, ld.gold, nm, "
 "objcopy, objdump, ranlib, readelf, size, strings, and strip"
@@ -341,36 +333,36 @@ msgstr ""
 "objcopy, objdump, ranlib, readelf, size, strings, 以及 strip"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:181
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:179
 msgid ""
 "libbfd.{a,so}, libctf.{a,so}, libctf-nobfd.{a,so}, and libopcodes.{a,so}"
 msgstr ""
 "libbfd.{a,so}, libctf.{a,so}, libctf-nobfd.{a,so}, and libopcodes.{a,so}"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:182
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:180
 msgid "/usr/lib/ldscripts"
 msgstr "/usr/lib/ldscripts"
 
 #. type: Content of: <sect1><sect2><variablelist><bridgehead>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:187
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:185
 msgid "Short Descriptions"
 msgstr "简要描述"
 
 #. type: Content of: <sect1><sect2><variablelist>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:188
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:186
 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/binutils.xml:192
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:190
 msgid "<command>addr2line</command>"
 msgstr "<command>addr2line</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:194
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:192
 msgid ""
 "Translates program addresses to file names and line numbers; given an "
 "address and the name of an executable, it uses the debugging information in "
@@ -381,32 +373,32 @@ msgstr ""
 "序使用可执行文件中的调试信息，确定与该地址相关的源代码文件和行号。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:199
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:197
 msgid "addr2line"
 msgstr "addr2line"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:205
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:203
 msgid "<command>ar</command>"
 msgstr "<command>ar</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:207
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:205
 msgid "Creates, modifies, and extracts from archives"
 msgstr "创建、修改、提取档案文件"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:209
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:207
 msgid "ar"
 msgstr "ar"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:215
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:213
 msgid "<command>as</command>"
 msgstr "<command>as</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:217
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:215
 msgid ""
 "An assembler that assembles the output of <command>gcc</command> into object "
 "files"
@@ -414,79 +406,79 @@ msgstr ""
 "一个能够汇编 <command>gcc</command> 输出的汇编代码并生成目标文件的汇编器"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:220
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:218
 msgid "as"
 msgstr "as"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:226
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:224
 msgid "<command>c++filt</command>"
 msgstr "<command>c++filt</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:228
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:226
 msgid ""
 "Used by the linker to de-mangle C++ and Java symbols and to keep overloaded "
 "functions from clashing"
 msgstr "被链接器用于 demangle C++ 和 Java 符号，防止重载函数冲突。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:231
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:229
 msgid "c++filt"
 msgstr "c++filt"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:237
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:235
 msgid "<command>dwp</command>"
 msgstr "<command>dwp</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:239
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:237
 msgid "The DWARF packaging utility"
 msgstr "DWARF 封装工具"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:241
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:239
 msgid "dwp"
 msgstr "dwp"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:247
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:245
 msgid "<command>elfedit</command>"
 msgstr "<command>elfedit</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:249
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:247
 msgid "Updates the ELF header of ELF files"
 msgstr "更改 ELF 文件的 ELF 头"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:251
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:249
 msgid "elfedit"
 msgstr "elfedit"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:257
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:255
 msgid "<command>gprof</command>"
 msgstr "<command>gprof</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:259
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:257
 msgid "Displays call graph profile data"
 msgstr "显示函数调用图性能分析数据"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:261
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:259
 msgid "gprof"
 msgstr "gprof"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:267
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:265
 msgid "<command>ld</command>"
 msgstr "<command>ld</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:269
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:267
 msgid ""
 "A linker that combines a number of object and archive files into a single "
 "file, relocating their data and tying up symbol references"
@@ -495,77 +487,77 @@ msgstr ""
 "并绑定符号引用"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:273
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:271
 msgid "ld"
 msgstr "ld"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:279
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:277
 msgid "<command>ld.gold</command>"
 msgstr "<command>ld.gold</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:281
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:279
 msgid "A cut down version of ld that only supports the elf object file format"
 msgstr "ld 的一个裁减版，只支持 ELF 目标文件格式"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:284
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:282
 msgid "ld.gold"
 msgstr "ld.gold"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:290
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:288
 msgid "<command>ld.bfd</command>"
 msgstr "<command>ld.bfd</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:292
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:290
 msgid "Hard link to <command>ld</command>"
 msgstr "<command>ld</command> 的硬链接"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:294
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:292
 msgid "ld.bfd"
 msgstr "ld.bfd"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:300
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:298
 msgid "<command>nm</command>"
 msgstr "<command>nm</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:302
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:300
 msgid "Lists the symbols occurring in a given object file"
 msgstr "列出给定目标文件中的符号"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:304
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:302
 msgid "nm"
 msgstr "nm"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:310
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:308
 msgid "<command>objcopy</command>"
 msgstr "<command>objcopy</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:312
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:310
 msgid "Translates one type of object file into another"
 msgstr "将一种目标文件翻译成另一种"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:314
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:312
 msgid "objcopy"
 msgstr "objcopy"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:320
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:318
 msgid "<command>objdump</command>"
 msgstr "<command>objdump</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:322
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:320
 msgid ""
 "Displays information about the given object file, with options controlling "
 "the particular information to display; the information shown is useful to "
@@ -575,17 +567,17 @@ msgstr ""
 "工具的程序员很有用"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:327
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:325
 msgid "objdump"
 msgstr "objdump"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:333
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:331
 msgid "<command>ranlib</command>"
 msgstr "<command>ranlib</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:335
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:333
 msgid ""
 "Generates an index of the contents of an archive and stores it in the "
 "archive; the index lists all of the symbols defined by archive members that "
@@ -595,47 +587,47 @@ msgstr ""
 "目标文件定义的符号"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:339
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:337
 msgid "ranlib"
 msgstr "ranlib"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:345
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:343
 msgid "<command>readelf</command>"
 msgstr "<command>readelf</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:347
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:345
 msgid "Displays information about ELF type binaries"
 msgstr "显示 ELF 格式二进制文件的信息"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:349
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:347
 msgid "readelf"
 msgstr "readelf"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:355
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:353
 msgid "<command>size</command>"
 msgstr "<command>size</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:357
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:355
 msgid "Lists the section sizes and the total size for the given object files"
 msgstr "列出给定文件各个段的大小和文件总大小"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:360
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:358
 msgid "size"
 msgstr "size"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:366
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:364
 msgid "<command>strings</command>"
 msgstr "<command>strings</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:368
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:366
 msgid ""
 "Outputs, for each given file, the sequences of printable characters that are "
 "of at least the specified length (defaulting to four); for object files, it "
@@ -647,77 +639,77 @@ msgstr ""
 "描整个文件"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:374
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:372
 msgid "strings"
 msgstr "strings"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:380
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:378
 msgid "<command>strip</command>"
 msgstr "<command>strip</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:382
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:380
 msgid "Discards symbols from object files"
 msgstr "移除目标文件中的符号"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:384
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:382
 msgid "strip"
 msgstr "strip"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:390
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:388
 msgid "<filename class=\"libraryfile\">libbfd</filename>"
 msgstr "<filename class=\"libraryfile\">libbfd</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:392
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:390
 msgid "The Binary File Descriptor library"
 msgstr "二进制文件描述符库"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:394
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:392
 msgid "libbfd"
 msgstr "libbfd"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:400
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:398
 msgid "<filename class=\"libraryfile\">libctf</filename>"
 msgstr "<filename class=\"libraryfile\">libctf</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:402
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:400
 msgid "The Compat ANSI-C Type Format debugging support library"
 msgstr "紧凑 ANSI-C 类型格式调试支持库"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:404
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:402
 msgid "libctf"
 msgstr "libctf"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:410
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:408
 msgid "<filename class=\"libraryfile\">libctf-nobfd</filename>"
 msgstr "<filename class=\"libraryfile\">libctf-nobfd</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:412
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:410
 msgid "A libctf variant which does not use libbfd functionality"
 msgstr "libctf 的变体，它不需要 libbfd 的功能"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:414
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:412
 msgid "libctf-nobfd"
 msgstr "libctf-nobfd"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:420
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:418
 msgid "<filename class=\"libraryfile\">libopcodes</filename>"
 msgstr "<filename class=\"libraryfile\">libopcodes</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:422
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:420
 msgid ""
 "A library for dealing with opcodes&mdash;the <quote>readable text</quote> "
 "versions of instructions for the processor; it is used for building "
@@ -727,6 +719,6 @@ msgstr ""
 "<command>objdump</command> 等构建工具所使用"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:427
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:425
 msgid "libopcodes"
 msgstr "libopcodes"

zh_CN/chapter08/libcap.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-08-05 04:39+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"
@@ -79,9 +79,8 @@ msgstr "防止一个静态库的安装："
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:48
-#, no-wrap
-msgid "<userinput remap=\"pre\">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput>"
-msgstr "<userinput remap=\"pre\">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput>"
+msgid "<userinput remap=\"pre\">sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile</userinput>"
+msgstr "<userinput remap=\"pre\">sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:50

zh_CN/chapter08/libpipeline.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-08-05 04:39+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,86 +70,97 @@ msgstr "安装 Libpipeline"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:44
+msgid "First, fix the files in the test suite:"
+msgstr "首先，修复测试套件中的文件："
+
+#. type: Content of: <sect1><sect2><screen>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:46
+#, no-wrap
+msgid "<userinput remap=\"pre\">patch -Np1 -i ../&libpipeline-checks-patch;</userinput>"
+msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&libpipeline-checks-patch;</userinput>"
+
+#. type: Content of: <sect1><sect2><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:48
 msgid "Prepare Libpipeline for compilation:"
 msgstr "准备编译 Libpipeline："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:46
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:50
 #, no-wrap
 msgid "<userinput remap=\"configure\">./configure --prefix=/usr</userinput>"
 msgstr "<userinput remap=\"configure\">./configure --prefix=/usr</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:48
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:52
 msgid "Compile the package:"
 msgstr "编译该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:50
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:54
 #, 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/libpipeline.xml:52
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:56
 msgid "To test the results, issue:"
 msgstr "运行以下命令以测试编译结果："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:54
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:58
 #, 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/libpipeline.xml:56
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:60
 msgid "Install the package:"
 msgstr "安装该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:58
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:62
 #, no-wrap
 msgid "<userinput remap=\"install\">make install</userinput>"
 msgstr "<userinput remap=\"install\">make install</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:63
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:67
 msgid "Contents of Libpipeline"
 msgstr "Libpipeline 的内容"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:66
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:70
 msgid "Installed library"
 msgstr "安装的库"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:69
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:73
 msgid "libpipeline.so"
 msgstr "libpipeline.so"
 
 #. type: Content of: <sect1><sect2><variablelist><bridgehead>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:74
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:78
 msgid "Short Descriptions"
 msgstr "简要描述"
 
 #. type: Content of: <sect1><sect2><variablelist>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:75
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:79
 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/libpipeline.xml:79
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:83
 msgid "<filename class=\"libraryfile\">libpipeline</filename>"
 msgstr "<filename class=\"libraryfile\">libpipeline</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:81
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:85
 msgid "This library is used to safely construct pipelines between subprocesses"
 msgstr "用于安全地在子进程之间构建流水线"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:84
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/libpipeline.xml:88
 msgid "libpipeline"
 msgstr "libpipeline"

zh_CN/chapter08/pkgmgt.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-08-05 05:00+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"
@@ -32,10 +32,10 @@ msgid ""
 msgstr ""
 "经常有人请求将软件包管理加入 LFS 手册。包管理器可以跟踪文件的安装过程，简化移"
 "除或升级软件包的工作。如同处理二进制程序和库文件一样，包管理器也会处理配置文"
-"件的安装过程。在您开始想入非非前，不 —— 本节不会讨论或者推荐任何一个特定的"
-"包管理器。本节对软件包管理的流行技术及其工作原理进行综述。对您来说，完美的包"
-"管理器可能是其中的某个技术，也可能是几个技术的结合。本节还会简要介绍在升级软"
-"件包时可能遇到的问题。"
+"件的安装过程。在您开始想入非非前，不 —— 本节不会讨论或者推荐任何一个特定的包"
+"管理器。本节对软件包管理的流行技术及其工作原理进行综述。对您来说，完美的包管"
+"理器可能是其中的某个技术，也可能是几个技术的结合。本节还会简要介绍在升级软件"
+"包时可能遇到的问题。"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:24
@@ -57,18 +57,18 @@ msgid ""
 "strengths and drawbacks.  Including one that satisfies all audiences is "
 "difficult."
 msgstr ""
-"存在多种软件包管理的解决方案，它们各有优缺点。很难找到一种让所有读者满意的"
-"方案。"
+"存在多种软件包管理的解决方案，它们各有优缺点。很难找到一种让所有读者满意的方"
+"案。"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:40
 msgid ""
 "There are some hints written on the topic of package management. Visit the "
-"<ulink url=\"&hints-index;\">Hints Project</ulink> and see if one of them "
+"<ulink url=\"&hints-root;\">Hints Project</ulink> and see if one of them "
 "fits your need."
 msgstr ""
 "已经有人写了一些关于软件包管理这一主题的短文。您可以访问 <ulink url=\"&hints-"
-"index;\">Hints Project</ulink> 并看一看是否有符合您的需求的方案。"
+"root;\">Hints Project</ulink> 并看一看是否有符合您的需求的方案。"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:45
@@ -84,8 +84,8 @@ msgid ""
 "aware of when upgrading packages, especially on a running system."
 msgstr ""
 "使用包管理器可以在软件包新版本发布后容易地完成升级。一般来说，使用 LFS 或者 "
-"BLFS 手册给出的构建方法即可升级软件包。下面是您在升级时必须注意的重点，特别是升级正"
-"在运行的系统时。"
+"BLFS 手册给出的构建方法即可升级软件包。下面是您在升级时必须注意的重点，特别是"
+"升级正在运行的系统时。"
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:54
@@ -96,8 +96,8 @@ msgid ""
 "do not recommend it."
 msgstr ""
 "如果需要升级 Glibc (例如从 Glibc-2.31 升级到 Glibc-2.32)，最安全的方法是重新"
-"构建 LFS。尽管您<emphasis>或许</emphasis>能按依赖顺序重新构建所有软件"
-"包，但我们不推荐这样做。"
+"构建 LFS。尽管您<emphasis>或许</emphasis>能按依赖顺序重新构建所有软件包，但我"
+"们不推荐这样做。"
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:60
@@ -117,14 +117,14 @@ msgid ""
 "all the dependent packages are recompiled."
 msgstr ""
 "如果更新了一个包含共享库的软件包，而且共享库的名称发生改变，那么所有动态链接"
-"到这个库的软件包都需要重新编译，以链接到新版本的库。(注意软件包的版本和共享"
-"库的名称没有关系。) 例如，考虑一个软件包 foo-1.2.3 安装了名为 <filename "
-"class='libraryfile'>libfoo.so.1</filename> 的共享库，如果您把该软件包升级到了新版"
-"本 foo-1.2.4，它安装了名为 <filename class='libraryfile'>libfoo.so.2</"
+"到这个库的软件包都需要重新编译，以链接到新版本的库。(注意软件包的版本和共享库"
+"的名称没有关系。) 例如，考虑一个软件包 foo-1.2.3 安装了名为 <filename "
+"class='libraryfile'>libfoo.so.1</filename> 的共享库，如果您把该软件包升级到了"
+"新版本 foo-1.2.4，它安装了名为 <filename class='libraryfile'>libfoo.so.2</"
 "filename> 的共享库。那么，所有链接到 <filename class='libraryfile'>libfoo."
 "so.1</filename> 的软件包都要重新编译以链接到 <filename "
-"class='libraryfile'>libfoo.so.2</filename>。注意，您不能删除旧版本的库，"
-"直到将所有依赖它的软件包都重新编译完成。"
+"class='libraryfile'>libfoo.so.2</filename>。注意，您不能删除旧版本的库，直到"
+"将所有依赖它的软件包都重新编译完成。"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:79
@@ -181,8 +181,8 @@ msgstr ""
 "class='directory'>/usr/pkg/foo-1.1</filename>，然后创建一个符号链接 "
 "<filename>/usr/pkg/foo</filename> 指向 <filename class='directory'>/usr/pkg/"
 "foo-1.1</filename>。在安装新版本 foo-1.2 的时候，把它安装到 <filename "
-"class='directory'>/usr/pkg/foo-1.2</filename>，然后把之前的符号链接替换为指"
-"向新版本的符号链接。"
+"class='directory'>/usr/pkg/foo-1.2</filename>，然后把之前的符号链接替换为指向"
+"新版本的符号链接。"
 
 #. type: Content of: <sect1><sect2><sect3><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:109
@@ -192,10 +192,10 @@ msgid ""
 "envar> need to be expanded to include <filename>/usr/pkg/foo</filename>. For "
 "more than a few packages, this scheme becomes unmanageable."
 msgstr ""
-"<envar>PATH</envar>、<envar>LD_LIBRARY_PATH</envar>、<envar>MANPATH</"
-"envar>、<envar>INFOPATH</envar> 和 <envar>CPPFLAGS</envar> 等环境变量需要被扩"
-"充，以包含 <filename>/usr/pkg/foo</filename>。一旦软件包的数量较多，这种架构"
-"就会变得无法管理。"
+"<envar>PATH</envar>、<envar>LD_LIBRARY_PATH</envar>、<envar>MANPATH</envar>、"
+"<envar>INFOPATH</envar> 和 <envar>CPPFLAGS</envar> 等环境变量需要被扩充，以包"
+"含 <filename>/usr/pkg/foo</filename>。一旦软件包的数量较多，这种架构就会变得"
+"无法管理。"
 
 #. type: Content of: <sect1><sect2><sect3><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:118
@@ -213,12 +213,11 @@ msgid ""
 "creation, many package managers have been written using this approach. A few "
 "of the popular ones include Stow, Epkg, Graft, and Depot."
 msgstr ""
-"这是前一种软件包管理技术的变种。和前一种方式一样，将各个软件包同样安装在独"
-"立的目录中。但不是建立目录的符号链接，而是把其中的每个文件符号链接到 "
-"<filename class='directory'>/usr</filename> 目录树中对应的位置。这样就不需要"
-"修改环境变量。虽然这些符号链接可以由用户自己创建，但已经有许多包管理器能够自"
-"动化这一过程。一些流行的包管理器如 Stow、Epkg、Graft 和 Depot 使用这种管理方"
-"式。"
+"这是前一种软件包管理技术的变种。和前一种方式一样，将各个软件包同样安装在独立"
+"的目录中。但不是建立目录的符号链接，而是把其中的每个文件符号链接到 <filename "
+"class='directory'>/usr</filename> 目录树中对应的位置。这样就不需要修改环境变"
+"量。虽然这些符号链接可以由用户自己创建，但已经有许多包管理器能够自动化这一过"
+"程。一些流行的包管理器如 Stow、Epkg、Graft 和 Depot 使用这种管理方式。"
 
 #. type: Content of: <sect1><sect2><sect3><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:129
@@ -262,8 +261,8 @@ msgstr ""
 "libfoo 库。如果要编译一个依赖于 libfoo 的软件包，您可能发现它链接到了 "
 "<filename class='libraryfile'>/usr/pkg/libfoo/1.1/lib/libfoo.so.1</filename> "
 "而不是您期望的 <filename class='libraryfile'>/usr/lib/libfoo.so.1</"
-"filename>。正确的做法是使用 <envar>DESTDIR</envar> 策略伪装软件包的安装过"
-"程。就像下面这样做："
+"filename>。正确的做法是使用 <envar>DESTDIR</envar> 策略伪装软件包的安装过程。"
+"就像下面这样做："
 
 #. type: Content of: <sect1><sect2><sect3><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:150
@@ -285,9 +284,9 @@ msgid ""
 "package, or you may find that it is easier to install some problematic "
 "packages into <filename class='directory'>/opt</filename>."
 msgstr ""
-"多数软件包可以这样安装，但有些不能。对于那些不兼容的软件包，您要么亲自动手"
-"安装，要么更简单地把一些出问题的软件包安装在 <filename class='directory'>/"
-"opt</filename>中。"
+"多数软件包可以这样安装，但有些不能。对于那些不兼容的软件包，您要么亲自动手安"
+"装，要么更简单地把一些出问题的软件包安装在 <filename class='directory'>/opt</"
+"filename>中。"
 
 #. type: Content of: <sect1><sect2><sect3><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:162
@@ -353,9 +352,9 @@ msgstr ""
 "预加载它。在安装过程中，这个库附加在 <command>cp</command>、"
 "<command>install</command>、<command>mv</command> 等可执行文件上，跟踪修改文"
 "件系统的系统调用。如果要使用这种方法，所有需要跟踪的可执行文件必须是动态链接"
-"的，且没有设定 suid 和 sgid 位。预加载动态库可能在安装过程中导致不希望的副"
-"作用。因此，建议在实际使用前进行一些测试，以确保包管理器不会造成破坏，并且记"
-"录了所有应该记录的文件。"
+"的，且没有设定 suid 和 sgid 位。预加载动态库可能在安装过程中导致不希望的副作"
+"用。因此，建议在实际使用前进行一些测试，以确保包管理器不会造成破坏，并且记录"
+"了所有应该记录的文件。"
 
 #. type: Content of: <sect1><sect2><sect3><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:197
@@ -381,8 +380,8 @@ msgid ""
 "to install the package on other machines."
 msgstr ""
 "在这种架构中，软件包被伪装安装到一个独立的目录树中，就像软链接风格的软件包管"
-"理那样。在安装后，使用被安装的文件创建一个软件包档案。它可以被用来在本地机"
-"器甚至其他机器上安装该软件包。"
+"理那样。在安装后，使用被安装的文件创建一个软件包档案。它可以被用来在本地机器"
+"甚至其他机器上安装该软件包。"
 
 #. type: Content of: <sect1><sect2><sect3><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:211
@@ -397,8 +396,8 @@ msgid ""
 msgstr ""
 "大多数商业发行版的包管理器采用这种策略。例如 RPM (值得一提的是，它被 <ulink "
 "url=\"http://refspecs.linuxfoundation.org/lsb.shtml\">Linux Standard Base 规"
-"则</ulink>所要求)、pkg-utils、Debian 的 apt，以及 Gentoo 的 Portage 系统"
-"等。LFS Hint 中的一篇短文描述了如何为 LFS 系统适用这种管理方式：<ulink url="
+"则</ulink>所要求)、pkg-utils、Debian 的 apt，以及 Gentoo 的 Portage 系统等。"
+"LFS Hint 中的一篇短文描述了如何为 LFS 系统适用这种管理方式：<ulink url="
 "\"&hints-root;fakeroot.txt\"/>。"
 
 #. type: Content of: <sect1><sect2><sect3><para>
@@ -416,9 +415,9 @@ msgid ""
 "package managers do.  For details of Slackware package management, see "
 "<ulink url=\"http://www.slackbook.org/html/package-management.html\"/>."
 msgstr ""
-"Slackware 使用一个基于 <command>tar</command> 的系统创建软件包档案。和更复"
-"杂的包管理器不同，该系统有意地没有涉及软件包依赖关系。如果想了解 Slackware "
-"包管理器的详细信息，阅读 <ulink url=\"http://www.slackbook.org/html/package-"
+"Slackware 使用一个基于 <command>tar</command> 的系统创建软件包档案。和更复杂"
+"的包管理器不同，该系统有意地没有涉及软件包依赖关系。如果想了解 Slackware 包管"
+"理器的详细信息，阅读 <ulink url=\"http://www.slackbook.org/html/package-"
 "management.html\"/>。"
 
 #. type: Content of: <sect1><sect2><sect3><title>
@@ -430,7 +429,7 @@ msgstr "基于用户的软件包管理"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgmgt.xml:233
 msgid ""
 "This scheme, unique to LFS, was devised by Matthias Benkmann, and is "
-"available from the <ulink url=\"&hints-index;\">Hints Project</ulink>. In "
+"available from the <ulink url=\"&hints-root;\">Hints Project</ulink>. In "
 "this scheme, each package is installed as a separate user into the standard "
 "locations. Files belonging to a package are easily identified by checking "
 "the user ID. The features and shortcomings of this approach are too complex "
@@ -438,7 +437,7 @@ msgid ""
 "url=\"&hints-root;more_control_and_pkg_man.txt\"/>."
 msgstr ""
 "这种架构是 LFS 特有的，由 Matthias Benkmann 提出，可以在 <ulink url=\"&hints-"
-"index;\">Hints Project</ulink> 查阅。在该架构中，每个软件包都由一个单独的用户"
+"root;\">Hints Project</ulink> 查阅。在该架构中，每个软件包都由一个单独的用户"
 "安装到标准位置。只要检查文件所有者，就能找出属于一个软件包的所有文件。它的优"
 "缺点十分复杂，无法在本节讨论。如果想详细了解，请访问 <ulink url=\"&hints-"
 "root;more_control_and_pkg_man.txt\"/> 阅读。"
@@ -467,14 +466,14 @@ msgid ""
 "filename>, <filename>/etc/sysconfig/network</filename>, and <filename>/etc/"
 "sysconfig/ifconfig.eth0</filename>.  </phrase>"
 msgstr ""
-"LFS 系统的一项优势是，没有依赖于磁盘系统中文件位置的文件。将构建好的 LFS 系"
-"统复制到另一台具有相同硬件架构的计算机很简单，只要用 <command>tar</command> "
-"命令把包含根目录的 LFS 分区打包 (未压缩的情况下，一个基本的 LFS 系统需要 250 "
-"MB)，然后通过网络或者 CD-ROM 复制到新的系统上，再展开即可。这时，个别配置文"
-"件需要修改。可能需要更新的配置文件有：<filename>/etc/hosts</filename>，"
+"LFS 系统的一项优势是，没有依赖于磁盘系统中文件位置的文件。将构建好的 LFS 系统"
+"复制到另一台具有相同硬件架构的计算机很简单，只要用 <command>tar</command> 命"
+"令把包含根目录的 LFS 分区打包 (未压缩的情况下，一个基本的 LFS 系统需要 250 "
+"MB)，然后通过网络或者 CD-ROM 复制到新的系统上，再展开即可。这时，个别配置文件"
+"需要修改。可能需要更新的配置文件有：<filename>/etc/hosts</filename>，"
 "<filename>/etc/fstab</filename>，<filename>/etc/passwd</filename>，"
-"<filename>/etc/group</filename>，<phrase revision=\"systemd\"><filename>/"
-"etc/shadow</filename>，以及 <filename>/etc/ld.so.conf</filename>。</"
+"<filename>/etc/group</filename>，<phrase revision=\"systemd\"><filename>/etc/"
+"shadow</filename>，以及 <filename>/etc/ld.so.conf</filename>。</"
 "phrase><phrase revision=\"sysv\"><filename>/etc/shadow</filename>，"
 "<filename>/etc/ld.so.conf</filename>，<filename>/etc/sysconfig/rc.site</"
 "filename>，<filename>/etc/sysconfig/network</filename>，以及 <filename>/etc/"

zh_CN/chapter08/procps.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-08-05 04:39+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"
@@ -139,42 +139,29 @@ 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/procps.xml:76
-msgid ""
-"The test suite needs some custom modifications for LFS.  Remove a test that "
-"fails when scripting does not use a tty device and fix two others.  To run "
-"the test suite, run the following commands:"
-msgstr ""
-"在 LFS 系统上，测试套件需要一些定制修改。删除一个在没有使用 tty 设备输入时"
-"会失败的测试，并修正另外两个。执行以下命令运行测试套件："
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:86
+msgid "To run the test suite, run:"
+msgstr "如果要运行测试套件，执行命令："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:81
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:88
 #, no-wrap
-msgid ""
-"<userinput remap=\"test\">sed -i -r 's|(pmap_initname)\\\\\\$|\\1|' testsuite/pmap.test/pmap.exp\n"
-"sed -i '/set tty/d' testsuite/pkill.test/pkill.exp\n"
-"rm testsuite/pgrep.test/pgrep.exp\n"
-"make check</userinput>"
-msgstr ""
-"<userinput remap=\"test\">sed -i -r 's|(pmap_initname)\\\\\\$|\\1|' testsuite/pmap.test/pmap.exp\n"
-"sed -i '/set tty/d' testsuite/pkill.test/pkill.exp\n"
-"rm testsuite/pgrep.test/pgrep.exp\n"
-"make check</userinput>"
+msgid "<userinput remap=\"test\">make check</userinput>"
+msgstr "<userinput remap=\"make\">make check</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:86
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:90
 msgid "Install the package:"
 msgstr "安装该软件包："
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:88
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:92
 #, 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/procps.xml:90
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:94
 msgid ""
 "Finally, move essential libraries to a location that can be found if "
 "<filename class=\"directory\">/usr</filename> is not mounted."
@@ -183,7 +170,7 @@ msgstr ""
 "时也能访问的位置。"
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:93
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:97
 #, no-wrap
 msgid ""
 "<userinput remap=\"install\">mv -v /usr/lib/libprocps.so.* /lib\n"
@@ -193,27 +180,27 @@ msgstr ""
 "ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:99
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:103
 msgid "Contents of Procps-ng"
 msgstr "Procps-ng 的内容"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:102
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:106
 msgid "Installed programs"
 msgstr "安装的程序"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:103
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:107
 msgid "Installed library"
 msgstr "安装的库"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:104
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:108
 msgid "Installed directories"
 msgstr "安装的目录"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:107
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:111
 msgid ""
 "free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload, top, "
 "uptime, vmstat, w, and watch"
@@ -222,220 +209,220 @@ msgstr ""
 "uptime, vmstat, w, 以及 watch"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:109
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:113
 msgid "libprocps.so"
 msgstr "libprocps.so"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:110
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:114
 msgid "/usr/include/proc and /usr/share/doc/procps-ng-&procps-ng-version;"
 msgstr "/usr/include/proc 和 /usr/share/doc/procps-ng-&procps-ng-version;"
 
 #. type: Content of: <sect1><sect2><variablelist><bridgehead>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:115
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:119
 msgid "Short Descriptions"
 msgstr "简要描述"
 
 #. type: Content of: <sect1><sect2><variablelist>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:116
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:120
 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/procps.xml:120
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:124
 msgid "<command>free</command>"
 msgstr "<command>free</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:122
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:126
 msgid ""
 "Reports the amount of free and used memory (both physical and swap memory) "
 "in the system"
 msgstr "报告系统中可用和已用内存 (包括物理内存和交换空间) 的容量"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:125
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:129
 msgid "free"
 msgstr "free"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:131
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:135
 msgid "<command>pgrep</command>"
 msgstr "<command>pgrep</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:133
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:137
 msgid "Looks up processes based on their name and other attributes"
 msgstr "根据名称和其他属性查找进程"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:135
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:139
 msgid "pgrep"
 msgstr "pgrep"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:141
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:145
 msgid "<command>pidof</command>"
 msgstr "<command>pidof</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:143
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:147
 msgid "Reports the PIDs of the given programs"
 msgstr "报告给定程序的 PID"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:145
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:149
 msgid "pidof"
 msgstr "pidof"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:151
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:155
 msgid "<command>pkill</command>"
 msgstr "<command>pkill</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:153
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:157
 msgid "Signals processes based on their name and other attributes"
 msgstr "根据名称和其他属性向进程发送信号"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:155
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:159
 msgid "pkill"
 msgstr "pkill"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:161
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:165
 msgid "<command>pmap</command>"
 msgstr "<command>pmap</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:163
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:167
 msgid "Reports the memory map of the given process"
 msgstr "报告给定进程的内存映射"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:165
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:169
 msgid "pmap"
 msgstr "pmap"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:171
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:175
 msgid "<command>ps</command>"
 msgstr "<command>ps</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:173
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:177
 msgid "Lists the current running processes"
 msgstr "列出正在运行的进程"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:175
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:179
 msgid "ps"
 msgstr "ps"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:181
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:185
 msgid "<command>pwdx</command>"
 msgstr "<command>pwdx</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:183
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:187
 msgid "Reports the current working directory of a process"
 msgstr "报告一个进程的当前工作目录"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:185
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:189
 msgid "pwdx"
 msgstr "pwdx"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:191
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:195
 msgid "<command>slabtop</command>"
 msgstr "<command>slabtop</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:193
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:197
 msgid "Displays detailed kernel slab cache information in real time"
 msgstr "实时显示内核 slab 缓存详细信息"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:195
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:199
 msgid "slabtop"
 msgstr "slabtop"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:201
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:205
 msgid "<command>sysctl</command>"
 msgstr "<command>sysctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:203
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:207
 msgid "Modifies kernel parameters at run time"
 msgstr "在运行时修改内核参数"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:205
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:209
 msgid "sysctl"
 msgstr "sysctl"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:211
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:215
 msgid "<command>tload</command>"
 msgstr "<command>tload</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:213
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:217
 msgid "Prints a graph of the current system load average"
 msgstr "打印当前系统平均负载示意图"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:215
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:219
 msgid "tload"
 msgstr "tload"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:221
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:225
 msgid "<command>top</command>"
 msgstr "<command>top</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:223
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:227
 msgid ""
 "Displays a list of the most CPU intensive processes; it provides an ongoing "
 "look at processor activity in real time"
 msgstr "列出 CPU 占用最大的进程列表；它实时地提供处理器活动的连续概况"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:226
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:230
 msgid "top"
 msgstr "top"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:232
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:236
 msgid "<command>uptime</command>"
 msgstr "<command>uptime</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:234
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:238
 msgid ""
 "Reports how long the system has been running, how many users are logged on, "
 "and the system load averages"
 msgstr "报告系统运行时间、登录用户数目和系统平均负载"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:237
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:241
 msgid "uptime"
 msgstr "uptime"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:243
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:247
 msgid "<command>vmstat</command>"
 msgstr "<command>vmstat</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:245
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:249
 msgid ""
 "Reports virtual memory statistics, giving information about processes, "
 "memory, paging, block Input/Output (IO), traps, and CPU activity"
@@ -443,32 +430,32 @@ msgstr ""
 "报告虚拟内存统计，给出进程、内存、分页、块输入输出 (IO)、 陷阱和 CPU 活动信息"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:249
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:253
 msgid "vmstat"
 msgstr "vmstat"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:255
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:259
 msgid "<command>w</command>"
 msgstr "<command>w</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:257
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:261
 msgid "Shows which users are currently logged on, where, and since when"
 msgstr "显示当前登录用户和它们的登录地点、时间"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:260
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:264
 msgid "w"
 msgstr "w"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:266
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:270
 msgid "<command>watch</command>"
 msgstr "<command>watch</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:268
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:272
 msgid ""
 "Runs a given command repeatedly, displaying the first screen-full of its "
 "output; this allows a user to watch the output change over time"
@@ -476,21 +463,29 @@ msgstr ""
 "重复执行给定命令，显示其输出的第一页；这使得用户可以观察输出随时间的变化"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:272
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:276
 msgid "watch"
 msgstr "watch"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:278
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:282
 msgid "<filename class=\"libraryfile\">libprocps</filename>"
 msgstr "<filename class=\"libraryfile\">libprocps</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:280
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:284
 msgid "Contains the functions used by most programs in this package"
 msgstr "包含该软件包大多数程序使用的函数"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:283
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:287
 msgid "libprocps"
 msgstr "libprocps"
+
+#~ msgid ""
+#~ "The test suite needs some custom modifications for LFS.  Remove a test "
+#~ "that fails when scripting does not use a tty device and fix two others.  "
+#~ "To run the test suite, run the following commands:"
+#~ msgstr ""
+#~ "在 LFS 系统上，测试套件需要一些定制修改。删除一个在没有使用 tty 设备输入时"
+#~ "会失败的测试，并修正另外两个。执行以下命令运行测试套件："