Skip to content

Commit

Permalink
Update to lfs-en @ 7c63034
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Jan 28, 2024
1 parent 750dea3 commit a64cb21
Show file tree
Hide file tree
Showing 34 changed files with 734 additions and 879 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from 5bef8f to 7c6303
7 changes: 6 additions & 1 deletion zh_CN/appendices/dependencies.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -770,6 +770,11 @@ msgstr "Diffutils, Perl, 以及 Tcl"
msgid "Automake and Bison"
msgstr "Automake 和 Bison"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid "<ulink url='&blfs-book;general/libxml2.html'>libxml2</ulink>"
msgstr "<ulink url='&blfs-book;general/libxml2.html'>libxml2</ulink>"

#. type: Content of: <appendix><segmentedlist><seglistitem><seg>
#: lfs-en/appendices/dependencies.xml
msgid ""
Expand Down
13 changes: 7 additions & 6 deletions zh_CN/chapter02/creatingpartition.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -76,16 +76,17 @@ msgid ""
"which the new partition will be created&mdash;for example <filename "
"class=\"devicefile\">/dev/sda</filename> for the primary disk drive. Create "
"a Linux native partition and a <systemitem class=\"filesystem\">swap</"
"systemitem> partition, if needed. Please refer to <filename>cfdisk(8)</"
"filename> or <filename>fdisk(8)</filename> if you do not yet know how to use "
"the programs."
"systemitem> partition, if needed. Please refer to <ulink role='man' "
"url='&man;cfdisk.8'>cfdisk(8)</ulink> or <ulink role='man' url='&man;"
"fdisk.8'>fdisk(8)</ulink> if you do not yet know how to use the programs."
msgstr ""
"启动一个磁盘分区程序,例如 <command>cfdisk</command> 或者<command>fdisk</"
"command>。在启动分区程序时需要一个命令行参数,表示希望创建新分区的硬盘,例如"
"主硬盘 <filename class=\"devicefile\">/dev/sda</filename>。创建一个 Linux 原"
"生分区,如果有必要的话再创建一个 <systemitem class=\"filesystem\">swap</"
"systemitem> 分区。请参考 <filename>cfdisk(8)</filename> 或者 "
"<filename>fdisk(8)</filename> 来学习如何使用分区程序。"
"systemitem> 分区。请参考 <ulink role='man' url='&man;cfdisk.8'>cfdisk(8)</"
"ulink> 或者 <ulink role='man' url='&man;fdisk.8'>fdisk(8)</ulink> 来学习如何"
"使用分区程序。"

#. type: Content of: <sect1><note><para>
#: lfs-en/chapter02/creatingpartition.xml
Expand Down
15 changes: 8 additions & 7 deletions zh_CN/chapter02/hostreqs.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -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 <quote>&lt;package-name&gt;-"
"devel</quote> or <quote>&lt;package-name&gt;-dev</quote>. Be sure to install "
"those if your distribution provides them."
"into separate packages, often in the form of <literal><replaceable>&lt;"
"package-name&gt;</replaceable>-devel</literal> or <literal><replaceable>&lt;"
"package-name&gt;</replaceable>-dev</literal>. Be sure to install those if "
"your distribution provides them."
msgstr ""
"您的宿主系统必须拥有下列软件,且版本不能低于我们给出的最低版本。对于大多数现"
"代 Linux 发行版来说这不成问题。要注意的是,很多发行版会把软件的头文件放在单独"
"的软件包中,这些软件包的名称往往是 <quote>&lt;软件包名&gt;-devel</quote> 或"
"者 <quote>&lt;软件包名&gt;-dev</quote>。如果您的发行版为下列软件提供了这类软"
"件包,一定要安装它们。"
"的软件包中,这些软件包的名称往往是 <literal>&lt;软件包名&gt;-devel</literal> "
"或者 <literal>&lt;软件包名&gt;-dev</literal>。如果您的发行版为下列软件提供了"
"这类软件包,一定要安装它们。"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter02/hostreqs.xml
Expand Down
12 changes: 6 additions & 6 deletions 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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -42,15 +42,15 @@ msgstr ""
#. type: Content of: <sect1><para>
#: lfs-en/chapter02/mounting.xml
msgid ""
"Strictly speaking, one cannot \"mount a partition\". One mounts the "
"<emphasis>file system</emphasis> embedded in that partition. But since a "
"Strictly speaking, one cannot <quote>mount a partition.</quote> One mounts "
"the <emphasis>file system</emphasis> 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 ""
"严格来说,我们不能“挂载一个分区”。我们挂载的是该分区中的<emphasis>文件系统</"
"emphasis>。但是,由于一个分区最多只包含一个文件系统,人们经常不加区分地用“分"
"”代表分区中的文件系统。"
"严格来说,我们不能<quote>挂载一个分区</quote>。我们挂载的是该分区中的"
"<emphasis>文件系统</emphasis>。但是,由于一个分区最多只包含一个文件系统,人们"
"经常不加区分地用“分区”代表分区中的文件系统。"

#. type: Content of: <sect1><para>
#: lfs-en/chapter02/mounting.xml
Expand Down
4 changes: 2 additions & 2 deletions zh_CN/chapter02/stages.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -99,7 +99,7 @@ msgstr "第 7&ndash;10 章"
#: lfs-en/chapter02/stages.xml
msgid ""
"A few operations, from <quote>Changing Ownership</quote> to <quote>Entering "
"the Chroot Environment</quote>, must be done as the <systemitem "
"the Chroot Environment,</quote> must be done as the <systemitem "
"class=\"username\">root</systemitem> user, with the LFS environment variable "
"set for the &root; user."
msgstr ""
Expand Down
12 changes: 7 additions & 5 deletions zh_CN/chapter04/addinguser.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -199,9 +199,11 @@ msgstr "<userinput>su - lfs</userinput>"
msgid ""
"The <quote><parameter>-</parameter></quote> instructs <command>su</command> "
"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 "
"<filename>bash(1)</filename> and <command>info bash</command>."
"between these two types of shells is described in detail in <ulink "
"role='man' url='&man;bash.1'>bash(1)</ulink> and <command>info bash</"
"command>."
msgstr ""
"参数 <quote><parameter>-</parameter></quote> 使得 <command>su</command> 启动"
"一个登录 shell,而不是非登录 shell。<filename>bash(1)</filename> 和 "
"<command>info bash</command> 详细介绍了它们的区别。"
"一个登录 shell,而不是非登录 shell。<ulink role='man' url='&man;"
"bash.1'>bash(1)</ulink> 和 <command>info bash</command> 详细介绍了它们的区"
"别。"
11 changes: 6 additions & 5 deletions zh_CN/chapter04/settingenviron.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -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 "
"<filename>open(2)</filename> system call, new files will end up with "
"permission mode 644 and directories with mode 755)."
"<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)."
msgstr ""
"将用户的文件创建掩码 (umask) 设定为 022,保证只有文件所有者可以写新创建的文件"
"和目录,但任何人都可读取、执行它们。(如果 <filename>open(2)</filename> 系统调"
"用使用默认模式,则新文件将具有权限模式 644,而新目录具有权限模式 755)。"
"和目录,但任何人都可读取、执行它们。(如果 <ulink role='man' url='&man;"
"open.2'>open(2)</ulink> 系统调用使用默认模式,则新文件将具有权限模式 644,而"
"新目录具有权限模式 755)。"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter04/settingenviron.xml
Expand Down
76 changes: 39 additions & 37 deletions zh_CN/chapter05/glibc.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -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;"
Expand Down Expand Up @@ -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;"
Expand Down Expand Up @@ -234,11 +234,12 @@ msgstr "<userinput remap=\"make\">make</userinput>"
#: 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
Expand All @@ -254,13 +255,14 @@ msgstr "<userinput remap=\"make\">make</userinput>"
#: 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 "安装该软件包:"
Expand Down Expand Up @@ -348,12 +350,12 @@ msgstr ""
msgid ""
"The above command is correct. The <command>ln</command> command has several "
"syntactic versions, so be sure to check <command>info coreutils ln</command> "
"and <filename>ln(1)</filename> before reporting what may appear to be an "
"error."
"and <ulink role='man' url='&man;ln.1'>ln(1)</ulink> before reporting what "
"may appear to be an error."
msgstr ""
"以上命令是正确的。<command>ln</command> 命令有多种语法变式,因此在报告看似错"
"误的命令之前,请先阅读 <command>info coreutils ln</command> 和 "
"<filename>ln(1)</filename>。"
"误的命令之前,请先阅读 <command>info coreutils ln</command> 和 <ulink "
"role='man' url='&man;ln.1'>ln(1)</ulink>。"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter05/glibc.xml
Expand Down Expand Up @@ -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."
"<quote>parallel make.</quote> If that occurs, rerun the make command with "
"the <option>-j1</option> option."
msgstr ""
"有报告称该软件包在并行构建时可能失败,如果发生了这种情况,加上 \"-j1\" 选项重"
"新执行 make 命令。"
"有报告称该软件包在并行构建时可能失败,如果发生了这种情况,加上 <option>-j1</"
"option> 选项重新执行 make 命令。"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter05/glibc.xml lfs-en/chapter06/bash.xml
Expand Down
4 changes: 2 additions & 2 deletions zh_CN/chapter07/creatingdirs.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: [email protected]\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 <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -116,7 +116,7 @@ msgid ""
"sure that any user can write to the <filename class=\"directory\">/tmp</"
"filename> and <filename class=\"directory\">/var/tmp</filename> directories, "
"but cannot remove another user's files from them. The latter is prohibited "
"by the so-called <quote>sticky bit</quote>, the highest bit (1) in the 1777 "
"by the so-called <quote>sticky bit,</quote> the highest bit (1) in the 1777 "
"bit mask."
msgstr ""
"第一个修改能保证不是所有人都能进入 <filename class=\"directory\">/root</"
Expand Down
Loading

0 comments on commit a64cb21

Please sign in to comment.