Merge branch 'master' into loongarch

xry111 · Mar 2, 2024 · 900e6d3 · 900e6d3
2 parents c6f1f2d + d0e97db
commit 900e6d3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/zh_CN/chapter01/changelog.po b/zh_CN/chapter01/changelog.po
@@ -53,7 +53,5 @@ msgstr "2024 年 3 月 1 日"
 
 #. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
-#, fuzzy
-#| msgid "[bdubbs] - LFS-12.0 released."
 msgid "[bdubbs] - LFS-12.1 released."
-msgstr "[bdubbs] - LFS-12.0 发布。"
+msgstr "[bdubbs] — LFS-12.1 发布。"
diff --git a/zh_CN/chapter08/coreutils.po b/zh_CN/chapter08/coreutils.po
@@ -688,13 +688,16 @@ msgid ""
 "to a PTY from host distro, and the device node for such a PTY cannot be "
 "accessed from the LFS chroot environment):"
 msgstr ""
+"现在运行测试 (使用 <filename>/dev/null</filename> 作为标准输入，否则在图形终"
+"端，SSH 会话，或者 GNU Screen 等环境构建 LFS 时，由于标准输入连接到了宿主发行"
+"版的 PTY，而该 PTY 的设备节点无法在 LFS chroot 环境中访问，两项测试无法正常工"
+"作)："
 
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter08/coreutils.xml
-#, fuzzy, no-wrap
-#| msgid "<userinput remap=\"test\">su tester -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\"</userinput>"
+#, no-wrap
 msgid "<userinput remap=\"test\">su tester -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\" &lt; /dev/null</userinput>"
-msgstr "<userinput remap=\"test\">su tester -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\"</userinput>"
+msgstr "<userinput remap=\"test\">su tester -c \"PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check\" &lt; /dev/null</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/coreutils.xml

diff --git a/zh_CN/chapter08/glibc.po b/zh_CN/chapter08/glibc.po
@@ -758,10 +758,9 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><screen>
 #: lfs-en/chapter08/glibc.xml
-#, fuzzy, no-wrap
-#| msgid "<userinput>grep \"Timed out\" -l $(find -name \\*.out)</userinput>"
+#, no-wrap
 msgid "<userinput remap=\"test\">grep \"Timed out\" $(find -name \\*.out)</userinput>"
-msgstr "<userinput>grep \"Timed out\" -l $(find -name \\*.out)</userinput>"
+msgstr "<userinput remap=\"test\">grep \"Timed out\" $(find -name \\*.out)</userinput>"
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
 #: lfs-en/chapter08/glibc.xml

diff --git a/zh_CN/chapter08/procps.po b/zh_CN/chapter08/procps.po
@@ -588,22 +588,14 @@ msgstr "如果要运行测试套件，执行命令："
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/procps.xml
-#, fuzzy
-#| msgid ""
-#| "One test named <literal>ps with output flag bsdtime,cputime,etime,etimes</"
-#| "literal> is known to fail if the host kernel is not built with "
-#| "<literal>CONFIG_BSD_PROCESS_ACCT</literal> enabled.  Two tests named "
-#| "<literal>pmap X with unreachable process</literal> and <literal>pmap XX "
-#| "with unreachable process</literal> are known to fail occasionally."
 msgid ""
 "One test named <literal>ps with output flag bsdtime,cputime,etime,etimes</"
 "literal> is known to fail if the host kernel is not built with "
 "<literal>CONFIG_BSD_PROCESS_ACCT</literal> enabled."
 msgstr ""
 "已知名为 <literal>ps with output flag bsdtime,cputime,etime,etimes</literal> "
 "的一项测试在宿主系统内核未启用 <literal>CONFIG_BSD_PROCESS_ACCT</literal> 时"
-"会失败。已知名为 <literal>pmap X with unreachable process</literal> 和 "
-"<literal>pmap XX with unreachable process</literal> 的两项测试有时会失败。"
+"会失败。"
 
 #. type: Content of: <sect1><sect2><title>
 #: lfs-en/chapter08/procps.xml