Skip to content

Commit

Permalink
Update to lfs-en @ 8e85548
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Nov 24, 2023
1 parent 0514500 commit ab57b71
Show file tree
Hide file tree
Showing 17 changed files with 325 additions and 287 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ pdf: booksrc

booksrc: $(MBOOK_FILES) $(ORIG_FILES) $(MLANG)/book/version.ent

$(MLANG)/book/tidy.conf: $(LFS_EN)/tidy.conf $(MLANG)/lang.mk
mkdir -pv $(@D)
sed -e '/output-encoding:/s|latin1|$(M_ENCODING_ALT)|' $< > $@

# $(MLANG)/book is not a git repo, so we need to generate the version info
# now and silence git-version.sh. lang.mk SHALL contain the recipe to
# localize git-version.sh.
Expand Down
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 4bc51b to 8e8554
30 changes: 29 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: 2023-11-01 16:10+0800\n"
"POT-Creation-Date: 2023-11-24 11:55+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/bash.xml
#: lfs-en/chapter08/bash.xml
msgid "Bash-&bash-version;"
msgstr "Bash-&bash-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/bc.xml
msgid "Bc-&bc-version;"
Expand All @@ -51,6 +57,12 @@ 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/chapter06/gawk.xml
#: lfs-en/chapter08/gawk.xml
msgid "Gawk-&gawk-version;"
msgstr "Gawk-&gawk-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter07/gettext.xml
#: lfs-en/chapter08/gettext.xml
Expand All @@ -68,6 +80,11 @@ msgstr "Gzip-&gzip-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/iproute2.xml
msgid "IPRoute2-&iproute2-version;"
msgstr "IPRoute2-&iproute2-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/kbd.xml
msgid "Kbd-&kbd-version;"
Expand All @@ -78,6 +95,11 @@ msgstr "Kbd-&kbd-version;"
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/chapter10/kernel.xml
msgid "Linux-&linux-version;"
Expand Down Expand Up @@ -151,6 +173,12 @@ msgstr "Vim-&vim-version;"
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
msgid "Xz-&xz-version;"
msgstr "Xz-&xz-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/zlib.xml
msgid "Zlib-&zlib-version;"
Expand Down
4 changes: 2 additions & 2 deletions zh_CN/chapter04/settingenviron.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-14 02:01+0800\n"
"POT-Creation-Date: 2023-11-24 11:47+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 @@ -403,7 +403,7 @@ msgid ""
"Never pass a <parameter>-j</parameter> option without a number to "
"<command>make</command> or set such an option in <envar>MAKEFLAGS</envar>. "
"Doing so will allow <command>make</command> to spawn infinite build jobs and "
"cause system stability issue."
"cause system stability problems."
msgstr ""
"绝对不要将一个没有数字的 <parameter>-j</parameter> 选项传递给 <command>make</"
"command> 或在 <envar>MAKEFLAGS</envar> 中设定这样的选项。这样做会导致 "
Expand Down
60 changes: 31 additions & 29 deletions zh_CN/chapter06/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-09-18 16:58+0800\n"
"POT-Creation-Date: 2023-11-24 11:47+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 "Bash"
msgstr "Bash"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/bash.xml
#: lfs-en/chapter08/bash.xml
msgid "Bash-&bash-version;"
msgstr "Bash-&bash-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 @@ -66,14 +72,14 @@ msgstr "Bash"
#: 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 @@ -124,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 @@ -234,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 @@ -331,11 +338,6 @@ msgstr ""
"<productname>bash</productname> <productnumber>&bash-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

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

#. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
#: lfs-en/chapter06/bash.xml
msgid "&bash-tmp-sbu;"
Expand Down
60 changes: 31 additions & 29 deletions zh_CN/chapter06/gawk.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-11-24 11:47+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 "Gawk"
msgstr "Gawk"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/gawk.xml
#: lfs-en/chapter08/gawk.xml
msgid "Gawk-&gawk-version;"
msgstr "Gawk-&gawk-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 @@ -66,14 +72,14 @@ msgstr "Gawk"
#: 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 @@ -124,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 @@ -220,13 +226,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 @@ -317,11 +324,6 @@ msgstr ""
"<productname>gawk</productname> <productnumber>&gawk-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

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

#. type: Content of: <sect1><sect2><segmentedlist><seglistitem><seg>
#: lfs-en/chapter06/gawk.xml
msgid "&gawk-tmp-sbu;"
Expand Down
Loading

0 comments on commit ab57b71

Please sign in to comment.