Skip to content

Commit

Permalink
Update to lfs-en @ 5561764
Browse files Browse the repository at this point in the history
  • Loading branch information
@xry111
xry111 committed Sep 1, 2023
1 parent 803a599 commit 842abe9
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 50 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 22c36b to 556176
101 changes: 60 additions & 41 deletions zh_CN/appendices/dependencies.po
View file
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: [email protected]\n"
"POT-Creation-Date: 2023-07-18 12:46+0800\n"
"POT-Creation-Date: 2023-09-02 01:22+0800\n"
"PO-Revision-Date: 2022-02-11 20:04+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -380,7 +380,7 @@ msgstr "E2fsprogs"

#. type: Content of: <sect1><indexterm><primary>
#: lfs-en/chapter08/udev.xml lfs-en/appendices/dependencies.xml
#: lfs-en/chapter09/udev.xml
#: lfs-en/prologue/why.xml lfs-en/chapter09/udev.xml
msgid "Udev"
msgstr "Udev"

Expand Down Expand Up @@ -615,6 +615,11 @@ msgstr "Bash, Coreutils, Grep, M4, Make, Sed, 以及 Texinfo"
msgid "Automake, Diffutils, Findutils, GCC, and Libtool"
msgstr "Automake, Diffutils, Findutils, GCC, 以及 Libtool"

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

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "<ulink url=\"&blfs-book;postlfs/emacs.html\">Emacs</ulink>"
Expand Down Expand Up @@ -749,11 +754,11 @@ msgstr "<ulink url='&github;/testing-cabal/subunit'>libsubunit</ulink>"
#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
"Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap, Make, "
"OpenSSL, Patch, Perl, Sed, and Texinfo"
"Autoconf, Automake, Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, "
"Grep, Libcap, Make, OpenSSL, Patch, Perl, Sed, and Texinfo"
msgstr ""
"Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap, Make, "
"OpenSSL, Patch, Perl, Sed, 以及 Texinfo"
"Autoconf, Automake, Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, "
"Grep, Libcap, Make, OpenSSL, Patch, Perl, Sed, 以及 Texinfo"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand Down Expand Up @@ -1712,21 +1717,24 @@ msgstr "D-Bus, E2fsprogs, Man-DB, Procps-ng, 以及 Util-linux"
#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
"<ulink url=\"https://www.apparmor.net/\">AppArmor</ulink>, <ulink "
"url=\"&github;/linux-audit/audit-userspace\"> audit-userspace</ulink>, "
"<ulink url=\"&github;/scop/bash-completion\"> bash-completion</ulink>, "
"<ulink url=\"&blfs-book;postlfs/btrfs-progs.html\">btrfs-progs</ulink>, "
"<ulink url=\"&blfs-book;basicnet/curl.html\">cURL</ulink>, <ulink "
"url=\"&blfs-book;postlfs/cryptsetup.html\">cryptsetup</ulink>, <ulink "
"url=\"&blfs-book;pst/docbook.html\">docbook-xml</ulink>, <ulink url=\"&blfs-"
"book;pst/docbook-xsl.html\">docbook-xsl-nons</ulink>, <ulink url=\"https://"
"sourceware.org/elfutils/\">elfutils</ulink>, <ulink url=\"&blfs-book;general/"
"git.html\">Git</ulink>, <ulink url=\"https://sourceforge.net/projects/gnu-"
"efi/\">gnu-efi</ulink>, <ulink url=\"&blfs-book;postlfs/gnutls."
"book;pst/docbook-xsl.html\">docbook-xsl-nons</ulink>, <ulink url=\"&blfs-"
"book;general/git.html\">Git</ulink>, <ulink url=\"&blfs-book;postlfs/gnutls."
"html\">GnuTLS</ulink>, <ulink url=\"&blfs-book;postlfs/iptables."
"html\">iptables</ulink>, <ulink url=\"https://www.kernel.org/pub/linux/utils/"
"kernel/kexec/\"> kexec-tools</ulink>, <ulink url=\"https://developers.yubico."
"com/libfido2/\">libfido2</ulink>, <ulink url=\"&blfs-book;general/libgcrypt."
"html\">libgcrypt</ulink>, <ulink url=\"&blfs-book;general/libidn2."
"html\">libidn2</ulink>, <ulink url=\"https://www.gnu.org/software/"
"libmicrohttpd/\"> Libmicrohttpd</ulink>, <ulink url=\"&blfs-book;postlfs/"
"html\">iptables</ulink>, <ulink url='https://jekyllrb.com/'>jekyll</ulink>, "
"<ulink url=\"https://www.kernel.org/pub/linux/utils/kernel/kexec/\"> kexec-"
"tools</ulink>, <ulink url='&github;/libbpf/libbpf'>libbpf</ulink>, <ulink "
"url=\"https://sourceware.org/elfutils/\">libdw</ulink>, <ulink url=\"https://"
"developers.yubico.com/libfido2/\">libfido2</ulink>, <ulink url=\"&blfs-book;"
"general/libgcrypt.html\">libgcrypt</ulink>, <ulink url=\"&blfs-book;general/"
"libidn2.html\">libidn2</ulink>, <ulink url=\"https://www.gnu.org/software/"
"libmicrohttpd/\"> libmicrohttpd</ulink>, <ulink url=\"&blfs-book;postlfs/"
"libpwquality.html\">libpwquality</ulink>, <ulink url=\"&blfs-book;general/"
"libseccomp.html\">libseccomp</ulink>, <ulink url=\"&blfs-book;general/"
"libxkbcommon.html\">libxkbcommon</ulink>, <ulink url=\"&blfs-book;general/"
Expand All @@ -1736,31 +1744,38 @@ msgid ""
"ulink>, <ulink url=\"&blfs-book;postlfs/make-ca.html\">make-ca</ulink>, "
"<ulink url=\"&blfs-book;postlfs/p11-kit.html\">p11-kit</ulink>, <ulink "
"url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink>, <ulink url=\"&blfs-book;"
"postlfs/polkit.html\">Polkit</ulink>, <ulink url=\"&blfs-book;postlfs/qemu."
"postlfs/polkit.html\">Polkit</ulink>, <ulink url='&pypi-home;/"
"pyelftools'>pyelftools</ulink>, <ulink url=\"&blfs-book;postlfs/qemu."
"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=\"&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 ""
"linuxquota/\" >quota-tools</ulink>, <ulink url=\"https://rpm.org\">rpm</"
"ulink>, <ulink url=\"&blfs-book;basicnet/rsync.html\">rsync</ulink>, <ulink "
"url=\"&github;/SELinuxProject/selinux\"> SELinux</ulink>, <ulink url=\"&blfs-"
"book;general/python-modules.html#sphinx\"> Sphinx</ulink>, <ulink "
"url=\"https://sourceware.org/systemtap/\"> systemtap</ulink>, <ulink "
"url=\"https://tpm2-tss.readthedocs.io/en/latest/\"> tpm2-tss</ulink>, <ulink "
"url=\"&blfs-book;general/valgrind.html\">Valgrind</ulink>, <ulink "
"url=\"https://xenproject.org\">Xen</ulink>, and <ulink url=\"&blfs-book;"
"postlfs/zsh.html\">zsh</ulink>"
msgstr ""
"<ulink url=\"https://www.apparmor.net/\">AppArmor</ulink>, <ulink "
"url=\"&github;/linux-audit/audit-userspace\"> audit-userspace</ulink>, "
"<ulink url=\"&github;/scop/bash-completion\"> bash-completion</ulink>, "
"<ulink url=\"&blfs-book;postlfs/btrfs-progs.html\">btrfs-progs</ulink>, "
"<ulink url=\"&blfs-book;basicnet/curl.html\">cURL</ulink>, <ulink "
"url=\"&blfs-book;postlfs/cryptsetup.html\">cryptsetup</ulink>, <ulink "
"url=\"&blfs-book;pst/docbook.html\">docbook-xml</ulink>, <ulink url=\"&blfs-"
"book;pst/docbook-xsl.html\">docbook-xsl-nons</ulink>, <ulink url=\"https://"
"sourceware.org/elfutils/\">elfutils</ulink>, <ulink url=\"&blfs-book;general/"
"git.html\">Git</ulink>, <ulink url=\"https://sourceforge.net/projects/gnu-"
"efi/\">gnu-efi</ulink>, <ulink url=\"&blfs-book;postlfs/gnutls."
"book;pst/docbook-xsl.html\">docbook-xsl-nons</ulink>, <ulink url=\"&blfs-"
"book;general/git.html\">Git</ulink>, <ulink url=\"&blfs-book;postlfs/gnutls."
"html\">GnuTLS</ulink>, <ulink url=\"&blfs-book;postlfs/iptables."
"html\">iptables</ulink>, <ulink url=\"https://www.kernel.org/pub/linux/utils/"
"kernel/kexec/\"> kexec-tools</ulink>, <ulink url=\"https://developers.yubico."
"com/libfido2/\">libfido2</ulink>, <ulink url=\"&blfs-book;general/libgcrypt."
"html\">libgcrypt</ulink>, <ulink url=\"&blfs-book;general/libidn2."
"html\">libidn2</ulink>, <ulink url=\"https://www.gnu.org/software/"
"libmicrohttpd/\"> Libmicrohttpd</ulink>, <ulink url=\"&blfs-book;postlfs/"
"html\">iptables</ulink>, <ulink url='https://jekyllrb.com/'>jekyll</ulink>, "
"<ulink url=\"https://www.kernel.org/pub/linux/utils/kernel/kexec/\"> kexec-"
"tools</ulink>, <ulink url='&github;/libbpf/libbpf'>libbpf</ulink>, <ulink "
"url=\"https://sourceware.org/elfutils/\">libdw</ulink>, <ulink url=\"https://"
"developers.yubico.com/libfido2/\">libfido2</ulink>, <ulink url=\"&blfs-book;"
"general/libgcrypt.html\">libgcrypt</ulink>, <ulink url=\"&blfs-book;general/"
"libidn2.html\">libidn2</ulink>, <ulink url=\"https://www.gnu.org/software/"
"libmicrohttpd/\"> libmicrohttpd</ulink>, <ulink url=\"&blfs-book;postlfs/"
"libpwquality.html\">libpwquality</ulink>, <ulink url=\"&blfs-book;general/"
"libseccomp.html\">libseccomp</ulink>, <ulink url=\"&blfs-book;general/"
"libxkbcommon.html\">libxkbcommon</ulink>, <ulink url=\"&blfs-book;general/"
Expand All @@ -1770,15 +1785,19 @@ msgstr ""
"ulink>, <ulink url=\"&blfs-book;postlfs/make-ca.html\">make-ca</ulink>, "
"<ulink url=\"&blfs-book;postlfs/p11-kit.html\">p11-kit</ulink>, <ulink "
"url=\"&blfs-book;general/pcre2.html\">PCRE2</ulink>, <ulink url=\"&blfs-book;"
"postlfs/polkit.html\">Polkit</ulink>, <ulink url=\"&blfs-book;postlfs/qemu."
"postlfs/polkit.html\">Polkit</ulink>, <ulink url='&pypi-home;/"
"pyelftools'>pyelftools</ulink>, <ulink url=\"&blfs-book;postlfs/qemu."
"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=\"&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>"
"linuxquota/\" >quota-tools</ulink>, <ulink url=\"https://rpm.org\">rpm</"
"ulink>, <ulink url=\"&blfs-book;basicnet/rsync.html\">rsync</ulink>, <ulink "
"url=\"&github;/SELinuxProject/selinux\"> SELinux</ulink>, <ulink url=\"&blfs-"
"book;general/python-modules.html#sphinx\"> Sphinx</ulink>, <ulink "
"url=\"https://sourceware.org/systemtap/\"> systemtap</ulink>, <ulink "
"url=\"https://tpm2-tss.readthedocs.io/en/latest/\"> tpm2-tss</ulink>, <ulink "
"url=\"&blfs-book;general/valgrind.html\">Valgrind</ulink>, <ulink "
"url=\"https://xenproject.org\">Xen</ulink>, 以及 <ulink url=\"&blfs-book;"
"postlfs/zsh.html\">zsh</ulink>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand Down
6 changes: 3 additions & 3 deletions zh_CN/chapter01/whatsnew.po
View file
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: [email protected]\n"
"POT-Creation-Date: 2023-08-16 12:21+0800\n"
"POT-Creation-Date: 2023-09-02 01:22+0800\n"
"PO-Revision-Date: 2021-11-05 23:31+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -87,13 +87,13 @@ msgstr ""
#. type: Content of: <sect1><para>
#: lfs-en/chapter01/whatsnew.xml
msgid ""
"In the 11.4 release, <parameter>--disable-fixincludes</parameter> is set for "
"In the 12.0 release, <parameter>--disable-fixincludes</parameter> is set for "
"GCC. It's a configure switch newly added in GCC 13.1 to prevent GCC from "
"<quote>fixing</quote> the system headers. Such a <quote>fix</quote> is "
"unnecessary for a modern Linux system and may cause issues if a package is "
"updated after installing GCC."
msgstr ""
"在本书的 11.4 版本中，我们为 GCC 设定 <parameter>--disable-fixincludes</"
"在本书的 12.0 版本中，我们为 GCC 设定 <parameter>--disable-fixincludes</"
"parameter> 选项。这个配置开关是 GCC 13.1 新增的，用于防止 GCC <quote>修复</"
"quote>系统头文件。这种<quote>修复</quote>对于现代的 Linux 系统来说没有必要，"
"而且如果在安装 GCC 后更新了某个软件包，它可能带来问题。"
Expand Down
10 changes: 5 additions & 5 deletions zh_CN/chapter02/hostreqs.po
View file
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: [email protected]\n"
"POT-Creation-Date: 2023-06-11 06:42+0800\n"
"POT-Creation-Date: 2023-09-02 01:22+0800\n"
"PO-Revision-Date: 2021-09-08 14:05+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -234,8 +234,8 @@ msgstr "<emphasis role=\"strong\">Tar-1.22</emphasis>"

#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
#: lfs-en/chapter02/hostreqs.xml
msgid "<emphasis role=\"strong\">Texinfo-4.7</emphasis>"
msgstr "<emphasis role=\"strong\">Texinfo-4.7</emphasis>"
msgid "<emphasis role=\"strong\">Texinfo-5.0</emphasis>"
msgstr "<emphasis role=\"strong\">Texinfo-5.0</emphasis>"

#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
#: lfs-en/chapter02/hostreqs.xml
Expand Down Expand Up @@ -330,7 +330,7 @@ msgid ""
"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"
Expand Down Expand Up @@ -419,7 +419,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"
Expand Down

0 comments on commit 842abe9

Please sign in to comment.