From a64cb212851097a911b9c6151a31611cd4adbb7b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 28 Jan 2024 21:24:27 +0800 Subject: [PATCH] Update to lfs-en @ 7c63034 --- lfs-en | 2 +- zh_CN/appendices/dependencies.po | 7 +- zh_CN/chapter02/creatingpartition.po | 13 +- zh_CN/chapter02/hostreqs.po | 15 +- zh_CN/chapter02/mounting.po | 12 +- zh_CN/chapter02/stages.po | 4 +- zh_CN/chapter04/addinguser.po | 12 +- zh_CN/chapter04/settingenviron.po | 11 +- zh_CN/chapter05/glibc.po | 76 +++--- zh_CN/chapter07/creatingdirs.po | 4 +- zh_CN/chapter07/python.po | 92 +++---- zh_CN/chapter08/coreutils.po | 6 +- zh_CN/chapter08/e2fsprogs.po | 78 +++--- zh_CN/chapter08/expect.po | 99 ++++---- zh_CN/chapter08/gmp.po | 50 ++-- zh_CN/chapter08/libtool.po | 21 +- zh_CN/chapter08/openssl.po | 26 +- zh_CN/chapter08/shadow.po | 66 +++--- zh_CN/chapter08/stripping.po | 10 +- zh_CN/chapter08/util-linux.po | 20 +- zh_CN/chapter09/consoled.po | 8 +- zh_CN/chapter09/locale.po | 306 ++++++++++++++++-------- zh_CN/chapter09/network.po | 16 +- zh_CN/chapter09/networkd.po | 54 +++-- zh_CN/chapter09/profile.po | 316 ------------------------- zh_CN/chapter09/systemd-custom.po | 45 ++-- zh_CN/chapter09/udev.po | 47 ++-- zh_CN/chapter09/usage.po | 108 +++++---- zh_CN/chapter10/fstab.po | 8 +- zh_CN/chapter10/kernel.po | 9 +- zh_CN/chapter11/reboot.po | 12 +- zh_CN/part3intro/toolchaintechnotes.po | 4 +- zh_CN/prologue/standards.po | 12 +- zh_CN/prologue/typography.po | 44 ++-- 34 files changed, 734 insertions(+), 879 deletions(-) delete mode 100644 zh_CN/chapter09/profile.po diff --git a/lfs-en b/lfs-en index 5bef8f22..7c630340 160000 --- a/lfs-en +++ b/lfs-en @@ -1 +1 @@ -Subproject commit 5bef8f221aa7dd82c9658da2190b315cced48aa6 +Subproject commit 7c630340c2813897c6424670edefa3a98e970ab7 diff --git a/zh_CN/appendices/dependencies.po b/zh_CN/appendices/dependencies.po index 320469f4..e53a76f0 100644 --- a/zh_CN/appendices/dependencies.po +++ b/zh_CN/appendices/dependencies.po @@ -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: 2024-01-22 06:18+0800\n" +"POT-Creation-Date: 2024-01-28 17:39+0800\n" "PO-Revision-Date: 2022-02-11 20:04+0800\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -770,6 +770,11 @@ msgstr "Diffutils, Perl, 以及 Tcl" msgid "Automake and Bison" msgstr "Automake 和 Bison" +#. type: Content of: +#: lfs-en/appendices/dependencies.xml +msgid "libxml2" +msgstr "libxml2" + #. type: Content of: #: lfs-en/appendices/dependencies.xml msgid "" diff --git a/zh_CN/chapter02/creatingpartition.po b/zh_CN/chapter02/creatingpartition.po index 52d40530..3baaa01a 100644 --- a/zh_CN/chapter02/creatingpartition.po +++ b/zh_CN/chapter02/creatingpartition.po @@ -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: 2023-04-01 03:35+0800\n" +"POT-Creation-Date: 2024-01-28 17:39+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -76,16 +76,17 @@ msgid "" "which the new partition will be created—for example /dev/sda for the primary disk drive. Create " "a Linux native partition and a swap partition, if needed. Please refer to cfdisk(8) or fdisk(8) if you do not yet know how to use " -"the programs." +"systemitem> partition, if needed. Please refer to cfdisk(8) or fdisk(8) if you do not yet know how to use the programs." msgstr "" "启动一个磁盘分区程序,例如 cfdisk 或者fdisk。在启动分区程序时需要一个命令行参数,表示希望创建新分区的硬盘,例如" "主硬盘 /dev/sda。创建一个 Linux 原" "生分区,如果有必要的话再创建一个 swap 分区。请参考 cfdisk(8) 或者 " -"fdisk(8) 来学习如何使用分区程序。" +"systemitem> 分区。请参考 cfdisk(8) 或者 fdisk(8) 来学习如何" +"使用分区程序。" #. type: Content of: #: lfs-en/chapter02/creatingpartition.xml diff --git a/zh_CN/chapter02/hostreqs.po b/zh_CN/chapter02/hostreqs.po index 814c9adb..b6798f77 100644 --- a/zh_CN/chapter02/hostreqs.po +++ b/zh_CN/chapter02/hostreqs.po @@ -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-11-14 02:01+0800\n" +"POT-Creation-Date: 2024-01-28 20:56+0800\n" "PO-Revision-Date: 2021-09-08 14:05+0800\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -52,15 +52,16 @@ msgid "" "Your host system should have the following software with the minimum " "versions indicated. This should not be an issue for most modern Linux " "distributions. Also note that many distributions will place software headers " -"into separate packages, often in the form of <package-name>-" -"devel or <package-name>-dev. Be sure to install " -"those if your distribution provides them." +"into separate packages, often in the form of <" +"package-name>-devel or <" +"package-name>-dev. Be sure to install those if " +"your distribution provides them." msgstr "" "您的宿主系统必须拥有下列软件,且版本不能低于我们给出的最低版本。对于大多数现" "代 Linux 发行版来说这不成问题。要注意的是,很多发行版会把软件的头文件放在单独" -"的软件包中,这些软件包的名称往往是 <软件包名>-devel 或" -"者 <软件包名>-dev。如果您的发行版为下列软件提供了这类软" -"件包,一定要安装它们。" +"的软件包中,这些软件包的名称往往是 <软件包名>-devel " +"或者 <软件包名>-dev。如果您的发行版为下列软件提供了" +"这类软件包,一定要安装它们。" #. type: Content of: #: lfs-en/chapter02/hostreqs.xml diff --git a/zh_CN/chapter02/mounting.po b/zh_CN/chapter02/mounting.po index c2741d60..4629cfc2 100644 --- a/zh_CN/chapter02/mounting.po +++ b/zh_CN/chapter02/mounting.po @@ -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: 2023-09-18 16:58+0800\n" +"POT-Creation-Date: 2024-01-28 20:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -42,15 +42,15 @@ msgstr "" #. type: Content of: #: lfs-en/chapter02/mounting.xml msgid "" -"Strictly speaking, one cannot \"mount a partition\". One mounts the " -"file system embedded in that partition. But since a " +"Strictly speaking, one cannot mount a partition. One mounts " +"the file system embedded in that partition. But since a " "single partition can't contain more than one file system, people often speak " "of the partition and the associated file system as if they were one and the " "same." msgstr "" -"严格来说,我们不能“挂载一个分区”。我们挂载的是该分区中的文件系统。但是,由于一个分区最多只包含一个文件系统,人们经常不加区分地用“分" -"区”代表分区中的文件系统。" +"严格来说,我们不能挂载一个分区。我们挂载的是该分区中的" +"文件系统。但是,由于一个分区最多只包含一个文件系统,人们" +"经常不加区分地用“分区”代表分区中的文件系统。" #. type: Content of: #: lfs-en/chapter02/mounting.xml diff --git a/zh_CN/chapter02/stages.po b/zh_CN/chapter02/stages.po index 536ecd5c..27ef30a6 100644 --- a/zh_CN/chapter02/stages.po +++ b/zh_CN/chapter02/stages.po @@ -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: 2022-10-18 14:07+0800\n" +"POT-Creation-Date: 2024-01-28 17:39+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -99,7 +99,7 @@ msgstr "第 7–10 章" #: lfs-en/chapter02/stages.xml msgid "" "A few operations, from Changing Ownership to Entering " -"the Chroot Environment, must be done as the must be done as the root user, with the LFS environment variable " "set for the &root; user." msgstr "" diff --git a/zh_CN/chapter04/addinguser.po b/zh_CN/chapter04/addinguser.po index 38819543..7349f565 100644 --- a/zh_CN/chapter04/addinguser.po +++ b/zh_CN/chapter04/addinguser.po @@ -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: 2022-10-30 21:21+0800\n" +"POT-Creation-Date: 2024-01-28 17:39+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -199,9 +199,11 @@ msgstr "su - lfs" msgid "" "The - instructs su " "to start a login shell as opposed to a non-login shell. The difference " -"between these two types of shells is described in detail in " -"bash(1) and info bash." +"between these two types of shells is described in detail in bash(1) and info bash." msgstr "" "参数 - 使得 su 启动" -"一个登录 shell,而不是非登录 shell。bash(1) 和 " -"info bash 详细介绍了它们的区别。" +"一个登录 shell,而不是非登录 shell。bash(1)info bash 详细介绍了它们的区" +"别。" diff --git a/zh_CN/chapter04/settingenviron.po b/zh_CN/chapter04/settingenviron.po index a84897cf..889175c8 100644 --- a/zh_CN/chapter04/settingenviron.po +++ b/zh_CN/chapter04/settingenviron.po @@ -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-15 12:25+0800\n" +"POT-Creation-Date: 2024-01-28 17:39+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -161,12 +161,13 @@ msgid "" "Setting the user file-creation mask (umask) to 022 ensures that newly " "created files and directories are only writable by their owner, but are " "readable and executable by anyone (assuming default modes are used by the " -"open(2) system call, new files will end up with " -"permission mode 644 and directories with mode 755)." +"open(2) system call, new files " +"will end up with permission mode 644 and directories with mode 755)." msgstr "" "将用户的文件创建掩码 (umask) 设定为 022,保证只有文件所有者可以写新创建的文件" -"和目录,但任何人都可读取、执行它们。(如果 open(2) 系统调" -"用使用默认模式,则新文件将具有权限模式 644,而新目录具有权限模式 755)。" +"和目录,但任何人都可读取、执行它们。(如果 open(2) 系统调用使用默认模式,则新文件将具有权限模式 644,而" +"新目录具有权限模式 755)。" #. type: Content of: #: lfs-en/chapter04/settingenviron.xml diff --git a/zh_CN/chapter05/glibc.po b/zh_CN/chapter05/glibc.po index 494c9fea..31f9074a 100644 --- a/zh_CN/chapter05/glibc.po +++ b/zh_CN/chapter05/glibc.po @@ -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-10-02 11:33+0800\n" +"POT-Creation-Date: 2024-01-28 17:39+0800\n" "PO-Revision-Date: 2021-08-07 09:09+0800\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -71,14 +71,14 @@ msgstr "Glibc" #: lfs-en/chapter08/perl.xml lfs-en/chapter08/pkgconf.xml #: lfs-en/chapter08/procps.xml lfs-en/chapter08/psmisc.xml #: lfs-en/chapter08/python.xml lfs-en/chapter08/readline.xml -#: lfs-en/chapter08/sed.xml lfs-en/chapter08/shadow.xml -#: lfs-en/chapter08/sysklogd.xml lfs-en/chapter08/systemd.xml -#: lfs-en/chapter08/sysvinit.xml lfs-en/chapter08/tar.xml -#: lfs-en/chapter08/tcl.xml lfs-en/chapter08/texinfo.xml -#: lfs-en/chapter08/udev.xml lfs-en/chapter08/util-linux.xml -#: lfs-en/chapter08/vim.xml lfs-en/chapter08/wheel.xml -#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml -#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml +#: lfs-en/chapter08/sed.xml lfs-en/chapter08/setuptools.xml +#: lfs-en/chapter08/shadow.xml lfs-en/chapter08/sysklogd.xml +#: lfs-en/chapter08/systemd.xml lfs-en/chapter08/sysvinit.xml +#: lfs-en/chapter08/tar.xml lfs-en/chapter08/tcl.xml +#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/udev.xml +#: lfs-en/chapter08/util-linux.xml lfs-en/chapter08/vim.xml +#: lfs-en/chapter08/wheel.xml lfs-en/chapter08/xml-parser.xml +#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml #: lfs-en/chapter09/bootscripts.xml lfs-en/chapter10/kernel.xml msgid "&buildtime;" msgstr "&buildtime;" @@ -129,14 +129,14 @@ msgstr "&buildtime;" #: lfs-en/chapter08/perl.xml lfs-en/chapter08/pkgconf.xml #: lfs-en/chapter08/procps.xml lfs-en/chapter08/psmisc.xml #: lfs-en/chapter08/python.xml lfs-en/chapter08/readline.xml -#: lfs-en/chapter08/sed.xml lfs-en/chapter08/shadow.xml -#: lfs-en/chapter08/sysklogd.xml lfs-en/chapter08/systemd.xml -#: lfs-en/chapter08/sysvinit.xml lfs-en/chapter08/tar.xml -#: lfs-en/chapter08/tcl.xml lfs-en/chapter08/texinfo.xml -#: lfs-en/chapter08/udev.xml lfs-en/chapter08/util-linux.xml -#: lfs-en/chapter08/vim.xml lfs-en/chapter08/wheel.xml -#: lfs-en/chapter08/xml-parser.xml lfs-en/chapter08/xz.xml -#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml +#: lfs-en/chapter08/sed.xml lfs-en/chapter08/setuptools.xml +#: lfs-en/chapter08/shadow.xml lfs-en/chapter08/sysklogd.xml +#: lfs-en/chapter08/systemd.xml lfs-en/chapter08/sysvinit.xml +#: lfs-en/chapter08/tar.xml lfs-en/chapter08/tcl.xml +#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/udev.xml +#: lfs-en/chapter08/util-linux.xml lfs-en/chapter08/vim.xml +#: lfs-en/chapter08/wheel.xml lfs-en/chapter08/xml-parser.xml +#: lfs-en/chapter08/xz.xml lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml #: lfs-en/chapter09/bootscripts.xml lfs-en/chapter10/kernel.xml msgid "&diskspace;" msgstr "&diskspace;" @@ -234,11 +234,12 @@ msgstr "make" #: lfs-en/chapter08/bc.xml lfs-en/chapter08/binutils.xml #: lfs-en/chapter08/bison.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/flit-core.xml -#: lfs-en/chapter08/gawk.xml lfs-en/chapter08/gcc.xml lfs-en/chapter08/gdbm.xml +#: lfs-en/chapter08/dejagnu.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/flit-core.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 @@ -254,13 +255,14 @@ msgstr "make" #: lfs-en/chapter08/openssl.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/readline.xml lfs-en/chapter08/shadow.xml -#: lfs-en/chapter08/sysklogd.xml lfs-en/chapter08/systemd.xml -#: lfs-en/chapter08/sysvinit.xml lfs-en/chapter08/tar.xml -#: lfs-en/chapter08/tcl.xml lfs-en/chapter08/texinfo.xml -#: lfs-en/chapter08/udev.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/chapter08/zstd.xml +#: lfs-en/chapter08/readline.xml lfs-en/chapter08/setuptools.xml +#: lfs-en/chapter08/shadow.xml lfs-en/chapter08/sysklogd.xml +#: lfs-en/chapter08/systemd.xml lfs-en/chapter08/sysvinit.xml +#: lfs-en/chapter08/tar.xml lfs-en/chapter08/tcl.xml +#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/udev.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/chapter08/zstd.xml #: lfs-en/chapter09/bootscripts.xml msgid "Install the package:" msgstr "安装该软件包:" @@ -348,12 +350,12 @@ msgstr "" msgid "" "The above command is correct. The ln command has several " "syntactic versions, so be sure to check info coreutils ln " -"and ln(1) before reporting what may appear to be an " -"error." +"and ln(1) before reporting what " +"may appear to be an error." msgstr "" "以上命令是正确的。ln 命令有多种语法变式,因此在报告看似错" -"误的命令之前,请先阅读 info coreutils ln 和 " -"ln(1)。" +"误的命令之前,请先阅读 info coreutils lnln(1)。" #. type: Content of: #: lfs-en/chapter05/glibc.xml @@ -527,11 +529,11 @@ msgstr "" #: lfs-en/chapter05/glibc.xml msgid "" "There have been reports that this package may fail when building as a " -"\"parallel make\". If that occurs, rerun the make command with the \"-j1\" " -"option." +"parallel make. If that occurs, rerun the make command with " +"the option." msgstr "" -"有报告称该软件包在并行构建时可能失败,如果发生了这种情况,加上 \"-j1\" 选项重" -"新执行 make 命令。" +"有报告称该软件包在并行构建时可能失败,如果发生了这种情况,加上