Skip to content

Commit

Permalink
Merge branch '12.0' into loongarch-12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@xry111
xry111 committed Sep 1, 2023
2 parents 9e2340b + 9468ddd commit bf6d54c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 67 deletions.
88 changes: 27 additions & 61 deletions zh_CN/appendices/dependencies.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,8 @@ msgstr "Automake, Diffutils, Findutils, GCC, 以及 Libtool"

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

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
Expand Down Expand Up @@ -755,16 +753,12 @@ msgstr "<ulink url='&github;/testing-cabal/subunit'>libsubunit</ulink>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
#, fuzzy
#| msgid ""
#| "Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap, Make, "
#| "OpenSSL, Patch, Perl, Sed, and Texinfo"
msgid ""
"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 @@ -1722,41 +1716,6 @@ msgstr "D-Bus, E2fsprogs, Man-DB, Procps-ng, 以及 Util-linux"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
#, fuzzy
#| msgid ""
#| "<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.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/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/libxslt.html\">libxslt</ulink>, "
#| "<ulink url=\"&blfs-book;postlfs/linux-pam.html\">Linux-PAM</ulink>, "
#| "<ulink url=\"&blfs-book;general/python-modules.html#lxml\">lxml</ulink>, "
#| "<ulink url=\"https://lz4.github.io/lz4/\">LZ4</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.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>"
msgid ""
"<ulink url=\"https://www.apparmor.net/\">AppArmor</ulink>, <ulink "
"url=\"&github;/linux-audit/audit-userspace\"> audit-userspace</ulink>, "
Expand Down Expand Up @@ -1799,21 +1758,24 @@ msgid ""
"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 @@ -1823,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
4 changes: 1 addition & 3 deletions zh_CN/chapter01/changelog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@ msgstr "2023 年 9 月 1 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
#, fuzzy
#| msgid "[bdubbs] - LFS-11.3 released."
msgid "[bdubbs] - LFS-12.0 released."
msgstr "[bdubbs] - LFS-11.3 发布。"
msgstr "[bdubbs] - LFS-12.0 发布。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
Expand Down
4 changes: 1 addition & 3 deletions zh_CN/chapter02/hostreqs.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,8 @@ msgstr "<emphasis role=\"strong\">Tar-1.22</emphasis>"

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

#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
#: lfs-en/chapter02/hostreqs.xml
Expand Down

0 comments on commit bf6d54c

Please sign in to comment.