Update to lfs-en @ 32c050c

Closes #39.
xry111 · May 22, 2024 · 467abd4 · 467abd4
1 parent fbbfc1b
commit 467abd4
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 46 deletions.
diff --git a/lfs-en b/lfs-en
diff --git a/zh_CN/appendices/dependencies.po b/zh_CN/appendices/dependencies.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2024-05-12 21:27+0800\n"
+"POT-Creation-Date: 2024-05-22 16:24+0800\n"
 "PO-Revision-Date: 2022-02-11 20:04+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -697,12 +697,10 @@ msgstr "GCC"
 #: lfs-en/appendices/dependencies.xml
 msgid ""
 "Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, Gettext, Glibc, "
-"GMP, Grep, Libxcrypt, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar, Texinfo, "
-"and Zstd"
+"GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar, Texinfo, and Zstd"
 msgstr ""
 "Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, Gettext, Glibc, "
-"GMP, Grep, Libxcrypt, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar, Texinfo, 以"
-"及 Zstd"
+"GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar, Texinfo, 以及 Zstd"
 
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml
@@ -1209,8 +1207,8 @@ msgstr ""
 
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml
-msgid "GCC, Perl, Python, Shadow, and &systemd-udev;"
-msgstr "GCC, Perl, Python, Shadow, 以及 &systemd-udev;"
+msgid "Perl, Python, Shadow, and &systemd-udev;"
+msgstr "Perl, Python, Shadow, 以及 &systemd-udev;"
 
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml

diff --git a/zh_CN/chapter01/changelog.po b/zh_CN/chapter01/changelog.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2024-05-13 18:34+0800\n"
+"POT-Creation-Date: 2024-05-22 16:24+0800\n"
 "PO-Revision-Date: 2022-02-05 22:45+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -46,6 +46,21 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
 msgid "Changelog Entries:"
 msgstr "更新日志记录："
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid "2024-05-13"
+msgstr "2024 年 5 月 13 日"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[xry111] - Synchronize coreutils i18n patch from Fedora to fix a build "
+"failure on 32-bit x86 and an alarming compiler warning on both 32-bit x86 "
+"and x86_64 with GCC 14.1 or later."
+msgstr ""
+"[xry111] — 从 Fedora 同步 coreutils 国际化补丁，以解决在 32 位 x86 系统构建失"
+"败和在 32 位 x86 和 x86_64 都会出现且令人不安的编译警告。"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
 msgid "2024-05-11"

diff --git a/zh_CN/chapter02/creatingfilesystem.po b/zh_CN/chapter02/creatingfilesystem.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-09-18 16:58+0800\n"
+"POT-Creation-Date: 2024-05-22 16:24+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -94,14 +94,14 @@ msgstr ""
 #. type: Content of: <sect1><para>
 #: lfs-en/chapter02/creatingfilesystem.xml
 msgid ""
-"Other file systems, including FAT32, NTFS, ReiserFS, JFS, and XFS are useful "
-"for specialized purposes. More information about these file systems, and "
-"many others, can be found at <ulink url=\"https://en.wikipedia.org/wiki/"
+"Other file systems, including FAT32, NTFS, JFS, and XFS are useful for "
+"specialized purposes. More information about these file systems, and many "
+"others, can be found at <ulink url=\"https://en.wikipedia.org/wiki/"
 "Comparison_of_file_systems\"/>."
 msgstr ""
-"其他文件系统，包括 FAT32, NTFS, ReiserFS, JFS 和 XFS 在特定场合也很有用。关于"
-"它们和其他文件系统的更多信息可以在 <ulink url=\"https://en.wikipedia.org/"
-"wiki/Comparison_of_file_systems\"/> 找到。"
+"其他文件系统，包括 FAT32, NTFS, JFS 和 XFS 在特定场合也很有用。关于它们和其他"
+"文件系统的更多信息可以在 <ulink url=\"https://en.wikipedia.org/wiki/"
+"Comparison_of_file_systems\"/> 找到。"
 
 #. type: Content of: <sect1><para>
 #: lfs-en/chapter02/creatingfilesystem.xml

diff --git a/zh_CN/chapter06/gcc-pass2.po b/zh_CN/chapter06/gcc-pass2.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-12-12 18:27+0800\n"
+"POT-Creation-Date: 2024-05-22 16:24+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -58,7 +58,7 @@ msgstr "GCC"
 #: 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
@@ -116,7 +116,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
@@ -216,11 +216,12 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 #: lfs-en/chapter08/bc.xml lfs-en/chapter08/binutils.xml
 #: lfs-en/chapter08/bison.xml lfs-en/chapter08/check.xml
 #: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/dbus.xml
-#: lfs-en/chapter08/diffutils.xml lfs-en/chapter08/e2fsprogs.xml
-#: lfs-en/chapter08/expat.xml lfs-en/chapter08/expect.xml
-#: lfs-en/chapter08/file.xml lfs-en/chapter08/findutils.xml
-#: lfs-en/chapter08/flex.xml lfs-en/chapter08/flit-core.xml
-#: lfs-en/chapter08/gawk.xml lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml
+#: lfs-en/chapter08/dejagnu.xml lfs-en/chapter08/diffutils.xml
+#: lfs-en/chapter08/e2fsprogs.xml lfs-en/chapter08/expat.xml
+#: lfs-en/chapter08/expect.xml lfs-en/chapter08/file.xml
+#: lfs-en/chapter08/findutils.xml lfs-en/chapter08/flex.xml
+#: lfs-en/chapter08/flit-core.xml lfs-en/chapter08/gawk.xml
+#: lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml
 #: lfs-en/chapter08/gettext.xml lfs-en/chapter08/glibc.xml
 #: lfs-en/chapter08/gperf.xml lfs-en/chapter08/grep.xml
 #: lfs-en/chapter08/groff.xml lfs-en/chapter08/grub.xml
@@ -230,7 +231,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
@@ -311,7 +312,7 @@ msgstr "该软件包的详细信息在<xref linkend=\"contents-gcc\"/>可以找
 #: 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
@@ -529,19 +530,19 @@ msgstr "<parameter>--target=$LFS_TGT</parameter>"
 msgid ""
 "We are cross-compiling GCC, so it's impossible to build target libraries "
 "(<filename class=\"libraryfile\">libgcc</filename> and <filename "
-"class=\"libraryfile\">libstdc++</filename>) with the previously compiled GCC "
-"binaries&mdash;those binaries won't run on the host.  The GCC build system "
-"will attempt to use the host's C and C++ compilers as a workaround by "
+"class=\"libraryfile\">libstdc++</filename>) with the GCC binaries compiled "
+"in this pass&mdash;those binaries won't run on the host.  The GCC build "
+"system will attempt to use the host's C and C++ compilers as a workaround by "
 "default.  Building the GCC target libraries with a different version of GCC "
 "is not supported, so using the host's compilers may cause the build to fail. "
 "This parameter ensures the libraries are built by GCC pass 1."
 msgstr ""
-"我们正在交叉编译 GCC，因此不可能用编译得到的 GCC 二进制程序构建用于目标系统的"
-"运行库 (<filename class=\"libraryfile\">libgcc</filename> 和 <filename "
-"class=\"libraryfile\">libstdc++</filename>) —— 这些二进制程序无法在宿主系统运"
-"行。GCC 构建系统在默认情况下会试图使用宿主系统提供的 C 和 C++ 编译器来绕过这"
-"个问题。但是，用不同版本的 GCC 构建 GCC 运行库不受支持，所以使用宿主系统的编"
-"译器可能导致构建失败。该选项保证使用第一遍构建的 GCC 编译运行库。"
+"我们正在交叉编译 GCC，因此无法使用这一遍构建的 GCC 二进制程序 —— 它们无法在宿"
+"主系统运行 —— 为目标系统构建运行库 (<filename class=\"libraryfile\">libgcc</"
+"filename> 和 <filename class=\"libraryfile\">libstdc++</filename>)。GCC 构建"
+"系统在默认情况下会试图使用宿主系统提供的 C 和 C++ 编译器来绕过这个问题。但"
+"是，用不同版本的 GCC 构建 GCC 运行库不受支持，所以使用宿主系统的编译器可能导"
+"致构建失败。该选项保证使用第一遍构建的 GCC 编译运行库。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: lfs-en/chapter06/gcc-pass2.xml
@@ -569,15 +570,13 @@ msgstr "<parameter>--disable-libsanitizer</parameter>"
 #: lfs-en/chapter06/gcc-pass2.xml
 msgid ""
 "Disable GCC sanitizer runtime libraries.  They are not needed for the "
-"temporary installation.  This switch is necessary to build GCC without "
-"<systemitem class='library'>libcrypt</systemitem> installed for the target.  "
-"In <xref linkend='ch-tools-gcc-pass1'/> it was implied by <parameter>--"
-"disable-libstdcxx</parameter>, but now we have to explicitly pass it."
+"temporary installation.  In <xref linkend='ch-tools-gcc-pass1'/> it was "
+"implied by <parameter>--disable-libstdcxx</parameter>, and now we can "
+"explicitly pass it."
 msgstr ""
-"禁用 GCC 清理检查运行库。它们对于临时安装的 GCC 并不必要。为了在没有为目标安"
-"装 <systemitem class='library'>libcrypt</systemitem> 的情况下构建 GCC，必须使"
-"用该选项。在 <xref linkend='ch-tools-gcc-pass1'/> 中，<parameter>--disable-"
-"libstdcxx</parameter> 隐式地指定了该选项，但这里我们必须显式指定它。"
+"禁用 GCC 清理检查运行库。临时性安装 GCC 不需要它们。在 <xref linkend='ch-"
+"tools-gcc-pass1'/> 中，<parameter>--disable-libstdcxx</parameter> 隐含了该选"
+"项，这里我们可以显式指定它。"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter06/gcc-pass2.xml

diff --git a/zh_CN/chapter09/symlinks.po b/zh_CN/chapter09/symlinks.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-12-22 18:23+0800\n"
+"POT-Creation-Date: 2024-05-22 16:24+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -239,11 +239,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<userinput>sed -e '/^AlternativeNamesPolicy/s/=.*$/=/'  \\\n"
-"    -i /usr/lib/udev/network/99-default.link \\\n"
+"       /usr/lib/udev/network/99-default.link \\\n"
 "     > /etc/udev/network/99-default.link</userinput>"
 msgstr ""
 "<userinput>sed -e '/^AlternativeNamesPolicy/s/=.*$/=/'  \\\n"
-"    -i /usr/lib/udev/network/99-default.link \\\n"
+"       /usr/lib/udev/network/99-default.link \\\n"
 "     > /etc/udev/network/99-default.link</userinput>"
 
 #. type: Content of: <sect1><sect2><title>