Update to lfs-en @ 9bfd203

zh_CN/chapter01/changelog.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.0\n"
 "Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
-"POT-Creation-Date: 2024-04-02 18:17+0800\n"
+"POT-Creation-Date: 2024-04-09 16:47+0800\n"
 "PO-Revision-Date: 2022-02-05 22:45+0800\n"
 "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
 "Language-Team: none\n"
@@ -121,13 +121,13 @@ msgstr "2024 年 3 月 29 日"
 
 #. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
-msgid "[bdubbs] - Revert to xz-5.4.6 due to uptream compromise."
+msgid "[bdubbs] - Revert to xz-5.4.6 due to upstream compromise."
 msgstr "[bdubbs] — 由于上游遭到蓄意破坏，退回至 xz-5.4.6。"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
-msgid "2024-04-25"
-msgstr "2024 年 4 月 25 日"
+msgid "2024-03-25"
+msgstr "2024 年 3 月 25 日"
 
 #. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml

zh_CN/chapter08/python.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.4\n"
 "Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
-"POT-Creation-Date: 2024-03-03 18:07+0800\n"
+"POT-Creation-Date: 2024-04-09 16:46+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
 "Language-Team: none\n"
@@ -41,7 +41,7 @@ msgstr ""
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
-#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
 #: lfs-en/chapter08/meson.xml lfs-en/chapter08/mpc.xml
 #: lfs-en/chapter08/mpfr.xml lfs-en/chapter08/ncurses.xml
@@ -107,7 +107,7 @@ msgstr "Python"
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
-#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
 #: lfs-en/chapter08/markupsafe.xml lfs-en/chapter08/meson.xml
 #: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
@@ -165,7 +165,7 @@ msgstr "&buildtime;"
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
-#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
 #: lfs-en/chapter08/markupsafe.xml lfs-en/chapter08/meson.xml
 #: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
@@ -279,7 +279,7 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 #: lfs-en/chapter08/less.xml lfs-en/chapter08/libcap.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
-#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/markupsafe.xml
 #: lfs-en/chapter08/meson.xml lfs-en/chapter08/ninja.xml
 #: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
@@ -359,7 +359,7 @@ msgstr "<userinput remap=\"install\">make install</userinput>"
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
-#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/ncurses.xml
 #: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
 #: lfs-en/chapter08/perl.xml lfs-en/chapter08/pkgconf.xml
@@ -417,7 +417,7 @@ msgstr "安装的目录"
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
-#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
 #: lfs-en/chapter08/meson.xml lfs-en/chapter08/mpc.xml
 #: lfs-en/chapter08/mpfr.xml lfs-en/chapter08/ncurses.xml
@@ -479,17 +479,17 @@ msgstr "准备编译 Python："
 #: lfs-en/chapter08/iproute2.xml lfs-en/chapter08/kbd.xml
 #: lfs-en/chapter08/kmod.xml lfs-en/chapter08/less.xml
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libtool.xml
-#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/meson.xml
-#: lfs-en/chapter08/ncurses.xml lfs-en/chapter08/ninja.xml
-#: lfs-en/chapter08/openssl.xml lfs-en/chapter08/perl.xml
-#: lfs-en/chapter08/pkgconf.xml lfs-en/chapter08/procps.xml
-#: lfs-en/chapter08/psmisc.xml lfs-en/chapter08/python.xml
-#: lfs-en/chapter08/shadow.xml lfs-en/chapter08/sysklogd.xml
-#: lfs-en/chapter08/systemd.xml lfs-en/chapter08/sysvinit.xml
-#: lfs-en/chapter08/tar.xml lfs-en/chapter08/tcl.xml
-#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/udev.xml
-#: lfs-en/chapter08/util-linux.xml lfs-en/chapter08/vim.xml
-#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/man-db.xml
+#: lfs-en/chapter08/meson.xml lfs-en/chapter08/ncurses.xml
+#: lfs-en/chapter08/ninja.xml lfs-en/chapter08/openssl.xml
+#: lfs-en/chapter08/perl.xml lfs-en/chapter08/pkgconf.xml
+#: lfs-en/chapter08/procps.xml lfs-en/chapter08/psmisc.xml
+#: lfs-en/chapter08/python.xml lfs-en/chapter08/shadow.xml
+#: lfs-en/chapter08/sysklogd.xml lfs-en/chapter08/systemd.xml
+#: lfs-en/chapter08/sysvinit.xml lfs-en/chapter08/tar.xml
+#: lfs-en/chapter08/tcl.xml lfs-en/chapter08/texinfo.xml
+#: lfs-en/chapter08/udev.xml lfs-en/chapter08/util-linux.xml
+#: lfs-en/chapter08/vim.xml lfs-en/chapter08/xz.xml lfs-en/chapter08/zstd.xml
 msgid "Installed programs"
 msgstr "安装的程序"
 
@@ -500,9 +500,10 @@ msgstr "安装的程序"
 #: lfs-en/chapter08/file.xml lfs-en/chapter08/kmod.xml
 #: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
-#: lfs-en/chapter08/pkgconf.xml lfs-en/chapter08/procps.xml
-#: lfs-en/chapter08/python.xml lfs-en/chapter08/tcl.xml
-#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/pkgconf.xml
+#: lfs-en/chapter08/procps.xml lfs-en/chapter08/python.xml
+#: lfs-en/chapter08/tcl.xml lfs-en/chapter08/texinfo.xml
+#: lfs-en/chapter08/zstd.xml
 msgid "Installed library"
 msgstr "安装的库"
 
@@ -576,14 +577,41 @@ msgstr ""
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/python.xml
 msgid ""
-"Running the tests at this point is not recommended.  The tests are known to "
-"hang indefinitely in the partial LFS environment.  If desired, the tests can "
-"be rerun at the end of this chapter, or when Python 3 is reinstalled in "
-"BLFS.  To run the tests anyway, issue <command>make test</command>."
+"Some tests are known to occasionally hang indefinitely.  So to test the "
+"results, run the test suite but set a 2-minute time limit for each test case:"
+msgstr ""
+"已知一些测试偶尔会陷入无限等待状态。因此如果需要测试编译结果，运行测试套件，"
+"但是将每个单项测试的最长运行时间限制为 2 分钟："
+
+#. type: Content of: <sect1><sect2><screen>
+#: lfs-en/chapter08/python.xml
+#, no-wrap
+msgid "<userinput remap=\"test\">make test TESTOPTS=\"--timeout 120\"</userinput>"
+msgstr "<userinput remap=\"test\">make test TESTOPTS=\"--timeout 120\"</userinput>"
+
+#. type: Content of: <sect1><sect2><para>
+#: lfs-en/chapter08/python.xml
+msgid ""
+"For a relatively slow system you may need to increase the time limit and 1 "
+"SBU (measured when building Binutils pass 1 with one CPU core) should be "
+"enough.  Some tests are flaky, so the test suite will automatically re-run "
+"failed tests.  If a test failed but then passed when re-run, it should be "
+"considered as passed."
+msgstr ""
+"对于较慢的系统，您可能需要放宽运行时间限制，1 SBU (通过仅用单个 CPU 核心构建"
+"第一遍的 Binutils 测得) 一般来说是足够的。一些测试并不精确，因此测试套件会自"
+"动重新运行失败的测试。如果某项测试失败后在重新运行时能够通过，则应该将其视为"
+"正常通过。"
+
+#. type: Content of: <sect1><sect2><para>
+#: lfs-en/chapter08/python.xml
+msgid ""
+"Two tests named <filename>test_xml_etree</filename> and "
+"<filename>test_xml_etree_c</filename> are known to fail with expat-2.6.0 or "
+"newer."
 msgstr ""
-"不建议在此时运行测试。在不完整的 LFS 环境中，测试可能会永远陷入等待状态。如果"
-"希望运行测试，可以在本章结束时，或者在 BLFS 中重新安装 Python 3 时再运行测"
-"试。如果一定要进行测试，运行 <command>make test</command>。"
+"已知 <filename>test_xml_etree</filename> 和 <filename>test_xml_etree_c</"
+"filename> 这两项测试在使用 expat-2.6.0 或更新版本时会失败。"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/python.xml

zh_CN/chapter08/util-linux.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.0\n"
 "Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
-"POT-Creation-Date: 2024-04-02 18:09+0800\n"
+"POT-Creation-Date: 2024-04-09 16:46+0800\n"
 "PO-Revision-Date: 2021-07-28 12:48+0800\n"
 "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
 "Language-Team: none\n"
@@ -618,8 +618,12 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/util-linux.xml
-msgid "If desired, run the test suite as a non-&root; user:"
-msgstr "如果希望的话，以非 &root; 用户身份运行测试套件："
+msgid ""
+"If desired, create a dummy <filename>/etc/fstab</filename> file to satisfy "
+"two tests and run the test suite as a non-&root; user:"
+msgstr ""
+"如果希望进行测试，创建 <filename>/etc/fstab</filename> 文件以满足两项测试的要"
+"求，并以非 &root; 用户身份运行测试套件："
 
 #. type: Content of: <sect1><sect2><warning><para>
 #: lfs-en/chapter08/util-linux.xml
@@ -648,10 +652,12 @@ msgstr "<userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput>"
 #: lfs-en/chapter08/util-linux.xml
 #, no-wrap
 msgid ""
-"<userinput remap=\"test\">chown -R tester .\n"
+"<userinput remap=\"test\">touch /etc/fstab\n"
+"chown -R tester .\n"
 "su tester -c \"make -k check\"</userinput>"
 msgstr ""
-"<userinput remap=\"test\">chown -R tester .\n"
+"<userinput remap=\"test\">touch /etc/fstab\n"
+"chown -R tester .\n"
 "su tester -c \"make -k check\"</userinput>"
 
 #. type: Content of: <sect1><sect2><para>

zh_CN/part3intro/generalinstructions.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.4\n"
 "Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
-"POT-Creation-Date: 2023-09-18 16:58+0800\n"
+"POT-Creation-Date: 2024-04-09 16:46+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
 "Language-Team: none\n"
@@ -193,12 +193,12 @@ msgstr ""
 msgid ""
 "Do not use any method except the <command>tar</command> command to extract "
 "the source code. Notably, using the <command>cp -R</command> command to copy "
-"the source code tree somewhere else can destroy links and timestamps in the "
-"source tree, and cause the build to fail."
+"the source code tree somewhere else can destroy timestamps in the source "
+"tree, and cause the build to fail."
 msgstr ""
 "除了使用 <command>tar</command> 命令解压源码包外，不要使用其他任何将源代码目"
 "录树置入工作目录的方法。特别需要注意的是，使用 <command>cp -R</command> 从其"
-"他位置复制源代码目录树会破坏其中的链接和时间戳，并导致构建失败。"
+"他位置复制源代码目录树会破坏其中的时间戳，从而导致构建失败。"
 
 #. type: Content of: <sect1><itemizedlist><listitem><important><orderedlist><listitem><orderedlist><listitem><para>
 #: lfs-en/part3intro/generalinstructions.xml