Skip to content

Commit

Permalink
Update to lfs-en @ e2d3b4b
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Mar 14, 2024
1 parent 1222162 commit 95fda05
Show file tree
Hide file tree
Showing 9 changed files with 220 additions and 74 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from c30194 to e2d3b4
106 changes: 105 additions & 1 deletion zh_CN/chapter01/changelog.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-03-03 18:08+0800\n"
"POT-Creation-Date: 2024-03-14 22:43+0800\n"
"PO-Revision-Date: 2022-02-05 22:45+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -46,6 +46,110 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-03-15"
msgstr "2024 年 3 月 15 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to wheel-0.43.0. Fixes <ulink url='&lfs-ticket-"
"root;5459'>#5459</ulink>."
msgstr ""
"[bdubbs] — 更新到 wheel-0.43.0。修复 <ulink url='&lfs-ticket-"
"root;5459'>#5459</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to setuptools-69.2.0 (Python module). Fixes <ulink "
"url='&lfs-ticket-root;5462'>#5462</ulink>."
msgstr ""
"[bdubbs] — 更新到 setuptools-69.2.0 (Python 模块)。修复 <ulink url='&lfs-"
"ticket-root;5462'>#5462</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to meson-1.4.0. Fixes <ulink url='&lfs-ticket-"
"root;5460'>#5460</ulink>."
msgstr ""
"[bdubbs] — 更新到 meson-1.4.0。修复 <ulink url='&lfs-ticket-"
"root;5460'>#5460</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to expat-2.6.2 (Security fix). Fixes <ulink url='&lfs-"
"ticket-root;5461'>#5461</ulink>."
msgstr ""
"[bdubbs] — 更新到 expat-2.6.2 (修复安全问题)。修复 <ulink url='&lfs-ticket-"
"root;5461'>#5461</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to iana-etc-20240305. Addresses <ulink url='&lfs-ticket-"
"root;5006'>#5006</ulink>."
msgstr ""
"[bdubbs] — 更新到 iana-etc-20240305。处理 <ulink url='&lfs-ticket-"
"root;5006'>#5006</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to vim-9.1.0161. Addresses <ulink url='&lfs-ticket-"
"root;4500'>#4500</ulink>."
msgstr ""
"[bdubbs] — 更新到 vim-9.1.0161。处理 <ulink url='&lfs-ticket-"
"root;4500'>#4500</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to xz-5.6.1. Fixes <ulink url='&lfs-ticket-"
"root;5457'>#5457</ulink>."
msgstr ""
"[bdubbs] — 更新到 xz-5.6.1。修复 <ulink url='&lfs-ticket-root;5457'>#5457</"
"ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to shadow-4.15.0. Fixes <ulink url='&lfs-ticket-"
"root;5456'>#5456</ulink>."
msgstr ""
"[bdubbs] — 更新到 shadow-4.15.0。修复 <ulink url='&lfs-ticket-"
"root;5456'>#5456</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to psmisc-23.7. Fixes <ulink url='&lfs-ticket-"
"root;5454'>#5454</ulink>."
msgstr ""
"[bdubbs] — 更新到 psmisc-23.7。修复 <ulink url='&lfs-ticket-"
"root;5454'>#5454</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to kmod-32. Fixes <ulink url='&lfs-ticket-"
"root;5455'>#5455</ulink>."
msgstr ""
"[bdubbs] — 更新到 kmod-32。修复 <ulink url='&lfs-ticket-root;5455'>#5455</"
"ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to elfutils-0.191. Fixes <ulink url='&lfs-ticket-"
"root;5451'>#5451</ulink>."
msgstr ""
"[bdubbs] — 更新到 elfutils-0.191。修复 <ulink url='&lfs-ticket-"
"root;5451'>#5451</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-03-02"
Expand Down
27 changes: 26 additions & 1 deletion zh_CN/chapter01/whatsnew.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-03-03 18:07+0800\n"
"POT-Creation-Date: 2024-03-14 22:41+0800\n"
"PO-Revision-Date: 2021-11-05 23:31+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -51,6 +51,16 @@ msgstr "Gettext-&gettext-version;"
msgid "Iana-Etc-&iana-etc-version;"
msgstr "Iana-Etc-&iana-etc-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/kmod.xml
msgid "Kmod-&kmod-version;"
msgstr "Kmod-&kmod-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/libelf.xml
msgid "Libelf from Elfutils-&elfutils-version;"
msgstr "Elfutils-&elfutils-version; 中的 Libelf"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/libffi.xml
msgid "Libffi-&libffi-version;"
Expand All @@ -61,6 +71,16 @@ msgstr "Libffi-&libffi-version;"
msgid "Linux-&linux-version;"
msgstr "Linux-&linux-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/meson.xml
msgid "Meson-&meson-version;"
msgstr "Meson-&meson-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/psmisc.xml
msgid "Psmisc-&psmisc-version;"
msgstr "Psmisc-&psmisc-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/setuptools.xml
msgid "Setuptools-&setuptools-version;"
Expand All @@ -81,6 +101,11 @@ msgstr "Tcl-&tcl-version;"
msgid "Vim-&vim-version;"
msgstr "Vim-&vim-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/wheel.xml
msgid "Wheel-&wheel-version;"
msgstr "Wheel-&wheel-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/xz.xml
#: lfs-en/chapter08/xz.xml
Expand Down
37 changes: 21 additions & 16 deletions zh_CN/chapter08/kmod.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-03-14 23:06+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -70,6 +70,11 @@ msgstr ""
msgid "Kmod"
msgstr "Kmod"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/kmod.xml
msgid "Kmod-&kmod-version;"
msgstr "Kmod-&kmod-version;"

#. type: Content of: <sect1><sect2><segmentedlist><segtitle>
#: lfs-en/chapter05/binutils-pass1.xml lfs-en/chapter05/gcc-pass1.xml
#: lfs-en/chapter05/glibc.xml lfs-en/chapter05/libstdc++.xml
Expand Down Expand Up @@ -393,11 +398,6 @@ msgstr ""
"<productname>kmod</productname> <productnumber>&kmod-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter08/kmod.xml
msgid "Kmod-&kmod-version;"
msgstr "Kmod-&kmod-version;"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/kmod.xml
msgid ""
Expand Down Expand Up @@ -479,11 +479,18 @@ msgstr ""
#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/kmod.xml
msgid ""
"Install the package and create symlinks for compatibility with Module-Init-"
"Tools (the package that previously handled Linux kernel modules):"
"Install the package and recreate some symlinks for compatibility with Module-"
"Init-Tools (the package that previously handled Linux kernel modules). The "
"building system will create all these symlinks in <filename "
"class='directory'>/usr/bin</filename>, but we only want <command>lsmod</"
"command> there and all other symlinks in <filename class='directory'>/usr/"
"sbin</filename> instead:"
msgstr ""
"安装该软件包,并创建与 Module-Init-Tools (曾经用于处理 Linux 内核模块的软件"
"包) 兼容的符号链接:"
"安装该软件包,并重新创建一些用于和 Module-Init-Tools (曾用于处理 Linux 内核模"
"块的软件包) 相兼容的符号链接。构建系统会将所有兼容性符号链接创建在 <filename "
"class='directory'>/usr/bin</filename> 中,但我们只希望 <command>lsmod</"
"command> 位于该目录,而其他符号链接应该位于 <filename class='directory'>/usr/"
"sbin</filename> 中:"

#. type: Content of: <sect1><sect2><screen>
#: lfs-en/chapter08/kmod.xml
Expand All @@ -493,17 +500,15 @@ msgid ""
"\n"
"for target in depmod insmod modinfo modprobe rmmod; do\n"
" ln -sfv ../bin/kmod /usr/sbin/$target\n"
"done\n"
"\n"
"ln -sfv kmod /usr/bin/lsmod</userinput>"
" rm -fv /usr/bin/$target\n"
"done</userinput>"
msgstr ""
"<userinput remap=\"install\">make install\n"
"\n"
"for target in depmod insmod modinfo modprobe rmmod; do\n"
" ln -sfv ../bin/kmod /usr/sbin/$target\n"
"done\n"
"\n"
"ln -sfv kmod /usr/bin/lsmod</userinput>"
" rm -fv /usr/bin/$target\n"
"done</userinput>"

#. type: Content of: <sect1><sect2><title>
#: lfs-en/chapter08/kmod.xml
Expand Down
12 changes: 6 additions & 6 deletions zh_CN/chapter08/libelf.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-03-14 22:41+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -70,6 +70,11 @@ msgstr ""
msgid "Libelf"
msgstr "Libelf"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/libelf.xml
msgid "Libelf from Elfutils-&elfutils-version;"
msgstr "Elfutils-&elfutils-version; 中的 Libelf"

#. type: Content of: <sect1><sect2><segmentedlist><segtitle>
#: lfs-en/chapter05/binutils-pass1.xml lfs-en/chapter05/gcc-pass1.xml
#: lfs-en/chapter05/glibc.xml lfs-en/chapter05/libstdc++.xml
Expand Down Expand Up @@ -409,11 +414,6 @@ msgstr ""
"<productname>libelf</productname> <productnumber>&elfutils-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter08/libelf.xml
msgid "Libelf from Elfutils-&elfutils-version;"
msgstr "Elfutils-&elfutils-version; 中的 Libelf"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/libelf.xml
msgid ""
Expand Down
12 changes: 6 additions & 6 deletions zh_CN/chapter08/meson.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-03-14 22:41+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -70,6 +70,11 @@ msgstr ""
msgid "Meson"
msgstr "Meson"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/meson.xml
msgid "Meson-&meson-version;"
msgstr "Meson-&meson-version;"

#. type: Content of: <sect1><sect2><segmentedlist><segtitle>
#: lfs-en/chapter05/binutils-pass1.xml lfs-en/chapter05/gcc-pass1.xml
#: lfs-en/chapter05/glibc.xml lfs-en/chapter05/libstdc++.xml
Expand Down Expand Up @@ -359,11 +364,6 @@ msgstr ""
"<productname>meson</productname> <productnumber>&meson-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter08/meson.xml
msgid "Meson-&meson-version;"
msgstr "Meson-&meson-version;"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/meson.xml
msgid ""
Expand Down

0 comments on commit 95fda05

Please sign in to comment.