Update to lfs-en @ r12.1

Prepare for 12.1 release. Remove an unnecessary sed in zh_CN/lang.mk BTW.
xry111 · Mar 1, 2024 · 9e6c8d3 · 9e6c8d3
1 parent bb11b1a
commit 9e6c8d3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/lfs-en b/lfs-en
diff --git a/zh_CN/chapter01/changelog.po b/zh_CN/chapter01/changelog.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.0\n"
 "Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
-"POT-Creation-Date: 2024-02-28 01:06+0800\n"
+"POT-Creation-Date: 2024-03-02 00:27+0800\n"
 "PO-Revision-Date: 2022-02-05 22:45+0800\n"
 "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
 "Language-Team: none\n"

diff --git a/zh_CN/chapter08/python.po b/zh_CN/chapter08/python.po
@@ -683,11 +683,11 @@ msgid ""
 "the same version for some reason, insert <parameter>--force-reinstall --no-"
 "deps</parameter> into the command line."
 msgstr ""
-"<command>pip3 install</command> 不会自动重新安装已经安装好的模块。如果需要"
-"用 <command>pip3 install</command> 命令升级模块 (例如，从 meson-0.61.3 升级"
-"到 meson-0.62.0)，则需要在命令行中加入 <parameter>--upgrade</parameter> 选"
-"项。如果由于某种原因，确实需要降级某个模块，或重新安装某个已安装的版本，需要"
-"在命令行中加入 <parameter>--force-reinstall --no-deps</parameter> 选项。"
+"<command>pip3 install</command> 不会自动重新安装已经安装好的模块。如果需要用 "
+"<command>pip3 install</command> 命令升级模块 (例如，从 meson-0.61.3 升级到 "
+"meson-0.62.0)，则需要在命令行中加入 <parameter>--upgrade</parameter> 选项。如"
+"果由于某种原因，确实需要降级某个模块，或重新安装某个已安装的版本，需要在命令"
+"行中加入 <parameter>--force-reinstall --no-deps</parameter> 选项。"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/python.xml

diff --git a/zh_CN/chapter09/networkd.po b/zh_CN/chapter09/networkd.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Linux From Scratch 11.4\n"
 "Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
-"POT-Creation-Date: 2024-01-28 20:56+0800\n"
+"POT-Creation-Date: 2024-03-02 00:25+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
 "Language-Team: none\n"
@@ -259,9 +259,9 @@ msgid ""
 "class=\"extension\">.link</filename>, <filename class=\"extension\">.netdev</"
 "filename> and <filename class=\"extension\">.network</filename> files. For "
 "detailed descriptions and example contents of these configuration files, "
-"consult the <ulink role='man' url='&man;systemd-link.5'>systemd-link(5)</"
-"ulink>, <ulink role='man' url='&man;systemd-netdev.5'>systemd-netdev(5)</"
-"ulink>, and <ulink role='man' url='&man;systemd-network.5'>systemd-"
+"consult the <ulink role='man' url='&man;systemd.link.5'>systemd.link(5)</"
+"ulink>, <ulink role='man' url='&man;systemd.netdev.5'>systemd.netdev(5)</"
+"ulink>, and <ulink role='man' url='&man;systemd.network.5'>systemd."
 "network(5)</ulink> manual pages."
 msgstr ""
 "<command>systemd-networkd</command> (以及 <command>systemd-resolved</"
@@ -272,10 +272,10 @@ msgstr ""
 "systemd/network</filename> 中的配置文件。有三种类型的配置文件：<filename "
 "class=\"extension\">.link</filename>、<filename class=\"extension\">.netdev</"
 "filename> 和 <filename class=\"extension\">.network</filename> 文件。如果需要"
-"它们的详细描述和内容示例，参阅 <ulink role='man' url='&man;systemd-"
-"link.5'>systemd-link(5)</ulink>，<ulink role='man' url='&man;systemd-"
-"netdev.5'>systemd-netdev(5)</ulink>，以及 <ulink role='man' url='&man;"
-"systemd-network.5'>systemd-network(5)</ulink> 手册页。"
+"它们的详细描述和内容示例，参阅 <ulink role='man' url='&man;systemd."
+"link.5'>systemd.link(5)</ulink>，<ulink role='man' url='&man;systemd."
+"netdev.5'>systemd.netdev(5)</ulink>，以及 <ulink role='man' url='&man;"
+"systemd.network.5'>systemd.network(5)</ulink> 手册页。"
 
 #. type: Content of: <sect1><sect2><sect3><title>
 #: lfs-en/chapter09/networkd.xml

diff --git a/zh_CN/lang.mk b/zh_CN/lang.mk
@@ -24,7 +24,6 @@ zh_CN/book/packages.ent: $(LFS_EN)/packages.ent $(THIS)
 	    -e 's/typically about/一般约/'                      \
 	    -e 's/about \(.*\) with tests/计入测试时间为约 \1/' \
 	    -e 's/with tests/已计入测试时间/'                   \
-	    -e '/encoding=/s/ISO-8859-1/UTF-8/'                 \
 	    -e 's/\([0-9.]* SBU\) on a spinning disk, \(.* SBU\) on an SSD/机械硬盘上 \1，固态硬盘上 \2/' \
 	    $< > $@