Skip to content

Commit

Permalink
Update to lfs-en @ e122d24
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Feb 22, 2023
1 parent 45f9461 commit 826a682
Show file tree
Hide file tree
Showing 10 changed files with 199 additions and 46 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from d94d60 to e122d2
97 changes: 74 additions & 23 deletions zh_CN/appendices/dependencies.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-02-07 00:00+0800\n"
"POT-Creation-Date: 2023-02-22 16:20+0800\n"
"PO-Revision-Date: 2022-02-11 20:04+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: noneLanguage: zh_CN\n"
Expand Down Expand Up @@ -413,6 +413,12 @@ msgstr "Vim"
msgid "Meson"
msgstr "Meson"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter08/dbus.xml lfs-en/appendices/dependencies.xml
#: lfs-en/prologue/why.xml
msgid "D-Bus"
msgstr "D-Bus"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter08/dejagnu.xml lfs-en/appendices/dependencies.xml
#: lfs-en/prologue/why.xml
Expand Down Expand Up @@ -734,8 +740,14 @@ msgstr "Diffutils, E2fsprogs, Findutils, Shadow, 以及 Util-linux"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "Bash, Diffutils, Eudev, Findutils, and Man-DB"
msgstr "Bash, Diffutils, Findutils, 以及 Man-DB"
msgid ""
"Bash, Diffutils, <phrase revision=\"sysv\">Eudev, </phrase> Findutils, "
"<phrase revision=\"sysv\">and </phrase>Man-DB<phrase revision=\"systemd\">, "
"and Systemd</phrase>"
msgstr ""
"Bash, Diffutils, <phrase revision=\"sysv\">Eudev, </phrase> Findutils, "
"<phrase revision=\"sysv\">以及 </phrase>Man-DB<phrase revision=\"systemd\">, "
"以及 Systemd</phrase>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand All @@ -746,6 +758,30 @@ msgstr ""
"<ulink url=\"https://metacpan.org/pod/Expect\">Expect.pm</ulink> 和 <ulink "
"url=\"https://metacpan.org/pod/IO::Tty\">IO::Tty</ulink>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
"Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make, Sed, "
"Systemd, and Util-linux"
msgstr ""
"Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make, Sed, "
"Systemd, 以及 Util-linux"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "Glibc and Systemd"
msgstr "Glibc 和 Systemd"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "Several packages in BLFS"
msgstr "一些 BLFS 软件包"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "<ulink url=\"&blfs-book;x/x7lib.html\">Xorg Libraries</ulink>"
msgstr "<ulink url=\"&blfs-book;x/x7lib.html\">Xorg 库</ulink>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "Bash, Coreutils, Diffutils, Expect, GCC, Grep, Make, Sed, and Texinfo"
Expand Down Expand Up @@ -1171,6 +1207,15 @@ msgstr ""
msgid "Glibc, Xz, and Zlib"
msgstr "Glibc, Xz, 以及 Zlib"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
"<phrase revision=\"sysv\">Eudev</phrase> <phrase "
"revision=\"systemd\">Systemd</phrase>"
msgstr ""
"<phrase revision='sysv'>Eudev</phrase> <phrase revision='systemd'>Systemd</"
"phrase>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
Expand All @@ -1187,8 +1232,12 @@ msgstr "Glibc 和 Ncurses"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "<ulink url=\"&blfs-book;general/pcre.html\">PCRE</ulink>"
msgstr "<ulink url=\"&blfs-book;general/pcre.html\">PCRE</ulink>"
msgid ""
"<ulink url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink> or <ulink "
"url=\"&blfs-book;general/pcre.html\">PCRE</ulink>"
msgstr ""
"<ulink url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink> 或 <ulink "
"url=\"&blfs-book;general/pcre.html\">PCRE</ulink>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand Down Expand Up @@ -1465,12 +1514,6 @@ msgstr "<ulink url=\"&blfs-book;server/db.html\">Berkeley DB</ulink>"
msgid "Pkg-config"
msgstr "Pkg-config"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt, and Sed"
msgstr ""
"Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt, 以及 Sed"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "<ulink url=\"&blfs-book;general/glib2.html\">Glib2</ulink>"
Expand Down Expand Up @@ -1617,9 +1660,9 @@ msgid ""
"html\">qemu</ulink>, <ulink url=\"&blfs-book;general/qrencode."
"html\">qrencode</ulink>, <ulink url=\"https://sourceforge.net/projects/"
"linuxquota/\"> quota-tools</ulink>, <ulink url=\"&blfs-book;basicnet/rsync."
"html\">rsync</ulink>, <ulink url=\"https://pypi.python.org/pypi/"
"Sphinx\">Sphinx</ulink>, <ulink url=\"https://tpm2-tss.readthedocs.io/en/"
"latest/\"> tpm2-tss</ulink>, <ulink url=\"&blfs-book;general/valgrind."
"html\">rsync</ulink>, <ulink url=\"&blfs-book;general/python-modules."
"html#sphinx\"> Sphinx</ulink>, <ulink url=\"https://tpm2-tss.readthedocs.io/"
"en/latest/\"> tpm2-tss</ulink>, <ulink url=\"&blfs-book;general/valgrind."
"html\">Valgrind</ulink>, and <ulink url=\"&blfs-book;postlfs/zsh.html\">zsh</"
"ulink>"
msgstr ""
Expand Down Expand Up @@ -1651,9 +1694,9 @@ msgstr ""
"html\">qemu</ulink>, <ulink url=\"&blfs-book;general/qrencode."
"html\">qrencode</ulink>, <ulink url=\"https://sourceforge.net/projects/"
"linuxquota/\"> quota-tools</ulink>, <ulink url=\"&blfs-book;basicnet/rsync."
"html\">rsync</ulink>, <ulink url=\"https://pypi.python.org/pypi/"
"Sphinx\">Sphinx</ulink>, <ulink url=\"https://tpm2-tss.readthedocs.io/en/"
"latest/\"> tpm2-tss</ulink>, <ulink url=\"&blfs-book;general/valgrind."
"html\">rsync</ulink>, <ulink url=\"&blfs-book;general/python-modules."
"html#sphinx\">Sphinx</ulink>, <ulink url=\"https://tpm2-tss.readthedocs.io/"
"en/latest/\"> tpm2-tss</ulink>, <ulink url=\"&blfs-book;general/valgrind."
"html\">Valgrind</ulink>, 以及 <ulink url=\"&blfs-book;postlfs/zsh."
"html\">zsh</ulink>"

Expand Down Expand Up @@ -1698,11 +1741,13 @@ msgstr ""
#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
"Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, GCC, Gettext, "
"Glibc, Grep, Make, Ncurses, Sed, and Zlib"
"Bash, Binutils, Coreutils, Diffutils, <phrase revision=\"sysv\">Eudev, </"
"phrase>Findutils, Gawk, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, "
"<phrase revision=\"systemd\">Systemd, </phrase>and Zlib"
msgstr ""
"Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, GCC, Gettext, "
"Glibc, Grep, Make, Ncurses, Sed, 以及 Zlib"
"Bash, Binutils, Coreutils, Diffutils, <phrase revision=\"sysv\">Eudev, </"
"phrase>Findutils, Gawk, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, "
"<phrase revision=\"systemd\">Systemd, </phrase>以及 Zlib"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand Down Expand Up @@ -1775,8 +1820,14 @@ msgstr "Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, 以及 Make."

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "Eudev, File, GRUB, Kmod, and Man-DB"
msgstr "Eudev, File, GRUB, Kmod, 以及 Man-DB"
msgid ""
"<phrase revision=\"sysv\">Eudev, </phrase>File, GRUB, Kmod, <phrase "
"revision=\"sysv\">and </phrase>Man-DB<phrase revision=\"systemd\">, and "
"Systemd</phrase>"
msgstr ""
"<phrase revision=\"sysv\">Eudev, </phrase>File, GRUB, Kmod, <phrase "
"revision=\"sysv\">以及 </phrase>Man-DB<phrase revision=\"systemd\">, 以及 "
"Systemd</phrase>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand Down
20 changes: 17 additions & 3 deletions zh_CN/chapter01/changelog.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-02-14 14:40+0800\n"
"POT-Creation-Date: 2023-02-22 16:41+0800\n"
"PO-Revision-Date: 2022-02-05 22:45+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: noneLanguage: zh_CN\n"
Expand Down Expand Up @@ -46,6 +46,20 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-02-19"
msgstr "2023 年 2 月 19 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[xry111] - Apply a patch for GRUB for an issue triggered with "
"e2fsprogs-1.47.0. Fixes <ulink url=\"&lfs-ticket-root;5219\">#5219</ulink>."
msgstr ""
"[xry111] — 为 GRUB 应用补丁,以修复被 e2fsprogs-1.47.0 触发的一项问题。修复 "
"<ulink url=\"&lfs-ticket-root;5219\">#5219</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-02-13"
Expand Down Expand Up @@ -96,10 +110,10 @@ msgstr ""
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to e2fsprogs-1.47.0. Fixes <ulink url=\"&lfs-ticket-"
"root;5214\">#5213</ulink>."
"root;5213\">#5213</ulink>."
msgstr ""
"[bdubbs] — 更新到 e2fsprogs-1.47.0。修复 <ulink url=\"&lfs-ticket-"
"root;5214\">#5213</ulink>。"
"root;5213\">#5213</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
Expand Down
13 changes: 12 additions & 1 deletion zh_CN/chapter01/whatsnew.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-02-13 03:55+0800\n"
"POT-Creation-Date: 2023-02-22 16:20+0800\n"
"PO-Revision-Date: 2021-11-05 23:31+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: noneLanguage: zh_CN\n"
Expand Down Expand Up @@ -130,6 +130,12 @@ msgstr "Expat-&expat-version;"
msgid "Gettext-&gettext-version;"
msgstr "Gettext-&gettext-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter05/glibc.xml
#: lfs-en/chapter08/glibc.xml
msgid "Glibc-&glibc-version;"
msgstr "Glibc-&glibc-version;"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "IANA-Etc-&iana-etc-version;"
Expand Down Expand Up @@ -292,6 +298,11 @@ msgstr "Zstd-&zstd-version;"
msgid "Added:"
msgstr "已添加:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "&grub-upstream-fixes-patch;"
msgstr "&grub-upstream-fixes-patch;"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "&readline-fixes-patch;"
Expand Down
18 changes: 17 additions & 1 deletion zh_CN/chapter03/patches.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-02-13 03:55+0800\n"
"POT-Creation-Date: 2023-02-22 16:20+0800\n"
"PO-Revision-Date: 2022-01-16 00:53+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: noneLanguage: zh_CN\n"
Expand Down Expand Up @@ -83,6 +83,22 @@ msgstr "下载地址:<ulink url=\"&patches-root;&glibc-fhs-patch;\"/>"
msgid "MD5 sum: <literal>&glibc-fhs-patch-md5;</literal>"
msgstr "MD5 校验和:<literal>&glibc-fhs-patch-md5;</literal>"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter03/patches.xml
msgid ""
"GRUB Upstream Fixes Patch - <token>&grub-upstream-fixes-patch-size;</token>:"
msgstr "GRUB 上游修复补丁 - <token>&grub-upstream-fixes-patch-size;</token>:"

#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
#: lfs-en/chapter03/patches.xml
msgid "Download: <ulink url=\"&patches-root;&grub-upstream-fixes-patch;\"/>"
msgstr "下载地址:<ulink url=\"&patches-root;&grub-upstream-fixes-patch;\"/>"

#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
#: lfs-en/chapter03/patches.xml
msgid "MD5 sum: <literal>&grub-upstream-fixes-patch-md5;</literal>"
msgstr "MD5 校验和:<literal>&grub-upstream-fixes-patch-md5;</literal>"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter03/patches.xml
msgid ""
Expand Down
13 changes: 7 additions & 6 deletions zh_CN/chapter05/glibc.po
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2023-02-04 23:29+0800\n"
"POT-Creation-Date: 2023-02-22 16:20+0800\n"
"PO-Revision-Date: 2021-08-07 09:09+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: noneLanguage: zh_CN\n"
Expand Down Expand Up @@ -326,6 +326,12 @@ msgstr ""
"<userinput remap=\"pre\">mkdir -v build\n"
"cd build</userinput>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter05/glibc.xml
#: lfs-en/chapter08/glibc.xml
msgid "Glibc-&glibc-version;"
msgstr "Glibc-&glibc-version;"

#. type: Content of: <sect1><sect1info><address>
#: lfs-en/chapter05/glibc.xml lfs-en/chapter08/glibc.xml
#, no-wrap
Expand All @@ -341,11 +347,6 @@ msgstr ""
"<productname>glibc</productname> <productnumber>&glibc-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter05/glibc.xml lfs-en/chapter08/glibc.xml
msgid "Glibc-&glibc-version;"
msgstr "Glibc-&glibc-version;"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter05/glibc.xml lfs-en/chapter08/glibc.xml
#: lfs-en/appendices/dependencies.xml lfs-en/prologue/why.xml
Expand Down
42 changes: 41 additions & 1 deletion zh_CN/chapter08/e2fsprogs.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: lfs-dev@lists.linuxfromscratch.org\n"
"POT-Creation-Date: 2023-02-08 09:41+0800\n"
"POT-Creation-Date: 2023-02-22 16:20+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -682,6 +682,46 @@ msgstr ""
"install -v -m644 doc/com_err.info /usr/share/info\n"
"install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput>"

#. type: Content of: <sect1><sect2><title>
#: lfs-en/chapter08/e2fsprogs.xml
msgid "Configuring E2fsprogs"
msgstr "配置 E2fsprogs"

#. type: Content of: <sect1><sect2><indexterm><primary>
#: lfs-en/chapter08/e2fsprogs.xml
msgid "/etc/mke2fs.conf"
msgstr "/etc/mke2fs.conf"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/e2fsprogs.xml
msgid ""
"<filename>/etc/mke2fs.conf</filename> contains the default value of various "
"command line options of <command>mke2fs</command>. You may edit the file to "
"make the default values suitable for your need. For example, some utilities "
"(not in LFS or BLFS) cannot recognize a <systemitem class='filesystem'>ext4</"
"systemitem> file system with <literal>metadata_csum_seed</literal> feature "
"enabled. <emphasis role='bold'>If</emphasis> you need such an utility, you "
"may remove the feature from the default <systemitem class='filesystem'>ext4</"
"systemitem> feature list with the command:"
msgstr ""
"<filename>/etc/mke2fs.conf</filename> 包含 <command>mke2fs</command> 一些命令"
"行选项的默认值。您可以修改这些默认值,使之符合您的需求。例如,一些工具 (未被 "
"LFS 或 BLFS 包含) 无法识别启用了 <literal>metadata_csum_seed</literal> 特性"
"的 <systemitem class='filesystem'>ext4</systemitem> 文件系统。<emphasis "
"role='bold'>如果</emphasis>需要使用这样的工具,可以执行命令,从默认的 "
"<systemitem class='filesystem'>ext4</systemitem> 特性列表中移除该特性:"

#. type: Content of: <sect1><sect2><screen>
#: lfs-en/chapter08/e2fsprogs.xml
#, no-wrap
msgid "<userinput>sed 's/metadata_csum_seed,//' -i /etc/mke2fs.conf</userinput>"
msgstr "<userinput>sed 's/metadata_csum_seed,//' -i /etc/mke2fs.conf</userinput>"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/e2fsprogs.xml
msgid "Read the man page <filename>mke2fs.conf(5)</filename> for details."
msgstr "更多信息详见 man 页面 <filename>mke2fs.conf(5)</filename>。"

#. type: Content of: <sect1><sect2><title>
#: lfs-en/chapter08/e2fsprogs.xml
msgid "Contents of E2fsprogs"
Expand Down
Loading

0 comments on commit 826a682

Please sign in to comment.