Manual translate after merge

xry111 · Jan 2, 2024 · 413ac91 · 413ac91
1 parent 278a919
commit 413ac91
Show file tree

Hide file tree

Showing 84 changed files with 27,306 additions and 27,316 deletions.
diff --git a/zh_CN/appendices/dependencies.po b/zh_CN/appendices/dependencies.po
diff --git a/zh_CN/chapter01/whatsnew.po b/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: 2024-01-02 21:02+0800\n"
+"POT-Creation-Date: 2024-01-02 21:03+0800\n"
 "PO-Revision-Date: 2021-11-05 23:31+0800\n"
 "Last-Translator: Xi Ruoyao <[email protected]>\n"
 "Language-Team: none\n"
@@ -19,36 +19,6 @@ msgstr ""
 "X-Pootle-Path: /zh_CN/lfs/chapter01/whatsnew.po\n"
 "X-Pootle-Revision: 9999999\n"
 
-#. type: Content of: <sect1><title>
-#: lfs-en/chapter06/bash.xml lfs-en/chapter01/whatsnew.xml
-#: lfs-en/chapter08/bash.xml
-msgid "Bash-&bash-version;"
-msgstr "Bash-&bash-version;"
-
-#. type: Content of: <sect1><title>
-#: lfs-en/chapter06/coreutils.xml lfs-en/chapter01/whatsnew.xml
-#: lfs-en/chapter08/coreutils.xml
-msgid "Coreutils-&coreutils-version;"
-msgstr "Coreutils-&coreutils-version;"
-
-#. type: Content of: <sect1><title>
-#: lfs-en/chapter06/gzip.xml lfs-en/chapter01/whatsnew.xml
-#: lfs-en/chapter08/gzip.xml
-msgid "Gzip-&gzip-version;"
-msgstr "Gzip-&gzip-version;"
-
-#. type: Content of: <sect1><title>
-#: lfs-en/chapter06/xz.xml lfs-en/chapter01/whatsnew.xml
-#: lfs-en/chapter08/xz.xml
-msgid "Xz-&xz-version;"
-msgstr "Xz-&xz-version;"
-
-#. type: Content of: <sect1><title>
-#: lfs-en/chapter06/gawk.xml lfs-en/chapter01/whatsnew.xml
-#: lfs-en/chapter08/gawk.xml
-msgid "Gawk-&gawk-version;"
-msgstr "Gawk-&gawk-version;"
-
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml
 msgid "What's new since the last release"
@@ -70,16 +40,34 @@ msgstr "已升级："
 msgid "Autoconf-&autoconf-version;"
 msgstr "Autoconf-&autoconf-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/bash.xml
+#: lfs-en/chapter08/bash.xml
+msgid "Bash-&bash-version;"
+msgstr "Bash-&bash-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/bc.xml
 msgid "Bc-&bc-version;"
 msgstr "Bc-&bc-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/coreutils.xml
+#: lfs-en/chapter08/coreutils.xml
+msgid "Coreutils-&coreutils-version;"
+msgstr "Coreutils-&coreutils-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/dbus.xml
 msgid "D-Bus-&dbus-version;"
 msgstr "D-Bus-&dbus-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/gawk.xml
+#: lfs-en/chapter08/gawk.xml
+msgid "Gawk-&gawk-version;"
+msgstr "Gawk-&gawk-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter07/gettext.xml
 #: lfs-en/chapter08/gettext.xml
@@ -91,6 +79,12 @@ msgstr "Gettext-&gettext-version;"
 msgid "GRUB-&grub-version;"
 msgstr "GRUB-&grub-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/gzip.xml
+#: lfs-en/chapter08/gzip.xml
+msgid "Gzip-&gzip-version;"
+msgstr "Gzip-&gzip-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/iana-etc.xml
 msgid "Iana-Etc-&iana-etc-version;"
@@ -210,6 +204,12 @@ msgstr "Wheel-&wheel-version;"
 msgid "XML::Parser-&xml-parser-version;"
 msgstr "XML::Parser-&xml-parser-version;"
 
+#. type: Content of: <sect1><title>
+#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter06/xz.xml
+#: lfs-en/chapter08/xz.xml
+msgid "Xz-&xz-version;"
+msgstr "Xz-&xz-version;"
+
 #. type: Content of: <sect1><title>
 #: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/zlib.xml
 msgid "Zlib-&zlib-version;"
@@ -242,10 +242,8 @@ msgstr "已移除："
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
-#, fuzzy
-#| msgid "&elfutils-loongarch-patch;"
 msgid "elfutils-0.189-loongarch-3.patch"
-msgstr "&elfutils-loongarch-patch;"
+msgstr "elfutils-0.189-loongarch-3.patch"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml

diff --git a/zh_CN/chapter02/hostreqs.po b/zh_CN/chapter02/hostreqs.po
@@ -274,96 +274,7 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter02/hostreqs.xml
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<userinput>cat &gt; version-check.sh &lt;&lt; \"EOF\"\n"
-#| "<literal>#!/bin/bash\n"
-#| "# A script to list version numbers of critical development tools\n"
-#| "\n"
-#| "# If you have tools installed in other directories, adjust PATH here AND\n"
-#| "# in ~lfs/.bashrc (section 4.4) as well.\n"
-#| "\n"
-#| "LC_ALL=C \n"
-#| "PATH=/usr/bin:/bin\n"
-#| "\n"
-#| "bail() { echo \"FATAL: $1\"; exit 1; }\n"
-#| "grep --version > /dev/null 2> /dev/null || bail \"grep does not work\"\n"
-#| "sed '' /dev/null || bail \"sed does not work\"\n"
-#| "sort   /dev/null || bail \"sort does not work\"\n"
-#| "\n"
-#| "ver_check()\n"
-#| "{\n"
-#| "   if ! type -p $2 &amp;>/dev/null\n"
-#| "   then \n"
-#| "     echo \"ERROR: Cannot find $2 ($1)\"; return 1; \n"
-#| "   fi\n"
-#| "   v=$($2 --version 2>&amp;1 | grep -E -o '[0-9]+\\.[0-9\\.]+[a-z]*' | head -n1)\n"
-#| "   if printf '%s\\n' $3 $v | sort --version-sort --check &amp;>/dev/null\n"
-#| "   then \n"
-#| "     printf \"OK:    %-9s %-6s >= $3\\n\" \"$1\" \"$v\"; return 0;\n"
-#| "   else \n"
-#| "     printf \"ERROR: %-9s is TOO OLD ($3 or later required)\\n\" \"$1\"; \n"
-#| "     return 1; \n"
-#| "   fi\n"
-#| "}\n"
-#| "\n"
-#| "ver_kernel()\n"
-#| "{\n"
-#| "   kver=$(uname -r | grep -E -o '^[0-9\\.]+')\n"
-#| "   if printf '%s\\n' $1 $kver | sort --version-sort --check &amp;>/dev/null\n"
-#| "   then \n"
-#| "     printf \"OK:    Linux Kernel $kver >= $1\\n\"; return 0;\n"
-#| "   else \n"
-#| "     printf \"ERROR: Linux Kernel ($kver) is TOO OLD ($1 or later required)\\n\" \"$kver\"; \n"
-#| "     return 1; \n"
-#| "   fi\n"
-#| "}\n"
-#| "\n"
-#| "# Coreutils first because-sort needs Coreutils >= 7.0\n"
-#| "ver_check Coreutils      sort     7.0 || bail \"--version-sort unsupported\"\n"
-#| "ver_check Bash           bash     3.2\n"
-#| "ver_check Binutils       ld       2.38\n"
-#| "ver_check Bison          bison    2.7\n"
-#| "ver_check Diffutils      diff     2.8.1\n"
-#| "ver_check Findutils      find     4.2.31\n"
-#| "ver_check Gawk           gawk     4.0.1\n"
-#| "ver_check GCC            gcc      12.2\n"
-#| "ver_check \"GCC (C++)\"    g++      12.2\n"
-#| "ver_check Grep           grep     2.5.1a\n"
-#| "ver_check Gzip           gzip     1.3.12\n"
-#| "ver_check M4             m4       1.4.10\n"
-#| "ver_check Make           make     4.0\n"
-#| "ver_check Patch          patch    2.5.4\n"
-#| "ver_check Perl           perl     5.8.8\n"
-#| "ver_check Python         python3  3.4\n"
-#| "ver_check Sed            sed      4.1.5\n"
-#| "ver_check Tar            tar      1.22\n"
-#| "ver_check Texinfo        texi2any 4.7\n"
-#| "ver_check Xz             xz       5.0.0\n"
-#| "ver_kernel &min-kernel;\n"
-#| "\n"
-#| "if mount | grep -q 'devpts on /dev/pts' &amp;&amp; [ -e /dev/ptmx ]\n"
-#| "then echo \"OK:    Linux Kernel supports UNIX 98 PTY\";\n"
-#| "else echo \"ERROR: Linux Kernel does NOT support UNIX 98 PTY\"; fi\n"
-#| "\n"
-#| "alias_check() {\n"
-#| "   if $1 --version 2>&amp;1 | grep -qi $2\n"
-#| "   then printf \"OK:    %-4s is $2\\n\" \"$1\";\n"
-#| "   else printf \"ERROR: %-4s is NOT $2\\n\" \"$1\"; fi\n"
-#| "}\n"
-#| "echo \"Aliases:\"\n"
-#| "alias_check awk GNU\n"
-#| "alias_check yacc Bison\n"
-#| "alias_check sh Bash\n"
-#| "\n"
-#| "echo \"Compiler check:\"\n"
-#| "if printf \"int main(){}\" | g++ -x c++ -\n"
-#| "then echo \"OK:    g++ works\";\n"
-#| "else echo \"ERROR: g++ does NOT work\"; fi\n"
-#| "rm -f a.out</literal>\n"
-#| "EOF\n"
-#| "\n"
-#| "bash version-check.sh</userinput>"
+#, no-wrap
 msgid ""
 "<?dbfo keep-together=\"auto\"?><userinput>cat &gt; version-check.sh &lt;&lt; \"EOF\"\n"
 "<literal>#!/bin/bash\n"
@@ -460,7 +371,7 @@ msgid ""
 "\n"
 "bash version-check.sh</userinput>"
 msgstr ""
-"<userinput>cat &gt; version-check.sh &lt;&lt; \"EOF\"\n"
+"<?dbfo keep-together=\"auto\"?><userinput>cat &gt; version-check.sh &lt;&lt; \"EOF\"\n"
 "<literal>#!/bin/bash\n"
 "# A script to list version numbers of critical development tools\n"
 "\n"
@@ -503,8 +414,8 @@ msgstr ""
 "   fi\n"
 "}\n"
 "\n"
-"# Coreutils first because-sort needs Coreutils >= 7.0\n"
-"ver_check Coreutils      sort     7.0 || bail \"--version-sort unsupported\"\n"
+"# Coreutils first because --version-sort needs Coreutils >= 7.0\n"
+"ver_check Coreutils      sort     8.1 || bail \"Coreutils too old, stop\"\n"
 "ver_check Bash           bash     3.2\n"
 "ver_check Binutils       ld       2.38\n"
 "ver_check Bison          bison    2.7\n"
@@ -522,7 +433,7 @@ msgstr ""
 "ver_check Python         python3  3.4\n"
 "ver_check Sed            sed      4.1.5\n"
 "ver_check Tar            tar      1.22\n"
-"ver_check Texinfo        texi2any 4.7\n"
+"ver_check Texinfo        texi2any 5.0\n"
 "ver_check Xz             xz       5.0.0\n"
 "ver_kernel &min-kernel;\n"
 "\n"
@@ -544,7 +455,13 @@ msgstr ""
 "if printf \"int main(){}\" | g++ -x c++ -\n"
 "then echo \"OK:    g++ works\";\n"
 "else echo \"ERROR: g++ does NOT work\"; fi\n"
-"rm -f a.out</literal>\n"
+"rm -f a.out\n"
+"\n"
+"if [ \"$(nproc)\" = \"\" ]; then\n"
+"   echo \"ERROR: nproc is not available or it produces empty output\"\n"
+"else\n"
+"   echo \"OK: nproc reports $(nproc) logical cores are available\"\n"
+"fi</literal>\n"
 "EOF\n"
 "\n"
 "bash version-check.sh</userinput>"