Skip to content

Commit

Permalink
Update to lfs-en @ 505b6b1
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Nov 10, 2024
1 parent 91dacf4 commit 0e6d5f9
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 51 deletions.
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from a9517d to 505b6b
34 changes: 33 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: [email protected]\n"
"POT-Creation-Date: 2024-11-02 01:56+0800\n"
"POT-Creation-Date: 2024-11-10 18:18+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,38 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-11-08"
msgstr "2024 年 11 月 8 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Added binutils-2.43.1-upstream_fix-1.patch. Fixes <ulink "
"url='&lfs-ticket-root;5591'>#5591</ulink>."
msgstr ""
"[bdubbs] — 加入 binutils-2.43.1-upstream_fix-1.patch。修复 <ulink url='&lfs-"
"ticket-root;5591'>#5591</ulink>。"

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

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

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2024-10-25"
Expand Down
7 changes: 6 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: [email protected]\n"
"POT-Creation-Date: 2024-11-02 01:55+0800\n"
"POT-Creation-Date: 2024-11-10 18:17+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 @@ -185,6 +185,11 @@ msgstr "Xz-&xz-version;"
msgid "Added:"
msgstr "已添加:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "binutils-2.43.1-upstream_fix-1.patch"
msgstr "binutils-2.43.1-upstream_fix-1.patch"

#. type: Content of: <sect1><itemizedlist><title>
#: lfs-en/chapter01/whatsnew.xml
msgid "Removed:"
Expand Down
19 changes: 18 additions & 1 deletion zh_CN/chapter03/patches.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-08-18 15:24+0800\n"
"POT-Creation-Date: 2024-11-10 18:17+0800\n"
"PO-Revision-Date: 2022-01-16 00:53+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -36,6 +36,23 @@ msgstr ""
"除了软件包外,我们还需要一些补丁。有些补丁解决了本应由维护者修复的问题,有些"
"则对软件包进行微小的修改,使得它们更容易使用。构建 LFS 系统需要下列补丁:"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter03/patches.xml
msgid ""
"Binutils Upstream Fixes Patch - <token>&binutils-upstream-patch-size;</"
"token>:"
msgstr "Binutils 上游修复补丁 - <token>&binutils-upstream-patch-size;</token>:"

#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
#: lfs-en/chapter03/patches.xml
msgid "Download: <ulink url=\"&patches-root;&binutils-upstream-patch;\"/>"
msgstr "下载地址:<ulink url=\"&patches-root;&binutils-upstream-patch;\"/>"

#. type: Content of: <sect1><variablelist><varlistentry><listitem><para>
#: lfs-en/chapter03/patches.xml
msgid "MD5 sum: <literal>&binutils-upstream-patch-md5;</literal>"
msgstr "MD5 校验和:<literal>&binutils-upstream-patch-md5;</literal>"

#. type: Content of: <sect1><variablelist><varlistentry><term>
#: lfs-en/chapter03/patches.xml
msgid "Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:"
Expand Down
8 changes: 3 additions & 5 deletions zh_CN/chapter06/bash.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-10-06 03:09+0800\n"
"POT-Creation-Date: 2024-11-10 18:17+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 @@ -366,14 +366,12 @@ msgid ""
"<userinput remap=\"configure\">./configure --prefix=/usr \\\n"
" --build=$(sh support/config.guess) \\\n"
" --host=$LFS_TGT \\\n"
" --without-bash-malloc \\\n"
" bash_cv_strtold_broken=no</userinput>"
" --without-bash-malloc</userinput>"
msgstr ""
"<userinput remap=\"configure\">./configure --prefix=/usr \\\n"
" --build=$(sh support/config.guess) \\\n"
" --host=$LFS_TGT \\\n"
" --without-bash-malloc \\\n"
" bash_cv_strtold_broken=no</userinput>"
" --without-bash-malloc</userinput>"

#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
#: lfs-en/chapter06/bash.xml
Expand Down
4 changes: 1 addition & 3 deletions zh_CN/chapter08/bash.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-10-06 03:09+0800\n"
"POT-Creation-Date: 2024-11-10 18:17+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 @@ -516,13 +516,11 @@ msgid ""
"<userinput remap=\"configure\">./configure --prefix=/usr \\\n"
" --without-bash-malloc \\\n"
" --with-installed-readline \\\n"
" bash_cv_strtold_broken=no \\\n"
" --docdir=/usr/share/doc/bash-&bash-version;</userinput>"
msgstr ""
"<userinput remap=\"configure\">./configure --prefix=/usr \\\n"
" --without-bash-malloc \\\n"
" --with-installed-readline \\\n"
" bash_cv_strtold_broken=no \\\n"
" --docdir=/usr/share/doc/bash-&bash-version;</userinput>"

#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
Expand Down
33 changes: 24 additions & 9 deletions zh_CN/chapter08/binutils.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-09-08 18:40+0800\n"
"POT-Creation-Date: 2024-11-10 18:17+0800\n"
"PO-Revision-Date: 2021-08-16 11:42+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -247,14 +247,14 @@ msgstr ""
#: 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 Down Expand Up @@ -448,6 +448,21 @@ msgstr "&binutils-fin-sbu;"
msgid "&binutils-fin-du;"
msgstr "&binutils-fin-du;"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/binutils.xml
msgid ""
"First, apply a patch to prevent a bug that causing unnecessary relinking "
"with packages that depend on cmake-3.31.0 or newer:"
msgstr ""
"首先,应用补丁,以修复导致使用 cmake-3.31.0 或更新版本构建软件包时发生非必要"
"重新链接的 bug:"

#. type: Content of: <sect1><sect2><screen>
#: lfs-en/chapter08/binutils.xml
#, no-wrap
msgid "<userinput remap=\"pre\">patch -Np1 -i ../&binutils-upstream-patch;</userinput>"
msgstr "<userinput remap=\"pre\">patch -Np1 -i ../&binutils-upstream-patch;</userinput>"

#. type: Content of: <sect1><sect2><screen>
#: lfs-en/chapter08/binutils.xml
#, no-wrap
Expand Down
51 changes: 21 additions & 30 deletions zh_CN/chapter08/shadow.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-09-08 18:40+0800\n"
"POT-Creation-Date: 2024-11-10 18:17+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 @@ -258,14 +258,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 Down Expand Up @@ -491,23 +491,25 @@ msgstr "安装 Shadow"
#: lfs-en/chapter08/shadow.xml
msgid ""
"If you've installed Linux-PAM, you should follow <ulink url='&blfs-book;"
"postlfs/shadow.xml'>the BLFS shadow page</ulink> instead of this page to "
"build (or, rebuild or upgrade) shadow."
"postlfs/shadow.html'>the BLFS instruction</ulink> instead of this page to "
"build (or, rebuild or upgrade) shadow."
msgstr ""
"如果已经安装了 Linux-PAM,则应该按照 <ulink url='&blfs-book;postlfs/shadow."
"xml'>BLFS shadow 页面</ulink>,而非本页的说明安装 shadow。"
"html'>BLFS shadow 页面</ulink>,而非本页的说明安装 shadow。"

#. type: Content of: <sect1><sect2><note><para>
#: lfs-en/chapter08/shadow.xml
msgid ""
"If you would like to enforce the use of strong passwords, refer to <ulink "
"url=\"&blfs-book;postlfs/cracklib.html\"/> for installing CrackLib prior to "
"building Shadow. Then add <parameter>--with-libcrack</parameter> to the "
"<command>configure</command> command below."
"If you would like to enforce the use of strong passwords, <ulink url='&blfs-"
"book;postlfs/linux-pam.html'>install and configure Linux-PAM</ulink> first. "
"Then <ulink url='&blfs-book;postlfs/shadow.html'>install and configure "
"shadow with the PAM support</ulink>. Finally <ulink url='&blfs-book;postlfs/"
"libpwquality.html'>install libpwquality and configure PAM to use it</ulink>."
msgstr ""
"如果您希望强制使用强密码,参考 <ulink url=\"&blfs-book;postlfs/cracklib."
"html\"/> 以在构建 Shadow 前安装 CrackLib。然后,将 <parameter>--with-"
"libcrack</parameter> 添加到下面的 <command>configure</command> 命令中。"
"如果您希望强制使用强密码,首先<ulink url='&blfs-book;postlfs/linux-pam.html'>"
"安装并配置 Linux-PAM</ulink>。之后<ulink url='&blfs-book;postlfs/shadow."
"html'>安装并配置带有 PAM 支持的shadow</ulink>。最后<ulink url='&blfs-book;"
"postlfs/libpwquality.html'>安装 libpwquality 并配置 PAM 使用它</ulink>。"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/shadow.xml
Expand Down Expand Up @@ -585,17 +587,6 @@ msgstr ""
" -e '/PATH=/{s@/sbin:@@;s@/bin:@@}' \\\n"
" -i etc/login.defs</userinput>"

#. type: Content of: <sect1><sect2><note><para>
#: lfs-en/chapter08/shadow.xml
msgid "If you chose to build Shadow with Cracklib support, issue this command:"
msgstr "如果您选择构建有 Cracklib 支持的 Shadow,执行该命令:"

#. type: Content of: <sect1><sect2><note><screen>
#: lfs-en/chapter08/shadow.xml
#, no-wrap
msgid "<userinput>sed -i 's:DICTPATH.*:DICTPATH\\t/lib/cracklib/pw_dict:' etc/login.defs</userinput>"
msgstr "<userinput>sed -i 's:DICTPATH.*:DICTPATH\\t/lib/cracklib/pw_dict:' etc/login.defs</userinput>"

#. type: Content of: <sect1><sect2><para>
#: lfs-en/chapter08/shadow.xml
msgid "Prepare Shadow for compilation:"
Expand Down

0 comments on commit 0e6d5f9

Please sign in to comment.