Update to lfs-en @ 7cce808

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: 2023-12-01 10:29+0800\n"
+"POT-Creation-Date: 2023-12-12 18:27+0800\n"
 "PO-Revision-Date: 2022-02-11 20:04+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -64,19 +64,13 @@ msgid ""
 "packages, in addition to those on the first list, need to be available in "
 "order to run the test suites. The fourth list of dependencies are packages "
 "that require this package to be built and installed in its final location "
-"before they are built and installed. In most cases, this is because these "
-"packages will hard code paths to binaries within their scripts. If not built "
-"in a certain order, this could result in paths of /tools/bin/[binary] being "
-"placed inside scripts installed to the final system. This is obviously not "
-"desirable."
+"before they are built and installed."
 msgstr ""
 "对于我们构建的每个软件包，我们都列出了三到五种依赖关系。第一种列出了编译和安"
 "装该软件包需要的其他软件包。第二种列出了在运行该软件包提供的程序或库时必要的"
 "软件包。第三种列出了不属于第一种情况，但在运行该软件包测试套件时需要的软件"
 "包。第四种列出了在构建和安装前，需要该软件包已经构建并安装到最终位置的其他软"
-"件包。多数情况下，这是因为它们会在脚本中硬编码指向二进制程序的路径。如果不按"
-"照特定顺序构建，则最终的系统中某个脚本可能包含路径 /tools/bin/[二进制程序]，"
-"这显然是我们不希望的。"
+"件包。"
 
 #. type: Content of: <appendix><para>
 #: lfs-en/appendices/dependencies.xml
@@ -1869,21 +1863,25 @@ msgstr "Glibc, Ncurses, Readline, &systemd-udev;, 以及 Zlib"
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml
 msgid ""
+"<ulink url=\"&blfs-book;general/asciidoctor.html\">Asciidoctor</ulink>, "
 "<ulink url=\"https://people.redhat.com/sgrubb/libcap-ng/\">Libcap-NG</"
 "ulink>, <ulink url=\"&github;/openSUSE/libeconf\">libeconf</ulink>, <ulink "
 "url=\"https://pagure.io/libuser/\">libuser</ulink>, <ulink url=\"&github;/"
 "altlinux/libutempter\">libutempter</ulink>, <ulink url=\"&blfs-book;postlfs/"
 "linux-pam.html\">Linux-PAM</ulink>, <ulink url=\"&blfs-book;postlfs/"
-"smartmontools.html\">smartmontools</ulink>, and <ulink url=\"&blfs-book;"
-"general/slang.html\">slang</ulink>"
+"smartmontools.html\">smartmontools</ulink>, <ulink url=\"https://po4a.org/"
+"index.php.en\">po4a</ulink>, and <ulink url=\"&blfs-book;general/slang."
+"html\">slang</ulink>"
 msgstr ""
+"<ulink url=\"&blfs-book;general/asciidoctor.html\">Asciidoctor</ulink>, "
 "<ulink url=\"https://people.redhat.com/sgrubb/libcap-ng/\">Libcap-NG</"
 "ulink>, <ulink url=\"&github;/openSUSE/libeconf\">libeconf</ulink>, <ulink "
 "url=\"https://pagure.io/libuser/\">libuser</ulink>, <ulink url=\"&github;/"
 "altlinux/libutempter\">libutempter</ulink>, <ulink url=\"&blfs-book;postlfs/"
 "linux-pam.html\">Linux-PAM</ulink>, <ulink url=\"&blfs-book;postlfs/"
-"smartmontools.html\">smartmontools</ulink>, 以及 <ulink url=\"&blfs-book;"
-"general/slang.html\">slang</ulink>"
+"smartmontools.html\">smartmontools</ulink>, <ulink url=\"https://po4a.org/"
+"index.php.en\">po4a</ulink>, 以及 <ulink url=\"&blfs-book;general/slang."
+"html\">slang</ulink>"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/appendices/dependencies.xml lfs-en/chapter08/vim.xml

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: 2023-12-01 10:30+0800\n"
+"POT-Creation-Date: 2023-12-12 18:28+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,34 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
 msgid "Changelog Entries:"
 msgstr "更新日志记录："
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid "2023-12-04"
+msgstr "2023 年 12 月 4 日"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[thomas] - Modify commands for install Python docs to avoid too restrictive "
+"permissions on the files and dirs."
+msgstr ""
+"[thomas] — 修改安装 Python 文档的命令以避免文件和目录被赋予过于严格的权限设"
+"置。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid "2023-12-01"
+msgstr "2023 年 12 月 1 日"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[xry111] - Restore NIC naming based on physical system characteristics.  "
+"Fixes <ulink url='&lfs-ticket-root;5386'>#5386</ulink>."
+msgstr ""
+"[xry111] — 恢复基于系统物理特性的网络接口设备命名。修复 <ulink url='&lfs-"
+"ticket-root;5386'>#5386</ulink>。"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
 msgid "2023-11-30"

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-09-18 16:58+0800\n"
+"POT-Creation-Date: 2023-12-12 18:27+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -67,14 +67,14 @@ msgstr "GCC"
 #: 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/readline.xml
-#: lfs-en/chapter08/sed.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/wheel.xml
-#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml
-#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/sed.xml lfs-en/chapter08/setuptools.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/wheel.xml lfs-en/chapter08/xml-parser.xml
+#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #: lfs-en/chapter09/bootscripts.xml lfs-en/chapter10/kernel.xml
 msgid "&buildtime;"
 msgstr "&buildtime;"
@@ -125,14 +125,14 @@ msgstr "&buildtime;"
 #: 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/readline.xml
-#: lfs-en/chapter08/sed.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/wheel.xml
-#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml
-#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/sed.xml lfs-en/chapter08/setuptools.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/wheel.xml lfs-en/chapter08/xml-parser.xml
+#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #: lfs-en/chapter09/bootscripts.xml lfs-en/chapter10/kernel.xml
 msgid "&diskspace;"
 msgstr "&diskspace;"
@@ -236,13 +236,14 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 #: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
 #: lfs-en/chapter08/pkgconf.xml lfs-en/chapter08/procps.xml
 #: lfs-en/chapter08/psmisc.xml lfs-en/chapter08/python.xml
-#: lfs-en/chapter08/readline.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/xml-parser.xml
-#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/readline.xml lfs-en/chapter08/setuptools.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/xml-parser.xml lfs-en/chapter08/xz.xml
+#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #: lfs-en/chapter09/bootscripts.xml
 msgid "Install the package:"
 msgstr "安装该软件包："
@@ -407,18 +408,20 @@ msgid ""
 msgstr "在 x86_64 上构建时，修改存放 64 位库的默认路径为 <quote>lib</quote>:"
 
 #. type: Content of: <sect1><sect2><screen>
-#: lfs-en/chapter06/gcc-pass2.xml
+#: lfs-en/chapter06/gcc-pass2.xml lfs-en/chapter08/gcc.xml
 #, no-wrap
 msgid ""
 "<userinput remap=\"pre\">case $(uname -m) in\n"
 "  x86_64)\n"
-"    sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64\n"
+"    sed -e '/m64=/s/lib64/lib/' \\\n"
+"        -i.orig gcc/config/i386/t-linux64\n"
 "  ;;\n"
 "esac</userinput>"
 msgstr ""
 "<userinput remap=\"pre\">case $(uname -m) in\n"
 "  x86_64)\n"
-"    sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64\n"
+"    sed -e '/m64=/s/lib64/lib/' \\\n"
+"        -i.orig gcc/config/i386/t-linux64\n"
 "  ;;\n"
 "esac</userinput>"
 

zh_CN/chapter08/gcc.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-09-18 16:58+0800\n"
+"POT-Creation-Date: 2023-12-12 18:27+0800\n"
 "PO-Revision-Date: 2022-03-03 03:00+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -122,14 +122,14 @@ msgstr "GCC"
 #: 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/readline.xml
-#: lfs-en/chapter08/sed.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/wheel.xml
-#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml
-#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/sed.xml lfs-en/chapter08/setuptools.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/wheel.xml lfs-en/chapter08/xml-parser.xml
+#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #: lfs-en/chapter09/bootscripts.xml lfs-en/chapter10/kernel.xml
 msgid "&buildtime;"
 msgstr "&buildtime;"
@@ -180,14 +180,14 @@ msgstr "&buildtime;"
 #: 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/readline.xml
-#: lfs-en/chapter08/sed.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/wheel.xml
-#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml
-#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/sed.xml lfs-en/chapter08/setuptools.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/wheel.xml lfs-en/chapter08/xml-parser.xml
+#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #: lfs-en/chapter09/bootscripts.xml lfs-en/chapter10/kernel.xml
 msgid "&diskspace;"
 msgstr "&diskspace;"
@@ -291,13 +291,14 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 #: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
 #: lfs-en/chapter08/pkgconf.xml lfs-en/chapter08/procps.xml
 #: lfs-en/chapter08/psmisc.xml lfs-en/chapter08/python.xml
-#: lfs-en/chapter08/readline.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/xml-parser.xml
-#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/readline.xml lfs-en/chapter08/setuptools.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/xml-parser.xml lfs-en/chapter08/xz.xml
+#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #: lfs-en/chapter09/bootscripts.xml
 msgid "Install the package:"
 msgstr "安装该软件包："
@@ -478,6 +479,24 @@ msgid ""
 "libraries to <quote>lib</quote>:"
 msgstr "在 x86_64 上构建时，修改存放 64 位库的默认路径为 <quote>lib</quote>:"
 
+#. type: Content of: <sect1><sect2><screen>
+#: lfs-en/chapter06/gcc-pass2.xml lfs-en/chapter08/gcc.xml
+#, no-wrap
+msgid ""
+"<userinput remap=\"pre\">case $(uname -m) in\n"
+"  x86_64)\n"
+"    sed -e '/m64=/s/lib64/lib/' \\\n"
+"        -i.orig gcc/config/i386/t-linux64\n"
+"  ;;\n"
+"esac</userinput>"
+msgstr ""
+"<userinput remap=\"pre\">case $(uname -m) in\n"
+"  x86_64)\n"
+"    sed -e '/m64=/s/lib64/lib/' \\\n"
+"        -i.orig gcc/config/i386/t-linux64\n"
+"  ;;\n"
+"esac</userinput>"
+
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: lfs-en/chapter08/acl.xml lfs-en/chapter08/attr.xml
 #: lfs-en/chapter08/autoconf.xml lfs-en/chapter08/automake.xml
@@ -562,24 +581,6 @@ msgstr "&gcc-fin-sbu;"
 msgid "&gcc-fin-du;"
 msgstr "&gcc-fin-du;"
 
-#. type: Content of: <sect1><sect2><screen>
-#: lfs-en/chapter08/gcc.xml
-#, no-wrap
-msgid ""
-"<userinput remap=\"pre\">case $(uname -m) in\n"
-"  x86_64)\n"
-"    sed -e '/m64=/s/lib64/lib/' \\\n"
-"        -i.orig gcc/config/i386/t-linux64\n"
-"  ;;\n"
-"esac</userinput>"
-msgstr ""
-"<userinput remap=\"pre\">case $(uname -m) in\n"
-"  x86_64)\n"
-"    sed -e '/m64=/s/lib64/lib/' \\\n"
-"        -i.orig gcc/config/i386/t-linux64\n"
-"  ;;\n"
-"esac</userinput>"
-
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter08/gcc.xml
 #, no-wrap