Skip to content

Commit

Permalink
Update to lfs-en @ e872712
Browse files Browse the repository at this point in the history
  • Loading branch information
@xry111
xry111 committed Jul 4, 2024
1 parent b5db631 commit be06d00
Show file tree
Hide file tree
Showing 21 changed files with 400 additions and 352 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from c04d98 to e87271
12 changes: 7 additions & 5 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: 2024-05-22 16:24+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+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 @@ -1222,11 +1222,13 @@ msgstr ""
#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
"<ulink url=\"&blfs-book;general/cpio.html\">cpio</ulink> and <ulink "
"url=\"&blfs-book;general/llvm.html\">LLVM</ulink> (with Clang)"
"<ulink url=\"&blfs-book;general/cpio.html\">cpio</ulink>, <ulink url=\"&blfs-"
"book;general/llvm.html\">LLVM</ulink> (with Clang), and <ulink url=\"&blfs-"
"book;general/rust-bindgen.html\">Rust-bindgen</ulink>"
msgstr ""
"<ulink url=\"&blfs-book;general/cpio.html\">cpio</ulink> 和 <ulink "
"url=\"&blfs-book;general/llvm.html\">LLVM</ulink> (包括 Clang)"
"<ulink url=\"&blfs-book;general/cpio.html\">cpio</ulink>, <ulink url=\"&blfs-"
"book;general/llvm.html\">LLVM</ulink> (包括 Clang), 以及 <ulink url=\"&blfs-"
"book;general/rust-bindgen.html\">Rust-bindgen</ulink>"

#. type: Content of: <appendix><bridgehead>
#: lfs-en/appendices/dependencies.xml
Expand Down
6 changes: 3 additions & 3 deletions zh_CN/appendices/udev-rules.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linux From Scratch 11.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2023-07-18 12:46+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand All @@ -15,7 +15,7 @@ msgstr ""
"X-Generator: Translate Toolkit 2.2.5\n"

#. type: Attribute 'xreflabel' of: <appendix>
#: lfs-en/appendices/udev-rules.xml lfs-en/appendices/license.xml
#: lfs-en/appendices/license.xml lfs-en/appendices/udev-rules.xml
msgid "Appendix E"
msgstr "附录 E"

Expand All @@ -28,7 +28,7 @@ msgstr "Udev 配置规则"
#: lfs-en/appendices/udev-rules.xml
msgid ""
"The rules in this appendix are listed for convenience. Installation is "
"normally done via instructions in <xref linkend='ch-system-udev'/>."
"normally done via instructions in <xref linkend='ch-system-udev' role='.'/>"
msgstr ""
"为了方便，在本附录中列出 udev 规则。它们的安装过程一般通过<xref linkend='ch-"
"system-udev'/>的命令完成。"
Expand Down
28 changes: 14 additions & 14 deletions zh_CN/chapter01/askforhelp.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linux From Scratch 11.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2023-07-29 18:09+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand All @@ -25,11 +25,11 @@ msgid ""
"In case you've hit an issue building one package with the LFS instruction, "
"we strongly discourage posting the issue directly onto the upstream support "
"channel before discussing via a LFS support channel listed in <xref "
"linkend=\"ch-intro-resources\"/>. Doing so is often quite inefficient "
"because the upstream maintainers are rarely familiar with LFS building "
"procedure. Even if you've really hit an upstream issue, the LFS community "
"can still help to isolate the information wanted by the upstream maintainers "
"and make a proper report."
"linkend=\"ch-intro-resources\" role='.'/> Doing so is often quite "
"inefficient because the upstream maintainers are rarely familiar with LFS "
"building procedure. Even if you've really hit an upstream issue, the LFS "
"community can still help to isolate the information wanted by the upstream "
"maintainers and make a proper report."
msgstr ""
"如果您在按照 LFS 的指示构建某个软件包时出现了问题，我们强烈反对在未通过<xref "
"linkend='ch-intro-resources'/>给出的 LFS 支持通道进行讨论前，直接将问题发布到"
Expand Down Expand Up @@ -190,10 +190,10 @@ msgstr ""
#: lfs-en/chapter01/askforhelp.xml
#, no-wrap
msgid ""
"<computeroutput>gcc -DALIASPATH=\\\"/mnt/lfs/usr/share/locale:.\\\"\n"
"-DLOCALEDIR=\\\"/mnt/lfs/usr/share/locale\\\"\n"
"-DLIBDIR=\\\"/mnt/lfs/usr/lib\\\"\n"
"-DINCLUDEDIR=\\\"/mnt/lfs/usr/include\\\" -DHAVE_CONFIG_H -I. -I.\n"
"<computeroutput>gcc -D ALIASPATH=\\\"/mnt/lfs/usr/share/locale:.\\\"\n"
"-D LOCALEDIR=\\\"/mnt/lfs/usr/share/locale\\\"\n"
"-D LIBDIR=\\\"/mnt/lfs/usr/lib\\\"\n"
"-D INCLUDEDIR=\\\"/mnt/lfs/usr/include\\\" -D HAVE_CONFIG_H -I. -I.\n"
"-g -O2 -c getopt1.c\n"
"gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o\n"
"expand.o file.o function.o getopt.o implicit.o job.o main.o\n"
Expand All @@ -209,10 +209,10 @@ msgid ""
"make[1]: Leaving directory `/lfs/tmp/make-3.79.1'\n"
"make: *** [all-recursive-am] Error 2</computeroutput>"
msgstr ""
"<computeroutput>gcc -DALIASPATH=\\\"/mnt/lfs/usr/share/locale:.\\\"\n"
"-DLOCALEDIR=\\\"/mnt/lfs/usr/share/locale\\\"\n"
"-DLIBDIR=\\\"/mnt/lfs/usr/lib\\\"\n"
"-DINCLUDEDIR=\\\"/mnt/lfs/usr/include\\\" -DHAVE_CONFIG_H -I. -I.\n"
"<computeroutput>gcc -D ALIASPATH=\\\"/mnt/lfs/usr/share/locale:.\\\"\n"
"-D LOCALEDIR=\\\"/mnt/lfs/usr/share/locale\\\"\n"
"-D LIBDIR=\\\"/mnt/lfs/usr/lib\\\"\n"
"-D INCLUDEDIR=\\\"/mnt/lfs/usr/include\\\" -D HAVE_CONFIG_H -I. -I.\n"
"-g -O2 -c getopt1.c\n"
"gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o\n"
"expand.o file.o function.o getopt.o implicit.o job.o main.o\n"
Expand Down
83 changes: 80 additions & 3 deletions zh_CN/chapter01/changelog.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: 2024-06-15 01:12+0800\n"
"POT-Creation-Date: 2024-07-04 13:23+0800\n"
"PO-Revision-Date: 2022-02-05 22:45+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -46,6 +46,83 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录："

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-07-01"
msgstr "2024 年 7 月 1 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to iana-etc-20240612. Addresses <ulink url='&lfs-ticket-"
"root;5006'>#5006</ulink>."
msgstr ""
"[bdubbs] — 更新到 iana-etc-20240612。处理 <ulink url='&lfs-ticket-"
"root;5006'>#5006</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to bc-6.7.6. Fixes <ulink url='&lfs-ticket-"
"root;5506'>#5506</ulink>."
msgstr ""
"[bdubbs] — 更新到 bc-6.7.6。修复 <ulink url='&lfs-ticket-root;5506'>#5506</"
"ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to man-pages-6.9.1. Fixes <ulink url='&lfs-ticket-"
"root;5507'>#5507</ulink>."
msgstr ""
"[bdubbs] — 更新到 man-pages-6.9.1。修复 <ulink url='&lfs-ticket-"
"root;5507'>#5507</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to linux-6.9.7. Fixes <ulink url='&lfs-ticket-"
"root;5508'>#5508</ulink>."
msgstr ""
"[bdubbs] — 更新到 linux-6.9.7。修复 <ulink url='&lfs-ticket-"
"root;5508'>#5508</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to sysklogd-2.5.2. Fixes <ulink url='&lfs-ticket-"
"root;5509'>#5509</ulink>."
msgstr ""
"[bdubbs] — 更新到 sysklogd-2.5.2。修复 <ulink url='&lfs-ticket-"
"root;5509'>#5509</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to shadow-4.16.0. Fixes <ulink url='&lfs-ticket-"
"root;5510'>#5510</ulink>."
msgstr ""
"[bdubbs] — 更新到 shadow-4.16.0。修复 <ulink url='&lfs-ticket-"
"root;5510'>#5510</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to systemd-256.1. Fixes <ulink url='&lfs-ticket-"
"root;5511'>#5511</ulink>."
msgstr ""
"[bdubbs] — 更新到 systemd-256.1。修复 <ulink url='&lfs-ticket-"
"root;5511'>#5511</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to setuptools-70.1.1. Fixes <ulink url='&lfs-ticket-"
"root;5512'>#5512</ulink>."
msgstr ""
"[bdubbs] — 更新到 setuptools-70.1.1。修复 <ulink url='&lfs-ticket-"
"root;5512'>#5512</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-06-15"
Expand Down Expand Up @@ -109,10 +186,10 @@ msgstr ""
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to linux-6.9.4. Fixes <ulink url='&lfs-ticket-"
"root;5491'>#5505</ulink>."
"root;5505'>#5505</ulink>."
msgstr ""
"[bdubbs] — 更新到 linux-6.9.4。修复 <ulink url='&lfs-ticket-"
"root;5491'>#5505</ulink>。"
"root;5505'>#5505</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
Expand Down
12 changes: 11 additions & 1 deletion 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: 2024-06-15 01:10+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+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 @@ -35,6 +35,11 @@ msgstr "这里列出本书上一次发布之后发生变化的软件包。"
msgid "Upgraded to:"
msgstr "已升级："

#. 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
Expand Down Expand Up @@ -171,6 +176,11 @@ msgstr "Setuptools-&setuptools-version;"
msgid "Shadow-&shadow-version;"
msgstr "Shadow-&shadow-version;"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/systemd.xml
msgid "Systemd-&systemd-version;"
Expand Down
5 changes: 3 additions & 2 deletions zh_CN/chapter02/stages.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linux From Scratch 11.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-01-28 17:39+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -124,7 +124,8 @@ msgid ""
"The virtual file systems must be mounted. This can be done before or after "
"entering chroot by changing to a host virtual terminal and, as <systemitem "
"class=\"username\">root</systemitem>, running the commands in <xref "
"linkend='ch-tools-bindmount'/> and <xref linkend='ch-tools-kernfsmount'/>."
"linkend='ch-tools-bindmount'/> and <xref linkend='ch-tools-kernfsmount' "
"role='.'/>"
msgstr ""
"虚拟文件系统必须挂载好。在进入 chroot 环境之前，请切换到一个宿主系统的虚拟终"
"端，以 <systemitem class=\"username\">root</systemitem> 身份执行<xref "
Expand Down
16 changes: 8 additions & 8 deletions zh_CN/chapter06/introduction.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linux From Scratch 11.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-11-04 11:39+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand All @@ -14,13 +14,13 @@ msgstr ""
"X-Pootle-Path: /zh_CN/lfs/chapter06/introduction.po\n"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/chapter01.xml lfs-en/chapter02/introduction.xml
#: lfs-en/chapter03/introduction.xml lfs-en/chapter04/introduction.xml
#: lfs-en/chapter06/introduction.xml lfs-en/part3intro/introduction.xml
#: lfs-en/chapter01/chapter01.xml lfs-en/chapter05/introduction.xml
#: lfs-en/chapter07/introduction.xml lfs-en/index.xml
#: lfs-en/chapter08/introduction.xml lfs-en/chapter10/grub.xml
#: lfs-en/chapter10/introduction.xml lfs-en/chapter02/introduction.xml
#: lfs-en/chapter09/introductiond.xml lfs-en/chapter09/introduction.xml
#: lfs-en/chapter05/introduction.xml lfs-en/chapter06/introduction.xml
#: lfs-en/chapter07/introduction.xml lfs-en/chapter08/introduction.xml
#: lfs-en/chapter09/introduction.xml lfs-en/chapter09/introductiond.xml
#: lfs-en/chapter10/grub.xml lfs-en/chapter10/introduction.xml lfs-en/index.xml
#: lfs-en/part3intro/introduction.xml
msgid "Introduction"
msgstr "概述"

Expand Down Expand Up @@ -54,7 +54,7 @@ msgid ""
"together with building as <systemitem class=\"username\">root</systemitem>, "
"may render your computer unusable. This whole chapter must be done as user "
"<systemitem class=\"username\">lfs</systemitem>, with the environment as "
"described in <xref linkend=\"ch-preps-settingenviron\"/>."
"described in <xref linkend=\"ch-preps-settingenviron\" role='.'/>"
msgstr ""
"再一次地，请注意如果 <envar>LFS</envar> 环境变量设置错误，而且使用 "
"<systemitem class=\"username\">root</systemitem> 用户的身份进行构建，可能导致"
Expand Down
6 changes: 4 additions & 2 deletions zh_CN/chapter07/cleanup.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.3\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-11-18 12:14+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+0800\n"
"PO-Revision-Date: 2021-09-19 14:21+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -162,7 +162,9 @@ msgstr ""

#. type: Content of: <sect1><sect2><important><para>
#: lfs-en/chapter07/cleanup.xml
msgid "This has been discussed in <xref linkend='ch-partitioning-aboutlfs'/>."
msgid ""
"This has been discussed in <xref linkend='ch-partitioning-aboutlfs' role='.'/"
">"
msgstr "<xref linkend='ch-partitioning-aboutlfs'/>已经讨论了这个问题。"

#. type: Content of: <sect1><sect2><para>
Expand Down
Loading

0 comments on commit be06d00

Please sign in to comment.