Browse Source

update to r11992

Xℹ Ruoyao 4 years ago
parent
commit
98f4fcf7f9
4 changed files with 272 additions and 184 deletions
  1. 152 122
      zh_CN/chapter01/changelog.po
  2. 56 49
      zh_CN/chapter07/libstdc++-pass2.po
  3. 27 11
      zh_CN/chapter07/python.po
  4. 37 2
      zh_CN/chapter08/revisedchroot.po

File diff suppressed because it is too large
+ 152 - 122
zh_CN/chapter01/changelog.po


+ 56 - 49
zh_CN/chapter07/libstdc++-pass2.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-17 12:44+0800\n"
+"POT-Creation-Date: 2020-07-05 16:17+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,13 +19,11 @@ msgstr "&gcc-url;"
 #. type: Content of: <sect1><sect1info>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:12
 msgid ""
-"<productname>gcc-libstdc++</productname> "
-"<productnumber>&gcc-version;</productnumber> <placeholder type=\"address\" "
-"id=\"0\"/>"
+"<productname>gcc-libstdc++</productname> <productnumber>&gcc-version;</"
+"productnumber> <placeholder type=\"address\" id=\"0\"/>"
 msgstr ""
-"<productname>gcc-libstdc++</productname> "
-"<productnumber>&gcc-version;</productnumber> <placeholder type=\"address\" "
-"id=\"0\"/>"
+"<productname>gcc-libstdc++</productname> <productnumber>&gcc-version;</"
+"productnumber> <placeholder type=\"address\" id=\"0\"/>"
 
 #. type: Content of: <sect1><title>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:17
@@ -51,10 +49,10 @@ msgid ""
 "because it is a native compiler and should not be used outside of chroot and "
 "risks polluting the libraries with some host components."
 msgstr ""
-"在构建<xref linkend=\"ch-tools-gcc-pass2\"/>时,我们不得不暂缓安装 C++ "
-"标准库,因为当时没有编译器能够编译它。我们不能使用那一节构建的编译器,"
-"因为它是一个本地编译器,不应在 chroot 外使用,否则可能导致编译产生的库"
-"被宿主系统组件污染。"
+"在构建<xref linkend=\"ch-tools-gcc-pass2\"/>时,我们不得不暂缓安装 C++ 标准"
+"库,因为当时没有编译器能够编译它。我们不能使用那一节构建的编译器,因为它是一"
+"个本地编译器,不应在 chroot 外使用,否则可能导致编译产生的库被宿主系统组件污"
+"染。"
 
 #. type: Content of: <sect1><sect2><segmentedlist><segtitle>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:34
@@ -85,12 +83,11 @@ msgstr "安装目标系统的 Libstdc++"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:49
 msgid ""
 "<application>Libstdc++</application> is part of the GCC sources.  You should "
-"first unpack the GCC tarball and change to the "
-"<filename>gcc-&gcc-version;</filename> directory."
+"first unpack the GCC tarball and change to the <filename>gcc-&gcc-version;</"
+"filename> directory."
 msgstr ""
-"<application>Libstdc++</application> 是 GCC 源代码的一部分。"
-"您应该先解压 GCC 压缩包并切换到解压出来的 "
-"<filename>gcc-&gcc-version;</filename> 目录。"
+"<application>Libstdc++</application> 是 GCC 源代码的一部分。您应该先解压 GCC "
+"压缩包并切换到解压出来的 <filename>gcc-&gcc-version;</filename> 目录。"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:54
@@ -100,12 +97,8 @@ msgstr "创建一个符号链接,允许在 GCC 源码树中构建 Libstdc++:
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:56
 #, no-wrap
-msgid ""
-"<userinput remap=\"pre\">ln -s gthr-posix.h "
-"libgcc/gthr-default.h</userinput>"
-msgstr ""
-"<userinput remap=\"pre\">ln -s gthr-posix.h "
-"libgcc/gthr-default.h</userinput>"
+msgid "<userinput remap=\"pre\">ln -s gthr-posix.h libgcc/gthr-default.h</userinput>"
+msgstr "<userinput remap=\"pre\">ln -s gthr-posix.h libgcc/gthr-default.h</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:58
@@ -131,77 +124,91 @@ msgstr "准备编译 Libstdc++:"
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:65
 #, no-wrap
 msgid ""
-"<userinput remap=\"configure\">../libstdc++-v3/configure           \\\n"
-"    CXXFLAGS=\"-g -O2 -D_GNU_SOURCE\" \\\n"
-"    --prefix=/usr                   \\\n"
-"    --disable-multilib              \\\n"
-"    --disable-nls                   \\\n"
+"<userinput remap=\"configure\">../libstdc++-v3/configure            \\\n"
+"    CXXFLAGS=\"-g -O2 -D_GNU_SOURCE\"  \\\n"
+"    --prefix=/usr                    \\\n"
+"    --disable-multilib               \\\n"
+"    --disable-nls                    \\\n"
+"    --host=$(uname -m)-lfs-linux-gnu \\\n"
 "    --disable-libstdcxx-pch</userinput>"
 msgstr ""
-"<userinput remap=\"configure\">../libstdc++-v3/configure           \\\n"
-"    CXXFLAGS=\"-g -O2 -D_GNU_SOURCE\" \\\n"
-"    --prefix=/usr                   \\\n"
-"    --disable-multilib              \\\n"
-"    --disable-nls                   \\\n"
+"<userinput remap=\"configure\">../libstdc++-v3/configure            \\\n"
+"    CXXFLAGS=\"-g -O2 -D_GNU_SOURCE\"  \\\n"
+"    --prefix=/usr                    \\\n"
+"    --disable-multilib               \\\n"
+"    --disable-nls                    \\\n"
+"    --host=$(uname -m)-lfs-linux-gnu \\\n"
 "    --disable-libstdcxx-pch</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:73
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:74
 msgid "The meaning of the configure options:"
 msgstr "配置选项的含义:"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:76
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:77
 msgid "<parameter>CXXFLAGS=\"-g -O2 -D_GNU_SOURCE\"</parameter>"
 msgstr "<parameter>CXXFLAGS=\"-g -O2 -D_GNU_SOURCE\"</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:78
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:79
 msgid ""
 "These flags are passed by the top level Makefile when doing a full build of "
 "GCC."
+msgstr "这些编译开关在构建完整的 GCC 时,由顶层目录 Makefile 传递。"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:85
+msgid "<parameter>--host=$(uname -m)-lfs-linux-gnu</parameter>"
+msgstr "<parameter>--host=$(uname -m)-lfs-linux-gnu</parameter>"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:87
+msgid ""
+"We have to mimic what would happen if this package were built as part of a "
+"full compiler build. This switch would be passed to configure by GCC's build "
+"machinery."
 msgstr ""
-"这些编译开关在构建完整的 GCC 时,由顶层目录 Makefile 传递。"
+"我们需要模拟该软件包作为完整编译器的一部分构建时发生的过程。"
+"在完整构建时,GCC 构建系统会传递该选项。"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:84
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:94
 msgid "<parameter>--disable-libstdcxx-pch</parameter>"
 msgstr "<parameter>--disable-libstdcxx-pch</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:86
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:96
 msgid ""
 "This switch prevents the installation of precompiled include files, which "
 "are not needed at this stage."
-msgstr ""
-"这个开关防止安装预编译包含文件,它在当前阶段没有必要。"
+msgstr "这个开关防止安装预编译包含文件,它在当前阶段没有必要。"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:93
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:103
 msgid "Compile libstdc++ by running:"
 msgstr "运行以下命令编译 Libstdc++:"
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:95
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:105
 #, no-wrap
 msgid "<userinput remap=\"make\">make</userinput>"
 msgstr "<userinput remap=\"make\">make</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:97
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:107
 msgid "Install the library:"
 msgstr "安装这个库:"
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:99
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:109
 #, no-wrap
 msgid "<userinput remap=\"install\">make install</userinput>"
 msgstr "<userinput remap=\"install\">make install</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:106
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/libstdc++-pass2.xml:116
 msgid ""
-"Details on this package are located in <xref linkend=\"contents-gcc\" "
-"role=\".\"/>"
-msgstr ""
-"该软件包的详细信息可以在<xref linkend=\"contents-gcc\"/>中找到。"
+"Details on this package are located in <xref linkend=\"contents-gcc\" role="
+"\".\"/>"
+msgstr "该软件包的详细信息可以在<xref linkend=\"contents-gcc\"/>中找到。"

+ 27 - 11
zh_CN/chapter07/python.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-17 12:44+0800\n"
+"POT-Creation-Date: 2020-07-05 16:17+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,50 +84,66 @@ msgstr "准备编译 Python:"
 #. type: Content of: <sect1><sect2><screen>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:55
 #, no-wrap
-msgid "<userinput remap=\"configure\">./configure --prefix=/usr --without-ensurepip</userinput>"
-msgstr "<userinput remap=\"configure\">./configure --prefix=/usr --without-ensurepip</userinput>"
+msgid ""
+"<userinput remap=\"configure\">./configure --prefix=/usr   \\\n"
+"            --enable-shared \\\n"
+"            --without-ensurepip</userinput>"
+msgstr ""
+"<userinput remap=\"configure\">./configure --prefix=/usr   \\\n"
+"            --enable-shared \\\n"
+"            --without-ensurepip</userinput>"
 
 #. type: Content of: <sect1><sect2><variablelist><title>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:58
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:60
 msgid "The meaning of the configure option:"
 msgstr "配置选项的含义:"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:61
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:63
+msgid "<parameter>--enable-shared</parameter>"
+msgstr "<parameter>--enable-shared</parameter>"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:65
+msgid "This switch prevents installation of static libraries."
+msgstr "该选项防止安装静态库。"
+
+#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:70
 msgid "<parameter>--without-ensurepip</parameter>"
 msgstr "<parameter>--without-ensurepip</parameter>"
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:63
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:72
 msgid ""
 "This switch disables the Python package installer, which is not needed at "
 "this stage."
 msgstr "该选项禁止构建 Python 软件包安装器,它在当前阶段没有必要。"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:70
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:79
 msgid "Compile the package:"
 msgstr "编译该软件包:"
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:72
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:81
 #, no-wrap
 msgid "<userinput remap=\"make\">make</userinput>"
 msgstr "<userinput remap=\"make\">make</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:74
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:83
 msgid "Install the package:"
 msgstr "安装该软件包:"
 
 #. type: Content of: <sect1><sect2><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:76
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:85
 #, no-wrap
 msgid "<userinput remap=\"install\">make install</userinput>"
 msgstr "<userinput remap=\"install\">make install</userinput>"
 
 #. type: Content of: <sect1><sect2><para>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:83
+#: /home/xry111/svn-repos/LFS-BOOK/chapter07/python.xml:92
 msgid ""
 "Details on this package are located in <xref linkend=\"contents-python\" "
 "role=\".\"/>"

+ 37 - 2
zh_CN/chapter08/revisedchroot.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-23 15:47+0800\n"
+"POT-Creation-Date: 2020-07-05 16:17+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,12 +144,47 @@ msgstr ""
 #. type: Content of: <sect1><para>
 #: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:65
 msgid ""
+"The compiler built in <xref linkend=\"chapter-temporary-tools\"/> and <xref "
+"linkend=\"chapter-chroot-temporary-tools\"/> is still partially installed, "
+"and not needed anymore. Remove it with:"
+msgstr ""
+"在<xref linkend=\"chapter-temporary-tools\"/>和"
+"<xref linkend=\"chapter-chroot-temporary-tools\"/>中构建的编译器仍然有一部分安装在系统上,它现在已经没有存在的意义了。执行命令删除它:"
+
+#. type: Content of: <sect1><screen>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:69
+#, no-wrap
+msgid ""
+"<userinput>find /usr/{bin,lib,libexec,include} \\\n"
+"     -depth                         \\\n"
+"     -name $(uname -m)-lfs-linux-gnu\\* | xargs rm -rf</userinput>"
+msgstr ""
+"<userinput>find /usr/{bin,lib,libexec,include} \\\n"
+"     -depth                         \\\n"
+"     -name $(uname -m)-lfs-linux-gnu\\* | xargs rm -rf</userinput>"
+
+#. type: Content of: <sect1><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:73
+msgid ""
+"The <filename class=\"directory\">/tools</filename> directory can also be "
+"removed to further gain some place:"
+msgstr ""
+"<filename class=\"directory\">/tools</filename> 也可以被删除,从而获得更多可用空间:"
+
+#. type: Content of: <sect1><screen>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:76
+msgid "<userinput>rm -rf /tools</userinput>"
+msgstr "<userinput>rm -rf /tools</userinput>"
+
+#. type: Content of: <sect1><para>
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:78
+msgid ""
 "Finally, remove the temporary 'tester' user account created at the beginning "
 "of the previous chapter."
 msgstr "最后,移除上一章开始时创建的临时 'tester' 用户账户。"
 
 #. type: Content of: <sect1><screen>
-#: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:68
+#: /home/xry111/svn-repos/LFS-BOOK/chapter08/revisedchroot.xml:81
 #, no-wrap
 msgid "<userinput>userdel -r tester</userinput>"
 msgstr "<userinput>userdel -r tester</userinput>"

Some files were not shown because too many files changed in this diff