Update to lfs-en @ 96026a1

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-02-02 19:05+0800\n"
+"POT-Creation-Date: 2024-02-14 17:01+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,97 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
 msgid "Changelog Entries:"
 msgstr "更新日志记录："
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid "2024-02-12"
+msgstr "2024 年 2 月 12 日"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to shadow-4.14.4.  Fixes <ulink url='&lfs-ticket-"
+"root;5437'>#5437</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 shadow-4.14.4。修复 <ulink url='&lfs-ticket-"
+"root;5437'>#5437</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to setuptools-69.1.0 (Python module).  Fixes <ulink "
+"url='&lfs-ticket-root;5439'>#5439</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 setuptools-69.1.0 (Python 模块)。修复 <ulink url='&lfs-"
+"ticket-root;5439'>#5439</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to python-3.12.2.  Fixes <ulink url='&lfs-ticket-"
+"root;5434'>#5434</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 python-3.12.2。修复 <ulink url='&lfs-ticket-"
+"root;5434'>#5434</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to pkgconf-2.1.1.  Fixes <ulink url='&lfs-ticket-"
+"root;5432'>#5432</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 pkgconf-2.1.1。修复 <ulink url='&lfs-ticket-"
+"root;5432'>#5432</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to MarkupSafe-2.1.5 (Python module).  Fixes <ulink "
+"url='&lfs-ticket-root;5431'>#5431</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 MarkupSafe-2.1.5 (Python 模块)。修复 <ulink url='&lfs-"
+"ticket-root;5431'>#5431</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to man-pages-6.06.  Fixes <ulink url='&lfs-ticket-"
+"root;5438'>#5438</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 man-pages-6.06。修复 <ulink url='&lfs-ticket-"
+"root;5438'>#5438</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to expat-2.6.0.  Fixes <ulink url='&lfs-ticket-"
+"root;5435'>#5435</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 expat-2.6.0。修复 <ulink url='&lfs-ticket-"
+"root;5435'>#5435</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to linux-6.7.4.  Fixes <ulink url='&lfs-ticket-"
+"root;5433'>#5433</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 linux-6.7.4。修复 <ulink url='&lfs-ticket-"
+"root;5433'>#5433</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid "2024-02-10"
+msgstr "2024 年 2 月 10 日"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[xry111] - Fix a bug in systemd breaking running systemd-analyze on an "
+"instantiated systemd unit."
+msgstr ""
+"[xry111] — 修复 systemd 中使用 systemd-analyze 分析实例化的 systemd 单元时出"
+"现的问题。"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
 msgid "2024-02-02"

zh_CN/chapter01/whatsnew.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-02-02 19:05+0800\n"
+"POT-Creation-Date: 2024-02-14 17:00+0800\n"
 "PO-Revision-Date: 2021-11-05 23:31+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -77,6 +77,11 @@ msgstr "Coreutils-&coreutils-version;"
 msgid "D-Bus-&dbus-version;"
 msgstr "D-Bus-&dbus-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/expat.xml
+msgid "Expat-&expat-version;"
+msgstr "Expat-&expat-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/gawk.xml
 #: lfs-en/chapter08/gawk.xml
@@ -151,6 +156,11 @@ msgstr "Linux-&linux-version;"
 msgid "Man-DB-&man-db-version;"
 msgstr "Man-DB-&man-db-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/man-pages.xml
+msgid "Man-pages-&man-pages-version;"
+msgstr "Man-pages-&man-pages-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/markupsafe.xml
 msgid "MarkupSafe-&markupsafe-version;"
@@ -199,6 +209,11 @@ msgstr "Procps-ng-&procps-ng-version;"
 msgid "Python-&python-version;"
 msgstr "Python-&python-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/setuptools.xml
+msgid "Setuptools-&setuptools-version;"
+msgstr "Setuptools-&setuptools-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/shadow.xml
 msgid "Shadow-&shadow-version;"
@@ -264,18 +279,18 @@ msgstr "&bash-upstream-fixes-patch;"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
-msgid "setuptools-&setuptools-version;"
-msgstr "setuptools-&setuptools-version;"
+msgid "&readline-fixes-patch;"
+msgstr "&readline-fixes-patch;"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
-msgid "&pkgconf-upstream-fix-patch;"
-msgstr "&pkgconf-upstream-fix-patch;"
+msgid "setuptools-&setuptools-version;"
+msgstr "setuptools-&setuptools-version;"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
-msgid "&readline-fixes-patch;"
-msgstr "&readline-fixes-patch;"
+msgid "&systemd-upstream-patch;"
+msgstr "&systemd-upstream-patch;"
 
 #. type: Content of: <sect1><itemizedlist><title>
 #: lfs-en/chapter01/whatsnew.xml

zh_CN/chapter03/patches.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-02-02 19:05+0800\n"
+"POT-Creation-Date: 2024-02-14 17:00+0800\n"
 "PO-Revision-Date: 2022-01-16 00:53+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -115,24 +115,6 @@ msgstr "下载地址：<ulink url=\"&patches-root;&kbd-backspace-patch;\"/>"
 msgid "MD5 sum: <literal>&kbd-backspace-patch-md5;</literal>"
 msgstr "MD5 校验和：<literal>&kbd-backspace-patch-md5;</literal>"
 
-#. type: Content of: <sect1><variablelist><varlistentry><term>
-#: lfs-en/chapter03/patches.xml
-msgid ""
-"Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</"
-"token>:"
-msgstr ""
-"Pkgconf 上游修复补丁 - <token>&pkgconf-upstream-fix-patch-size;</token>:"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: lfs-en/chapter03/patches.xml
-msgid "Download: <ulink url=\"&patches-root;&pkgconf-upstream-fix-patch;\"/>"
-msgstr "下载地址：<ulink url=\"&patches-root;&pkgconf-upstream-fix-patch;\"/>"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: lfs-en/chapter03/patches.xml
-msgid "MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal>"
-msgstr "MD5 校验和：<literal>&pkgconf-upstream-fix-patch-md5;</literal>"
-
 #. type: Content of: <sect1><variablelist><varlistentry><term>
 #: lfs-en/chapter03/patches.xml
 msgid ""
@@ -167,6 +149,22 @@ msgstr "下载地址：<ulink url=\"&patches-root;&sysvinit-consolidated-patch;\
 msgid "MD5 sum: <literal>&sysvinit-consolidated-patch-md5;</literal>"
 msgstr "MD5 校验和：<literal>&sysvinit-consolidated-patch-md5;</literal>"
 
+#. type: Content of: <sect1><variablelist><varlistentry><term>
+#: lfs-en/chapter03/patches.xml
+msgid ""
+"Systemd Upstream Fixes Patch - <token>&systemd-upstream-patch-size;</token>:"
+msgstr "Systemd 上游修复补丁 - <token>&systemd-upstream-patch-size;</token>:"
+
+#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
+#: lfs-en/chapter03/patches.xml
+msgid "Download: <ulink url=\"&patches-root;&systemd-upstream-patch;\"/>"
+msgstr "下载地址：<ulink url=\"&patches-root;&systemd-upstream-patch;\"/>"
+
+#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
+#: lfs-en/chapter03/patches.xml
+msgid "MD5 sum: <literal>&systemd-upstream-patch-md5;</literal>"
+msgstr "MD5 校验和：<literal>&systemd-upstream-patch-md5;</literal>"
+
 #. type: Content of: <sect1><para>
 #: lfs-en/chapter03/patches.xml
 msgid "Total size of these patches: about <returnvalue/>"

zh_CN/chapter07/kernfs.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-11-24 11:47+0800\n"
+"POT-Creation-Date: 2024-02-14 17:00+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -113,30 +113,76 @@ msgstr "挂载虚拟内核文件系统"
 msgid "Now mount the remaining virtual kernel file systems:"
 msgstr "现在挂载其余的虚拟内核文件系统："
 
+#.  Do not put any option after $LFS/${mountpoint} or jhalfs cannot
+#.            handle it! 
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter07/kernfs.xml
 #, no-wrap
 msgid ""
-"<userinput>mount -v --bind /dev/pts $LFS/dev/pts\n"
+"<userinput>mount -vt devpts devpts -o gid=5,mode=0620 $LFS/dev/pts\n"
 "mount -vt proc proc $LFS/proc\n"
 "mount -vt sysfs sysfs $LFS/sys\n"
 "mount -vt tmpfs tmpfs $LFS/run</userinput>"
 msgstr ""
-"<userinput>mount -v --bind /dev/pts $LFS/dev/pts\n"
+"<userinput>mount -vt devpts devpts -o gid=5,mode=0620 $LFS/dev/pts\n"
 "mount -vt proc proc $LFS/proc\n"
 "mount -vt sysfs sysfs $LFS/sys\n"
 "mount -vt tmpfs tmpfs $LFS/run</userinput>"
 
+#. type: Content of: <sect1><sect2><variablelist><title>
+#: lfs-en/chapter07/kernfs.xml
+msgid "The meaning of the mount options for devpts:"
+msgstr "devpts 文件系统挂载选项的含义："
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: lfs-en/chapter07/kernfs.xml
+msgid "<parameter>gid=5</parameter>"
+msgstr "<parameter>gid=5</parameter>"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: lfs-en/chapter07/kernfs.xml
+msgid ""
+"This ensures that all devpts-created device nodes are owned by group ID 5.  "
+"This is the ID we will use later on for the <systemitem "
+"class=\"groupname\">tty</systemitem> group.  We use the group ID instead of "
+"a name, since the host system might use a different ID for its <systemitem "
+"class=\"groupname\">tty</systemitem> group."
+msgstr ""
+"该选项使得所有通过 devpts 文件系统创建的设备节点属于编号为 5 的组。我们将会"
+"为 <systemitem class='groupname'>tty</systemitem> 组分配这个编号。因为宿主系"
+"统可能为 <systemitem class='groupname'>tty</systemitem> 组分配不同的编号，此"
+"处指定组编号而不是组名。"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: lfs-en/chapter07/kernfs.xml
+msgid "<parameter>mode=0620</parameter>"
+msgstr "<parameter>mode=0620</parameter>"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: lfs-en/chapter07/kernfs.xml
+msgid ""
+"This ensures that all devpts-created device nodes have mode 0620 (user "
+"readable and writable, group writable).  Together with the option above, "
+"this ensures that devpts will create device nodes that meet the requirements "
+"of grantpt(), meaning the Glibc <command>pt_chown</command> helper binary "
+"(which is not installed by default) is not necessary."
+msgstr ""
+"该选项使得所有通过 devpts 创建的设备节点的权限模式为 0620 (所属用户可读写，所"
+"属组可写)。该选项和前一选项共同保证 devpts 创建的设备节点符合 grantpt() 函数"
+"的要求，这样就不需要 Glibc 的 <command>pt_chown</command> 辅助程序 (默认不会"
+"安装该程序)。"
+
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter07/kernfs.xml
 msgid ""
-"In some host systems, <filename>/dev/shm</filename> is a symbolic link to "
-"<filename class=\"directory\">/run/shm</filename>.  The /run tmpfs was "
-"mounted above so in this case only a directory needs to be created."
+"In some host systems, <filename>/dev/shm</filename> is a symbolic link to a "
+"directory, typically <filename class=\"directory\">/run/shm</filename>.  "
+"The /run tmpfs was mounted above so in this case only a directory needs to "
+"be created with the correct permissions."
 msgstr ""
-"在某些宿主系统上，<filename>/dev/shm</filename> 是一个指向 <filename "
-"class=\"directory\">/run/shm</filename> 的符号链接。我们已经在 /run 下挂载了 "
-"tmpfs 文件系统，因此在这里只需要创建一个目录。"
+"在某些宿主系统上，<filename>/dev/shm</filename> 是一个符号链接，通常指向 "
+"<filename class=\"directory\">/run/shm</filename> 目录。我们已经在 /run 下挂"
+"载了 tmpfs 文件系统，因此在这里只需要创建一个访问权限符合要求的目录。"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter07/kernfs.xml
@@ -155,13 +201,13 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<userinput>if [ -h $LFS/dev/shm ]; then\n"
-"  (cd $LFS/dev; mkdir $(readlink shm))\n"
+"  install -v -d -m 1777 $LFS$(realpath /dev/shm)\n"
 "else\n"
 "  mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm\n"
 "fi</userinput>"
 msgstr ""
 "<userinput>if [ -h $LFS/dev/shm ]; then\n"
-"  (cd $LFS/dev; mkdir $(readlink shm))\n"
+"  install -v -d -m 1777 $LFS$(realpath /dev/shm)\n"
 "else\n"
 "  mount -vt tmpfs -o nosuid,nodev tmpfs $LFS/dev/shm\n"
 "fi</userinput>"

zh_CN/chapter08/bash.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: 2024-02-02 19:05+0800\n"
+"POT-Creation-Date: 2024-02-14 17:00+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -589,15 +589,15 @@ msgstr ""
 #: lfs-en/chapter08/bash.xml
 #, no-wrap
 msgid ""
-"<userinput remap=\"test\">su -s /usr/bin/expect tester &lt;&lt; EOF\n"
+"<userinput remap=\"test\">su -s /usr/bin/expect tester &lt;&lt; \"EOF\"\n"
 "set timeout -1\n"
 "spawn make tests\n"
 "expect eof\n"
 "lassign [wait] _ _ _ value\n"
 "exit $value\n"
 "EOF</userinput>"
 msgstr ""
-"<userinput remap=\"test\">su -s /usr/bin/expect tester &lt;&lt; EOF\n"
+"<userinput remap=\"test\">su -s /usr/bin/expect tester &lt;&lt; \"EOF\"\n"
 "set timeout -1\n"
 "spawn make tests\n"
 "expect eof\n"