Skip to content

Commit

Permalink
Update to lfs-en @ ba64c50
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Apr 2, 2024
1 parent cf35592 commit cc69d67
Show file tree
Hide file tree
Showing 9 changed files with 358 additions and 267 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 313367 to ba64c5
70 changes: 69 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-03-30 09:19+0800\n"
"POT-Creation-Date: 2024-04-02 18:17+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,74 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

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

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

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

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

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

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

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

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-03-29"
Expand Down
24 changes: 23 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-03-20 15:18+0800\n"
"POT-Creation-Date: 2024-04-02 18:09+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,12 @@ msgstr "这里列出本书上一次发布之后发生变化的软件包。"
msgid "Upgraded to:"
msgstr "已升级:"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/expat.xml
msgid "Expat-&expat-version;"
Expand Down Expand Up @@ -86,6 +92,11 @@ msgstr "Man-pages-&man-pages-version;"
msgid "Meson-&meson-version;"
msgstr "Meson-&meson-version;"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/psmisc.xml
msgid "Psmisc-&psmisc-version;"
Expand All @@ -106,6 +117,12 @@ msgstr "Shadow-&shadow-version;"
msgid "Tcl-&tcl-version;"
msgstr "Tcl-&tcl-version;"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/vim.xml
msgid "Vim-&vim-version;"
Expand All @@ -122,6 +139,11 @@ msgstr "Wheel-&wheel-version;"
msgid "Xz-&xz-version;"
msgstr "Xz-&xz-version;"

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

#. type: Content of: <sect1><itemizedlist><title>
#: lfs-en/chapter01/whatsnew.xml
msgid "Added:"
Expand Down
21 changes: 11 additions & 10 deletions zh_CN/chapter06/coreutils.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-03-03 18:07+0800\n"
"POT-Creation-Date: 2024-04-02 18:09+0800\n"
"PO-Revision-Date: 2021-09-08 13:50+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand All @@ -25,6 +25,12 @@ msgstr ""
msgid "Coreutils"
msgstr "Coreutils"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/coreutils.xml
#: lfs-en/chapter08/coreutils.xml
msgid "Coreutils-&coreutils-version;"
msgstr "Coreutils-&coreutils-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 @@ -62,7 +68,7 @@ msgstr "Coreutils"
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
#: lfs-en/chapter08/markupsafe.xml lfs-en/chapter08/meson.xml
#: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
Expand Down Expand Up @@ -120,7 +126,7 @@ msgstr "&buildtime;"
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
#: lfs-en/chapter08/markupsafe.xml lfs-en/chapter08/meson.xml
#: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
Expand Down Expand Up @@ -234,7 +240,7 @@ msgstr "<userinput remap=\"make\">make</userinput>"
#: lfs-en/chapter08/less.xml lfs-en/chapter08/libcap.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/markupsafe.xml
#: lfs-en/chapter08/meson.xml lfs-en/chapter08/ninja.xml
#: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
Expand Down Expand Up @@ -295,7 +301,7 @@ msgstr "工具"
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/ncurses.xml
#: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
#: lfs-en/chapter08/perl.xml lfs-en/chapter08/pkgconf.xml
Expand Down Expand Up @@ -338,11 +344,6 @@ msgstr ""
"<productname>coreutils</productname> <productnumber>&coreutils-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

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

#. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
#: lfs-en/chapter06/coreutils.xml
msgid "&coreutils-tmp-sbu;"
Expand Down
67 changes: 35 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: 2024-03-03 18:07+0800\n"
"POT-Creation-Date: 2024-04-02 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 All @@ -20,6 +20,12 @@ msgstr ""
msgid "Util-linux"
msgstr "Util-linux"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter07/util-linux.xml
#: lfs-en/chapter08/util-linux.xml
msgid "Util-linux-&util-linux-version;"
msgstr "Util-linux-&util-linux-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 @@ -57,7 +63,7 @@ msgstr "Util-linux"
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
#: lfs-en/chapter08/markupsafe.xml lfs-en/chapter08/meson.xml
#: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
Expand Down Expand Up @@ -115,7 +121,7 @@ msgstr "&buildtime;"
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/man-pages.xml
#: lfs-en/chapter08/markupsafe.xml lfs-en/chapter08/meson.xml
#: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
Expand Down Expand Up @@ -229,7 +235,7 @@ msgstr "<userinput remap=\"make\">make</userinput>"
#: lfs-en/chapter08/less.xml lfs-en/chapter08/libcap.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/markupsafe.xml
#: lfs-en/chapter08/meson.xml lfs-en/chapter08/ninja.xml
#: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
Expand Down Expand Up @@ -322,7 +328,7 @@ msgstr "工具"
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libelf.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/ncurses.xml
#: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
#: lfs-en/chapter08/perl.xml lfs-en/chapter08/pkgconf.xml
Expand Down Expand Up @@ -358,11 +364,6 @@ msgstr ""
"<productname>util-linux</productname> <productnumber>&util-linux-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter07/util-linux.xml lfs-en/chapter08/util-linux.xml
msgid "Util-linux-&util-linux-version;"
msgstr "Util-linux-&util-linux-version;"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter07/util-linux.xml
msgid "The Util-linux package contains miscellaneous utility programs."
Expand Down Expand Up @@ -410,31 +411,33 @@ msgstr "准备编译 Util-linux:"
#: lfs-en/chapter07/util-linux.xml
#, no-wrap
msgid ""
"<userinput remap=\"configure\">./configure --libdir=/usr/lib \\\n"
" --runstatedir=/run \\\n"
" --disable-chfn-chsh \\\n"
" --disable-login \\\n"
" --disable-nologin \\\n"
" --disable-su \\\n"
" --disable-setpriv \\\n"
" --disable-runuser \\\n"
" --disable-pylibmount \\\n"
" --disable-static \\\n"
" --without-python \\\n"
"<userinput remap=\"configure\">./configure --libdir=/usr/lib \\\n"
" --runstatedir=/run \\\n"
" --disable-chfn-chsh \\\n"
" --disable-login \\\n"
" --disable-nologin \\\n"
" --disable-su \\\n"
" --disable-setpriv \\\n"
" --disable-runuser \\\n"
" --disable-pylibmount \\\n"
" --disable-static \\\n"
" --disable-liblastlog2 \\\n"
" --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 --libdir=/usr/lib \\\n"
" --runstatedir=/run \\\n"
" --disable-chfn-chsh \\\n"
" --disable-login \\\n"
" --disable-nologin \\\n"
" --disable-su \\\n"
" --disable-setpriv \\\n"
" --disable-runuser \\\n"
" --disable-pylibmount \\\n"
" --disable-static \\\n"
" --without-python \\\n"
"<userinput remap=\"configure\">./configure --libdir=/usr/lib \\\n"
" --runstatedir=/run \\\n"
" --disable-chfn-chsh \\\n"
" --disable-login \\\n"
" --disable-nologin \\\n"
" --disable-su \\\n"
" --disable-setpriv \\\n"
" --disable-runuser \\\n"
" --disable-pylibmount \\\n"
" --disable-static \\\n"
" --disable-liblastlog2 \\\n"
" --without-python \\\n"
" ADJTIME_PATH=/var/lib/hwclock/adjtime \\\n"
" --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput>"

Expand Down
Loading

0 comments on commit cc69d67

Please sign in to comment.