Skip to content

Commit

Permalink
Update to lfs-en @ 70bf551
Browse files Browse the repository at this point in the history
  • Loading branch information
xry111 committed Jul 31, 2023
1 parent 5fc98e7 commit 4a214df
Show file tree
Hide file tree
Showing 13 changed files with 741 additions and 789 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ include $(MLANG)/lang.mk
L10N_XML = stylesheets/lfs-xsl/lfs-l10n.xml
EXCLUDE_XML = $(LFS_EN)/$(L10N_XML) $(LFS_EN)/chapter01/changelog.xml \
$(LFS_EN)/appendices/creat-comm.xml \
$(LFS_EN)/appendices/mit-lic.xml
$(LFS_EN)/appendices/mit-lic.xml \
$(wildcard $(LFS_EN)/chapter10/kernel/*.xml)
CMD_FIND_XML = find $(LFS_EN) -type f -name '*.xml'
XML_FILES = $(filter-out $(EXCLUDE_XML), $(wildcard $(shell $(CMD_FIND_XML))))
POT_DIRS = $(sort $(patsubst $(LFS_EN)/%, pot/%, $(dir $(XML_FILES))))
Expand Down
2 changes: 1 addition & 1 deletion lfs-en
Submodule lfs-en updated from e5c08b to 70bf55
33 changes: 32 additions & 1 deletion zh_CN/chapter01/askforhelp.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: 2023-07-29 18:09+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand All @@ -19,6 +19,37 @@ msgstr ""
msgid "Help"
msgstr "如何求助"

#. type: Content of: <sect1><note><para>
#: lfs-en/chapter01/askforhelp.xml
msgid ""
"In case you've hit an issue building one package with the LFS instruction, "
"we strongly discourage posting the issue directly onto the upstream support "
"channel before discussing via a LFS support channel listed in <xref "
"linkend=\"ch-intro-resources\"/>. Doing so is often quite inefficient "
"because the upstream maintainers are rarely familiar with LFS building "
"procedure. Even if you've really hit an upstream issue, the LFS community "
"can still help to isolate the information wanted by the upstream maintainers "
"and make a proper report."
msgstr ""
"如果您在按照 LFS 的指示构建某个软件包时出现了问题,我们强烈反对在未通过<xref "
"linkend='ch-intro-resources'/>给出的 LFS 支持通道进行讨论前,直接将问题发布到"
"上游支持通道。这样做通常十分低效,因为上游维护者很少熟悉 LFS 的构建过程。即使"
"您真的遇到了上游导致的问题,LFS 社区仍然能够帮您提取上游维护者需要的信息,并"
"正确地报告问题。"

#. type: Content of: <sect1><note><para>
#: lfs-en/chapter01/askforhelp.xml
msgid ""
"If you must ask a question directly via an upstream support channel, you "
"shall at least note that many upstream projects have the support channels "
"separated from the bug tracker. The <quote>bug</quote> reports for asking "
"questions are considered invalid and may annoy upstream developers for these "
"projects."
msgstr ""
"如果您一定要通过上游支持通道直接提问,请至少注意许多上游项目的支持通道和 bug "
"管理系统是分离的。对于这些项目,用于提问的 <quote>bug</quote> 报告会被视为无"
"效,并可能令上游开发者感到不快。"

#. type: Content of: <sect1><para>
#: lfs-en/chapter01/askforhelp.xml
msgid ""
Expand Down
92 changes: 91 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: 2023-07-23 00:21+0800\n"
"POT-Creation-Date: 2023-08-01 00:16+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,96 @@ msgstr "下面是本书自上一版本发布以来的更新日志。"
msgid "Changelog Entries:"
msgstr "更新日志记录:"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-07-28"
msgstr "2023 年 7 月 28 日"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update udev-lfs tarball to remove obsolete cdrom rules and "
"references to ISDN devices. Fixes <ulink url='&lfs-ticket-root;5291'>#5291</"
"ulink>."
msgstr ""
"[bdubbs] — 更新 udev-lfs 压缩包以删除过时的 cdrom 规则和对 ISDN 设备的引用。"
"修复 <ulink url='&lfs-ticket-root;5291'>#5291</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to wheel-0.41.0 (Python Module). Fixes <ulink url='&lfs-"
"ticket-root;5290'>#5290</ulink>."
msgstr ""
"[bdubbs] — 更新到 wheel-0.41.0 (Python 模块)。修复 <ulink url='&lfs-ticket-"
"root;5290'>#5290</ulink>。"

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

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[bdubbs] - Update to<phrase revision='sysv'> udev from</phrase> systemd-254. "
"Fixes <ulink url='&lfs-ticket-root;5293'>#5293</ulink>."
msgstr ""
"[bdubbs] — 更新到 systemd-254<phrase revision='sysv'> 中的 udev</phrase>。修"
"复 <ulink url='&lfs-ticket-root;5293'>#5293</ulink>。"

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

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

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

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

#. type: Content of: <sect1><itemizedlist><listitem><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid ""
"[xry111] - Enable cgroup-based memory pressure information in kernel, and "
"add the cgroup file system into /etc/fstab and the mountvirtfs bootscript. "
"This is a preparation for udev from systemd-254. Addresses <ulink url='&lfs-"
"ticket-root;5293'>#5293</ulink>."
msgstr ""
"[xry111] — 在内核配置中启用基于 cgroup 的内存压力信息统计,并将 cgroup 文件系"
"统加入 /etc/fstab 和 mountvirtfs 引导脚本。这是为 systemd-254 中的 udev 进行"
"的准备。处理 <ulink url='&lfs-ticket-root;5293'>#5293</ulink>。"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/changelog.xml
msgid "2023-07-22"
Expand Down
19 changes: 18 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: 2023-07-18 12:46+0800\n"
"POT-Creation-Date: 2023-07-29 18:09+0800\n"
"PO-Revision-Date: 2021-11-05 23:31+0800\n"
"Last-Translator: Xi Ruoyao <[email protected]>\n"
"Language-Team: none\n"
Expand All @@ -19,6 +19,12 @@ msgstr ""
"X-Pootle-Path: /zh_CN/lfs/chapter01/whatsnew.po\n"
"X-Pootle-Revision: 9999999\n"

#. type: Content of: <sect1><title>
#: lfs-en/chapter06/file.xml lfs-en/chapter01/whatsnew.xml
#: lfs-en/chapter08/file.xml
msgid "File-&file-version;"
msgstr "File-&file-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter06/grep.xml lfs-en/chapter01/whatsnew.xml
#: lfs-en/chapter08/grep.xml
Expand All @@ -31,6 +37,12 @@ msgstr "Grep-&grep-version;"
msgid "Coreutils-&coreutils-version;"
msgstr "Coreutils-&coreutils-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter06/tar.xml lfs-en/chapter01/whatsnew.xml
#: lfs-en/chapter08/tar.xml
msgid "Tar-&tar-version;"
msgstr "Tar-&tar-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter06/diffutils.xml lfs-en/chapter01/whatsnew.xml
#: lfs-en/chapter08/diffutils.xml
Expand Down Expand Up @@ -214,6 +226,11 @@ msgstr "Util-Linux-&util-linux-version;"
msgid "Vim-&vim-version;"
msgstr "Vim-&vim-version;"

#. type: Content of: <sect1><itemizedlist><listitem><para>
#: lfs-en/chapter01/whatsnew.xml
msgid "wheel-&wheel-version;"
msgstr "wheel-&wheel-version;"

#. type: Content of: <sect1><title>
#: lfs-en/chapter01/whatsnew.xml lfs-en/chapter08/zstd.xml
msgid "Zstd-&zstd-version;"
Expand Down
Loading

0 comments on commit 4a214df

Please sign in to comment.