From ef02a6c6eecca971f3e7ae1c1bbbd71c6066b2e3 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 26 Jan 2025 17:52:59 +0800 Subject: [PATCH] Update to lfs-en @ 50a0916 --- lfs-en | 2 +- zh_CN/chapter08/glibc.po | 68 +++++++++++++++--------------- zh_CN/chapter08/libtool.po | 85 ++++++++++++++++++++------------------ zh_CN/chapter08/vim.po | 67 ++++++++++++++++-------------- 4 files changed, 116 insertions(+), 106 deletions(-) diff --git a/lfs-en b/lfs-en index ff4a32e..50a0916 160000 --- a/lfs-en +++ b/lfs-en @@ -1 +1 @@ -Subproject commit ff4a32ec01eafa53ef4d1f628787afc1b18563ba +Subproject commit 50a0916dea503c04dcdb3f7979e14afc568c4917 diff --git a/zh_CN/chapter08/glibc.po b/zh_CN/chapter08/glibc.po index 8429783..3cf74d4 100644 --- a/zh_CN/chapter08/glibc.po +++ b/zh_CN/chapter08/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: 2024-12-03 19:51+0800\n" +"POT-Creation-Date: 2025-01-26 17:48+0800\n" "PO-Revision-Date: 2021-08-21 11:33+0800\n" "Last-Translator: Xi Ruoyao \n" "Language-Team: none\n" @@ -211,12 +211,11 @@ msgstr "" #: 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 "配置选项的含义:" @@ -243,17 +242,17 @@ msgstr "--disable-werror" #: 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 @@ -331,11 +330,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 @@ -556,16 +554,16 @@ msgstr "安装的程序" #. type: Content of: #: lfs-en/chapter08/attr.xml lfs-en/chapter08/autoconf.xml #: lfs-en/chapter08/bison.xml lfs-en/chapter08/check.xml -#: lfs-en/chapter08/dbus.xml lfs-en/chapter08/dejagnu.xml -#: lfs-en/chapter08/diffutils.xml lfs-en/chapter08/e2fsprogs.xml -#: lfs-en/chapter08/expat.xml lfs-en/chapter08/file.xml -#: lfs-en/chapter08/flex.xml lfs-en/chapter08/gdbm.xml -#: lfs-en/chapter08/gettext.xml lfs-en/chapter08/glibc.xml -#: lfs-en/chapter08/grep.xml lfs-en/chapter08/groff.xml -#: lfs-en/chapter08/gzip.xml lfs-en/chapter08/inetutils.xml -#: lfs-en/chapter08/intltool.xml lfs-en/chapter08/kbd.xml -#: lfs-en/chapter08/less.xml lfs-en/chapter08/libelf.xml -#: lfs-en/chapter08/libffi.xml lfs-en/chapter08/libpipeline.xml +#: lfs-en/chapter08/dejagnu.xml lfs-en/chapter08/diffutils.xml +#: lfs-en/chapter08/e2fsprogs.xml lfs-en/chapter08/expat.xml +#: lfs-en/chapter08/file.xml lfs-en/chapter08/flex.xml +#: lfs-en/chapter08/gdbm.xml lfs-en/chapter08/gettext.xml +#: lfs-en/chapter08/glibc.xml lfs-en/chapter08/grep.xml +#: lfs-en/chapter08/groff.xml lfs-en/chapter08/gzip.xml +#: lfs-en/chapter08/inetutils.xml lfs-en/chapter08/intltool.xml +#: lfs-en/chapter08/kbd.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 #: lfs-en/chapter08/man-db.xml lfs-en/chapter08/mpc.xml #: lfs-en/chapter08/mpfr.xml lfs-en/chapter08/patch.xml @@ -1277,7 +1275,7 @@ msgid "" "\n" "cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO\n" "zic -d $ZONEINFO -p America/New_York\n" -"unset ZONEINFO" +"unset ZONEINFO tz" msgstr "" "tar -xf ../../tzdata&tzdata-version;.tar.gz\n" "\n" @@ -1293,7 +1291,7 @@ msgstr "" "\n" "cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO\n" "zic -d $ZONEINFO -p America/New_York\n" -"unset ZONEINFO" +"unset ZONEINFO tz" #. type: Content of: #: lfs-en/chapter08/glibc.xml diff --git a/zh_CN/chapter08/libtool.po b/zh_CN/chapter08/libtool.po index 02a7fe7..2008ee7 100644 --- a/zh_CN/chapter08/libtool.po +++ b/zh_CN/chapter08/libtool.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-10-06 03:09+0800\n" +"POT-Creation-Date: 2025-01-26 17:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n" "Language-Team: none\n" @@ -208,17 +208,17 @@ msgstr "&diskspace;" #: 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 @@ -296,11 +296,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 @@ -311,11 +310,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>" @@ -473,6 +473,29 @@ msgstr "<userinput remap=\"configure\">./configure --prefix=/usr</userinput>" msgid "Installed programs" msgstr "安装的程序" +#. type: Content of: <sect1><sect2><screen> +#: lfs-en/chapter08/attr.xml lfs-en/chapter08/autoconf.xml +#: lfs-en/chapter08/bison.xml lfs-en/chapter08/check.xml +#: lfs-en/chapter08/dejagnu.xml lfs-en/chapter08/diffutils.xml +#: lfs-en/chapter08/e2fsprogs.xml lfs-en/chapter08/expat.xml +#: lfs-en/chapter08/file.xml lfs-en/chapter08/flex.xml +#: lfs-en/chapter08/gdbm.xml lfs-en/chapter08/gettext.xml +#: lfs-en/chapter08/glibc.xml lfs-en/chapter08/grep.xml +#: lfs-en/chapter08/groff.xml lfs-en/chapter08/gzip.xml +#: lfs-en/chapter08/inetutils.xml lfs-en/chapter08/intltool.xml +#: lfs-en/chapter08/kbd.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 +#: lfs-en/chapter08/man-db.xml lfs-en/chapter08/mpc.xml +#: lfs-en/chapter08/mpfr.xml lfs-en/chapter08/patch.xml +#: lfs-en/chapter08/psmisc.xml lfs-en/chapter08/tar.xml +#: lfs-en/chapter08/texinfo.xml lfs-en/chapter08/xz.xml +#: lfs-en/chapter08/zlib.xml lfs-en/chapter08/zstd.xml +#, no-wrap +msgid "<userinput remap=\"test\">make check</userinput>" +msgstr "<userinput remap=\"test\">make check</userinput>" + #. type: Content of: <sect1><sect2><para> #: lfs-en/chapter08/autoconf.xml lfs-en/chapter08/dbus.xml #: lfs-en/chapter08/dejagnu.xml lfs-en/chapter08/diffutils.xml @@ -495,12 +518,6 @@ msgstr "安装的程序" msgid "To test the results, issue:" msgstr "运行命令以测试编译结果:" -#. type: Content of: <sect1><sect2><screen> -#: lfs-en/chapter08/binutils.xml lfs-en/chapter08/libtool.xml -#, no-wrap -msgid "<userinput remap=\"test\">make -k check</userinput>" -msgstr "<userinput remap=\"test\">make -k check</userinput>" - #. type: Content of: <sect1><sect2><segmentedlist><segtitle> #: lfs-en/chapter08/binutils.xml lfs-en/chapter08/bzip2.xml #: lfs-en/chapter08/dbus.xml lfs-en/chapter08/e2fsprogs.xml @@ -569,18 +586,6 @@ msgstr "安装 Libtool" msgid "Prepare Libtool for compilation:" msgstr "准备编译 Libtool:" -#. type: Content of: <sect1><sect2><para> -#: lfs-en/chapter08/libtool.xml -msgid "" -"Five tests are known to fail in the LFS build environment due to a circular " -"dependency, but these tests pass if rechecked after automake has been " -"installed. Additionally, with grep-3.8 or newer, two tests will trigger a " -"warning for non-POSIX regular expressions and fail." -msgstr "" -"在 LFS 构建环境中,已知有五项测试因为循环依赖而失败,但这些测试在 automake 安" -"装后能够通过。另外,在使用 grep-3.8 或更新版本时,两项测试触发关于非 POSIX 正" -"则表达式的警告而失败。" - #. type: Content of: <sect1><sect2><screen> #: lfs-en/chapter08/libtool.xml #, no-wrap diff --git a/zh_CN/chapter08/vim.po b/zh_CN/chapter08/vim.po index 7d491ab..3346d28 100644 --- a/zh_CN/chapter08/vim.po +++ b/zh_CN/chapter08/vim.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-09-22 20:58+0800\n" +"POT-Creation-Date: 2025-01-26 17:48+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xi Ruoyao <xry111@xry111.site>\n" "Language-Team: none\n" @@ -208,17 +208,17 @@ msgstr "&diskspace;" #: 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 @@ -296,11 +296,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 @@ -311,11 +310,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>" @@ -469,12 +469,6 @@ msgstr "安装的程序" msgid "Installed directory" msgstr "安装的目录" -#. type: Content of: <sect1><sect2><screen> -#: lfs-en/chapter08/bash.xml lfs-en/chapter08/vim.xml -#, no-wrap -msgid "<userinput remap=\"test\">chown -R tester .</userinput>" -msgstr "<userinput remap=\"test\">chown -R tester .</userinput>" - #. type: Content of: <sect1><sect1info><address> #: lfs-en/chapter08/vim.xml #, no-wrap @@ -549,10 +543,23 @@ msgstr "准备编译 Vim:" #: lfs-en/chapter08/vim.xml msgid "" "To prepare the tests, ensure that user <systemitem " -"class=\"username\">tester</systemitem> can write to the source tree:" +"class=\"username\">tester</systemitem> can write to the source tree and " +"exclude one file containing tests requiring <command>curl</command> or " +"<command>wget</command>:" msgstr "" "为了准备运行测试套件,需要使得 <systemitem class=\"username\">tester</" -"systemitem> 用户拥有写入源代码目录树的权限:" +"systemitem> 用户拥有写入源代码目录树的权限,并排除一个含有需要 " +"<command>curl</command> 或 <command>wget</command> 的测试的文件:" + +#. type: Content of: <sect1><sect2><screen> +#: lfs-en/chapter08/vim.xml +#, no-wrap +msgid "" +"<userinput remap=\"test\">chown -R tester .\n" +"sed '/test_glvs/d' -i src/testdir/Make_all.mak</userinput>" +msgstr "" +"<userinput remap=\"test\">chown -R tester .\n" +"sed '/test_glvs/d' -i src/testdir/Make_all.mak</userinput>" #. type: Content of: <sect1><sect2><para> #: lfs-en/chapter08/vim.xml