Skip to content

Commit

Permalink
Merge branch 'master' into 12.2-rc1
Browse files Browse the repository at this point in the history
Merge two translation fixes from master.
  • Loading branch information
xry111 committed Aug 19, 2024
2 parents 344b373 + 6c3754f commit 43b6eee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions zh_CN/chapter07/createfiles.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-06-15 01:10+0800\n"
"POT-Creation-Date: 2024-07-04 13:21+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 @@ -389,8 +389,8 @@ msgid ""
"user. We add this user here and delete this account at the end of that "
"chapter."
msgstr ""
"<xref linkend=\"chapter-building-system\"/>中的一些测试需要使用一个普通用户。"
"我们这里创建一个用户,在那一章的末尾再删除该用户。"
"<xref linkend=\"chapter-building-system\"/>中的一些测试需要使用一个非特权用"
"户。我们这里创建一个用户,在那一章的末尾再删除该用户。"

#. type: Content of: <sect1><screen>
#: lfs-en/chapter07/createfiles.xml
Expand Down
2 changes: 1 addition & 1 deletion zh_CN/chapter07/python.po
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ msgid ""
"system\"/>."
msgstr ""
"一些 Python 3 模块目前无法构建,这是因为它们的依赖项尚未安装。对于 "
"<filename>ssl</filename> 模块,构建系统会输出一条消息<computeroutput>Python "
"<filename>ssl</filename> 模块,构建系统会输出一条消息 <computeroutput>Python "
"requires a OpenSSL 1.1.1 or newer</computeroutput> (“Python 需要 OpenSSL "
"1.1.1 或更新版本”)。这条消息应该被忽略。只需要确认最外层的 <command>make</"
"command> 命令执行成功即可。目前不需要这些可选的模块,它们将在<xref "
Expand Down

0 comments on commit 43b6eee

Please sign in to comment.