瀏覽代碼

chapter08: merge and update the translations

Xℹ Ruoyao 5 年之前
父節點
當前提交
cef1abd15f
共有 51 個文件被更改,包括 267 次插入658 次删除
  1. 4 5
      zh_CN/chapter08/aboutdebug.po
  2. 1 1
      zh_CN/chapter08/acl.po
  3. 2 2
      zh_CN/chapter08/autoconf.po
  4. 2 5
      zh_CN/chapter08/automake.po
  5. 10 10
      zh_CN/chapter08/bash.po
  6. 0 3
      zh_CN/chapter08/binutils.po
  7. 4 12
      zh_CN/chapter08/bison.po
  8. 7 14
      zh_CN/chapter08/check.po
  9. 23 42
      zh_CN/chapter08/coreutils.po
  10. 6 11
      zh_CN/chapter08/dbus.po
  11. 6 23
      zh_CN/chapter08/e2fsprogs.po
  12. 0 8
      zh_CN/chapter08/expat.po
  13. 5 11
      zh_CN/chapter08/findutils.po
  14. 0 20
      zh_CN/chapter08/flex.po
  15. 14 62
      zh_CN/chapter08/gcc.po
  16. 3 5
      zh_CN/chapter08/gdbm.po
  17. 5 5
      zh_CN/chapter08/gettext.po
  18. 0 67
      zh_CN/chapter08/glibc.po
  19. 1 2
      zh_CN/chapter08/grep.po
  20. 2 2
      zh_CN/chapter08/groff.po
  21. 1 1
      zh_CN/chapter08/grub.po
  22. 0 5
      zh_CN/chapter08/gzip.po
  23. 2 2
      zh_CN/chapter08/inetutils.po
  24. 2 0
      zh_CN/chapter08/intltool.po
  25. 1 3
      zh_CN/chapter08/iproute2.po
  26. 7 11
      zh_CN/chapter08/kbd.po
  27. 0 1
      zh_CN/chapter08/kmod.po
  28. 10 9
      zh_CN/chapter08/libcap.po
  29. 0 3
      zh_CN/chapter08/libelf.po
  30. 1 5
      zh_CN/chapter08/libffi.po
  31. 4 19
      zh_CN/chapter08/make.po
  32. 1 2
      zh_CN/chapter08/man-db.po
  33. 4 5
      zh_CN/chapter08/meson.po
  34. 3 1
      zh_CN/chapter08/ninja.po
  35. 2 4
      zh_CN/chapter08/openssl.po
  36. 3 4
      zh_CN/chapter08/patch.po
  37. 0 15
      zh_CN/chapter08/perl.po
  38. 1 2
      zh_CN/chapter08/pkgconfig.po
  39. 0 1
      zh_CN/chapter08/procps.po
  40. 2 4
      zh_CN/chapter08/python.po
  41. 11 30
      zh_CN/chapter08/revisedchroot.po
  42. 4 14
      zh_CN/chapter08/sed.po
  43. 17 11
      zh_CN/chapter08/shadow.po
  44. 9 21
      zh_CN/chapter08/strippingagain.po
  45. 0 1
      zh_CN/chapter08/sysklogd.po
  46. 58 123
      zh_CN/chapter08/systemd.po
  47. 3 4
      zh_CN/chapter08/tar.po
  48. 5 6
      zh_CN/chapter08/texinfo.po
  49. 5 21
      zh_CN/chapter08/util-linux.po
  50. 12 19
      zh_CN/chapter08/vim.po
  51. 4 1
      zh_CN/fix.sh

+ 4 - 5
zh_CN/chapter08/aboutdebug.po

@@ -18,7 +18,6 @@ msgstr "关于调试符号"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/aboutdebug.xml:13
-#, fuzzy
 msgid ""
 "Most programs and libraries are, by default, compiled with debugging symbols "
 "included (with <command>gcc</command>'s <parameter>-g</parameter> option). "
@@ -26,8 +25,8 @@ msgid ""
 "debugging information, the debugger can provide not only memory addresses, "
 "but also the names of the routines and variables."
 msgstr ""
-"许多程序和库在默认情况下被编译为带有调试符号的二进制文件 通过使用 "
-"<command>gcc</command> 的 <parameter>-g</parameter> 选项。这意味着在调试这"
+"许多程序和库在默认情况下被编译为带有调试符号的二进制文件 (通过使用 "
+"<command>gcc</command> 的 <parameter>-g</parameter> 选项)。这意味着在调试这"
 "些带有调试信息的程序和库时,调试器不仅能给出内存地址,还能给出子程序和变量的"
 "名称。"
 
@@ -58,8 +57,8 @@ msgid ""
 "<filename class=\"directory\">/usr/lib</filename>) with debugging symbols: "
 "87 MB"
 msgstr ""
-"带有调试符号的 Glibc 和 GCC 文件 <filename class=\"directory\">/lib</"
-"filename> 和 <filename class=\"directory\">/usr/lib</filename> 目录中:87 "
+"带有调试符号的 Glibc 和 GCC 文件 (<filename class=\"directory\">/lib</"
+"filename> 和 <filename class=\"directory\">/usr/lib</filename> 目录中):87 "
 "MB"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>

+ 1 - 1
zh_CN/chapter08/acl.po

@@ -94,7 +94,7 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/acl.xml:53
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"configure\">./configure --prefix=/usr         \\\n"
 "            --disable-static      \\\n"

+ 2 - 2
zh_CN/chapter08/autoconf.po

@@ -75,9 +75,9 @@ msgstr "首先,修复 Perl 5.28 引入的 bug:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/autoconf.xml:46
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"pre\">sed -i '361 s/{/\\\\{/' bin/autoscan.in</userinput>"
-msgstr "<userinput remap=\"pre\">sed '361 s/{/\\\\{/' -i bin/autoscan.in</userinput>"
+msgstr "<userinput remap=\"pre\">sed -i '361 s/{/\\\\{/' bin/autoscan.in</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/autoconf.xml:48

+ 2 - 5
zh_CN/chapter08/automake.po

@@ -71,11 +71,11 @@ msgstr "安装 Automake"
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/automake.xml:44
 msgid "Fix a failing test:"
-msgstr ""
+msgstr "修复一个失败的测试:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/automake.xml:46
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"pre\">sed -i \"s/''/etags/\" t/tags-lisp-space.sh</userinput>"
 msgstr "<userinput remap=\"test\">make -j4 check</userinput>"
 
@@ -248,6 +248,3 @@ msgstr "指向 <command>automake</command> 的硬链接"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/automake.xml:132
 msgid "automake-&am-minor-version;"
 msgstr "automake-&am-minor-version;"
-
-#~ msgid "One test is known to fail in the LFS environment: subobj.sh."
-#~ msgstr "已知在 LFS 环境中,一项名为 subobj.sh 的测试可能失败。"

+ 10 - 10
zh_CN/chapter08/bash.po

@@ -136,38 +136,39 @@ msgstr "如果不运行测试套件,跳到 <quote>安装该软件包</quote>
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:76
-#, fuzzy
 msgid ""
 "To prepare the tests, ensure that the <systemitem class=\"username\">tester</"
 "systemitem> user can write to the sources tree:"
 msgstr ""
-"为了准备进行测试,确保 <systemitem class=\"username\">nobody</systemitem> 用"
+"为了准备进行测试,确保 <systemitem class=\"username\">tester</systemitem> 用"
 "户可以写入源代码目录:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:78
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">chown -Rv tester .</userinput>"
-msgstr "<userinput remap=\"test\">chown -Rv nobody .</userinput>"
+msgstr "<userinput remap=\"test\">chown -Rv tester .</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:80
-#, fuzzy
 msgid ""
 "Now, run the tests as the <systemitem class=\"username\">tester</systemitem> "
 "user:"
 msgstr ""
-"现在以 <systemitem class=\"username\">nobody</systemitem> 用户的身份运行测"
+"现在以 <systemitem class=\"username\">tester</systemitem> 用户的身份运行测"
 "试:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:83
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"test\">su tester &lt;&lt; EOF\n"
 "PATH=$PATH make tests &lt; $(tty)\n"
 "EOF</userinput>"
-msgstr "<userinput remap=\"test\">su nobody -s /bin/bash -c \"PATH=$PATH HOME=/home make tests\"</userinput>"
+msgstr ""
+"<userinput remap=\"test\">su tester &lt;&lt; EOF\n"
+"PATH=$PATH make tests &lt; $(tty)\n"
+"EOF</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:87
@@ -193,7 +194,7 @@ msgstr ""
 msgid ""
 "Run the newly compiled <command>bash</command> program (replacing the one "
 "that is currently being executed):"
-msgstr "执行新编译的 <command>bash</command> 程序 (替换当前正在执行的版本):"
+msgstr "执行新编译的 <command>bash</command> 程序 (替换当前正在执行的版本):"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:96
@@ -203,7 +204,6 @@ msgstr "<userinput>exec /bin/bash --login +h</userinput>"
 
 #. type: Content of: <sect1><sect2><note><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bash.xml:99
-#, fuzzy
 msgid ""
 "The parameters used make the <command>bash</command> process an interactive "
 "login shell and continues to disable hashing so that new programs are found "

+ 0 - 3
zh_CN/chapter08/binutils.po

@@ -728,6 +728,3 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/binutils.xml:427
 msgid "libopcodes"
 msgstr "libopcodes"
-
-#~ msgid "The ver_test_pr16504.sh test is known to fail."
-#~ msgstr "已知名为 ver_test_pr16504.sh 的测试可能失败。"

+ 4 - 12
zh_CN/chapter08/bison.po

@@ -94,12 +94,14 @@ msgid ""
 "The tests are known to fail using multiple processors.  To test the results "
 "(about 5.5 SBU), issue:"
 msgstr ""
+"已知测试在使用多个处理器时可能失败。如果要测试编译结果 (需要约 5.5 SBU),"
+"运行命令:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bison.xml:54
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">make -j1 check</userinput>"
-msgstr "<userinput remap=\"make\">make</userinput>"
+msgstr "<userinput remap=\"make\">make -j1 check</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bison.xml:56
@@ -218,13 +220,3 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/bison.xml:114
 msgid "liby"
 msgstr "liby"
-
-#~ msgid ""
-#~ "There is a circular dependency between bison and flex with regard to the "
-#~ "checks.  If desired, after installing flex in the next section, the bison "
-#~ "package can be rebuilt and the bison checks can be run with <command>make "
-#~ "check</command>."
-#~ msgstr ""
-#~ "在考虑测试的情况下,bison 和 flex 之间存在循环依赖。如果希望的话,可以在"
-#~ "下一节安装 flex 后,重新构建 bison 软件包,再执行 <command>make check</"
-#~ "command> 运行测试。"

+ 7 - 14
zh_CN/chapter08/check.po

@@ -53,15 +53,13 @@ msgstr "&diskspace;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:33
-#, fuzzy
 msgid "&check-fin-sbu;"
-msgstr "&check-ch5-sbu;"
+msgstr "&check-fin-sbu;"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:34
-#, fuzzy
 msgid "&check-fin-du;"
-msgstr "&check-ch5-du;"
+msgstr "&check-fin-du;"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:41
@@ -107,21 +105,18 @@ msgstr "<userinput remap=\"test\">make check</userinput>"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:56
 msgid ""
 "Note that the Check test suite may take a relatively long (up to 4 SBU) time."
-msgstr "注意 Check 测试套件可能需要相对较长(高达 4 SBU)的时间。"
+msgstr "注意 Check 测试套件可能需要相对较长 (可能高达 4 SBU) 的时间。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:59
-#, fuzzy
 msgid "Install the package:"
-msgstr "构建该软件包:"
+msgstr "安装该软件包:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:61
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"install\">make docdir=/usr/share/doc/check-&check-version; install</userinput>"
-msgstr ""
-"<userinput remap=\"install\">make docdir=/usr/share/doc/check-&check-version; install &amp;&amp;\n"
-"sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput>"
+msgstr "<userinput remap=\"install\">make docdir=/usr/share/doc/check-&check-version; install</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:66
@@ -159,6 +154,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/check.xml:84
@@ -188,6 +184,3 @@ msgstr "包含使得测试程序能够调用 Check 的函数"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/check.xml:100
 msgid "libcheck"
 msgstr "libcheck"
-
-#~ msgid "Install the package and fix a script:"
-#~ msgstr "安装该软件包,并修复一个脚本:"

+ 23 - 42
zh_CN/chapter08/coreutils.po

@@ -194,13 +194,12 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:111
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">make NON_ROOT_USERNAME=tester check-root</userinput>"
-msgstr "<userinput remap=\"test\">make NON_ROOT_USERNAME=nobody check-root</userinput>"
+msgstr "<userinput remap=\"test\">make NON_ROOT_USERNAME=tester check-root</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:113
-#, fuzzy
 msgid ""
 "We're going to run the remainder of the tests as the <systemitem class="
 "\"username\">tester</systemitem> user. Certain tests require that the user "
@@ -208,16 +207,16 @@ msgid ""
 "a temporary group and make the user <systemitem class=\"username\">tester</"
 "systemitem> a part of it:"
 msgstr ""
-"之后我们要以 <systemitem class=\"username\">nobody</systemitem> 用户身份运行"
+"之后我们要以 <systemitem class=\"username\">tester</systemitem> 用户身份运行"
 "其余测试。然而,某些测试要求测试用户属于至少一个组。为了不跳过这些测试,我们"
-"添加一个临时组,并使得 <systemitem class=\"username\">nobody</systemitem> 用"
+"添加一个临时组,并使得 <systemitem class=\"username\">tester</systemitem> 用"
 "户成为它的成员:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:119
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">echo \"dummy:x:102:tester\" &gt;&gt; /etc/group</userinput>"
-msgstr "<userinput remap=\"test\">echo \"dummy:x:1000:nobody\" &gt;&gt; /etc/group</userinput>"
+msgstr "<userinput remap=\"test\">echo \"dummy:x:102:tester\" &gt;&gt; /etc/group</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:121
@@ -228,22 +227,19 @@ msgstr "修正访问权限,使得非 root 用户可以编译和运行测试:
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:124
-#, fuzzy, no-wrap
 msgid "<userinput remap=\"test\">chown -Rv tester . </userinput>"
-msgstr "<userinput remap=\"test\">chown -Rv nobody . </userinput>"
+msgstr "<userinput remap=\"test\">chown -Rv tester . </userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:126
 msgid "Now run the tests:"
-msgstr ""
+msgstr "现在运行测试:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:128
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">su tester -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\"</userinput>"
-msgstr ""
-"<userinput remap=\"test\">su nobody -s /bin/bash \\\n"
-"          -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\"</userinput>"
+msgstr "<userinput remap=\"test\">su tester -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\"</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:130
@@ -274,7 +270,7 @@ msgstr "将程序移动到 FHS 要求的位置:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:139
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"install\">mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin\n"
 "mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin\n"
@@ -288,7 +284,7 @@ msgstr ""
 "mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin\n"
 "mv -v /usr/bin/chroot /usr/sbin\n"
 "mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8\n"
-"sed -i s/\\\"1\\\"/\\\"8\\\"/1 /usr/share/man/man8/chroot.8</userinput>"
+"sed -i 's/\"1\"/\"8\"/' /usr/share/man/man8/chroot.8</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:146
@@ -379,9 +375,8 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:188
-#, fuzzy
 msgid "<command>[</command>"
-msgstr "<command>cp</command>"
+msgstr "<command>[</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:190
@@ -389,11 +384,13 @@ msgid ""
 "Is an actual command, /usr/bin/[, that is a synonym for the <command>test</"
 "command> command."
 msgstr ""
+"这是一个真实存在的命令,/usr/bin/[,它和 <command>test</command> 命令"
+"的功能相同。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:193
 msgid "["
-msgstr ""
+msgstr "["
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:199
@@ -576,7 +573,7 @@ msgstr "<command>cksum</command>"
 msgid ""
 "Prints the Cyclic Redundancy Check (CRC) checksum and the byte counts of "
 "each specified file"
-msgstr "输出每个给定文件的循环冗余检查(CRC) 校验和及字节数"
+msgstr "输出每个给定文件的循环冗余检查 (CRC) 校验和及字节数"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:320
@@ -693,7 +690,7 @@ msgstr "<command>df</command>"
 msgid ""
 "Reports the amount of disk space available (and used) on all mounted file "
 "systems, or only on the file systems holding the selected files"
-msgstr "报告每个已挂载文件系统(或包含给定文件的文件系统) 的总大小和可用空间"
+msgstr "报告每个已挂载文件系统 (或包含给定文件的文件系统) 的总大小和可用空间"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:398
@@ -710,7 +707,7 @@ msgstr "<command>dir</command>"
 msgid ""
 "Lists the contents of each given directory (the same as the <command>ls</"
 "command> command)"
-msgstr "列出给定目录的内容 (和 <command>ls</command> 命令相同)"
+msgstr "列出给定目录的内容 (和 <command>ls</command> 命令相同)"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:409
@@ -915,7 +912,7 @@ msgstr "<command>head</command>"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:542
 msgid ""
 "Prints the first ten lines (or the given number of lines)  of each given file"
-msgstr "打印文件的前 10 (或给定行数)行"
+msgstr "打印文件的前 10 (或给定行数) 行"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:545
@@ -964,7 +961,7 @@ msgstr "<command>install</command>"
 msgid ""
 "Copies files while setting their permission modes and, if possible, their "
 "owner and group"
-msgstr "复制文件并设定它们的访问权限,以及(如果可能) 它们的所有者和属组"
+msgstr "复制文件并设定它们的访问权限,以及 (如果可能) 它们的所有者和属组"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:577
@@ -1009,7 +1006,7 @@ msgstr "<command>ln</command>"
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:606
 msgid "Makes hard links or soft (symbolic) links between files"
-msgstr "在文件之间创建硬链接或软(符号)链接"
+msgstr "在文件之间创建硬链接或软 (符号) 链接"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:608
@@ -1054,7 +1051,7 @@ msgstr "<command>md5sum</command>"
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:636
 msgid "Reports or checks Message Digest 5 (MD5) checksums"
-msgstr "报告或检查消息摘要 5 (MD5)校验和"
+msgstr "报告或检查消息摘要 5 (MD5) 校验和"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:638
@@ -2024,19 +2021,3 @@ msgstr "<command>stdbuf</command> 使用的库"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/coreutils.xml:1283
 msgid "libstdbuf"
 msgstr "libstdbuf"
-
-#~ msgid ""
-#~ "Now run the tests. Make sure the PATH in the <userinput>su</userinput> "
-#~ "environment includes /tools/bin."
-#~ msgstr ""
-#~ "现在运行测试。执行以下命令,确保在 <userinput>su</userinput> 环境的 PATH "
-#~ "变量包含 /tools/bin 的情况下运行测试。"
-
-#~ msgid ""
-#~ "The test program test-getlogin is known to fail in a partially built "
-#~ "system environment like the chroot environment here, but passes if run at "
-#~ "the end of this chapter.  The test program tty.sh is also known to fail."
-#~ msgstr ""
-#~ "已知测试程序 test-getlogin 在部分构建的系统环境(如这里的 chroot 环境)会"
-#~ "失败,但是在本章的最后再运行即可通过。另外已知测试程序 tty.sh 可能会失"
-#~ "败。"

+ 6 - 11
zh_CN/chapter08/dbus.po

@@ -117,7 +117,6 @@ msgstr "<parameter>--with-console-auth-dir=/run/console</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:66
-#, fuzzy
 msgid "This specifies the location of the ConsoleKit authorization directory."
 msgstr "该选项指定 ConsoleKit 认证目录位置。"
 
@@ -177,12 +176,11 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:94
-#, fuzzy
 msgid ""
 "Create a symlink so that D-Bus and systemd can use the same "
 "<filename>machine-id</filename> file:"
 msgstr ""
-"创建符号链接,使 D-Bus 和 systemd 使用同样的 <filename>machine-id</filename> "
+"创建符号链接,使 D-Bus 和 systemd 使用同一个 <filename>machine-id</filename> "
 "文件:"
 
 #. type: Content of: <sect1><sect2><screen>
@@ -194,13 +192,13 @@ msgstr "<userinput remap=\"install\">ln -sfv /etc/machine-id /var/lib/dbus</user
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:99
 msgid "Move the socket file to /run instead of the deprecated /var/run:"
-msgstr ""
+msgstr "将 socket 文件从过时的 /var/run 移动到 /run:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:102
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"install\">sed -i 's:/var/run:/run:' /lib/systemd/system/dbus.socket</userinput>"
-msgstr "<userinput remap=\"install\">ln -sfv /etc/machine-id /var/lib/dbus</userinput>"
+msgstr "<userinput remap=\"install\">sed -i 's:/var/run:/run:' /lib/systemd/system/dbus.socket</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:107
@@ -266,7 +264,6 @@ msgstr "<command>dbus-cleanup-sockets</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:133
-#, fuzzy
 msgid "is used to remove leftover sockets in a directory"
 msgstr "用于清理目录中遗留的套接字"
 
@@ -282,9 +279,8 @@ msgstr "<command>dbus-daemon</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:143
-#, fuzzy
 msgid "Is the D-Bus message bus daemon"
-msgstr "D-Bus 消息总线守护程序"
+msgstr "D-Bus 消息总线守护程序"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:145
@@ -362,9 +358,8 @@ msgstr "<command>dbus-test-tool</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:196
-#, fuzzy
 msgid "Is a tool to help packages test <application>D-Bus</application>"
-msgstr "一个帮助软件包测试 <application>D-Bus</application> 的工具"
+msgstr "一个帮助软件包测试 <application>D-Bus</application> 的工具"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/dbus.xml:199

+ 6 - 23
zh_CN/chapter08/e2fsprogs.po

@@ -38,7 +38,6 @@ msgstr "E2fsprogs"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:26
-#, fuzzy
 msgid ""
 "The e2fsprogs package contains the utilities for handling the <systemitem "
 "class=\"filesystem\">ext2</systemitem> file system. It also supports the "
@@ -77,11 +76,10 @@ msgstr "安装 E2fsprogs"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:47
-#, fuzzy
 msgid ""
 "The e2fsprogs documentation recommends that the package be built in a "
 "subdirectory of the source tree:"
-msgstr "E2fsprogs 文档推荐在源代码目录树中的一个子目录构建该软件包:"
+msgstr "E2fsprogs 文档推荐在源代码目录树中的一个子目录构建该软件包:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:50
@@ -95,7 +93,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:53
-#, fuzzy
 msgid "Prepare e2fsprogs for compilation:"
 msgstr "准备编译 E2fsprogs:"
 
@@ -123,9 +120,8 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:65
-#, fuzzy
 msgid "The meaning of the configure options:"
-msgstr "环境变量和配置选项的含义:"
+msgstr "配置选项的含义:"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:68
@@ -138,7 +134,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:71
-#, fuzzy
 msgid ""
 "Certain programs (such as the <command>e2fsck</command> program) are "
 "considered essential programs.  When, for example, <filename class="
@@ -173,7 +168,6 @@ msgstr "<parameter>--disable-*</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:93
-#, fuzzy
 msgid ""
 "This prevents e2fsprogs from building and installing the <systemitem class="
 "\"library\">libuuid</systemitem> and <systemitem class=\"library\">libblkid</"
@@ -184,7 +178,7 @@ msgstr ""
 "该选项防止 e2fsprogs 构建和安装 <systemitem class=\"library\">libuuid</"
 "systemitem> 和 <systemitem class=\"library\">libblkid</systemitem> 库,"
 "<systemitem class=\"daemon\">uuidd</systemitem> 守护程序,以及 "
-"<command>fsck</command> 包装器, 因为 Util-linux 会安装更新的版本。"
+"<command>fsck</command> 包装器因为 Util-linux 会安装更新的版本。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:104
@@ -214,6 +208,8 @@ msgid ""
 "On a spinning disk, the tests take a little more than 4 SBUs. They can be "
 "much shorter on an SSD (down to about 1.5 SBUs)."
 msgstr ""
+"在机械硬盘上,测试使用的时间略超过 4 SBU。在 SSD 上测试时间短很多 "
+"(只要约 1.5 SBU)。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:121
@@ -302,7 +298,6 @@ msgstr "安装的目录"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:156
-#, fuzzy
 msgid ""
 "badblocks, chattr, compile_et, debugfs, dumpe2fs, e2freefrag, e2fsck, "
 "e2image, e2label, e2mmpstatus, e2scrub, e2scrub_all, e2undo, e4crypt, "
@@ -350,7 +345,7 @@ msgstr "<command>badblocks</command>"
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:177
 msgid "Searches a device (usually a disk partition) for bad blocks"
-msgstr "在一个设备(一般是磁盘分区)上搜索坏块"
+msgstr "在一个设备 (一般是磁盘分区) 上搜索坏块"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:180
@@ -926,15 +921,3 @@ msgstr "被 <command>debugfs</command> 使用"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/e2fsprogs.xml:534
 msgid "libss"
 msgstr "libss"
-
-#~ msgid ""
-#~ "One of the E2fsprogs tests will attempt to allocate 256 MB of memory.  If "
-#~ "you do not have significantly more RAM than this, be sure to enable "
-#~ "sufficient swap space for the test. See <xref linkend=\"ch-partitioning-"
-#~ "creatingfilesystem\"/> and <xref linkend=\"ch-partitioning-mounting\"/> "
-#~ "for details on creating and enabling swap space."
-#~ msgstr ""
-#~ "某个 e2fsprogs 测试会试图分配 256MB 内存。如果系统内存不比 256MB 大很"
-#~ "多,请确认为测试启用了足够的交换空间。参阅 <xref linkend=\"ch-"
-#~ "partitioning-creatingfilesystem\"/> 和 <xref linkend=\"ch-partitioning-"
-#~ "mounting\"/>,了解创建和启用交换空间的详细信息。"

+ 0 - 8
zh_CN/chapter08/expat.po

@@ -201,11 +201,3 @@ msgstr "包含解析 XML 文档的 API 函数"
 #: /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>"

+ 5 - 11
zh_CN/chapter08/findutils.po

@@ -38,7 +38,6 @@ msgstr "Findutils"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/findutils.xml:26
-#, fuzzy
 msgid ""
 "The Findutils package contains programs to find files. These programs are "
 "provided to recursively search through a directory tree and to create, "
@@ -46,7 +45,7 @@ msgid ""
 "is unreliable if the database has not been recently updated)."
 msgstr ""
 "Findutils 软件包包含用于查找文件的程序。这些程序能够递归地搜索目录树,以及创"
-"建、维护和搜索数据库 (一般比递归搜索快,但在数据库最近没有更新时不可靠)。"
+"建、维护和搜索文件数据库 (一般比递归搜索快,但在数据库最近没有更新时不可靠)。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/findutils.xml:32
@@ -122,11 +121,13 @@ msgstr "运行以下命令以测试编译结果:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/findutils.xml:70
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"test\">chown -Rv tester .\n"
 "su tester -c \"PATH=$PATH make check\"</userinput>"
-msgstr "<userinput remap=\"test\">make check</userinput>"
+msgstr ""
+"<userinput remap=\"test\">chown -Rv tester .\n"
+"su tester -c \"PATH=$PATH make check\"</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/findutils.xml:73
@@ -277,10 +278,3 @@ msgstr "可以将给定命令作用于一个列表中的所有文件"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/findutils.xml:152
 msgid "xargs"
 msgstr "xargs"
-
-#~ msgid ""
-#~ "Two tests are known to fail in the chroot environment: sv-bug-54171.old-"
-#~ "O3 and sv-bug-54171.new-O3."
-#~ msgstr ""
-#~ "已知有两项测试在 chroot 环境中会失败:sv-bug-54171.old-O3 和 sv-"
-#~ "bug-54171.new-O3。"

+ 0 - 20
zh_CN/chapter08/flex.po

@@ -251,23 +251,3 @@ msgstr "<filename class=\"libraryfile\">flex</filename> 库"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/flex.xml:140
 msgid "libfl"
 msgstr "libfl"
-
-#~ msgid "First, fix a problem introduced with glibc-2.26:"
-#~ msgstr "首先修正一个 glibc-2.26 引入的问题:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">sed -i \"/math.h/a #include &lt;malloc.h&gt;\" "
-#~ "src/flexdef.h</userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">sed -i \"/math.h/a #include &lt;malloc.h&gt;\" "
-#~ "src/flexdef.h</userinput>"
-
-#~ msgid ""
-#~ "The build procedure assumes the <application>help2man</application> "
-#~ "program is available to create a man page from the executable --help "
-#~ "option.  This is not present, so we use an environment variable to skip "
-#~ "this process.  Now, prepare Flex for compilation:"
-#~ msgstr ""
-#~ "构建过程假设 <application>help2man</application> 程序存在,以根据可执行文"
-#~ "件的 --help 选项创建一个 man 页面。然而它并不存在,因此我们使用一个环境"
-#~ "变量,跳过这一过程。现在,准备编译 Flex:"

+ 14 - 62
zh_CN/chapter08/gcc.po

@@ -116,7 +116,7 @@ msgstr "准备编译 GCC:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:61
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"configure\">../configure --prefix=/usr            \\\n"
 "             LD=ld                    \\\n"
@@ -125,8 +125,8 @@ msgid ""
 "             --disable-bootstrap      \\\n"
 "             --with-system-zlib</userinput>"
 msgstr ""
-"<userinput remap=\"configure\">SED=sed                               \\\n"
-"../configure --prefix=/usr            \\\n"
+"<userinput remap=\"configure\">../configure --prefix=/usr            \\\n"
+"             LD=ld                    \\\n"
 "             --enable-languages=c,c++ \\\n"
 "             --disable-multilib       \\\n"
 "             --disable-bootstrap      \\\n"
@@ -134,7 +134,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:68
-#, fuzzy
 msgid ""
 "Note that for other programming languages there are some prerequisites that "
 "are not yet available. See the <ulink url=\"&blfs-book;general/gcc.html"
@@ -151,9 +150,8 @@ msgstr "新的配置选项的含义:"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:77
-#, fuzzy
 msgid "<parameter>LD=ld</parameter>"
-msgstr "<parameter>--with-system-zlib</parameter>"
+msgstr "<parameter>LD=ld</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:79
@@ -162,6 +160,8 @@ msgid ""
 "binutils built earlier in this chapter, rather than the cross-built version "
 "which would otherwise be used."
 msgstr ""
+"该选项使得配置脚本使用之前在本章中构建的 ld,而没有该选项时会使用交叉编译"
+"构建的版本。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:86
@@ -170,7 +170,6 @@ msgstr "<parameter>--with-system-zlib</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:88
-#, fuzzy
 msgid ""
 "This switch tells GCC to link to the system installed copy of the zlib "
 "library, rather than its own internal copy."
@@ -196,12 +195,11 @@ msgstr "本节中 GCC 的测试套件被认为是关键的,无论如何不能
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:103
-#, fuzzy
 msgid ""
 "One set of tests in the GCC test suite is known to exhaust the default "
 "stack, so increase the stack size prior to running the tests:"
 msgstr ""
-"已知 GCC 测试套件中的一组测试可能耗尽栈空间,因此运行测试前要增加栈空间:"
+"已知 GCC 测试套件中的一组测试可能耗尽默认栈空间,因此运行测试前要增加栈空间:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:106
@@ -216,13 +214,13 @@ msgstr "以非特权用户身份测试编译结果,但出错时继续执行其
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:110
-#, fuzzy, no-wrap
+#, , no-wrap
 msgid ""
 "<userinput remap=\"test\">chown -Rv tester . \n"
 "su tester -c \"PATH=$PATH make -k check\"</userinput>"
 msgstr ""
-"<userinput remap=\"test\">chown -Rv nobody .\n"
-"su nobody -s /bin/bash -c \"PATH=$PATH make -k check\"</userinput>"
+"<userinput remap=\"test\">chown -Rv tester . \n"
+"su tester -c \"PATH=$PATH make -k check\"</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:113
@@ -288,14 +286,13 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:151
-#, fuzzy
 msgid ""
 "The GCC build directory is owned by <systemitem class=\"username\"> tester</"
 "systemitem> now and the ownership of the installed header directory (and its "
 "content) will be incorrect.  Change the ownership to <systemitem class="
 "\"username\">root</systemitem> user and group:"
 msgstr ""
-"GCC 构建目录目前属于用户 <systemitem class=\"username\"> nobody</"
+"GCC 构建目录目前属于用户 <systemitem class=\"username\">tester</"
 "systemitem>,这会导致安装的头文件目录 (及其内容) 具有不正确的所有权。将所"
 "有者修改为 <systemitem class=\"username\">root</systemitem> 用户和组:"
 
@@ -346,14 +343,13 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:177
-#, fuzzy
 msgid ""
 "Now that our final toolchain is in place, it is important to again ensure "
 "that compiling and linking will work as expected. We do this by performing "
 "some sanity checks:"
 msgstr ""
 "现在最终的工具链已经就位,重要的是再次确认编译和链接像我们期望的一样正常工"
-"作。再一次执行之前进行过的完整性检查:"
+"作。我们通过进行一些完整性检查,进行确认:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:205
@@ -369,7 +365,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:209
-#, fuzzy
 msgid ""
 "Depending on your machine architecture, the above may differ slightly.  The "
 "difference will be the name of the directory after <filename class="
@@ -378,7 +373,7 @@ msgid ""
 "filename> files under the <filename class=\"directory\">/usr/lib</filename> "
 "directory."
 msgstr ""
-"以上结果可能随您的机器体系结构不同而略微不同,区别一般是 <filename class="
+"以上结果可能随您的机器体系结构不同而略微不同。差异在于 <filename class="
 "\"directory\">/usr/lib/gcc</filename> 之后的目录名。我们关注的重点是,"
 "<command>gcc</command> 应该找到所有三个 <filename>crt*.o</filename> 文件,它"
 "们应该位于 <filename class=\"directory\">/usr/lib</filename> 目录中。"
@@ -407,12 +402,11 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:232
-#, fuzzy
 msgid ""
 "Again, the directory named after your target triplet may be different than "
 "the above, depending on your system architecture."
 msgstr ""
-"同样要注意以您的目标三元组命名的目录根据您体系结构的不同,可能和以上不同。"
+"同样要注意,以您的目标三元组命名的目录由于您体系结构的不同,可能和以上不同。"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:247
@@ -950,45 +944,3 @@ msgstr "未定义行为清理检查库"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gcc.xml:619
 msgid "libubsan"
 msgstr "libubsan"
-
-#~ msgid "As in gcc-pass2, fix a problem introduced by Glibc-2.31:"
-#~ msgstr ""
-#~ "就像在临时工具链中第二次构建 GCC 时那样,修复 Glibc-2.31 引入的一个问题:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">sed -e '1161 s|^|//|' \\\n"
-#~ "    -i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc</"
-#~ "userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">sed -e '1161 s|^|//|' \\\n"
-#~ "    -i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc</"
-#~ "userinput>"
-
-#~ msgid "<envar>SED=sed</envar>"
-#~ msgstr "<envar>SED=sed</envar>"
-
-#~ msgid ""
-#~ "Setting this environment variable prevents a hard-coded path to /tools/"
-#~ "bin/sed."
-#~ msgstr "设定该环境变量,防止路径 /tools/bin/sed 被硬编码到编译结果中。"
-
-#~ msgid ""
-#~ "Two tests named lookup.cc and reverse.cc in experimental/net are known to "
-#~ "fail in LFS chroot environment because they require /etc/hosts and iana-"
-#~ "etc."
-#~ msgstr ""
-#~ "已知 experimental/net 目录中名为 lookup.cc 和 reverse.cc 的两个测试在 LFS "
-#~ "chroot 环境中会失败,因为它们需要 /etc/hosts 和 iana-etc。"
-
-#~ msgid "Two tests named pr57193.c and pr90178.c are known to fail."
-#~ msgstr "已知名为 pr57193.c 和 pr90178.c 的测试会失败。"
-
-#~ msgid ""
-#~ "Many packages use the name <command>cc</command> to call the C compiler. "
-#~ "To satisfy those packages, create a symlink:"
-#~ msgstr ""
-#~ "许多软件包使用 <command>cc</command> 调用 C 编译器。为了满足它们,创建一"
-#~ "个符号链接:"
-
-#~ msgid "<userinput remap=\"install\">ln -sv gcc /usr/bin/cc</userinput>"
-#~ msgstr "<userinput remap=\"install\">ln -sv gcc /usr/bin/cc</userinput>"

+ 3 - 5
zh_CN/chapter08/gdbm.po

@@ -38,7 +38,6 @@ msgstr "GDBM"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gdbm.xml:26
-#, fuzzy
 msgid ""
 "The GDBM package contains the GNU Database Manager.  It is a library of "
 "database functions that use extensible hashing and works similar to the "
@@ -78,13 +77,13 @@ msgstr "安装 GDBM"
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gdbm.xml:47
 msgid "First, fix an issue first identified by gcc-10:"
-msgstr ""
+msgstr "首先,修复一个 GCC-10 首先发现的问题:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gdbm.xml:49
 #, no-wrap
 msgid "<userinput remap=\"pre\">sed -r -i '/^char.*parseopt_program_(doc|args)/d' src/parseopt.c</userinput>"
-msgstr ""
+msgstr "<userinput remap=\"pre\">sed -r -i '/^char.*parseopt_program_(doc|args)/d' src/parseopt.c</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gdbm.xml:51
@@ -115,12 +114,11 @@ msgstr "<envar>--enable-libgdbm-compat</envar>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gdbm.xml:63
-#, fuzzy
 msgid ""
 "This switch enables building the libgdbm compatibility library.  Some "
 "packages outside of LFS may require the older DBM routines it provides."
 msgstr ""
-"该选项启用 libgdbm 兼容性库的构建,因为 LFS 之外的一些软件包需要它提供的老"
+"该选项启用 libgdbm 兼容性库的构建LFS 之外的一些软件包需要它提供的老"
 "式 DBM 子程序。"
 
 #. type: Content of: <sect1><sect2><para>

+ 5 - 5
zh_CN/chapter08/gettext.po

@@ -43,8 +43,8 @@ msgid ""
 "localization. These allow programs to be compiled with NLS (Native Language "
 "Support), enabling them to output messages in the user's native language."
 msgstr ""
-"Gettext 软件包包含国际化和本地化工具,它们允许程序在编译时加入 NLS (母语支"
-"持)功能,使它们能够以用户的母语输出消息。"
+"Gettext 软件包包含国际化和本地化工具,它们允许程序在编译时加入 NLS (本地语言支"
+"持) 功能,使它们能够以用户的本地语言输出消息。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gettext.xml:32
@@ -104,7 +104,7 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gettext.xml:72
 msgid "To test the results (this takes a long time, around 3 SBUs), issue:"
-msgstr "输入以下命令以测试编译结果(需要较长时间, 大约 3 SBU):"
+msgstr "输入以下命令以测试编译结果 (需要较长时间, 大约 3 SBU):"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gettext.xml:75
@@ -598,9 +598,9 @@ msgid ""
 "not suffice"
 msgstr ""
 "用于编写处理 <filename class=\"extension\">.po</filename> 文件的专用程序; 这"
-"个库在 Gettext 发行的标准程序 如 <command>msgcomm</command>, "
+"个库在 Gettext 发行的标准程序 (如 <command>msgcomm</command>, "
 "<command>msgcmp</command>, <command>msgattrib</command>, 以及 "
-"<command>msgen</command> 不能满足要求时使用"
+"<command>msgen</command>) 不能满足要求时使用"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gettext.xml:380

+ 0 - 67
zh_CN/chapter08/glibc.po

@@ -1575,70 +1575,3 @@ msgstr "包含许多 Unix 工具使用的 <quote>标准</quote> 函数"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/glibc.xml:921
 msgid "libutil"
 msgstr "libutil"
-
-#~ msgid "The meaning of the options and new configure parameters:"
-#~ msgstr "新的配置选项和参数的含义:"
-
-#~ msgid ""
-#~ "The Glibc build system is self-contained and will install perfectly, even "
-#~ "though the compiler specs file and linker are still pointing to <filename "
-#~ "class=\"directory\">/tools</filename>. The specs and linker cannot be "
-#~ "adjusted before the Glibc install because the Glibc autoconf tests would "
-#~ "give false results and defeat the goal of achieving a clean build."
-#~ msgstr ""
-#~ "Glibc 构建系统是自给自足的,即使编译器 specs 文件和链接器仍然指向 "
-#~ "<filename class=\"directory\">/tools</filename>,也能完美地安装 Glibc。在"
-#~ "安装 Glibc 之前不能调整工具链,否则 Glibc 的 autoconf 测试会给出错误结果,"
-#~ "结果无法达成干净地构建 Glibc 这一目的。"
-
-#~ msgid ""
-#~ "Create a symlink for LSB compliance. Additionally, for x86_64, create a "
-#~ "compatibility symlink required for the dynamic loader to function "
-#~ "correctly:"
-#~ msgstr ""
-#~ "为了兼容 LSB 创建一个符号链接。另外,对于 x86_64,还要创建一个动态链接器的"
-#~ "兼容性符号链接,使它能够正常工作:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">case $(uname -m) in\n"
-#~ "    i?86)   ln -sfv ld-linux.so.2 /lib/ld-lsb.so.3\n"
-#~ "    ;;\n"
-#~ "    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64\n"
-#~ "            ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64."
-#~ "so.3\n"
-#~ "    ;;\n"
-#~ "esac</userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">case $(uname -m) in\n"
-#~ "    i?86)   ln -sfv ld-linux.so.2 /lib/ld-lsb.so.3\n"
-#~ "    ;;\n"
-#~ "    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64\n"
-#~ "            ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64."
-#~ "so.3\n"
-#~ "    ;;\n"
-#~ "esac</userinput>"
-
-#~ msgid "<parameter>CC=\"gcc -ffile-prefix-map=/tools=/usr\"</parameter>"
-#~ msgstr "<parameter>CC=\"gcc -ffile-prefix-map=/tools=/usr\"</parameter>"
-
-#~ msgid ""
-#~ "Make GCC record any references to files in /tools in result of the "
-#~ "compilation as if the files resided in /usr.  This avoids introduction of "
-#~ "invalid paths in debugging symbols."
-#~ msgstr ""
-#~ "使 GCC 在编译结果中记录文件的路径时,将 /tools 中的文件记录为 /usr 中的对"
-#~ "应路径。这可以避免调试符号中出现无效路径。"
-
-#~ msgid ""
-#~ "<emphasis>inet/tst-idna_name_classify</emphasis> is known to fail in the "
-#~ "LFS chroot environment."
-#~ msgstr ""
-#~ "已知 <emphasis>inet/tst-idna_name_classify</emphasis> 在 LFS chroot 环境中"
-#~ "会失败。"
-
-#~ msgid ""
-#~ "<emphasis>posix/tst-getaddrinfo4</emphasis> and <emphasis>posix/tst-"
-#~ "getaddrinfo5</emphasis> may fail on some architectures."
-#~ msgstr ""
-#~ "已知 <emphasis>posix/tst-getaddrinfo4</emphasis> 和 <emphasis>posix/tst-"
-#~ "getaddrinfo5</emphasis> 在某些硬件架构上会失败。"

+ 1 - 2
zh_CN/chapter08/grep.po

@@ -38,11 +38,10 @@ msgstr "Grep"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/grep.xml:26
-#, fuzzy
 msgid ""
 "The Grep package contains programs for searching through the contents of "
 "files."
-msgstr "Grep 软件包包含在文件中进行搜索的程序。"
+msgstr "Grep 软件包包含在文件内容中进行搜索的程序。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/grep.xml:29

+ 2 - 2
zh_CN/chapter08/groff.po

@@ -436,7 +436,7 @@ msgid ""
 "Is a <command>groff</command> driver for Canon CAPSL printers (LBP-4 and "
 "LBP-8 series laser printers)"
 msgstr ""
-"是一个用于 Canon CAPSL 打印机 (LBP-4 和 LBP-8 系列激光打印机)的 "
+"是一个用于 Canon CAPSL 打印机 (LBP-4 和 LBP-8 系列激光打印机) 的 "
 "<command>groff</command> 驱动程序"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
@@ -614,7 +614,7 @@ msgstr "<command>neqn</command>"
 msgid ""
 "Formats equations for American Standard Code for Information Interchange "
 "(ASCII) output"
-msgstr "将公式格式化为美国标准信息交换代码(ASCII)输出"
+msgstr "将公式格式化为美国标准信息交换代码 (ASCII) 输出"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/groff.xml:378

+ 1 - 1
zh_CN/chapter08/grub.po

@@ -462,7 +462,7 @@ msgstr "<command>grub-mkstandalone</command>"
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/grub.xml:283
 msgid "Generates a standalone image"
-msgstr "生成独立(包含所有模块)的镜像"
+msgstr "生成独立 (包含所有模块) 的镜像"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/grub.xml:285

+ 0 - 5
zh_CN/chapter08/gzip.po

@@ -375,8 +375,3 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/gzip.xml:224
 msgid "znew"
 msgstr "znew"
-
-#~ msgid ""
-#~ "Two tests are known to fail in the LFS environment: help-version and "
-#~ "zmore."
-#~ msgstr "已知两个测试可能在 LFS 环境中失败:help-version 和 zmore。"

+ 2 - 2
zh_CN/chapter08/inetutils.po

@@ -404,8 +404,8 @@ msgid ""
 "another host on a network, showing all the intermediate hops (gateways) "
 "along the way"
 msgstr ""
-"追踪您的数据包从您工作的主机到网络上另一台主机的路径,显示中间通过的跳跃网"
-"关。"
+"追踪您的数据包从您工作的主机到网络上另一台主机的路径,显示中间通过的跳跃 (网"
+"关)。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/inetutils.xml:240

+ 2 - 0
zh_CN/chapter08/intltool.po

@@ -86,6 +86,8 @@ msgid ""
 "What it does is add a backslash before the right brace character in the "
 "sequence '\\${' resulting in '\\$\\{'."
 msgstr ""
+"上面使用的正则表达式由于大量的反斜线,看上去比较奇怪。"
+"它的功能是在序列 '\\${' 的花括号之前增加一个反斜线,得到 '\\$\\{'。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/intltool.xml:52

+ 1 - 3
zh_CN/chapter08/iproute2.po

@@ -70,7 +70,6 @@ msgstr "安装 IPRoute2"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/iproute2.xml:44
-#, fuzzy
 msgid ""
 "The <command>arpd</command> program included in this package will not be "
 "built since it is dependent on Berkeley DB, which is not installed in LFS. "
@@ -84,7 +83,7 @@ msgstr ""
 "此不会被构建。然而,用于 <command>arpd</command> 的一个目录和它的 man 页面仍"
 "会被安装。运行以下命令以防止它们的安装。如果需要使用 <command>arpd</"
 "command> 二进制程序,参考 BLFS 手册中的 Berkeley DB 编译说明,它位于 <ulink "
-"url=\"&blfs-book;server/databases.html#db\"/>。"
+"url=\"&blfs-book;server/db.html\"/>。"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/iproute2.xml:53
@@ -98,7 +97,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/iproute2.xml:56
-#, fuzzy
 msgid ""
 "It is also necessary to disable building two modules that require <ulink url="
 "\"&blfs-book;postlfs/iptables.html\"/>."

+ 7 - 11
zh_CN/chapter08/kbd.po

@@ -70,7 +70,6 @@ msgstr "安装 Kbd"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:44
-#, fuzzy
 msgid ""
 "The behaviour of the backspace and delete keys is not consistent across the "
 "keymaps in the Kbd package. The following patch fixes this issue for i386 "
@@ -87,7 +86,6 @@ msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&kbd-backspace-patch;</userinp
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:50
-#, fuzzy
 msgid ""
 "After patching, the backspace key generates the character with code 127, and "
 "the delete key generates a well-known escape sequence."
@@ -108,12 +106,12 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:58
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"pre\">sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure\n"
 "sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput>"
 msgstr ""
-"<userinput remap=\"pre\">sed -i 's/\\(RESIZECONS_PROGS=\\)yes/\\1no/g' configure\n"
+"<userinput remap=\"pre\">sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure\n"
 "sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
@@ -123,13 +121,12 @@ msgstr "准备编译 Kbd:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:63
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"configure\">./configure --prefix=/usr --disable-vlock</userinput>"
-msgstr "<userinput remap=\"configure\">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr --disable-vlock</userinput>"
+msgstr "<userinput remap=\"configure\">./configure --prefix=/usr --disable-vlock</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:66
-#, fuzzy
 msgid "The meaning of the configure option:"
 msgstr "配置选项的含义:"
 
@@ -140,7 +137,6 @@ msgstr "<parameter>--disable-vlock</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:71
-#, fuzzy
 msgid ""
 "This option prevents the vlock utility from being built because it requires "
 "the PAM library, which isn't available in the chroot environment."
@@ -199,12 +195,12 @@ msgstr "如果需要的话,安装文档:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:100
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"install\">mkdir -v            /usr/share/doc/kbd-&kbd-version;\n"
 "cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput>"
 msgstr ""
-"<userinput remap=\"install\">mkdir -v       /usr/share/doc/kbd-&kbd-version;\n"
+"<userinput remap=\"install\">mkdir -v            /usr/share/doc/kbd-&kbd-version;\n"
 "cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
@@ -546,7 +542,7 @@ msgstr "<command>setleds</command>"
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:318
 msgid "Sets the keyboard flags and Light Emitting Diodes (LEDs)"
-msgstr "设置键盘标志位和发光二极管(LED)"
+msgstr "设置键盘标志位和发光二极管 (LED)"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kbd.xml:320

+ 0 - 1
zh_CN/chapter08/kmod.po

@@ -140,7 +140,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/kmod.xml:81
-#, fuzzy
 msgid ""
 "Install the package and create symlinks for compatibility with Module-Init-"
 "Tools (the package that previously handled Linux kernel modules):"

+ 10 - 9
zh_CN/chapter08/libcap.po

@@ -74,15 +74,14 @@ msgstr "安装 Libcap"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:46
-#, fuzzy
 msgid "Prevent a static library from being installed:"
-msgstr "防止个静态库的安装:"
+msgstr "防止个静态库的安装:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:48
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"pre\">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput>"
-msgstr "<userinput remap=\"pre\">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput>"
+msgstr "<userinput remap=\"pre\">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:50
@@ -127,13 +126,12 @@ msgstr "<userinput remap=\"test\">make test</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:72
-#, fuzzy
 msgid "Install the package and do some cleanup:"
-msgstr "安装该软件包:"
+msgstr "安装该软件包,并进行清理工作:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:74
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"install\">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install\n"
 "chmod -v 755 /lib/libcap.so.&libcap-version;\n"
@@ -141,8 +139,11 @@ msgid ""
 "rm -v /lib/libcap.so\n"
 "ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput>"
 msgstr ""
-"<userinput remap=\"install\">make lib=lib install\n"
-"chmod -v 755 /lib/libcap.so.&libcap-version;</userinput>"
+"<userinput remap=\"install\">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install\n"
+"chmod -v 755 /lib/libcap.so.&libcap-version;\n"
+"mv -v /lib/libpsx.a /usr/lib\n"
+"rm -v /lib/libcap.so\n"
+"ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libcap.xml:83

+ 0 - 3
zh_CN/chapter08/libelf.po

@@ -150,6 +150,3 @@ msgstr "libelf.so"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libelf.xml:81
 msgid "/usr/include/elfutils"
 msgstr "/usr/include/elfutils"
-
-#~ msgid "One test, run-elfclassify.sh, is known to fail."
-#~ msgstr "已知一项名为 run-elfclassify.sh 的测试可能失败。"

+ 1 - 5
zh_CN/chapter08/libffi.po

@@ -107,7 +107,6 @@ msgstr "<parameter>--with-gcc-arch=native</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libffi.xml:63
-#, fuzzy
 msgid ""
 "Ensure GCC optimizes for the current system.  If this is not specified, the "
 "system is guessed and the code generated may not be correct for some "
@@ -121,7 +120,7 @@ msgstr ""
 "某些系统上可能生成不正确的代码。如果要将生成的代码从本地系统复制到指令集功"
 "能较弱的系统中,需要使用目标系统架构作为该选项的参数值。关于不同系统架构的信"
 "息,参阅 <ulink url='https://gcc.gnu.org/onlinedocs/gcc-&gcc-version;/gcc/"
-"x86-Options.html'> gcc 手册中提供的的 x86 选项</ulink>。"
+"x86-Options.html'>gcc 手册中提供的的 x86 选项</ulink>。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libffi.xml:76
@@ -192,6 +191,3 @@ msgstr "<filename class=\"libraryfile\">libffi</filename>"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/libffi.xml:109
 msgid "contains the libffi API functions."
 msgstr "包含 libffi API 函数"
-
-#~ msgid "Six tests, all related to test-callback.c, are known to fail."
-#~ msgstr "已知 6 项与 test-callback.c 相关的测试可能失败。"

+ 4 - 19
zh_CN/chapter08/make.po

@@ -42,6 +42,8 @@ msgid ""
 "The Make package contains a program for controlling the generation of "
 "executables and other non-source files of a package from source files."
 msgstr ""
+"Make 软件包包含一个程序,用于控制从软件包源代码生成可执行文件和其他非源代码文件"
+"的过程。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/make.xml:30
@@ -93,13 +95,12 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/make.xml:56
 msgid "To test the results, issue:"
-msgstr ""
+msgstr "如果要测试编译结果,运行命令:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/make.xml:58
-#, fuzzy, no-wrap
 msgid "<userinput remap=\"test\">make check</userinput>"
-msgstr "<userinput remap=\"make\">make</userinput>"
+msgstr "<userinput remap=\"make\">make check</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/make.xml:60
@@ -151,19 +152,3 @@ msgid ""
 "Automatically determines which pieces of a package need to be (re)compiled "
 "and then issues the relevant commands"
 msgstr "自动确定软件包中需要(重新)构建的部分,并执行对应命令"
-
-#~ msgid "The Make package contains a program for compiling packages."
-#~ msgstr "Make 软件包包含用于编译软件包的程序。"
-
-#~ msgid ""
-#~ "The test suite needs to know where supporting perl files are located.  We "
-#~ "use an environment variable to accomplish this.  To test the results, "
-#~ "issue:"
-#~ msgstr ""
-#~ "测试套件需要知道 perl 支持文件的位置。为此我们使用一个环境变量。运行以"
-#~ "下命令测试编译结果:"
-
-#~ msgid ""
-#~ "<userinput remap=\"test\">make PERL5LIB=$PWD/tests/ check</userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"test\">make PERL5LIB=$PWD/tests/ check</userinput>"

+ 1 - 2
zh_CN/chapter08/man-db.po

@@ -165,11 +165,10 @@ msgstr "<parameter>--enable-cache-owner=bin</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/man-db.xml:91
-#, fuzzy
 msgid ""
 "This makes the system-wide cache files be owned by user <systemitem class="
 "\"username\">bin</systemitem>."
-msgstr "该选项使得系统范围的缓存文件所有者为用户 bin。"
+msgstr "该选项使得系统范围的缓存文件所有者为用户 <systemitem class=\"username\">bin</systemitem>。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/man-db.xml:97

+ 4 - 5
zh_CN/chapter08/meson.po

@@ -38,13 +38,11 @@ msgstr "Meson"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/meson.xml:26
-#, fuzzy
 msgid ""
 "Meson is an open source build system meant to be both extremely fast and as "
 "user friendly as possible."
 msgstr ""
-"Meson 是一个开放源代码构建系统,它的设计保证了非常快的执行速度,同时更注重用"
-"户友好性。"
+"Meson 是一个开放源代码构建系统,它的设计保证了非常快的执行速度,和尽可能高的用户友好性。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/meson.xml:30
@@ -73,7 +71,9 @@ msgid ""
 "other hand, meson/ninja is a powerful build system, which is expected to be "
 "used more and more often. It is required for several packages in <ulink url="
 "\"&blfs-book;\">the BLFS book</ulink>."
-msgstr ""
+msgstr "如果不使用 systemd,本节内容不是严格必要的。但是,meson/ninja "
+"的组合构成一个强大的构建系统,预期它将被越来越广泛地使用。"
+"<ulink url=\"&blfs-book;\">BLFS 手册</ulink> 中的一些软件包需要它。"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/meson.xml:49
@@ -123,7 +123,6 @@ msgstr "<parameter>--root=dest</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/meson.xml:68
-#, fuzzy
 msgid ""
 "By default <command>python3 setup.py install</command> installs various "
 "files (such as man pages) into Python Eggs.  With a specified root location, "

+ 3 - 1
zh_CN/chapter08/ninja.po

@@ -69,7 +69,9 @@ msgid ""
 "combination, which is expected to be used more and more often. It is "
 "required for several packages in <ulink url=\"&blfs-book;\">the BLFS book</"
 "ulink>."
-msgstr ""
+msgstr "如果不使用 systemd,本节内容不是严格必要的。但是,ninja 和 meson "
+"的组合构成一个强大的构建系统,预期它将被越来越广泛地使用。"
+"<ulink url=\"&blfs-book;\">BLFS 手册</ulink> 中的一些软件包需要它。"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/ninja.xml:50

+ 2 - 4
zh_CN/chapter08/openssl.po

@@ -38,7 +38,6 @@ msgstr "OpenSSL"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/openssl.xml:26
-#, fuzzy
 msgid ""
 "The OpenSSL package contains management tools and libraries relating to "
 "cryptography. These are useful for providing cryptographic functions to "
@@ -122,6 +121,8 @@ msgid ""
 "One test 30-test_afalg.t is known to fail on some kernel configurations (it "
 "apparently assumes certain unspecified crypto options have been selected)."
 msgstr ""
+"一项名为 30-test_afalg.t 的测试在某些内核配置下会失败 (它假定选择了一些未"
+"说明的内核配置选项)。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/openssl.xml:66
@@ -289,6 +290,3 @@ msgstr ""
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/openssl.xml:162
 msgid "libssl.so"
 msgstr "libssl.so"
-
-#~ msgid "One subtest in the test 20-test_enc.t is known to fail."
-#~ msgstr "已知测试 20-test_enc.t 的一项子测试可能失败。"

+ 3 - 4
zh_CN/chapter08/patch.po

@@ -150,13 +150,12 @@ msgstr "<command>patch</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/patch.xml:82
-#, fuzzy
 msgid ""
 "Modifies files according to a patch file (A patch file is normally a "
 "difference listing created with the <command>diff</command> program. By "
 "applying these differences to the original files, <command>patch</command> "
 "creates the patched versions.)"
 msgstr ""
-"根据补丁文件修改文件 [补丁文件一般是使用 <command>diff</command> 程序创建的差"
-"异列表。通过将这些差异应用到原始文件,<command>patch</command> 即可创建应用"
-"补丁的文件版本。]"
+"根据补丁文件修改文件 (补丁文件一般是使用 <command>diff</command> 程序创建的差"
+"异清单。通过将这些差异应用到原始文件,<command>patch</command> 即可创建应用"
+"补丁的文件版本。)"

+ 0 - 15
zh_CN/chapter08/perl.po

@@ -798,18 +798,3 @@ msgstr "显示 Zip 文件内部结构的详细信息"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/perl.xml:507
 msgid "zipdetails"
 msgstr "zipdetails"
-
-#~ msgid ""
-#~ "First create a basic <filename>/etc/hosts</filename> file to be "
-#~ "referenced in one of Perl's configuration files as well as the optional "
-#~ "test suite:"
-#~ msgstr ""
-#~ "首先创建一个基本的 <filename>/etc/hosts</filename> 文件,Perl 的一个配置"
-#~ "文件和可选的测试套件都会引用它:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">echo \"127.0.0.1 localhost $(hostname)\" &gt; /"
-#~ "etc/hosts</userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">echo \"127.0.0.1 localhost $(hostname)\" &gt; /"
-#~ "etc/hosts</userinput>"

+ 1 - 2
zh_CN/chapter08/pkgconfig.po

@@ -38,13 +38,12 @@ msgstr "Pkgconfig"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/pkgconfig.xml:26
-#, fuzzy
 msgid ""
 "The pkg-config package contains a tool for passing the include path and/or "
 "library paths to build tools during the configure and make phases of package "
 "installations."
 msgstr ""
-"pkg-config 软件包提供一个在 configure 和 make 文件执行过程中向构建工具传递头"
+"pkg-config 软件包提供一个在软件包安装的配置和编译阶段,向构建工具传递头"
 "文件和/或库文件路径的工具。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>

+ 0 - 1
zh_CN/chapter08/procps.po

@@ -111,7 +111,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/procps.xml:61
-#, fuzzy
 msgid "The meaning of the configure option:"
 msgstr "配置选项的含义:"
 

+ 2 - 4
zh_CN/chapter08/python.po

@@ -38,14 +38,13 @@ msgstr "python"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/python.xml:26
-#, fuzzy
 msgid ""
 "The Python 3 package contains the Python development environment. It is "
 "useful for object-oriented programming, writing scripts, prototyping large "
 "programs, or developing entire applications."
 msgstr ""
-"Python 3 软件包包含 Python 开发环境。它被用于面向对象编程、 编写脚本、为大型"
-"程序建立原型或开发完整的应用。"
+"Python 3 软件包包含 Python 开发环境。它被用于面向对象编程,编写脚本,为大型"
+"程序建立原型开发完整的应用。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/python.xml:31
@@ -149,7 +148,6 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/python.xml:86
-#, fuzzy
 msgid ""
 "To test the results, issue <command>make test</command>.  Some tests "
 "requiring a network connection or additional packages are skipped.  The test "

+ 11 - 30
zh_CN/chapter08/revisedchroot.po

@@ -63,6 +63,8 @@ msgid ""
 "Here the <parameter>+h</parameter> option is not used anymore, since all the "
 "previous programs have been replaced: hashing is therefore possible."
 msgstr ""
+"这里不再使用 <parameter>+h</parameter> 选项,因为所有之前安装的程序都已经"
+"替换成了最终版本,可以进行散列。"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:33
@@ -73,8 +75,8 @@ msgid ""
 "system-bindmount\"/> and <xref linkend=\"ch-system-kernfsmount\"/>."
 msgstr ""
 "如果解除了虚拟内核文件系统的挂载,必须通过手动或重启系统的方式重新挂载它们,"
-"保证在进入 chroot 时它们已经挂载好。<xref linkend=\"ch-system-bindmount\"/> "
-"和 <xref linkend=\"ch-system-kernfsmount\"/>已经说明了这一过程。"
+"保证在进入 chroot 时它们已经挂载好。<xref linkend=\"ch-system-bindmount\"/>"
+"和<xref linkend=\"ch-system-kernfsmount\"/>已经说明了这一过程。"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:39
@@ -90,7 +92,7 @@ msgstr ""
 
 #. type: Content of: <sect1><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:44
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput>rm -f /usr/lib/lib{bfd,opcodes}.a\n"
 "rm -f /usr/lib/libctf{,-nobfd}.a\n"
@@ -101,6 +103,7 @@ msgid ""
 "rm -f /usr/lib/libz.a</userinput>"
 msgstr ""
 "<userinput>rm -f /usr/lib/lib{bfd,opcodes}.a\n"
+"rm -f /usr/lib/libctf{,-nobfd}.a\n"
 "rm -f /usr/lib/libbz2.a\n"
 "rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a\n"
 "rm -f /usr/lib/libltdl.a\n"
@@ -109,7 +112,6 @@ msgstr ""
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:52
-#, fuzzy
 msgid ""
 "There are also several files installed in the /usr/lib and /usr/libexec "
 "directories with a file name extention of .la. These are \"libtool archive\" "
@@ -119,8 +121,8 @@ msgid ""
 "remove them, run:"
 msgstr ""
 "在 /usr/lib 和 /usr/libexec 目录中还有一些扩展名为 .la 的文件。它们是 "
-"\"libtool 档案\" 文件,在 Linux 系统上一般是不必要的。截至目前,已经安装的 ."
-"la 文件中没有一个是必要的。执行以下命令删除它们:"
+"\"libtool 档案\" 文件。正如我们已经讨论过的,它们在链接到共享库,特别是"
+"使用 autotools 以外的构建系统时,是不必要,甚至有害的。执行以下命令删除它们:"
 
 #. type: Content of: <sect1><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:59
@@ -145,31 +147,10 @@ msgid ""
 "Finally, remove the temporary 'tester' user account created at the beginning "
 "of the previous chapter."
 msgstr ""
+"最后,移除上一章开始时创建的临时 'tester' 用户账户。"
 
 #. type: Content of: <sect1><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:68
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput>userdel -r tester</userinput>"
-msgstr "<userinput>rm -rf /tmp/*</userinput>"
-
-#~ msgid ""
-#~ "The reason for this is that the programs in <filename class=\"directory"
-#~ "\">/tools</filename> are no longer needed.  For this reason you can "
-#~ "delete the <filename class=\"directory\">/tools</filename> directory if "
-#~ "so desired."
-#~ msgstr ""
-#~ "这是由于 <filename class=\"directory\">/tools</filename> 中的程序不再必"
-#~ "要。因此,如果您希望的话,可以删除 <filename class=\"directory\">/"
-#~ "tools</filename> 目录。"
-
-#~ msgid ""
-#~ "Removing <filename class=\"directory\">/tools</filename> will also remove "
-#~ "the temporary copies of Tcl, Expect, and DejaGNU which were used for "
-#~ "running the toolchain tests. If you need these programs later on, they "
-#~ "will need to be recompiled and re-installed. The BLFS book has "
-#~ "instructions for this (see <ulink url=\"&blfs-root;\"/>)."
-#~ msgstr ""
-#~ "删除 <filename class=\"directory\">/tools</filename> 也会移除 Tcl、Expect "
-#~ "和 DejaGNU 的临时拷贝,它们之前被用于进行工具链测试。如果您之后仍然需要它"
-#~ "们,必须重新编译和安装这些软件包。BLFS 手册包含了安装它们的说明 (见 "
-#~ "<ulink url=\"&blfs-root;\"/>)。"
+msgstr "<userinput>userdel -r tester</userinput>"

+ 4 - 14
zh_CN/chapter08/sed.po

@@ -99,11 +99,13 @@ msgstr "运行以下命令以测试编译结果:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/sed.xml:54
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"test\">chown -Rv tester .\n"
 "su tester -c \"PATH=$PATH make check\"</userinput>"
-msgstr "<userinput remap=\"test\">make check</userinput>"
+msgstr ""
+"<userinput remap=\"test\">chown -Rv tester .\n"
+"su tester -c \"PATH=$PATH make check\"</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/sed.xml:57
@@ -169,15 +171,3 @@ msgstr "<command>sed</command>"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/sed.xml:86
 msgid "Filters and transforms text files in a single pass"
 msgstr "一次性过滤和转换文本文件"
-
-#~ msgid "First fix an issue in the LFS environment and remove a failing test:"
-#~ msgstr "首先修复 LFS 环境中的一个问题,并删除一个失败的测试:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">sed -i 's/usr/tools/'                 build-aux/"
-#~ "help2man\n"
-#~ "sed -i 's/testsuite.panic-tests.sh//' Makefile.in</userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">sed -i 's/usr/tools/'                 build-aux/"
-#~ "help2man\n"
-#~ "sed -i 's/testsuite.panic-tests.sh//' Makefile.in</userinput>"

+ 17 - 11
zh_CN/chapter08/shadow.po

@@ -89,7 +89,7 @@ msgid ""
 "\"ch-system-man-pages\"/>:"
 msgstr ""
 "禁止该软件包安装 <command>groups</command> 程序和它的 man 页面,因为 "
-"Coreutils 会提供更好的版本。同样,避免安装 <xref linkend=\"ch-system-man-"
+"Coreutils 会提供更好的版本。同样,避免安装<xref linkend=\"ch-system-man-"
 "pages\"/>软件包已经提供的 man 页面:"
 
 #. type: Content of: <sect1><sect2><screen>
@@ -124,14 +124,15 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:70
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"pre\">sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \\\n"
 "    -e 's:/var/spool/mail:/var/mail:'                 \\\n"
 "    -i etc/login.defs</userinput>"
 msgstr ""
-"<userinput remap=\"pre\">sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \\\n"
-"       -e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput>"
+"<userinput remap=\"pre\">sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \\\n"
+"    -e 's:/var/spool/mail:/var/mail:'                 \\\n"
+"    -i etc/login.defs</userinput>"
 
 #. type: Content of: <sect1><sect2><note><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:75
@@ -140,9 +141,9 @@ msgstr "如果您选择构建有 Cracklib 支持的 Shadow,执行以下命令
 
 #. type: Content of: <sect1><sect2><note><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:77
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput>sed -i 's:DICTPATH.*:DICTPATH\\t/lib/cracklib/pw_dict:' etc/login.defs</userinput>"
-msgstr "<userinput>sed -i 's@DICTPATH.*@DICTPATH\\t/lib/cracklib/pw_dict@' etc/login.defs</userinput>"
+msgstr "<userinput>sed -i 's:DICTPATH.*:DICTPATH\\t/lib/cracklib/pw_dict:' etc/login.defs</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:80
@@ -163,12 +164,15 @@ msgstr "准备编译 Shadow:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:87
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"configure\">touch /usr/bin/passwd\n"
 "./configure --sysconfdir=/etc \\\n"
 "            --with-group-name-max-length=32</userinput>"
-msgstr "<userinput remap=\"configure\">./configure --sysconfdir=/etc --with-group-name-max-length=32</userinput>"
+msgstr ""
+"<userinput remap=\"configure\">touch /usr/bin/passwd\n"
+"./configure --sysconfdir=/etc \\\n"
+"            --with-group-name-max-length=32</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:92
@@ -177,9 +181,8 @@ msgstr "配置选项的含义:"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:95
-#, fuzzy
 msgid "<command>touch /usr/bin/passwd</command>"
-msgstr "<command>chpasswd</command>"
+msgstr "<command>touch /usr/bin/passwd</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:97
@@ -188,6 +191,9 @@ msgid ""
 "location is harcoded in some programs, and the default location if it does "
 "not exist is not right."
 msgstr ""
+"我们需要保证 <filename>/usr/bin/passwd</filename> 存在,"
+"因为它的位置会被硬编码到一些程序中,如果它不存在的话,"
+"会使用错误的默认位置。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/shadow.xml:103
@@ -297,7 +303,7 @@ msgstr ""
 "Shadow 附带的 <command>useradd</command> 配置文件有一些需要解释的事项。首先,"
 "<command>useradd</command> 的默认操作是创建一个用户,以及一个名字和用户名相同"
 "的组。默认情况下,用户 ID (UID) 和组 ID (GID) 会从 1000 开始。这意味着,如果"
-"您不向 <command>useradd</command>传递参数,每个用户都会属于一个不同的组。如果"
+"您不向 <command>useradd</command> 传递参数,每个用户都会属于一个不同的组。如果"
 "您不希望这样,就要传递 <parameter>-g</parameter> 参数给 <command>useradd</"
 "command>。默认参数保存在 <filename>/etc/default/useradd</filename> 文件中。您"
 "可以编辑其中的两个参数,以满足您的特定需求。"

+ 9 - 21
zh_CN/chapter08/strippingagain.po

@@ -18,7 +18,6 @@ msgstr "再次移除调试符号"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/strippingagain.xml:13
-#, fuzzy
 msgid ""
 "This section is optional.  If the intended user is not a programmer and does "
 "not plan to do any debugging on the system software, the system size can be "
@@ -27,7 +26,7 @@ msgid ""
 "the software fully anymore."
 msgstr ""
 "本节是可选的。如果系统不是为程序员设计的,也没有调试系统软件的计划,可以通"
-"过从二进制程序和库移除调试符号,将系统的体积减小约 90 MB。除了无法再调试全"
+"过从二进制程序和库移除调试符号,将系统的体积减小约 2 GB。除了无法再调试全"
 "部软件外,这不会造成任何不便。"
 
 #. type: Content of: <sect1><para>
@@ -111,13 +110,12 @@ msgstr ""
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/strippingagain.xml:66
-#, fuzzy
 msgid "Now the binaries and libraries can be stripped:"
-msgstr "现在即可安全地移除程序和库的调试符号:"
+msgstr "现在即可移除程序和库的调试符号:"
 
 #. type: Content of: <sect1><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/strippingagain.xml:67
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput>find /usr/lib -type f -name \\*.a \\\n"
 "   -exec strip --strip-debug {} ';'\n"
@@ -128,14 +126,14 @@ msgid ""
 "find /{bin,sbin} /usr/{bin,sbin,libexec} -type f \\\n"
 "    -exec strip --strip-all {} ';'</userinput>"
 msgstr ""
-"<userinput>/tools/bin/find /usr/lib -type f -name \\*.a \\\n"
-"   -exec /tools/bin/strip --strip-debug {} ';'\n"
+"<userinput>find /usr/lib -type f -name \\*.a \\\n"
+"   -exec strip --strip-debug {} ';'\n"
 "\n"
-"/tools/bin/find /lib /usr/lib -type f \\( -name \\*.so* -a ! -name \\*dbg \\) \\\n"
-"   -exec /tools/bin/strip --strip-unneeded {} ';'\n"
+"find /lib /usr/lib -type f -name \\*.so* ! -name \\*dbg \\\n"
+"   -exec strip --strip-unneeded {} ';'\n"
 "\n"
-"/tools/bin/find /{bin,sbin} /usr/{bin,sbin,libexec} -type f \\\n"
-"    -exec /tools/bin/strip --strip-all {} ';'</userinput>"
+"find /{bin,sbin} /usr/{bin,sbin,libexec} -type f \\\n"
+"    -exec strip --strip-all {} ';'</userinput>"
 
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/strippingagain.xml:76
@@ -146,13 +144,3 @@ msgid ""
 msgstr ""
 "这里会有很多文件被报告为格式无法识别。这些警告可以安全地忽略。它们表明那些文"
 "件是脚本文件,而不是二进制文件。"
-
-#~ msgid ""
-#~ "Before performing the stripping, take special care to ensure that none of "
-#~ "the binaries that are about to be stripped are running:"
-#~ msgstr ""
-#~ "在移除调试符号前,必须特别小心,保证没有需要移除调试符号的二进制程序还在运"
-#~ "行:"
-
-#~ msgid "<userinput>exec /tools/bin/bash</userinput>"
-#~ msgstr "<userinput>exec /tools/bin/bash</userinput>"

+ 0 - 1
zh_CN/chapter08/sysklogd.po

@@ -39,7 +39,6 @@ msgstr "Sysklogd"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/sysklogd.xml:26
-#, fuzzy
 msgid ""
 "The sysklogd package contains programs for logging system messages, such as "
 "those given by the kernel when unusual things happen."

+ 58 - 123
zh_CN/chapter08/systemd.po

@@ -71,24 +71,23 @@ msgstr "安装 systemd"
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:43
 msgid "First, apply a patch to fix the build with GCC-10:"
-msgstr ""
+msgstr "首先,应用一个补丁,修复使用 GCC-10 编译时出现的问题:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:45
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"pre\">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-1.patch</userinput>"
-msgstr "<userinput remap=\"pre\">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput>"
+msgstr "<userinput remap=\"pre\">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-1.patch</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:47
-#, fuzzy
 msgid ""
 "Create a symlink to work around the xsltproc command not being installed:"
-msgstr "创建一个符号链接,绕过不存在的 xsltproc:"
+msgstr "创建一个符号链接,绕过本书不会安装的 xsltproc:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:49
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"pre\">ln -sf /bin/true /usr/bin/xsltproc</userinput>"
 msgstr "<userinput remap=\"pre\">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput>"
 
@@ -110,9 +109,9 @@ msgstr "删除在 chroot 环境中无法构建的测试:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:57
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"pre\">sed '179,$ d' -i src/resolve/meson.build</userinput>"
-msgstr "<userinput remap=\"pre\">sed '177,$ d' -i src/resolve/meson.build</userinput>"
+msgstr "<userinput remap=\"pre\">sed '179,$ d' -i src/resolve/meson.build</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:59
@@ -136,7 +135,7 @@ msgstr "准备安装 systemd:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:67
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"configure\">mkdir -p build\n"
 "cd       build\n"
@@ -169,27 +168,29 @@ msgstr ""
 "<userinput remap=\"configure\">mkdir -p build\n"
 "cd       build\n"
 "\n"
-"PKG_CONFIG_PATH=\"/usr/lib/pkgconfig:/tools/lib/pkgconfig\" \\\n"
-"LANG=en_US.UTF-8                   \\\n"
-"meson --prefix=/usr                \\\n"
-"      --sysconfdir=/etc            \\\n"
-"      --localstatedir=/var         \\\n"
-"      -Dblkid=true                 \\\n"
-"      -Dbuildtype=release          \\\n"
-"      -Ddefault-dnssec=no          \\\n"
-"      -Dfirstboot=false            \\\n"
-"      -Dinstall-tests=false        \\\n"
-"      -Dkmod-path=/bin/kmod        \\\n"
-"      -Dldconfig=false             \\\n"
-"      -Dmount-path=/bin/mount      \\\n"
-"      -Drootprefix=                \\\n"
-"      -Drootlibdir=/lib            \\\n"
-"      -Dsplit-usr=true             \\\n"
-"      -Dsulogin-path=/sbin/sulogin \\\n"
-"      -Dsysusers=false             \\\n"
-"      -Dumount-path=/bin/umount    \\\n"
-"      -Db_lto=false                \\\n"
-"      -Drpmmacrosdir=no            \\\n"
+"LANG=en_US.UTF-8                    \\\n"
+"meson --prefix=/usr                 \\\n"
+"      --sysconfdir=/etc             \\\n"
+"      --localstatedir=/var          \\\n"
+"      -Dblkid=true                  \\\n"
+"      -Dbuildtype=release           \\\n"
+"      -Ddefault-dnssec=no           \\\n"
+"      -Dfirstboot=false             \\\n"
+"      -Dinstall-tests=false         \\\n"
+"      -Dkmod-path=/bin/kmod         \\\n"
+"      -Dldconfig=false              \\\n"
+"      -Dmount-path=/bin/mount       \\\n"
+"      -Drootprefix=                 \\\n"
+"      -Drootlibdir=/lib             \\\n"
+"      -Dsplit-usr=true              \\\n"
+"      -Dsulogin-path=/sbin/sulogin  \\\n"
+"      -Dsysusers=false              \\\n"
+"      -Dumount-path=/bin/umount     \\\n"
+"      -Db_lto=false                 \\\n"
+"      -Drpmmacrosdir=no             \\\n"
+"      -Dhomed=false                 \\\n"
+"      -Duserdb=false                \\\n"
+"      -Dman=true                    \\\n"
 "      ..</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
@@ -204,14 +205,11 @@ msgstr "<parameter>-D*-path=*</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:101
-#, fuzzy
 msgid ""
 "These switches provide the location of binaries needed by systemd at runtime "
 "that have not yet been installed."
 msgstr ""
-"这些开关提供了 systemd 在运行时需要的二进制程序的位置,这些程序有些尚未安"
-"装,有些的 pkgconfig 文件还在 <filename>/tools/lib/pkgconfig</filename>目录"
-"中。"
+"这些开关提供了 systemd 在运行时需要,但尚未安装的二进制程序的位置。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:107
@@ -272,11 +270,10 @@ msgstr "<parameter>-Droot*</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:143
-#, fuzzy
 msgid ""
 "These switches ensure that core programs and shared libraries are installed "
 "in subdirectories of the root partition."
-msgstr "这个开关保证核心程序和共享库被安装到 root 分区下的子目录中。"
+msgstr "这个开关保证核心程序和共享库被安装到分区下的子目录中。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:150
@@ -322,15 +319,15 @@ msgstr "该选项禁止安装用于 systemd 的 RPM 宏,因为 LFS 并不支
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:178
-#, fuzzy
 msgid "<parameter>-D{userdb,homed}=false</parameter>"
-msgstr "<parameter>-Dsysusers=false</parameter>"
+msgstr "<parameter>-D{userdb,homed}=false</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:180
 msgid ""
 "Remove two daemons that have dependencies that do not fit the scope of LFS."
 msgstr ""
+"移除两个守护程序,它们的依赖项超出了 LFS 的范围。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:187
@@ -413,12 +410,13 @@ msgid ""
 "Prevent systemd from resetting the maximum PID value which causes some "
 "problems with packages and units in BLFS:"
 msgstr ""
+"防止 systemd 重设最大 PID 值,它会导致 BLFS 中一些软件包和单元出现问题:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:218
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"adjust\">rm -f /usr/lib/sysctl.d/50-pid-max.conf</userinput>"
-msgstr "<userinput remap=\"adjust\">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput>"
+msgstr "<userinput remap=\"adjust\">rm -f /usr/lib/sysctl.d/50-pid-max.conf</userinput>"
 
 #. type: Content of: <sect1><sect2><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:223
@@ -442,7 +440,6 @@ msgstr "安装的目录"
 
 #. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:231
-#, fuzzy
 msgid ""
 "bootctl, busctl, coredumpctl, halt (symlink to systemctl), hostnamectl, "
 "init, journalctl, kernel-install, localectl, loginctl, machinectl, "
@@ -466,7 +463,7 @@ msgstr ""
 "systemctl, systemd-analyze, systemd-ask-password, systemd-cat, systemd-cgls, "
 "systemd-cgtop, systemd-delta, systemd-detect-virt, systemd-escape, systemd-"
 "hwdb, systemd-id128, systemd-inhibit, systemd-machine-id-setup, systemd-"
-"mount, systemd-notify, systemd-nspawn, systemd-path, systemd-resolve (到 "
+"mount, systemd-notify, systemd-nspawn, systemd-path, systemd-repart, systemd-resolve (到 "
 "resolvectl 的符号链接), systemd-run, systemd-socket-activate, systemd-stdio-"
 "bridge, systemd-tmpfiles, systemd-tty-ask-password-agent, systemd-umount (到 "
 "systemd-mount 的符号链接), telinit (到 systemctl 的符号链接), timedatectl, 以"
@@ -519,7 +516,6 @@ msgstr "<command>bootctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:268
-#, fuzzy
 msgid "Is used to query the firmware and boot manager settings"
 msgstr "用于查询固件和启动管理器设置"
 
@@ -535,7 +531,6 @@ msgstr "<command>busctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:278
-#, fuzzy
 msgid "Is used to introspect and monitor the D-Bus bus"
 msgstr "用于探查和监视 D-bus 总线"
 
@@ -551,7 +546,6 @@ msgstr "<command>coredumpctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:288
-#, fuzzy
 msgid "Is used to retrieve coredumps from the systemd journal"
 msgstr "用于从 systemd 日志获取核心转储"
 
@@ -589,9 +583,8 @@ msgstr "<command>hostnamectl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:312
-#, fuzzy
 msgid "Is used to query and change the system hostname and related settings"
-msgstr "查询和修改系统机器名"
+msgstr "用于查询和修改系统机器名和相关设置"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:315
@@ -605,14 +598,13 @@ msgstr "<command>init</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:323
-#, fuzzy
 msgid ""
 "Is the first process to be started when the kernel has initialized the "
 "hardware which takes over the boot process and starts all processes "
 "according to its configuration files. In this case, it starts systemd."
 msgstr ""
 "在内核初始化硬件后第一个启动的进程,它接管引导过程,并根据它的配置文件启动所"
-"有进程"
+"有进程。在本例中,它启动 systemd。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:328
@@ -626,7 +618,6 @@ msgstr "<command>journalctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:336
-#, fuzzy
 msgid "Is used to query the contents of the systemd journal"
 msgstr "用于查询 systemd 日志的内容"
 
@@ -642,11 +633,11 @@ msgstr "<command>kernel-install</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:346
-#, fuzzy
 msgid ""
 "Is used to add and remove kernel and initramfs images to and from /boot. In "
 "LFS, this is done manually."
-msgstr "用于在 /boot 中添加或删除内核和 initramfs 映像文件"
+msgstr "用于在 /boot 中添加或删除内核和 initramfs 映像文件。"
+"在 LFS 中,这项工作是手工完成的。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:349
@@ -660,7 +651,6 @@ msgstr "<command>localectl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:357
-#, fuzzy
 msgid ""
 "Is used to query and change the system locale and keyboard layout settings"
 msgstr "用于查询和修改系统 locale 和键盘布局设置"
@@ -677,7 +667,6 @@ msgstr "<command>loginctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:368
-#, fuzzy
 msgid ""
 "Is used to introspect and control the state of the systemd Login Manager"
 msgstr "用于探查和控制 systemd 登录管理器的状态"
@@ -694,7 +683,6 @@ msgstr "<command>machinectl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:379
-#, fuzzy
 msgid ""
 "Is used to introspect and control the state of the systemd Virtual Machine "
 "and Container Registration Manager"
@@ -712,11 +700,10 @@ msgstr "<command>networkctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:390
-#, fuzzy
 msgid ""
 "Is used to introspect and configure the state of the network links "
 "configured by systemd-networkd"
-msgstr "用于探查 systemd-networkd 管理的网络连接状态"
+msgstr "用于探查和配置 systemd-networkd 管理的网络连接状态"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:393
@@ -730,7 +717,6 @@ msgstr "<command>portablectl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:401
-#, fuzzy
 msgid "Is used to attach or detach portable services from the local system"
 msgstr "用于在本地系统附加或移除可移植服务"
 
@@ -746,7 +732,6 @@ msgstr "<command>poweroff</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:412
-#, fuzzy
 msgid ""
 "Instructs the kernel to halt the system and switch off the computer (see "
 "<command>halt</command>)"
@@ -764,7 +749,6 @@ msgstr "<command>reboot</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:423
-#, fuzzy
 msgid "Instructs the kernel to reboot the system (see <command>halt</command>)"
 msgstr "告诉内核重启系统 (见 <command>halt</command>)"
 
@@ -780,7 +764,6 @@ msgstr "<command>resolvconf</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:434
-#, fuzzy
 msgid ""
 "Registers DNS server and domain configuration with <command>systemd-"
 "resolved</command>"
@@ -798,7 +781,6 @@ msgstr "<command>resolvectl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:445
-#, fuzzy
 msgid ""
 "Sends control commands to the network name resolution manager, or resolves "
 "domain names, IPv4 and IPv6 addresses, DNS records, and services."
@@ -818,7 +800,6 @@ msgstr "<command>runlevel</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:457
-#, fuzzy
 msgid ""
 "Outputs the previous and the current run-level, as noted in the last run-"
 "level record in <filename>/var/run/utmp</filename>"
@@ -838,7 +819,6 @@ msgstr "<command>shutdown</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:468
-#, fuzzy
 msgid ""
 "Brings the system down in a safe and secure manner, signaling all processes "
 "and notifying all logged-in users"
@@ -856,7 +836,6 @@ msgstr "<command>systemctl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:479
-#, fuzzy
 msgid ""
 "Is used to introspect and control the state of the systemd system and "
 "service manager"
@@ -874,11 +853,10 @@ msgstr "<command>systemd-analyze</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:490
-#, fuzzy
 msgid ""
 "Is used to determine system startup performance of the current boot, as well "
 "as identify troublesome systemd units"
-msgstr "用于分析当前运行系统的引导性能"
+msgstr "用于分析当前运行系统的引导性能,找出导致问题的 systemd 单元"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:493
@@ -892,7 +870,6 @@ msgstr "<command>systemd-ask-password</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:501
-#, fuzzy
 msgid ""
 "Is used to query a system password or passphrase from the user, using a "
 "question message specified on the command line"
@@ -910,7 +887,6 @@ msgstr "<command>systemd-cat</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:512
-#, fuzzy
 msgid ""
 "Is used to connect the STDOUT and STDERR outputs of a process with the "
 "systemd journal."
@@ -964,7 +940,6 @@ msgstr "<command>systemd-delta</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:546
-#, fuzzy
 msgid ""
 "Is used to identify and compare configuration files in <filename class="
 "\"directory\">/etc</filename> that override default counterparts in "
@@ -989,6 +964,7 @@ msgid ""
 "Detects whether the system is being run in a virtual environment, and "
 "adjusts udev accordingly."
 msgstr ""
+"确定系统是否在虚拟化环境中运行,并据此调节 udev。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:561
@@ -1002,7 +978,6 @@ msgstr "<command>systemd-escape</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:569
-#, fuzzy
 msgid "Is used to escape strings for inclusion in systemd unit names"
 msgstr "用于转义字符串,以便将其包含在 systemd 单元名中"
 
@@ -1018,7 +993,6 @@ msgstr "<command>systemd-hwdb</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:580
-#, fuzzy
 msgid "Is used to manage the hardware database (hwdb)"
 msgstr "用于管理硬件数据库 (hwdb)"
 
@@ -1034,7 +1008,6 @@ msgstr "<command>systemd-id128</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:590
-#, fuzzy
 msgid "Generates and prints id128 strings"
 msgstr "生成和打印 id128 串"
 
@@ -1050,12 +1023,12 @@ msgstr "<command>systemd-inhibit</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:600
-#, fuzzy
 msgid ""
 "Is used to execute a program with a shutdown, sleep or idle inhibitor lock "
 "taken, preventing an action such as a system shutdown until the process is "
 "completed."
-msgstr "用于在关机、休眠或待机抑制锁被锁定的情况下运行程序"
+msgstr "用于在关机、休眠或待机抑制锁被锁定的情况下运行程序,在进程结束前"
+"防止关闭系统等动作。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:604
@@ -1069,7 +1042,6 @@ msgstr "<command>systemd-machine-id-setup</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:612
-#, fuzzy
 msgid ""
 "Is used by system installer tools to initialize the machine ID stored in "
 "<filename>/etc/machine-id</filename> at install time with a randomly "
@@ -1090,7 +1062,6 @@ msgstr "<command>systemd-mount</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:624
-#, fuzzy
 msgid "Is used to temporarily mount or automount disks."
 msgstr "一个用于临时挂载或自动挂载驱动器的工具。"
 
@@ -1106,7 +1077,6 @@ msgstr "<command>systemd-notify</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:634
-#, fuzzy
 msgid ""
 "Is used by daemon scripts to notify the init system about status changes"
 msgstr "被守护脚本用于通知 init 系统关于状态变化的信息"
@@ -1123,7 +1093,6 @@ msgstr "<command>systemd-nspawn</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:645
-#, fuzzy
 msgid "Is used to run a command or OS in a light-weight namespace container"
 msgstr "用于在轻量级命名空间容器中运行命令或操作系统"
 
@@ -1139,7 +1108,6 @@ msgstr "<command>systemd-path</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:656
-#, fuzzy
 msgid "Is used to query system and user paths"
 msgstr "用于查询系统和用户路径"
 
@@ -1150,22 +1118,21 @@ msgstr "systemd-path"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:664
-#, fuzzy
 msgid "<command>systemd-repart</command>"
-msgstr "<command>systemd-path</command>"
+msgstr "<command>systemd-repart</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:666
 msgid ""
 "Is used to grow and add partitions to a partition table when systemd is used "
 "in an OS image (e.g. a container)."
-msgstr ""
+msgstr "在 systemd 被作为 OS 映像使用 (例如在容器中) 时,"
+"用于在分区表中添加分区或增长分区大小。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:669
-#, fuzzy
 msgid "systemd-repart"
-msgstr "systemd-path"
+msgstr "systemd-repart"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:675
@@ -1174,11 +1141,10 @@ msgstr "<command>systemd-resolve</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:677
-#, fuzzy
 msgid ""
 "Is used to resolve domain names, IPV4 and IPv6 addresses, DNS resource "
 "records, and services"
-msgstr "用于解析域名、IPv4 和 IPv6 地址、DNS 资源记录,以及服务"
+msgstr "用于解析域名,IPv4 和 IPv6 地址,DNS 资源记录,以及服务"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:680
@@ -1192,11 +1158,11 @@ msgstr "<command>systemd-run</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:688
-#, fuzzy
 msgid ""
 "Is used to create and start a transient .service or a .scope unit and run "
 "the specified command in it. This is useful for validating systemd units."
-msgstr "用于创建一个临时的 .service 或 .scope 单元,并在其中运行指定命令"
+msgstr "用于创建一个临时的 .service 或 .scope 单元,并在其中运行指定命令。"
+"这对于验证 systemd 单元很有用。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:692
@@ -1210,11 +1176,10 @@ msgstr "<command>systemd-socket-activate</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:700
-#, fuzzy
 msgid ""
 "Is used to listen on socket devices and launch a process upon a successful "
 "connection to the socket."
-msgstr "用于监听 socket 服务,并在连接时启动进程。"
+msgstr "用于监听 socket 服务,并在 socket 成功连接时启动进程。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:703
@@ -1248,7 +1213,6 @@ msgstr "<command>systemd-umount</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:724
-#, fuzzy
 msgid "Unmounts mount points"
 msgstr "卸载挂载点"
 
@@ -1264,7 +1228,6 @@ msgstr "<command>systemd-tty-ask-password-agent</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:734
-#, fuzzy
 msgid "Is used to list and/or process pending systemd password requests"
 msgstr "列出或处理等待中的 systemd 密码请求"
 
@@ -1295,7 +1258,6 @@ msgstr "<command>timedatectl</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:756
-#, fuzzy
 msgid "Is used to query and change the system clock and its settings"
 msgstr "用于查询和修改系统时钟及其设置"
 
@@ -1311,15 +1273,14 @@ msgstr "<command>udevadm</command>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:767
-#, fuzzy
 msgid ""
 "Is a generic udev administration tool which controls the udevd daemon, "
 "provides info from the Udev hardware database, monitors uevents, waits for "
 "uevents to finish, tests udev configuration, and triggers uevents for a "
 "given device"
 msgstr ""
-"通用 udev 管理工具控制 udevd 守护进程,提供 udev 数据库的信息,监视 udev "
-"事件,等待 udev 事件结束,测试 udev 配置,或对于给定设备触发 udev 事件"
+"通用 udev 管理工具,它控制 udevd 守护进程,提供 udev 数据库的信息,监视 uevent "
+"事件,等待 uevent 事件结束,测试 udev 配置,或对于给定设备触发 uevent 事件"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:772
@@ -1333,7 +1294,6 @@ msgstr "<filename class=\"libraryfile\">libsystemd</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:780
-#, fuzzy
 msgid "Is the main systemd utility library"
 msgstr "主要的 systemd 工具库"
 
@@ -1349,7 +1309,6 @@ msgstr "<filename class=\"libraryfile\">libudev</filename>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:790
-#, fuzzy
 msgid "Is a library to access Udev device information"
 msgstr "用于访问 udev 设备信息的库"
 
@@ -1357,27 +1316,3 @@ msgstr "用于访问 udev 设备信息的库"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/systemd.xml:792
 msgid "libudev"
 msgstr "libudev"
-
-#~ msgid ""
-#~ "Because we have not yet installed the final version of Util-Linux, create "
-#~ "links to the libraries in the appropriate location:"
-#~ msgstr ""
-#~ "由于还没有安装好最终的 Util-Linux,需要在适当的位置创建指向一些库的符号链"
-#~ "接:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">for file in /tools/lib/lib{blkid,mount,uuid}."
-#~ "so*; do\n"
-#~ "    ln -sf $file /usr/lib/\n"
-#~ "done</userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">for file in /tools/lib/lib{blkid,mount,uuid}."
-#~ "so*; do\n"
-#~ "    ln -sf $file /usr/lib/\n"
-#~ "done</userinput>"
-
-#~ msgid "Cleanup symbolic links to Util-Linux libraries:"
-#~ msgstr "清理指向 Util-Linux 库的符号链接:"
-
-#~ msgid "Detects execution in a virtualized environment"
-#~ msgstr "检测系统是否在虚拟化环境下运行"

+ 3 - 4
zh_CN/chapter08/tar.po

@@ -44,6 +44,9 @@ msgid ""
 "previously created archives to extract files, to store additional files, or "
 "to update or list files which were already stored."
 msgstr ""
+"Tar 软件包提供创建 tar 归档文件,以及对归档文件进行其他操作的功能。"
+"Tar 可以对已经创建的归档文件进行提取文件,存储新文件,更新文件,"
+"或者列出文件等操作。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/tar.xml:32
@@ -89,7 +92,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/tar.xml:53
-#, fuzzy
 msgid "The meaning of the configure option:"
 msgstr "配置选项的含义:"
 
@@ -196,6 +198,3 @@ msgid ""
 "Creates, extracts files from, and lists the contents of archives, also known "
 "as tarballs"
 msgstr "创建称为 tarball 的档案文件,从档案文件中提取文件,或列出档案文件内容"
-
-#~ msgid "The Tar package contains an archiving program."
-#~ msgstr "Tar 软件包包含一个归档程序。"

+ 5 - 6
zh_CN/chapter08/texinfo.po

@@ -81,7 +81,6 @@ msgstr "<userinput remap=\"configure\">./configure --prefix=/usr --disable-stati
 
 #. type: Content of: <sect1><sect2><variablelist><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/texinfo.xml:49
-#, fuzzy
 msgid "The meaning of the configure option:"
 msgstr "配置选项的含义:"
 
@@ -185,7 +184,7 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/texinfo.xml:103
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput>pushd /usr/share/info\n"
 "  rm -v dir\n"
@@ -195,10 +194,10 @@ msgid ""
 "popd</userinput>"
 msgstr ""
 "<userinput>pushd /usr/share/info\n"
-"rm -v dir\n"
-"for f in *\n"
-"  do install-info $f dir 2&gt;/dev/null\n"
-"done\n"
+"  rm -v dir\n"
+"  for f in *\n"
+"    do install-info $f dir 2&gt;/dev/null\n"
+"  done\n"
 "popd</userinput>"
 
 #. type: Content of: <sect1><sect2><title>

+ 5 - 21
zh_CN/chapter08/util-linux.po

@@ -72,7 +72,6 @@ msgstr "安装 Util-linux"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:45
-#, fuzzy
 msgid ""
 "The FHS recommends using the <filename class=\"directory\">/var/lib/hwclock</"
 "filename> directory instead of the usual <filename class=\"directory\">/etc</"
@@ -81,8 +80,7 @@ msgid ""
 msgstr ""
 "FHS 建议使用 <filename class=\"directory\">/var/lib/hwclock</filename> 目录,"
 "而非一般的 <filename class=\"directory\">/etc</filename> 目录作为 "
-"<filename>adjtime</filename> 文件的位置。首先创建该目录,启用 "
-"<command>hwclock</command> 程序的存储功能:"
+"<filename>adjtime</filename> 文件的位置。首先创建该目录:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:51
@@ -183,7 +181,6 @@ msgstr "如果希望的话,以非 root 用户身份运行测试套件:"
 
 #. type: Content of: <sect1><sect2><warning><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:91
-#, fuzzy
 msgid ""
 "Running the test suite as the root user can be harmful to your system.  To "
 "run it, the CONFIG_SCSI_DEBUG option for the kernel must be available in the "
@@ -206,13 +203,13 @@ msgstr "<userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput>"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:101
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "<userinput remap=\"test\">chown -Rv tester .\n"
 "su tester -c \"make -k check\"</userinput>"
 msgstr ""
-"<userinput remap=\"test\">chown -Rv nobody .\n"
-"su nobody -s /bin/bash -c \"PATH=$PATH make -k check\"</userinput>"
+"<userinput remap=\"test\">chown -Rv tester .\n"
+"su tester -c \"make -k check\"</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:104
@@ -1868,7 +1865,7 @@ msgstr "<command>wall</command>"
 msgid ""
 "Displays the contents of a file or, by default, its standard input, on the "
 "terminals of all currently logged in users"
-msgstr "显示文件或标准输入(默认值)的内容到所有登录用户的终端"
+msgstr "显示文件或标准输入 (默认值) 的内容到所有登录用户的终端"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><indexterm><primary>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:1205
@@ -2023,16 +2020,3 @@ msgstr "包含为对象生成唯一标识符,使它在本地系统以外也可
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/util-linux.xml:1310
 msgid "libuuid"
 msgstr "libuuid"
-
-#~ msgid "FHS compliance notes"
-#~ msgstr "FHS 兼容性注意事项"
-
-#~ msgid "Remove the earlier created symlinks:"
-#~ msgstr "删除之前创建的符号链接:"
-
-#~ msgid ""
-#~ "<userinput remap=\"pre\">rm -vf /usr/include/{blkid,libmount,uuid}</"
-#~ "userinput>"
-#~ msgstr ""
-#~ "<userinput remap=\"pre\">rm -vf /usr/include/{blkid,libmount,uuid}</"
-#~ "userinput>"

+ 12 - 19
zh_CN/chapter08/vim.po

@@ -98,7 +98,6 @@ msgstr "<userinput remap=\"pre\">echo '#define SYS_VIMRC_FILE \"/etc/vimrc\"' &g
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:57
-#, fuzzy
 msgid "Prepare vim for compilation:"
 msgstr "准备编译 Vim:"
 
@@ -121,33 +120,31 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:65
-#, fuzzy
 msgid ""
 "To prepare the tests, ensure that user <systemitem class=\"username"
 "\">tester</systemitem> can write to the source tree:"
 msgstr ""
-"为了准备运行测试套件,需要使得 <systemitem class=\"username\">nobody</"
+"为了准备运行测试套件,需要使得 <systemitem class=\"username\">tester</"
 "systemitem> 用户拥有写入源代码目录树的权限:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:69
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">chown -Rv tester .</userinput>"
-msgstr "<userinput remap=\"test\">chown -Rv nobody .</userinput>"
+msgstr "<userinput remap=\"test\">chown -Rv tester .</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:71
-#, fuzzy
 msgid ""
 "Now run the tests as user <systemitem class=\"username\">tester</systemitem>:"
 msgstr ""
-"现在,以 <systemitem class=\"username\">nobody</systemitem> 用户运行测试:"
+"现在,以 <systemitem class=\"username\">tester</systemitem> 用户身份运行测试:"
 
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:74
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "<userinput remap=\"test\">su tester -c \"LANG=en_US.UTF-8 make -j1 test\" &amp;> vim-test.log</userinput>"
-msgstr "<userinput remap=\"test\">su nobody -s /bin/bash -c \"LANG=en_US.UTF-8 make -j1 test\" &amp;> vim-test.log</userinput>"
+msgstr "<userinput remap=\"test\">su tester -c \"LANG=en_US.UTF-8 make -j1 test\" &amp;> vim-test.log</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:76
@@ -201,7 +198,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:97
-#, fuzzy
 msgid ""
 "By default, vim's documentation is installed in <filename class=\"directory"
 "\">/usr/share/vim</filename>. The following symlink allows the documentation "
@@ -210,7 +206,7 @@ msgid ""
 "for other packages:"
 msgstr ""
 "默认情况下,Vim 的文档安装在 <filename class=\"directory\">/usr/share/vim</"
-"filename>。下面创建的符号链接允许通过 <filename class=\"directory\">/usr/"
+"filename> 中。下面创建符号链接,使得可以通过 <filename class=\"directory\">/usr/"
 "share/doc/vim-&vim-version;</filename> 访问符号链接,这个路径与其他软件包的文"
 "档位置格式一致:"
 
@@ -222,7 +218,6 @@ msgstr "<userinput remap=\"install\">ln -sv ../&vim-docdir;/doc /usr/share/doc/v
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:105
-#, fuzzy
 msgid ""
 "If an X Window System is going to be installed on the LFS system, it may be "
 "necessary to recompile vim after installing X. Vim comes with a GUI version "
@@ -258,11 +253,11 @@ msgid ""
 "overrides must come after this setting. Create a default <command>vim</"
 "command> configuration file by running the following:"
 msgstr ""
-"默认情况下,<command>vim</command> 在不兼容 vi 的模式下运行这对于过去使用"
+"默认情况下,<command>vim</command> 在不兼容 vi 的模式下运行这对于过去使用"
 "其他编辑器的用户来说可能显得陌生。以下配置包含的 <quote>nocompatible</"
 "quote> 设定是为了强调编辑器使用了新的行为这一事实。它也提醒那些想要使用 "
-"<quote>compatible</quote> 模式的用户,必须在配置文件的一开始改变模式因为它"
-"会修改其他设置,因此对这些设置的覆盖必须在设定模式后进行。执行以下命令创建"
+"<quote>compatible</quote> 模式的用户,必须在配置文件的一开始改变模式。这是因为它"
+"会修改其他设置,对这些设置的覆盖必须在设定模式后进行。执行以下命令创建"
 "默认 <command>vim</command> 配置文件:"
 
 #. type: Content of: <sect1><sect2><screen>
@@ -307,7 +302,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:149
-#, fuzzy
 msgid ""
 "The <parameter>set nocompatible</parameter> setting makes <command>vim</"
 "command> behave in a more useful way (the default) than the vi-compatible "
@@ -326,12 +320,12 @@ msgstr ""
 "<parameter>set nocompatible</parameter> 设定使得 <command>vim</command> 以一"
 "种更有用的方式 (也是默认方式) 行动,而不是兼容于 vi 的旧模式。删除其中的 "
 "<quote>no</quote> 可以保持旧的 <command>vi</command> 行为。<parameter>set "
-"backspace=2</parameter> 设定允许退格越过换行、 自动缩进和插入模式的起始位置。"
+"backspace=2</parameter> 设定允许退格越过换行,自动缩进,以及插入模式的起始位置。"
 "参数 <parameter>syntax on</parameter> 启用 vim 符号高亮功能。参数 "
 "<parameter>set mouse=</parameter> 允许在 chroot 中或通过远程连接工作时使用鼠"
 "标正确地粘贴文本。最后,<emphasis>if</emphasis> 语句为 <parameter>set "
 "background=dark</parameter> 纠正 <command>vim</command> 对于某些终端模拟器背"
-"景色的猜测这能够提供更适合这些程序黑色背景的配色方案。"
+"景色的猜测这能够提供更适合这些程序黑色背景的配色方案。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:163
@@ -348,7 +342,6 @@ msgstr "<userinput>vim -c ':options'</userinput>"
 
 #. type: Content of: <sect1><sect2><note><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/vim.xml:169
-#, fuzzy
 msgid ""
 "By default, vim only installs spell files for the English language.  To "
 "install spell files for your preferred language, download the <filename>*."

+ 4 - 1
zh_CN/fix.sh

@@ -89,7 +89,10 @@ $p
 	chapter02/hostreqs.xml                       \
 	chapter06/ncurses.xml                        \
 	chapter08/glibc.xml                          \
-	chapter08/flex.xml
+	chapter08/flex.xml                           \
+	chapter08/ninja.xml                          \
+	chapter08/texinfo.xml                        \
+	chapter08/systemd.xml
 
 # Apply lfs-l10n.xml patch, if it's not applied
 grep "Simplified Chinese" stylesheets/lfs-xsl/lfs-l10n.xml ||