Merge branch 'master' into loongarch

zh_CN/chapter01/changelog.po

@@ -63,7 +63,7 @@ msgstr ""
 #. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
 msgid "[bdubbs] - Update to udev-lfs-20230818."
-msgstr ""
+msgstr "[bdubbs] — 更新到 udev-lfs-20230818。"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
@@ -72,17 +72,13 @@ msgstr "2023 年 8 月 15 日"
 
 #. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml
-#, fuzzy
-#| msgid ""
-#| "[bdubbs] - Update to openssl-3.1.2. Fixes <ulink url='&lfs-ticket-"
-#| "root;5305'>#5305</ulink>."
 msgid ""
 "[bdubbs] - Add a patch to fix a performance regression in glibc's "
 "posix_memalign() function. Fixes <ulink url='&lfs-ticket-root;5315'>#5315</"
 "ulink>."
 msgstr ""
-"[bdubbs] — 更新到 openssl-3.1.2。修复 <ulink url='&lfs-ticket-"
-"root;5305'>#5305</ulink>。"
+"[bdubbs] — 加入补丁以修复 glibc 中 posix_memalign() 函数的性能退化问题。修复 "
+"<ulink url='&lfs-ticket-root;5315'>#5315</ulink>。"
 
 #. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
 #: lfs-en/chapter01/changelog.xml

zh_CN/chapter01/whatsnew.po

@@ -256,10 +256,8 @@ msgstr "Texinfo-&texinfo-version;"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
-#, fuzzy
-#| msgid "Tar-&tar-version;"
 msgid "Tzdata-&tzdata-version;"
-msgstr "Tar-&tar-version;"
+msgstr "Tzdata-&tzdata-version;"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
@@ -313,10 +311,8 @@ msgstr "&elfutils-loongarch-patch;"
 
 #. type: Content of: <sect1><itemizedlist><listitem><para>
 #: lfs-en/chapter01/whatsnew.xml
-#, fuzzy
-#| msgid "&glibc-fin-du;"
 msgid "&glibc-memalign-patch;"
-msgstr "&glibc-fin-du;"
+msgstr "&glibc-memalign-patch;"
 
 #. type: Content of: <sect1><itemizedlist><title>
 #: lfs-en/chapter01/whatsnew.xml

zh_CN/chapter03/patches.po

@@ -92,24 +92,18 @@ msgstr "MD5 sum: <literal>&elfutils-loongarch-patch-md5;</literal>"
 
 #. type: Content of: <sect1><variablelist><varlistentry><term>
 #: lfs-en/chapter03/patches.xml
-#, fuzzy
-#| msgid "Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:"
 msgid "Glibc Memalign Patch - <token>&glibc-memalign-patch-size;</token>:"
-msgstr "Glibc FHS 补丁 - <token>&glibc-fhs-patch-size;</token>:"
+msgstr "Glibc Memalign 补丁 - <token>&glibc-memalign-patch-size;</token>:"
 
 #. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
 #: lfs-en/chapter03/patches.xml
-#, fuzzy
-#| msgid "Download: <ulink url=\"&patches-root;&glibc-fhs-patch;\"/>"
 msgid "Download: <ulink url=\"&patches-root;&glibc-memalign-patch;\"/>"
-msgstr "下载地址：<ulink url=\"&patches-root;&glibc-fhs-patch;\"/>"
+msgstr "下载地址：<ulink url=\"&patches-root;&glibc-memalign-patch;\"/>"
 
 #. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
 #: lfs-en/chapter03/patches.xml
-#, fuzzy
-#| msgid "MD5 sum: <literal>&glibc-fhs-patch-md5;</literal>"
 msgid "MD5 sum: <literal>&glibc-memalign-patch-md5;</literal>"
-msgstr "MD5 校验和：<literal>&glibc-fhs-patch-md5;</literal>"
+msgstr "MD5 校验和：<literal>&glibc-memalign-patch-md5;</literal>"
 
 #. type: Content of: <sect1><variablelist><varlistentry><term>
 #: lfs-en/chapter03/patches.xml

zh_CN/chapter08/gcc.po

@@ -763,14 +763,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/gcc.xml
-#, fuzzy
-#| msgid ""
-#| "With Glibc-2.38, the analyzer tests named <filename>data-model-4.c</"
-#| "filename> and <filename>conftest-1.c</filename> are known to fail.  In "
-#| "the asan tests, the subtest named "
-#| "<filename>AddressSanitizer_StrtolOOBTest</filename> in the test "
-#| "<filename>asan_test.C</filename> and the test named "
-#| "<filename>interception-malloc-test-1.C</filename> are known to fail."
 msgid ""
 "With Glibc-2.38, the analyzer tests named <filename>data-model-4.c</"
 "filename> and <filename>conftest-1.c</filename> are known to fail.  In the "
@@ -780,9 +772,8 @@ msgid ""
 msgstr ""
 "在使用 Glibc-2.38 时，已知名为 <filename>data-model-4.c</filename> 和 "
 "<filename>conftest-1.c</filename> 的静态分析器 (analyzer) 测试会失败。在 "
-"asan 测试中，已知 <filename>asan_test.C</filename> 中名为 "
-"<filename>AddressSanitizer_StrtolOOBTest</filename> 的子测试和名为 "
-"<filename>interception-malloc-test-1.C</filename> 的测试会失败。"
+"asan 测试中，已知 <filename>asan_test.C</filename> 中一些测试会失败。已知名"
+"为 <filename>interception-malloc-test-1.C</filename> 的测试会失败。"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/gcc.xml

zh_CN/chapter08/glibc.po

@@ -618,14 +618,13 @@ msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&glibc-fhs-patch;</userinput>"
 msgid ""
 "Now fix a regression causing the posix_memalign() function to be very slow "
 "in some conditions:"
-msgstr ""
+msgstr "现在修复导致 posix_memalign() 函数在一些条件下非常缓慢的退化问题："
 
 #. type: Content of: <sect1><sect2><screen>
 #: lfs-en/chapter08/glibc.xml
-#, fuzzy, no-wrap
-#| msgid "<userinput remap=\"pre\">patch -Np1 -i ../&glibc-fhs-patch;</userinput>"
+#, no-wrap
 msgid "<userinput remap=\"pre\">patch -Np1 -i ../&glibc-memalign-patch;</userinput>"
-msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&glibc-fhs-patch;</userinput>"
+msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&glibc-memalign-patch;</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: lfs-en/chapter08/glibc.xml

zh_CN/chapter08/libxcrypt.po

@@ -576,14 +576,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><note><para>
 #: lfs-en/chapter08/libxcrypt.xml
-#, fuzzy
-#| msgid ""
-#| "The instructions above disabled obsolete API functions since no package "
-#| "installed by compiling from sources would link against them at runtime. "
-#| "However, the only known binary-only applications that link against these "
-#| "functions require ABI version 1.  If you must have such functions because "
-#| "of some binary-only application or to be to be compliant with LSB, build "
-#| "the package again with the following commands:"
 msgid ""
 "The instructions above disabled obsolete API functions since no package "
 "installed by compiling from sources would link against them at runtime. "
@@ -599,16 +591,7 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><note><screen>
 #: lfs-en/chapter08/libxcrypt.xml
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<userinput remap=\"nodump\">make distclean\n"
-#| "./configure --prefix=/usr                \\\n"
-#| "            --enable-hashes=strong,glibc \\\n"
-#| "            --enable-obsolete-api=glibc  \\\n"
-#| "            --disable-static             \\\n"
-#| "            --disable-failure-tokens\n"
-#| "make\n"
-#| "cp -av .libs/libcrypt.so.1* /usr/lib</userinput>"
+#, no-wrap
 msgid ""
 "<userinput>make distclean\n"
 "./configure --prefix=/usr                \\\n"
@@ -619,7 +602,7 @@ msgid ""
 "make\n"
 "cp -av .libs/libcrypt.so.1* /usr/lib</userinput>"
 msgstr ""
-"<userinput remap=\"nodump\">make distclean\n"
+"<userinput>make distclean\n"
 "./configure --prefix=/usr                \\\n"
 "            --enable-hashes=strong,glibc \\\n"
 "            --enable-obsolete-api=glibc  \\\n"

zh_CN/chapter09/usage.po

@@ -302,20 +302,6 @@ msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
 #: lfs-en/chapter09/usage.xml
-#, fuzzy
-#| msgid ""
-#| "There are a number of directories under <filename class=\"directory\">/"
-#| "etc/rc.d</filename> that look like <filename class=\"directory\">rc?.d</"
-#| "filename> (where ? is the number of the run level) and <filename "
-#| "class=\"directory\">rcS.d</filename>, all containing a number of symbolic "
-#| "links. Some links begin with a <emphasis>K</emphasis>; the others begin "
-#| "with an <emphasis>S</emphasis>, and all of them have two numbers "
-#| "following the initial letter. The K means to stop (kill) a service and "
-#| "the S means to start a service. The numbers determine the order in which "
-#| "the scripts are run, from 00 to 99&mdash;the smaller the number, the "
-#| "sooner tht script runs. When <command>init</command> switches to another "
-#| "run level, the appropriate services are either started or stopped, "
-#| "depending on the run level chosen."
 msgid ""
 "There are a number of directories under <filename class=\"directory\">/etc/"
 "rc.d</filename> that look like <filename class=\"directory\">rc?.d</"

zh_CN/chapter10/grub.po

@@ -439,6 +439,17 @@ msgid ""
 "<command>insmod</command> commands will do nothing.  But they do no harm "
 "anyway, and they may be needed with some rare configurations."
 msgstr ""
+"<command>insmod</command> 命令加载 <application>GRUB</application> 模块 "
+"<filename>part_gpt</filename> and <filename>ext2</filename>。<filename>ext2</"
+"filename> 模块尽管如此命名，实际上却支持 <systemitem "
+"class='filesystem'>ext2</systemitem>，<systemitem class='filesystem'>ext3</"
+"systemitem>，以及 <systemitem class='filesystem'>ext4</systemitem> 文件系统。"
+"<command>grub-install</command> 命令已经将一些模块嵌入 <application>GRUB</"
+"application> 主映像 (它安装在 MBR 或 GRUB BIOS 分区中)，以便在访问其他模块 "
+"(这些模块在 <filename class='directory'>/boot/grub/i386-pc</filename> 中) 时"
+"避免“先有鸡还是先有蛋”的问题。因此，在典型的系统配置中，这两个模块已经被嵌入"
+"主映像，此时这两条 <command>insmod</command> 命令不会产生任何效果。但是无论如"
+"何它们不会造成损害，而且在一些少见的系统配置中它们可能是必要的。"
 
 #. type: Content of: <sect1><sect2><note><para>
 #: lfs-en/chapter10/grub.xml

zh_CN/chapter11/afterlfs.po

@@ -119,13 +119,6 @@ msgstr "从 LFS 宿主系统中通过 chroot 进行操作"
 
 #. type: Content of: <sect1><sect2><sect3><para>
 #: lfs-en/chapter11/afterlfs.xml
-#, fuzzy
-#| msgid ""
-#| "This method provides a complete graphical environment where a full "
-#| "featured browser and copy/paste capabilities are available. This method "
-#| "allows using applications like the host's version of wget to download "
-#| "package sources to a location available when working in the chroot "
-#| "envirnment."
 msgid ""
 "This method provides a complete graphical environment where a full featured "
 "browser and copy/paste capabilities are available. This method allows using "