Skip to content

Commit

Permalink
Update to lfs-en @ cdf280e
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Jan 31, 2024
1 parent 62d004b commit 42e6a8f
Show file tree
Hide file tree
Showing 11 changed files with 299 additions and 94 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 7c6303 to cdf280
88 changes: 87 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: [email protected]\n"
"POT-Creation-Date: 2024-01-22 06:19+0800\n"
"POT-Creation-Date: 2024-02-01 03:07+0800\n"
"PO-Revision-Date: 2022-02-05 22:45+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -46,6 +46,92 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-02-01"
msgstr "2024 年 2 月 1 日"

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

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

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

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

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to iana-etc-20240125. Addresses <ulink url='&lfs-ticket-"
"root;5006'>#5006</ulink>."
msgstr ""
"[bdubbs] — 更新到 iana-etc-20240125。处理 <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 binutils-2.42. Fixes <ulink url='&lfs-ticket-"
"root;5424'>#5424</ulink>."
msgstr ""
"[bdubbs] — 更新到 binutils-2.42。修复 <ulink url='&lfs-ticket-"
"root;5424'>#5424</ulink>。"

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

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update upstream fixes for readline-8.2. Fixes <ulink url='&lfs-"
"ticket-root;5420'>#5420</ulink>."
msgstr ""
"[bdubbs] — 更新 readline-8.2 上游修复补丁。修复 <ulink url='&lfs-ticket-"
"root;5420'>#5420</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Apply upstream fix for bash-5.2.21. Fixes <ulink url='&lfs-ticket-"
"root;5420'>#5420</ulink>."
msgstr ""
"[bdubbs] — 应用 bash-5.2.21 上游修复补丁。修复 <ulink url='&lfs-ticket-"
"root;5420'>#5420</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-01-21"
Expand Down
17 changes: 16 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: [email protected]\n"
"POT-Creation-Date: 2024-01-22 06:18+0800\n"
"POT-Creation-Date: 2024-02-01 03:06+0800\n"
"PO-Revision-Date: 2021-11-05 23:31+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -35,6 +35,11 @@ msgstr "这里列出本书上一次发布之后发生变化的软件包。"
msgid "Upgraded to:"
msgstr "已升级:"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/attr.xml
msgid "Attr-&attr-version;"
Expand All @@ -56,6 +61,11 @@ msgstr "Bash-&bash-version;"
msgid "Bc-&bc-version;"
msgstr "Bc-&bc-version;"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/coreutils.xml
#: lfs-en/chapter08/coreutils.xml
Expand Down Expand Up @@ -241,6 +251,11 @@ msgstr "Zlib-&zlib-version;"
msgid "Added:"
msgstr "已添加:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "&bash-upstream-fixes-patch;"
msgstr "&bash-upstream-fixes-patch;"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "setuptools-&setuptools-version;"
Expand Down
18 changes: 17 additions & 1 deletion zh_CN/chapter03/patches.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: [email protected]\n"
"POT-Creation-Date: 2024-01-22 06:18+0800\n"
"POT-Creation-Date: 2024-02-01 03:06+0800\n"
"PO-Revision-Date: 2022-01-16 00:53+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -36,6 +36,22 @@ msgstr ""
"除了软件包外,我们还需要一些补丁。有些补丁解决了本应由维护者修复的问题,有些"
"则对软件包进行微小的修改,使得它们更容易使用。构建 LFS 系统需要下列补丁:"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter03/patches.xml
msgid ""
"Bash Upstream Fixes Patch - <token>&bash-upstream-fixes-patch-size;</token>:"
msgstr "Bash 上游修复补丁 - <token>&bash-upstream-fixes-patch-size;</token>:"

#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
#: lfs-en/chapter03/patches.xml
msgid "Download: <ulink url=\"&patches-root;&bash-upstream-fixes-patch;\"/>"
msgstr "下载地址:<ulink url=\"&patches-root;&bash-upstream-fixes-patch;\"/>"

#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
#: lfs-en/chapter03/patches.xml
msgid "MD5 sum: <literal>&bash-upstream-fixes-patch-md5;</literal>"
msgstr "MD5 校验和:<literal>&bash-upstream-fixes-patch-md5;</literal>"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter03/patches.xml
msgid "Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:"
Expand Down
70 changes: 36 additions & 34 deletions zh_CN/chapter08/acl.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: [email protected]\n"
"POT-Creation-Date: 2023-09-18 16:58+0800\n"
"POT-Creation-Date: 2024-02-01 03:06+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -70,6 +70,11 @@ msgstr ""
msgid "Acl"
msgstr "Acl"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/acl.xml
msgid "Acl-&acl-version;"
msgstr "Acl-&acl-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 @@ -116,14 +121,14 @@ msgstr "Acl"
#: 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;"
Expand Down Expand Up @@ -174,14 +179,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;"
Expand Down Expand Up @@ -250,11 +255,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
Expand All @@ -270,13 +276,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 "安装该软件包:"
Expand Down Expand Up @@ -436,11 +443,6 @@ msgstr ""
"<productname>acl</productname> <productnumber>&acl-version;</productnumber> "
"<placeholder type=\"address\" id=\"0\"/>"

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

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/acl.xml
msgid ""
Expand Down
24 changes: 18 additions & 6 deletions zh_CN/chapter08/bash.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: [email protected]\n"
"POT-Creation-Date: 2023-11-24 11:47+0800\n"
"POT-Creation-Date: 2024-02-01 03:06+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -256,11 +256,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
Expand Down Expand Up @@ -508,6 +509,17 @@ msgstr "&bash-fin-sbu;"
msgid "&bash-fin-du;"
msgstr "&bash-fin-du;"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/bash.xml
msgid "First, fix some issues identified upstream:"
msgstr "首先,修复上游发现的一些问题:"

#. type: Content of: <sect1><sect2><screen>
#: lfs-en/chapter08/bash.xml
#, no-wrap
msgid "<userinput remap=\"pre\">patch -Np1 -i ../&bash-upstream-fixes-patch;</userinput>"
msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&bash-upstream-fixes-patch;</userinput>"

#. type: Content of: <sect1><sect2><screen>
#: lfs-en/chapter08/bash.xml
#, no-wrap
Expand Down
Loading

0 comments on commit 42e6a8f

Please sign in to comment.