Skip to content

Commit

Permalink
Update to lfs-en @ 59cc122
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Jan 16, 2025
1 parent 72fe0c4 commit 922bba2
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 141 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 016ba1 to 59cc12
88 changes: 87 additions & 1 deletion 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: 2025-01-12 13:24+0800\n"
"POT-Creation-Date: 2025-01-16 15:08+0800\n"
"PO-Revision-Date: 2022-02-05 22:45+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -46,6 +46,92 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

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

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

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to iana-etc-20250108. Addresses <ulink url='&lfs-ticket-"
"root;5006'>#5006</ulink>."
msgstr ""
"[bdubbs] — 更新到 iana-etc-20250108。处理 <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 util-linux-2.40.4. Fixes <ulink url='&lfs-ticket-"
"root;5624'>#5624</ulink>."
msgstr ""
"[bdubbs] — 更新到 util-linux-2.40.4。修复 <ulink url='&lfs-ticket-"
"root;5624'>#5624</ulink>。"

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

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

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

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

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

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

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2025-01-01"
Expand Down
8 changes: 7 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: 2025-01-01 14:22+0800\n"
"POT-Creation-Date: 2025-01-16 15:06+0800\n"
"PO-Revision-Date: 2021-11-05 23:31+0800\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -211,6 +211,12 @@ msgstr "Tzdata-&tzdata-version;"
msgid "Udev from Systemd-&systemd-version;"
msgstr "Systemd-&systemd-version; 中的 Udev"

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

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/vim.xml
msgid "Vim-&vim-version;"
Expand Down
8 changes: 4 additions & 4 deletions zh_CN/chapter02/aboutlfs.po
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: lfs-dev@lists.linuxfromscratch.org\n"
"POT-Creation-Date: 2025-01-12 13:22+0800\n"
"POT-Creation-Date: 2025-01-13 16:52+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -59,7 +59,7 @@ msgstr ""
#. type: Content of: <sect1><para>
#: lfs-en/chapter02/aboutlfs.xml
msgid ""
"Now setting the file mode creation mask (umask) to <literal>022</literal> in "
"Now set the file mode creation mask (umask) to <literal>022</literal> in "
"case the host distro uses a different default:"
msgstr ""
"现在设定创建文件时使用的访问权限模式掩码 (umask) 为 <literal>022</literal>,"
Expand All @@ -78,8 +78,8 @@ msgid ""
"are only writable by their owner, but are readable and searchable (only for "
"directories) by anyone (assuming default modes are used by the <ulink "
"role='man' url='&man;open.2'>open(2)</ulink> system call, new files will end "
"up with permission mode 644 and directories with mode 755). An over-"
"permissive default can leave security holes in the LFS system, and an over-"
"up with permission mode 644 and directories with mode 755). An overly-"
"permissive default can leave security holes in the LFS system, and an overly-"
"restrictive default can cause strange issues building or using the LFS "
"system."
msgstr ""
Expand Down
25 changes: 24 additions & 1 deletion zh_CN/chapter02/mounting.po
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: lfs-dev@lists.linuxfromscratch.org\n"
"POT-Creation-Date: 2024-01-28 20:56+0800\n"
"POT-Creation-Date: 2025-01-13 16:52+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -102,6 +102,29 @@ msgstr ""
"将 <replaceable>&lt;xxx&gt;</replaceable> 和 <replaceable>&lt;yyy&gt;</"
"replaceable> 替换成对应的分区代号。"

#. type: Content of: <sect1><para>
#: lfs-en/chapter02/mounting.xml
msgid ""
"Set the owner and permission mode of the <filename class='directory'>$LFS</"
"filename> directory (i.e. the root directory in the newly created file "
"system for the LFS system) to &root; and <literal>755</literal> in case the "
"host distro has been configured to use a different default for "
"<command>mkfs</command>:"
msgstr ""
"将 <filename class='directory'>$LFS</filename> 目录 (即为 LFS 系统新创建的文"
"件系统的根目录) 的所有者设为 &root;,访问权限设为 <literal>755</literal>,以"
"防个别宿主发行版中 <command>mkfs</command> 被配置为使用与此不同的默认值:"

#. type: Content of: <sect1><screen>
#: lfs-en/chapter02/mounting.xml
#, no-wrap
msgid ""
"<userinput>chown root:root $LFS\n"
"chmod 755 $LFS</userinput>"
msgstr ""
"<userinput>chown root:root $LFS\n"
"chmod 755 $LFS</userinput>"

#. type: Content of: <sect1><para>
#: lfs-en/chapter02/mounting.xml
msgid ""
Expand Down
26 changes: 1 addition & 25 deletions zh_CN/chapter04/creatingminlayout.po
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: lfs-dev@lists.linuxfromscratch.org\n"
"POT-Creation-Date: 2025-01-12 13:22+0800\n"
"POT-Creation-Date: 2025-01-13 16:52+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -35,30 +35,6 @@ msgstr ""
"和 libstdc++) 可以被安装到它们的最终位置。这样,在<xref linkend=\"chapter-"
"building-system\"/>中重新构建它们时,就能直接覆盖这些临时程序。"

#. type: Content of: <sect1><para>
#: lfs-en/chapter04/creatingminlayout.xml
msgid ""
"At first, set the owner and permission mode of the <filename "
"class='directory'>$LFS</filename> directory (i.e. the root directory in the "
"newly created file system for the LFS system) to &root; and <literal>755</"
"literal> in case the host distro has been configured to use a different "
"default for <command>mkfs</command>:"
msgstr ""
"首先,将 <filename class='directory'>$LFS</filename> 目录 (即为 LFS 系统新创"
"建的文件系统的根目录) 的所有者设为 &root;,访问权限设为 <literal>755</"
"literal>,以防个别宿主发行版中 <command>mkfs</command> 被配置为使用与此不同的"
"默认值:"

#. type: Content of: <sect1><screen>
#: lfs-en/chapter04/creatingminlayout.xml
#, no-wrap
msgid ""
"<userinput>chown root:root $LFS\n"
"chmod 755 $LFS</userinput>"
msgstr ""
"<userinput>chown root:root $LFS\n"
"chmod 755 $LFS</userinput>"

#. type: Content of: <sect1><para>
#: lfs-en/chapter04/creatingminlayout.xml
msgid ""
Expand Down
82 changes: 41 additions & 41 deletions zh_CN/chapter07/util-linux.po
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: lfs-dev@lists.linuxfromscratch.org\n"
"POT-Creation-Date: 2024-09-08 18:40+0800\n"
"POT-Creation-Date: 2025-01-16 15:06+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <xry111@xry111.site>\n"
"Language-Team: none\n"
Expand All @@ -20,6 +20,12 @@ msgstr ""
msgid "Util-linux"
msgstr "Util-linux"

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

#. type: Content of: <sect1><sect2><segmentedlist><segtitle>
#: lfs-en/chapter05/binutils-pass1.xml lfs-en/chapter05/gcc-pass1.xml
#: lfs-en/chapter05/glibc.xml lfs-en/chapter05/libstdc++.xml
Expand Down Expand Up @@ -141,12 +147,11 @@ msgstr "&diskspace;"
#: lfs-en/chapter05/glibc.xml lfs-en/chapter05/libstdc++.xml
#: lfs-en/chapter06/bash.xml lfs-en/chapter06/coreutils.xml
#: lfs-en/chapter07/util-linux.xml lfs-en/chapter08/bc.xml
#: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/dbus.xml
#: lfs-en/chapter08/e2fsprogs.xml lfs-en/chapter08/expect.xml
#: lfs-en/chapter08/findutils.xml lfs-en/chapter08/glibc.xml
#: lfs-en/chapter08/inetutils.xml lfs-en/chapter08/kmod.xml
#: lfs-en/chapter08/less.xml lfs-en/chapter08/man-db.xml
#: lfs-en/chapter08/python.xml
#: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/e2fsprogs.xml
#: lfs-en/chapter08/expect.xml lfs-en/chapter08/findutils.xml
#: lfs-en/chapter08/glibc.xml lfs-en/chapter08/inetutils.xml
#: lfs-en/chapter08/kmod.xml lfs-en/chapter08/less.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/python.xml
msgid "The meaning of the configure options:"
msgstr "配置选项的含义:"

Expand All @@ -167,17 +172,17 @@ msgstr "配置选项的含义:"
#: lfs-en/chapter08/autoconf.xml lfs-en/chapter08/automake.xml
#: lfs-en/chapter08/bash.xml lfs-en/chapter08/bc.xml lfs-en/chapter08/bison.xml
#: lfs-en/chapter08/bzip2.xml lfs-en/chapter08/check.xml
#: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/dbus.xml
#: lfs-en/chapter08/diffutils.xml lfs-en/chapter08/e2fsprogs.xml
#: lfs-en/chapter08/expat.xml lfs-en/chapter08/expect.xml
#: lfs-en/chapter08/file.xml lfs-en/chapter08/findutils.xml
#: lfs-en/chapter08/flex.xml lfs-en/chapter08/gawk.xml lfs-en/chapter08/gcc.xml
#: lfs-en/chapter08/gdbm.xml lfs-en/chapter08/gettext.xml
#: lfs-en/chapter08/glibc.xml lfs-en/chapter08/gperf.xml
#: lfs-en/chapter08/grep.xml lfs-en/chapter08/groff.xml
#: lfs-en/chapter08/grub.xml lfs-en/chapter08/gzip.xml
#: lfs-en/chapter08/inetutils.xml lfs-en/chapter08/intltool.xml
#: lfs-en/chapter08/kbd.xml lfs-en/chapter08/kmod.xml lfs-en/chapter08/less.xml
#: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/diffutils.xml
#: lfs-en/chapter08/e2fsprogs.xml lfs-en/chapter08/expat.xml
#: lfs-en/chapter08/expect.xml lfs-en/chapter08/file.xml
#: lfs-en/chapter08/findutils.xml lfs-en/chapter08/flex.xml
#: lfs-en/chapter08/gawk.xml lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml
#: lfs-en/chapter08/gettext.xml lfs-en/chapter08/glibc.xml
#: lfs-en/chapter08/gperf.xml lfs-en/chapter08/grep.xml
#: lfs-en/chapter08/groff.xml lfs-en/chapter08/grub.xml
#: lfs-en/chapter08/gzip.xml lfs-en/chapter08/inetutils.xml
#: lfs-en/chapter08/intltool.xml lfs-en/chapter08/kbd.xml
#: lfs-en/chapter08/kmod.xml lfs-en/chapter08/less.xml
#: lfs-en/chapter08/libelf.xml lfs-en/chapter08/libffi.xml
#: lfs-en/chapter08/libpipeline.xml lfs-en/chapter08/libtool.xml
#: lfs-en/chapter08/libxcrypt.xml lfs-en/chapter08/m4.xml
Expand Down Expand Up @@ -222,14 +227,14 @@ msgstr "<userinput remap=\"make\">make</userinput>"
#: lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml
#: lfs-en/chapter08/gettext.xml lfs-en/chapter08/glibc.xml
#: lfs-en/chapter08/gperf.xml lfs-en/chapter08/grep.xml
#: lfs-en/chapter08/groff.xml lfs-en/chapter08/grub.xml
#: lfs-en/chapter08/gzip.xml lfs-en/chapter08/inetutils.xml
#: lfs-en/chapter08/intltool.xml lfs-en/chapter08/iproute2.xml
#: lfs-en/chapter08/jinja2.xml lfs-en/chapter08/kbd.xml
#: lfs-en/chapter08/less.xml lfs-en/chapter08/libcap.xml
#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml
#: lfs-en/chapter08/libtool.xml lfs-en/chapter08/libxcrypt.xml
#: lfs-en/chapter08/lz4.xml lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/groff.xml lfs-en/chapter08/gzip.xml
#: lfs-en/chapter08/inetutils.xml lfs-en/chapter08/intltool.xml
#: lfs-en/chapter08/iproute2.xml lfs-en/chapter08/jinja2.xml
#: lfs-en/chapter08/kbd.xml lfs-en/chapter08/less.xml
#: lfs-en/chapter08/libcap.xml lfs-en/chapter08/libffi.xml
#: lfs-en/chapter08/libpipeline.xml lfs-en/chapter08/libtool.xml
#: lfs-en/chapter08/libxcrypt.xml lfs-en/chapter08/lz4.xml
#: lfs-en/chapter08/m4.xml lfs-en/chapter08/make.xml
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/markupsafe.xml
#: lfs-en/chapter08/meson.xml lfs-en/chapter08/ninja.xml
#: lfs-en/chapter08/openssl.xml lfs-en/chapter08/patch.xml
Expand All @@ -255,11 +260,10 @@ msgstr "安装该软件包:"
#: lfs-en/chapter08/attr.xml lfs-en/chapter08/autoconf.xml
#: lfs-en/chapter08/automake.xml lfs-en/chapter08/bash.xml
#: lfs-en/chapter08/bc.xml lfs-en/chapter08/bison.xml
#: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/dbus.xml
#: lfs-en/chapter08/diffutils.xml lfs-en/chapter08/e2fsprogs.xml
#: lfs-en/chapter08/expat.xml lfs-en/chapter08/file.xml
#: lfs-en/chapter08/findutils.xml lfs-en/chapter08/flex.xml
#: lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml
#: lfs-en/chapter08/coreutils.xml lfs-en/chapter08/diffutils.xml
#: lfs-en/chapter08/e2fsprogs.xml lfs-en/chapter08/expat.xml
#: lfs-en/chapter08/file.xml lfs-en/chapter08/findutils.xml
#: lfs-en/chapter08/flex.xml lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml
#: lfs-en/chapter08/glibc.xml lfs-en/chapter08/gperf.xml
#: lfs-en/chapter08/grep.xml lfs-en/chapter08/groff.xml
#: lfs-en/chapter08/gzip.xml lfs-en/chapter08/inetutils.xml
Expand All @@ -270,11 +274,12 @@ msgstr "安装该软件包:"
#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/patch.xml
#: lfs-en/chapter08/pkgconf.xml lfs-en/chapter08/procps.xml
#: lfs-en/chapter08/psmisc.xml lfs-en/chapter08/python.xml
#: lfs-en/chapter08/sysklogd.xml lfs-en/chapter08/sysvinit.xml
#: lfs-en/chapter08/tcl.xml lfs-en/chapter08/texinfo.xml
#: lfs-en/chapter08/util-linux.xml lfs-en/chapter08/vim.xml
#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml
#: lfs-en/chapter08/zlib.xml lfs-en/chapter09/bootscripts.xml
#: lfs-en/chapter08/readline.xml lfs-en/chapter08/sysklogd.xml
#: lfs-en/chapter08/sysvinit.xml lfs-en/chapter08/tcl.xml
#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/util-linux.xml
#: lfs-en/chapter08/vim.xml lfs-en/chapter08/xml-parser.xml
#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml
#: lfs-en/chapter09/bootscripts.xml
#, no-wrap
msgid "<userinput remap=\"install\">make install</userinput>"
msgstr "<userinput remap=\"install\">make install</userinput>"
Expand Down Expand Up @@ -358,11 +363,6 @@ msgstr ""
"<productname>util-linux</productname> <productnumber>&util-linux-version;</"
"productnumber> <placeholder type=\"address\" id=\"0\"/>"

#. type: Content of: <sect1><title>
#: lfs-en/chapter07/util-linux.xml lfs-en/chapter08/util-linux.xml
msgid "Util-linux-&util-linux-version;"
msgstr "Util-linux-&util-linux-version;"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter07/util-linux.xml
msgid "The Util-linux package contains miscellaneous utility programs."
Expand Down
Loading

0 comments on commit 922bba2

Please sign in to comment.