Merge commit '9e6c8d39fefe4c8eddacc24a41d7404322113efa' into loongarch

xry111 · Mar 2, 2024 · 9efe11a · 9efe11a
2 parents 767ad94 + 9e6c8d3
commit 9efe11a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
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
@@ -248,22 +248,6 @@ msgstr "<userinput>systemctl disable systemd-networkd-wait-online</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter09/networkd.xml
-#, fuzzy
-#| msgid ""
-#| "Configuration files for <command>systemd-networkd</command> (and "
-#| "<command>systemd-resolved</command>) can be placed in <filename "
-#| "class=\"directory\">/usr/lib/systemd/network</filename> or <filename "
-#| "class=\"directory\">/etc/systemd/network</filename>. Files in <filename "
-#| "class=\"directory\">/etc/systemd/network</filename> have a higher "
-#| "priority than the ones in <filename class=\"directory\">/usr/lib/systemd/"
-#| "network</filename>.  There are three types of configuration files: "
-#| "<filename 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-network(5)</ulink> manual pages."
 msgid ""
 "Configuration files for <command>systemd-networkd</command> (and "
 "<command>systemd-resolved</command>) can be placed in <filename "
@@ -288,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
@@ -26,7 +26,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/' \
 	    $< > $@