update to lfs-en @ 5e95faa

I've added Chinese entries into lfs-l10n.xml, LFS trunk.  So it's not
needed to maintain a downstream patch anymore.

changelogtranslator.py

@@ -35,6 +35,8 @@
 tt.append(re.compile('\[([^\]]+)\] - Updated? to ([^ ]+)\. +Addresses (<ulink [^>]+> *#[0-9]+ *</ulink>).?$', re.MULTILINE|re.DOTALL),
 	{'fr': '[#1] — Mise à jour vers #2. Traiter #3',
          'zh_CN': '[#1] — 更新到 #2。处理 #3。'})
+tt.append(re.compile('\[([^\]]+)\] - Updated? to ([^ ]+) \(Python [mM]odule\)\. +Fixes (<ulink [^>]+> *#[0-9]+ *</ulink>).?$', re.MULTILINE|re.DOTALL),
+	{'zh_CN': '[#1] — 更新到 #2 (Python 模块)。修复 #3。'})
 tt.append(re.compile('(20[0-9]{2})-(0?)([0-9]+)-(0?)([0-9]+)'),
 	{'fr': '#4#5-#2#3-#1',
          'zh_CN': '#1 年 #3 月 #5 日'})

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: 2022-11-04 11:40+0800\n"
+"POT-Creation-Date: 2022-11-12 00:13+0800\n"
 "PO-Revision-Date: 2022-02-05 22:45+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: noneLanguage: zh_CN\n"
@@ -46,6 +46,110 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
 msgid "Changelog Entries:"
 msgstr "更新日志记录："
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid "2022-11-10"
+msgstr "2022 年 11 月 10 日"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Fix make-4.4 bug. Fixes <ulink url=\"&lfs-ticket-"
+"root;5150\">#5150</ulink>."
+msgstr ""
+"[bdubbs] — 修复 make-4.4 中的错误。修复 <ulink url=\"&lfs-ticket-"
+"root;5150\">#5150</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to wheel-0.38.4 (Python Module). Fixes <ulink url=\"&lfs-"
+"ticket-root;5155\">#5155</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 wheel-0.38.4 (Python 模块)。修复 <ulink url=\"&lfs-ticket-"
+"root;5155\">#5155</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to texinfo-7.0. Fixes <ulink url=\"&lfs-ticket-"
+"root;5159\">#5159</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 texinfo-7.0。修复 <ulink url=\"&lfs-ticket-"
+"root;5159\">#5159</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to sysvinit-3.05. Fixes <ulink url=\"&lfs-ticket-"
+"root;5153\">#5153</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 sysvinit-3.05。修复 <ulink url=\"&lfs-ticket-"
+"root;5153\">#5153</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to shadow-4.13. Fixes <ulink url=\"&lfs-ticket-"
+"root;5161\">#5161</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 shadow-4.13。修复 <ulink url=\"&lfs-ticket-"
+"root;5161\">#5161</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to sed-4.9. Fixes <ulink url=\"&lfs-ticket-"
+"root;5157\">#5157</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 sed-4.9。修复 <ulink url=\"&lfs-ticket-root;5157\">#5157</"
+"ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to meson-0.64.0. Fixes <ulink url=\"&lfs-ticket-"
+"root;5156\">#5156</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 meson-0.64.0。修复 <ulink url=\"&lfs-ticket-"
+"root;5156\">#5156</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to linux-6.0.7. Fixes <ulink url=\"&lfs-ticket-"
+"root;5154\">#5154</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 linux-6.0.7。修复 <ulink url=\"&lfs-ticket-"
+"root;5154\">#5154</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to elfutils-0.188. Fixes <ulink url=\"&lfs-ticket-"
+"root;5152\">#5152</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 elfutils-0.188。修复 <ulink url=\"&lfs-ticket-"
+"root;5152\">#5152</ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to bc-6.1.1. Fixes <ulink url=\"&lfs-ticket-"
+"root;5151\">#5151</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 bc-6.1.1。修复 <ulink url=\"&lfs-ticket-root;5151\">#5151</"
+"ulink>。"
+
+#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
+#: lfs-en/chapter01/changelog.xml
+msgid ""
+"[bdubbs] - Update to bash-5.2.9. Fixes <ulink url=\"&lfs-ticket-"
+"root;5158\">#5158</ulink>."
+msgstr ""
+"[bdubbs] — 更新到 bash-5.2.9。修复 <ulink url=\"&lfs-ticket-"
+"root;5158\">#5158</ulink>。"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
 msgid "2022-11-03"

zh_CN/chapter01/whatsnew.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: 2022-11-04 11:39+0800\n"
+"POT-Creation-Date: 2022-11-12 00:07+0800\n"
 "PO-Revision-Date: 2021-11-05 23:31+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: noneLanguage: zh_CN\n"
@@ -31,6 +31,12 @@ msgstr "File-&file-version;"
 msgid "Grep-&grep-version;"
 msgstr "Grep-&grep-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter06/sed.xml lfs-en/chapter01/whatsnew.xml
+#: lfs-en/chapter08/sed.xml
+msgid "Sed-&sed-version;"
+msgstr "Sed-&sed-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter06/make.xml lfs-en/chapter01/whatsnew.xml
 #: lfs-en/chapter08/make.xml
@@ -127,6 +133,11 @@ msgstr "Less-&less-version;"
 msgid "Libcap-&libcap-version;"
 msgstr "Libcap-&libcap-version;"
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/whatsnew.xml
+msgid "Libelf-&elfutils-version; (from elfutils)"
+msgstr "Libelf-&elfutils-version; (来自 elfutils)"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/libffi.xml
 msgid "Libffi-&libffi-version;"
@@ -188,6 +199,17 @@ msgstr "Shadow-&shadow-version;"
 msgid "Systemd-&systemd-version;"
 msgstr "Systemd-&systemd-version;"
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/whatsnew.xml
+msgid "SysVinit-&sysvinit-version;"
+msgstr "SysVinit-&sysvinit-version;"
+
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter07/texinfo.xml
+#: lfs-en/chapter08/texinfo.xml
+msgid "Texinfo-&texinfo-version;"
+msgstr "Texinfo-&texinfo-version;"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
 msgid "Tzdata-&tzdata-version;"
@@ -198,6 +220,11 @@ msgstr "Tzdata-&tzdata-version;"
 msgid "Vim-&vim-version;"
 msgstr "Vim-&vim-version;"
 
+#. type: Content of: <sect1><itemizedlist><listitem><para>
+#: lfs-en/chapter01/whatsnew.xml
+msgid "wheel-&wheel-version;"
+msgstr "wheel-&wheel-version;"
+
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
 msgid "XZ-Utils-&xz-version;"
@@ -213,11 +240,6 @@ msgstr "Zlib-&zlib-version;"
 msgid "Added:"
 msgstr "已添加："
 
-#. type: Content of: <sect1><itemizedlist><listitem><para>
-#: lfs-en/chapter01/whatsnew.xml
-msgid "&bash-fixes-patch;"
-msgstr "&bash-fixes-patch;"
-
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
 msgid "&readline-fixes-patch;"

zh_CN/chapter03/patches.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: 2022-11-04 11:39+0800\n"
+"POT-Creation-Date: 2022-11-12 00:07+0800\n"
 "PO-Revision-Date: 2022-01-16 00:53+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: noneLanguage: zh_CN\n"
@@ -36,21 +36,6 @@ msgstr ""
 "除了软件包外，我们还需要一些补丁。有些补丁解决了本应由维护者修复的问题，有些"
 "则对软件包进行微小的修改，使得它们更容易使用。构建 LFS 系统需要下列补丁："
 
-#. type: Content of: <sect1><variablelist><varlistentry><term>
-#: lfs-en/chapter03/patches.xml
-msgid "Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:"
-msgstr "Bash 上游修复补丁 - <token>&bash-fixes-patch-size;</token>:"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: lfs-en/chapter03/patches.xml
-msgid "Download: <ulink url=\"&patches-root;&bash-fixes-patch;\"/>"
-msgstr "下载地址：<ulink url=\"&patches-root;&bash-fixes-patch;\"/>"
-
-#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
-#: lfs-en/chapter03/patches.xml
-msgid "MD5 sum: <literal>&bash-fixes-patch-md5;</literal>"
-msgstr "MD5 校验和：<literal>&bash-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>:"

zh_CN/chapter06/make.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-10-15 09:55+0800\n"
+"POT-Creation-Date: 2022-11-12 00:07+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -314,7 +314,8 @@ msgstr ""
 "productnumber> <placeholder type=\"address\" id=\"0\"/>"
 
 #. type: Content of: <sect1><title>
-#: lfs-en/chapter06/make.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter06/make.xml lfs-en/chapter01/whatsnew.xml
+#: lfs-en/chapter08/make.xml
 msgid "Make-&make-version;"
 msgstr "Make-&make-version;"
 
@@ -339,6 +340,23 @@ msgstr "&make-tmp-du;"
 msgid "Installation of Make"
 msgstr "安装 Make"
 
+#. type: Content of: <sect1><sect2><para>
+#: lfs-en/chapter06/make.xml
+msgid "First, fix an issue identified upstream:"
+msgstr "首先，修复上游发现的问题："
+
+#. type: Content of: <sect1><sect2><screen>
+#: lfs-en/chapter06/make.xml lfs-en/chapter08/make.xml
+#, no-wrap
+msgid ""
+"<userinput remap=\"pre\">sed -e '/ifdef SIGPIPE/,+2 d' \\\n"
+"    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \\\n"
+"    -i src/main.c</userinput>"
+msgstr ""
+"<userinput remap=\"pre\">sed -e '/ifdef SIGPIPE/,+2 d' \\\n"
+"    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \\\n"
+"    -i src/main.c</userinput>"
+
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter06/make.xml lfs-en/chapter08/make.xml
 msgid "Prepare Make for compilation:"

zh_CN/chapter07/texinfo.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-09-17 18:28+0800\n"
+"POT-Creation-Date: 2022-11-12 00:07+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -265,6 +265,12 @@ msgstr "<userinput remap=\"make\">make</userinput>"
 msgid "Install the package:"
 msgstr "安装该软件包："
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter07/texinfo.xml
+#: lfs-en/chapter08/texinfo.xml
+msgid "Texinfo-&texinfo-version;"
+msgstr "Texinfo-&texinfo-version;"
+
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter05/gcc-pass1.xml lfs-en/chapter05/binutils-pass1.xml
 #: lfs-en/chapter07/bison.xml lfs-en/chapter07/texinfo.xml
@@ -311,11 +317,6 @@ msgstr ""
 "<productname>texinfo</productname> <productnumber>&texinfo-version;</"
 "productnumber> <placeholder type=\"address\" id=\"0\"/>"
 
-#. type: Content of: <sect1><title>
-#: lfs-en/chapter07/texinfo.xml lfs-en/chapter08/texinfo.xml
-msgid "Texinfo-&texinfo-version;"
-msgstr "Texinfo-&texinfo-version;"
-
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter07/texinfo.xml lfs-en/chapter08/texinfo.xml
 #: lfs-en/appendices/dependencies.xml lfs-en/prologue/why.xml

zh_CN/chapter08/bash.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-10-15 09:55+0800\n"
+"POT-Creation-Date: 2022-11-12 00:07+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -494,17 +494,6 @@ 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-fixes-patch;</userinput>"
-msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&bash-fixes-patch;</userinput>"
-
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter08/bash.xml
 #, no-wrap

zh_CN/chapter08/make.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-09-17 18:28+0800\n"
+"POT-Creation-Date: 2022-11-12 00:07+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -281,7 +281,8 @@ msgstr ""
 "productnumber> <placeholder type=\"address\" id=\"0\"/>"
 
 #. type: Content of: <sect1><title>
-#: lfs-en/chapter06/make.xml lfs-en/chapter08/make.xml
+#: lfs-en/chapter06/make.xml lfs-en/chapter01/whatsnew.xml
+#: lfs-en/chapter08/make.xml
 msgid "Make-&make-version;"
 msgstr "Make-&make-version;"
 
@@ -296,6 +297,18 @@ msgstr "Make"
 msgid "Installation of Make"
 msgstr "安装 Make"
 
+#. type: Content of: <sect1><sect2><screen>
+#: lfs-en/chapter06/make.xml lfs-en/chapter08/make.xml
+#, no-wrap
+msgid ""
+"<userinput remap=\"pre\">sed -e '/ifdef SIGPIPE/,+2 d' \\\n"
+"    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \\\n"
+"    -i src/main.c</userinput>"
+msgstr ""
+"<userinput remap=\"pre\">sed -e '/ifdef SIGPIPE/,+2 d' \\\n"
+"    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \\\n"
+"    -i src/main.c</userinput>"
+
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter06/make.xml lfs-en/chapter08/make.xml
 msgid "Prepare Make for compilation:"
@@ -508,6 +521,11 @@ msgstr "&make-fin-sbu;"
 msgid "&make-fin-du;"
 msgstr "&make-fin-du;"
 
+#. type: Content of: <sect1><sect2><para>
+#: lfs-en/chapter08/make.xml
+msgid "First, fix some issues identified upstream:"
+msgstr "首先，修复上游发现的一些问题："
+
 #. type: Content of: <sect1><sect2><title>
 #: lfs-en/chapter08/make.xml
 msgid "Contents of Make"