Skip to content

Commit

Permalink
Update to lfs-en @ eea548f
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Dec 22, 2023
1 parent 7ab1a8c commit 1302e5e
Show file tree
Hide file tree
Showing 8 changed files with 297 additions and 149 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 7cce80 to eea548
58 changes: 29 additions & 29 deletions zh_CN/appendices/dependencies.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: 2023-12-12 18:27+0800\n"
"POT-Creation-Date: 2023-12-22 18:09+0800\n"
"PO-Revision-Date: 2022-02-11 20:04+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -1718,20 +1718,20 @@ msgid ""
"html#lxml\">lxml</ulink>, <ulink url=\"https://lz4.github.io/lz4/\">LZ4</"
"ulink>, <ulink url=\"&blfs-book;postlfs/make-ca.html\">make-ca</ulink>, "
"<ulink url=\"&blfs-book;postlfs/p11-kit.html\">p11-kit</ulink>, <ulink "
"url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink>, <ulink url=\"&blfs-book;"
"postlfs/polkit.html\">Polkit</ulink>, <ulink url='&pypi-home;/"
"pyelftools'>pyelftools</ulink>, <ulink url=\"&blfs-book;postlfs/qemu."
"html\">qemu</ulink>, <ulink url=\"&blfs-book;general/qrencode."
"html\">qrencode</ulink>, <ulink url=\"https://sourceforge.net/projects/"
"linuxquota/\" >quota-tools</ulink>, <ulink url=\"https://rpm.org\">rpm</"
"ulink>, <ulink url=\"&blfs-book;basicnet/rsync.html\">rsync</ulink>, <ulink "
"url=\"&github;/SELinuxProject/selinux\"> SELinux</ulink>, <ulink url=\"&blfs-"
"book;general/python-modules.html#sphinx\"> Sphinx</ulink>, <ulink "
"url=\"https://sourceware.org/systemtap/\"> systemtap</ulink>, <ulink "
"url=\"https://tpm2-tss.readthedocs.io/en/latest/\"> tpm2-tss</ulink>, <ulink "
"url=\"&blfs-book;general/valgrind.html\">Valgrind</ulink>, <ulink "
"url=\"https://xenproject.org\">Xen</ulink>, and <ulink url=\"&blfs-book;"
"postlfs/zsh.html\">zsh</ulink>"
"url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink>, <ulink url=\"&pypi-home;"
"pefile\">pefile</ulink>, <ulink url=\"&blfs-book;postlfs/polkit."
"html\">Polkit</ulink>, <ulink url='&pypi-home;/pyelftools'>pyelftools</"
"ulink>, <ulink url=\"&blfs-book;postlfs/qemu.html\">qemu</ulink>, <ulink "
"url=\"&blfs-book;general/qrencode.html\">qrencode</ulink>, <ulink "
"url=\"https://sourceforge.net/projects/linuxquota/\" >quota-tools</ulink>, "
"<ulink url=\"https://rpm.org\">rpm</ulink>, <ulink url=\"&blfs-book;basicnet/"
"rsync.html\">rsync</ulink>, <ulink url=\"&github;/SELinuxProject/selinux\"> "
"SELinux</ulink>, <ulink url=\"&blfs-book;general/python-modules."
"html#sphinx\"> Sphinx</ulink>, <ulink url=\"https://sourceware.org/systemtap/"
"\"> systemtap</ulink>, <ulink url=\"https://tpm2-tss.readthedocs.io/en/"
"latest/\"> tpm2-tss</ulink>, <ulink url=\"&blfs-book;general/valgrind."
"html\">Valgrind</ulink>, <ulink url=\"https://xenproject.org\">Xen</ulink>, "
"and <ulink url=\"&blfs-book;postlfs/zsh.html\">zsh</ulink>"
msgstr ""
"<ulink url=\"https://www.apparmor.net/\">AppArmor</ulink>, <ulink "
"url=\"&github;/linux-audit/audit-userspace\"> audit-userspace</ulink>, "
Expand Down Expand Up @@ -1759,20 +1759,20 @@ msgstr ""
"html#lxml\">lxml</ulink>, <ulink url=\"https://lz4.github.io/lz4/\">LZ4</"
"ulink>, <ulink url=\"&blfs-book;postlfs/make-ca.html\">make-ca</ulink>, "
"<ulink url=\"&blfs-book;postlfs/p11-kit.html\">p11-kit</ulink>, <ulink "
"url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink>, <ulink url=\"&blfs-book;"
"postlfs/polkit.html\">Polkit</ulink>, <ulink url='&pypi-home;/"
"pyelftools'>pyelftools</ulink>, <ulink url=\"&blfs-book;postlfs/qemu."
"html\">qemu</ulink>, <ulink url=\"&blfs-book;general/qrencode."
"html\">qrencode</ulink>, <ulink url=\"https://sourceforge.net/projects/"
"linuxquota/\" >quota-tools</ulink>, <ulink url=\"https://rpm.org\">rpm</"
"ulink>, <ulink url=\"&blfs-book;basicnet/rsync.html\">rsync</ulink>, <ulink "
"url=\"&github;/SELinuxProject/selinux\"> SELinux</ulink>, <ulink url=\"&blfs-"
"book;general/python-modules.html#sphinx\"> Sphinx</ulink>, <ulink "
"url=\"https://sourceware.org/systemtap/\"> systemtap</ulink>, <ulink "
"url=\"https://tpm2-tss.readthedocs.io/en/latest/\"> tpm2-tss</ulink>, <ulink "
"url=\"&blfs-book;general/valgrind.html\">Valgrind</ulink>, <ulink "
"url=\"https://xenproject.org\">Xen</ulink>, 以及 <ulink url=\"&blfs-book;"
"postlfs/zsh.html\">zsh</ulink>"
"url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink>, <ulink url=\"&pypi-home;"
"pefile\">pefile</ulink>, <ulink url=\"&blfs-book;postlfs/polkit."
"html\">Polkit</ulink>, <ulink url='&pypi-home;/pyelftools'>pyelftools</"
"ulink>, <ulink url=\"&blfs-book;postlfs/qemu.html\">qemu</ulink>, <ulink "
"url=\"&blfs-book;general/qrencode.html\">qrencode</ulink>, <ulink "
"url=\"https://sourceforge.net/projects/linuxquota/\" >quota-tools</ulink>, "
"<ulink url=\"https://rpm.org\">rpm</ulink>, <ulink url=\"&blfs-book;basicnet/"
"rsync.html\">rsync</ulink>, <ulink url=\"&github;/SELinuxProject/selinux\"> "
"SELinux</ulink>, <ulink url=\"&blfs-book;general/python-modules."
"html#sphinx\"> Sphinx</ulink>, <ulink url=\"https://sourceware.org/systemtap/"
"\"> systemtap</ulink>, <ulink url=\"https://tpm2-tss.readthedocs.io/en/"
"latest/\"> tpm2-tss</ulink>, <ulink url=\"&blfs-book;general/valgrind."
"html\">Valgrind</ulink>, <ulink url=\"https://xenproject.org\">Xen</ulink>, "
"以及 <ulink url=\"&blfs-book;postlfs/zsh.html\">zsh</ulink>"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/appendices/dependencies.xml lfs-en/chapter08/sysvinit.xml
Expand Down
75 changes: 74 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: 2023-12-12 18:28+0800\n"
"POT-Creation-Date: 2023-12-22 18:09+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,79 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-12-16"
msgstr "2023 年 12 月 16 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[xry111] - Update to <phrase revision='sysv'>udev from </"
"phrase>systemd-255. Fixes <ulink url='&lfs-ticket-root;5390'>#5390</ulink>."
msgstr ""
"[xry111] — 更新到 systemd-255<phrase revision='sysv'> 中的 udev</phrase>。修"
"复 <ulink url='&lfs-ticket-root;5390'>#5390</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-12-14"
msgstr "2023 年 12 月 14 日"

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

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

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

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

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

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Reformat util-linux configure parameters. Fixes <ulink url='&lfs-"
"ticket-root;5395'>#5395</ulink>."
msgstr ""
"[bdubbs] — 重新格式化 util-linux 的 configure 参数。修复 <ulink url='&lfs-"
"ticket-root;5395'>#5395</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-12-04"
Expand Down
65 changes: 33 additions & 32 deletions zh_CN/chapter07/util-linux.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: 2023-12-22 18:09+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 @@ -72,14 +72,14 @@ msgstr "Util-linux-&util-linux-version;"
#: 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 @@ -130,14 +130,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 @@ -240,13 +240,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 @@ -409,10 +410,8 @@ msgstr "准备编译 Util-linux:"
#: lfs-en/chapter07/util-linux.xml
#, no-wrap
msgid ""
"<userinput remap=\"configure\">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \\\n"
" --libdir=/usr/lib \\\n"
"<userinput remap=\"configure\">./configure --libdir=/usr/lib \\\n"
" --runstatedir=/run \\\n"
" --docdir=/usr/share/doc/util-linux-&util-linux-version; \\\n"
" --disable-chfn-chsh \\\n"
" --disable-login \\\n"
" --disable-nologin \\\n"
Expand All @@ -421,12 +420,12 @@ msgid ""
" --disable-runuser \\\n"
" --disable-pylibmount \\\n"
" --disable-static \\\n"
" --without-python</userinput>"
" --without-python \\\n"
" ADJTIME_PATH=/var/lib/hwclock/adjtime \\\n"
" --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput>"
msgstr ""
"<userinput remap=\"configure\">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \\\n"
" --libdir=/usr/lib \\\n"
"<userinput remap=\"configure\">./configure --libdir=/usr/lib \\\n"
" --runstatedir=/run \\\n"
" --docdir=/usr/share/doc/util-linux-&util-linux-version; \\\n"
" --disable-chfn-chsh \\\n"
" --disable-login \\\n"
" --disable-nologin \\\n"
Expand All @@ -435,7 +434,9 @@ msgstr ""
" --disable-runuser \\\n"
" --disable-pylibmount \\\n"
" --disable-static \\\n"
" --without-python</userinput>"
" --without-python \\\n"
" ADJTIME_PATH=/var/lib/hwclock/adjtime \\\n"
" --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput>"

#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
#: lfs-en/chapter07/util-linux.xml
Expand Down
Loading

0 comments on commit 1302e5e

Please sign in to comment.