Update to lfs-en @ fd02389

Now the English LFS book sources are encoded in UTF-8, so we can remove
some hacks for modifying the encoding lines!

Makefile

@@ -8,8 +8,8 @@ MLANG = zh_CN
 
 include $(MLANG)/lang.mk
 
-L10N_XML = stylesheets/lfs-xsl/lfs-l10n.xml
-EXCLUDE_XML = $(LFS_EN)/$(L10N_XML) $(LFS_EN)/chapter01/changelog.xml \
+EXCLUDE_XML = $(LFS_EN)/stylesheets/lfs-xsl/lfs-l10n.xml              \
+              $(LFS_EN)/chapter01/changelog.xml                       \
               $(LFS_EN)/appendices/creat-comm.xml                     \
               $(LFS_EN)/appendices/mit-lic.xml                        \
               $(wildcard $(LFS_EN)/chapter10/kernel/*.xml)
@@ -93,16 +93,11 @@ $(MXML_FILES) &: $(XML_FILES) $(PO_FILES) mkpo4acfg.py po4a_issue295.sh
 	sed -e 's|<book>|<book lang="$(M_DOCBOOK_LANG)">|' -i $(MLANG)/book/index.xml
 	cd $(MLANG)/book; $(PWD)/po4a_issue295.sh
 
-$(MLANG)/book/$(L10N_XML): $(LFS_EN)/$(L10N_XML)
-	mkdir -pv $(@D)
-	sed -e '/encoding=/s|ISO-8859-1|$(M_ENCODING)|' $< > $@
-
 $(MLANG)/book/chapter01/changelog.xml: $(LFS_EN)/chapter01/changelog.xml \
                                        $(MLANG)/chapter01/changelog.po
 	mkdir -pv pot/chapter01
 	$(MKPO4ACFG) $(LFS_EN)/chapter01/changelog.xml > po4a-changelog.cfg
 	po4a po4a-changelog.cfg
-	sed -e '/encoding=/s|ISO-8859-1|$(M_ENCODING)|' -i $@
 
 $(MLANG)/book/%: $(LFS_EN)/%
 	mkdir -pv "$(@D)"

zh_CN/appendices/dependencies.po

@@ -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-22 18:09+0800\n"
+"POT-Creation-Date: 2024-01-19 20:13+0800\n"
 "PO-Revision-Date: 2022-02-11 20:04+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -170,8 +170,8 @@ msgstr "Glibc"
 
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml
-msgid "Acl and Libcap"
-msgstr "Acl 和 Libcap"
+msgid "Acl, Libcap, and Patch"
+msgstr "Acl, Libcap, 以及 Patch"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/appendices/dependencies.xml lfs-en/chapter08/autoconf.xml
@@ -1450,8 +1450,8 @@ msgstr "Patch"
 
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml
-msgid "Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed"
-msgstr "Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, 以及 Sed"
+msgid "Attr, Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed"
+msgstr "Attr, Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, 以及 Sed"
 
 #. type: Content of: <appendix><segmentedlist><seglistitem><seg>
 #: lfs-en/appendices/dependencies.xml

zh_CN/chapter01/changelog.po

@@ -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-15 12:25+0800\n"
+"POT-Creation-Date: 2024-01-19 20:15+0800\n"
 "PO-Revision-Date: 2022-02-05 22:45+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"

zh_CN/chapter08/dejagnu.po

@@ -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-01-19 20:13+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -116,14 +116,14 @@ msgstr "DejaGNU"
 #: 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;"
@@ -174,14 +174,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;"
@@ -201,6 +201,57 @@ msgstr ""
 "<userinput remap=\"pre\">mkdir -v build\n"
 "cd       build</userinput>"
 
+#. type: Content of: <sect1><sect2><para>
+#: lfs-en/chapter05/binutils-pass1.xml lfs-en/chapter05/gcc-pass1.xml
+#: lfs-en/chapter05/glibc.xml lfs-en/chapter06/bash.xml
+#: lfs-en/chapter06/binutils-pass2.xml lfs-en/chapter06/coreutils.xml
+#: lfs-en/chapter06/diffutils.xml lfs-en/chapter06/file.xml
+#: lfs-en/chapter06/findutils.xml lfs-en/chapter06/gawk.xml
+#: lfs-en/chapter06/gcc-pass2.xml lfs-en/chapter06/grep.xml
+#: lfs-en/chapter06/gzip.xml lfs-en/chapter06/m4.xml lfs-en/chapter06/make.xml
+#: lfs-en/chapter06/ncurses.xml lfs-en/chapter06/patch.xml
+#: lfs-en/chapter06/sed.xml lfs-en/chapter06/tar.xml lfs-en/chapter06/xz.xml
+#: lfs-en/chapter07/bison.xml lfs-en/chapter07/perl.xml
+#: lfs-en/chapter07/python.xml lfs-en/chapter07/texinfo.xml
+#: lfs-en/chapter07/util-linux.xml lfs-en/chapter08/acl.xml
+#: lfs-en/chapter08/attr.xml lfs-en/chapter08/autoconf.xml
+#: lfs-en/chapter08/automake.xml lfs-en/chapter08/bash.xml
+#: 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/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
+#: lfs-en/chapter08/gzip.xml lfs-en/chapter08/inetutils.xml
+#: lfs-en/chapter08/intltool.xml lfs-en/chapter08/iproute2.xml
+#: lfs-en/chapter08/jinja2.xml lfs-en/chapter08/kbd.xml
+#: 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/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
+#: 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/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 "安装该软件包："
+
 #. type: Content of: <sect1><sect2><variablelist><bridgehead>
 #: lfs-en/chapter05/linux-headers.xml lfs-en/chapter08/acl.xml
 #: lfs-en/chapter08/attr.xml lfs-en/chapter08/autoconf.xml
@@ -258,11 +309,11 @@ msgstr "简要描述"
 #: lfs-en/chapter08/less.xml lfs-en/chapter08/libelf.xml
 #: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
 #: lfs-en/chapter08/libxcrypt.xml lfs-en/chapter08/m4.xml
-#: lfs-en/chapter08/mpc.xml lfs-en/chapter08/mpfr.xml
-#: lfs-en/chapter08/patch.xml lfs-en/chapter08/procps.xml
-#: lfs-en/chapter08/psmisc.xml lfs-en/chapter08/tar.xml
-#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/xz.xml
-#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
+#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/mpc.xml
+#: lfs-en/chapter08/mpfr.xml lfs-en/chapter08/patch.xml
+#: lfs-en/chapter08/procps.xml lfs-en/chapter08/psmisc.xml
+#: lfs-en/chapter08/tar.xml lfs-en/chapter08/texinfo.xml
+#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml
 #, no-wrap
 msgid "<userinput remap=\"test\">make check</userinput>"
 msgstr "<userinput remap=\"test\">make check</userinput>"
@@ -368,11 +419,6 @@ msgstr ""
 "makeinfo --html --no-split -o doc/dejagnu.html ../doc/dejagnu.texi\n"
 "makeinfo --plaintext       -o doc/dejagnu.txt  ../doc/dejagnu.texi</userinput>"
 
-#. type: Content of: <sect1><sect2><para>
-#: lfs-en/chapter08/dejagnu.xml
-msgid "Build and install the package:"
-msgstr "构建并安装该软件包："
-
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter08/dejagnu.xml
 #, no-wrap

zh_CN/lang.mk

@@ -1,5 +1,3 @@
-M_ENCODING = UTF-8
-M_ENCODING_ALT = utf8
 M_DOCBOOK_LANG = zh_cn
 
 THIS = zh_CN/lang.mk