summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorHolger Wansing <hwansing@mailbox.org>2020-08-29 15:21:35 +0200
committerHolger Wansing <hwansing@mailbox.org>2020-08-29 15:21:35 +0200
commit3c0e7c7ceb457383a7a478cc05ca44d321f86637 (patch)
tree6f7a9ab5cf25fb0f2ebbfc931807612f07d87459 /po
parentae34a779ee0b757278d456a14c9e5fc51c26124b (diff)
downloadinstallation-guide-3c0e7c7ceb457383a7a478cc05ca44d321f86637.zip
[Commit from Weblate] Chinese (simplified) translation update by Tao Wang <tonywang5@163.com> + edit translators credits
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN/administrivia.po35
-rw-r--r--po/zh_CN/bookinfo.po17
-rw-r--r--po/zh_CN/boot-installer.po13
-rw-r--r--po/zh_CN/boot-new.po45
-rw-r--r--po/zh_CN/gpl.po4
-rw-r--r--po/zh_CN/hardware.po126
-rw-r--r--po/zh_CN/install-methods.po4
-rw-r--r--po/zh_CN/installation-howto.po2
-rw-r--r--po/zh_CN/partitioning.po3
-rw-r--r--po/zh_CN/post-install.po117
-rw-r--r--po/zh_CN/preface.po4
-rw-r--r--po/zh_CN/preparing.po2
-rw-r--r--po/zh_CN/preseed.po2
-rw-r--r--po/zh_CN/random-bits.po131
-rw-r--r--po/zh_CN/using-d-i.po4
-rw-r--r--po/zh_CN/welcome.po89
16 files changed, 202 insertions, 396 deletions
diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index 275df5c60..f62b6cdd7 100644
--- a/po/zh_CN/administrivia.po
+++ b/po/zh_CN/administrivia.po
@@ -1,16 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
+# Ji YongGang <jungleji@gmail.com>, 2010.
+# tao wang <tonywang5@163.com>, 2020.
+#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2019-08-06 18:46+0000\n"
-"PO-Revision-Date: 2010-10-26 19:59+0800\n"
-"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: administrivia.xml:5
@@ -114,17 +119,7 @@ msgstr ""
#. Tag: para
#: administrivia.xml:68
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Better yet, get a copy of the DocBook source for this document, and "
-#| "produce patches against it. The DocBook source can be found at the <ulink "
-#| "url=\"&url-d-i-websvn;\">debian-installer WebSVN</ulink>. If you're not "
-#| "familiar with DocBook, don't worry: there is a simple cheatsheet in the "
-#| "manuals directory that will get you started. It's like html, but oriented "
-#| "towards the meaning of the text rather than the presentation. Patches "
-#| "submitted to the debian-boot mailing list (see below) are welcomed. For "
-#| "instructions on how to check out the sources via SVN, see <ulink url="
-#| "\"&url-d-i-readme;\">README</ulink> from the source root directory."
+#, no-c-format
msgid ""
"Better yet, get a copy of the DocBook source for this document, and produce "
"patches against it. The DocBook source can be found at the <ulink url=\"&url-"
@@ -136,13 +131,11 @@ msgid ""
"instructions on how to check out the sources via git, see <ulink url=\"&url-"
"manual-readme;\">README</ulink> from the source root directory."
msgstr ""
-"更佳的途径是取得一份本文档的 DocBook 源文件拷贝,给它打一个补丁。DocBook 的源"
-"文件位于 <ulink url=\"&url-d-i-project-salsa;\">installation-guide project "
-"on salsa</ulink>。如果您不熟悉 DocBook,别发愁:在 manuals 目录下有一个简单"
-"的 cheatsheet 文件,可以帮您起步。它像 html 文件,但更侧重于文字的含义而不是"
-"显示。欢迎将补丁提交到 debian-boot 邮件列表(见下)。关于如何从 SVN 检出(check "
-"out)源文件,请参考源文件目录中的 <ulink url=\"&url-manual-readme;\">README</"
-"ulink>。"
+"更佳的途径是取得一份本文档的 DocBook 源文件拷贝,给它打一个补丁。DocBook 的源文件位于 <ulink url=\"&url-d-i"
+"-project-salsa;\">installation-guide project on salsa</ulink>。如果您不熟悉 "
+"DocBook,别发愁:在 manuals 目录下有一个简单的 cheatsheet 文件,可以帮您起步。它像 html "
+"文件,但更侧重于文字的含义而不是显示。欢迎将补丁提交到 debian-boot 邮件列表(见下)。关于如何从 git 检出(check out)源文件,"
+"请参考源文件目录中的 <ulink url=\"&url-manual-readme;\">README</ulink>。"
#. Tag: para
#: administrivia.xml:82
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index be0b84afb..68c6a0d31 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2020-01-10 23:02+0000\n"
-"PO-Revision-Date: 2017-06-11 21:27+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: bookinfo.xml:5
@@ -85,6 +86,10 @@ msgid ""
"the <ulink url=\"https://lists.debian.org/i18n.html\">debian-l10n-xxx "
"mailinglist</ulink> for this language. Many thanks"
msgstr ""
+"本安装手册的翻译不是最新的,并且现在没有人活跃地进行更新工作。阅读时请记住,它可能包含过时的或错误的信息。如果有疑问的话,请阅读或重复检查英语变体。如果您"
+"能够帮助我们更新翻译,针对当前这种语言,请联系 <email>debian-boot@lists.debian.org</email> 或 <ulink "
+"url=\"https://lists.debian.org/i18n.html\">debian-l10n-xxx mailinglist</"
+"ulink> 。非常感谢"
#. Tag: para
#: bookinfo.xml:53
@@ -120,4 +125,4 @@ msgstr ""
#: bookinfo.xml:78
#, no-c-format
msgid "Build version of this manual: &debversion;."
-msgstr ""
+msgstr "本手册的生成: &debversion; 。"
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 4fef1b27c..74d4225d8 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2020-07-26 23:02+0000\n"
-"PO-Revision-Date: 2017-06-11 22:36+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: boot-installer.xml:4
@@ -2454,7 +2455,7 @@ msgstr ""
#: boot-installer.xml:2118
#, no-c-format
msgid "Hardware Speech Synthesis"
-msgstr "硬件语音合成"
+msgstr "硬件语音合成 (Hardware Speech Synthesis)"
#. Tag: para
#: boot-installer.xml:2119
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index c5b2ff639..3555ba21a 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2020-04-02 09:22+0000\n"
-"PO-Revision-Date: 2017-06-11 22:10+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: boot-new.xml:5
@@ -40,15 +41,7 @@ msgstr ""
#. Tag: para
#: boot-new.xml:13
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you did a default installation, the first thing you should see when "
-#| "you boot the system is the menu of the <classname>grub</classname><phrase "
-#| "arch=\"x86\"> or possibly the <classname>lilo</classname> bootloader</"
-#| "phrase>. The first choices in the menu will be for your new &debian; "
-#| "system. If you had any other operating systems on your computer (like "
-#| "Windows) that were detected by the installation system, those will be "
-#| "listed lower down in the menu."
+#, no-c-format
msgid ""
"If you did a default installation, the first thing you should see when you "
"boot the system is the menu of the <classname>grub</classname> bootloader. "
@@ -57,10 +50,8 @@ msgid ""
"detected by the installation system, those will be listed lower down in the "
"menu."
msgstr ""
-"如果您使用了默认安装,引导系统后首先看到的是 <classname>grub</classname> "
-"<phrase arch=\"x86\">或者是 <classname>lilo</classname> bootloader</phrase>菜"
-"单。菜单中的首选项将是新的 &debian; 系统。假如您的计算机上有其他的操作系统"
-"(如 Windows),它们将被安装系统检测到,并列入菜单的下方。"
+"如果您使用了默认安装,引导系统后首先看到的是 <classname>grub</classname> bootloader 菜单。菜单中的首选项将是新的 "
+"&debian; 系统。假如您的计算机上有其他的操作系统(如 Windows),它们将被安装系统检测到,并列入菜单的下方。"
#. Tag: para
#: boot-new.xml:23
@@ -433,13 +424,9 @@ msgid ""
"running in your default runlevel because it is very likely that they were "
"not started. The easiest way is to just reboot the computer."
msgstr ""
-"如果保存着非临界系统文件(<filename>/usr</filename> 或 <filename>/var</"
-"filename>)的卷不能加载,系统仍然可以启动,并且您仍然可以按前一种情况手动加"
-"载。但是,您需要(重新)启动默认 runlevel 下的任何 service,因为它们很可能没有"
-"启动。最简单的做法是切换到第一个 runlevel 再返回<informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>init 1</userinput>\n"
-"</screen></informalexample> 在 shell 提示符下输入该命令,并在要求输入 root 口"
-"令时按下 <keycombo> <keycap>Control</keycap> <keycap>D</keycap> </keycombo>。"
+"如果保存着非临界系统文件( <filename>/usr</filename> 或 <filename>/var</filename> "
+")的卷不能加载,系统仍然可以启动,并且您仍然可以按前一种情况手动加载。但是,您需要(重新)启动默认 runlevel "
+"下的任何服务,因为它们很可能没有启动。最简单的做法是仅重新启动计算机。"
#. Tag: title
#: boot-new.xml:262
@@ -500,10 +487,10 @@ msgid ""
"browsable index of documentation in <filename>/usr/share/doc/HTML/index."
"html</filename>."
msgstr ""
-"另外,还有一些特殊的目录位于 <filename>/usr/share/doc/</filename> 里。Linux "
-"HOWTOs 以 <emphasis>.gz</emphasis> (压缩)格式安装,放在 <filename>/usr/share/"
-"doc/HOWTO/en-txt/</filename>。安装 <command>dhelp</command>之后,可以浏览 "
-"<filename>/usr/share/doc/HTML/index.html</filename> 文档索引。"
+"另外,还有一些特殊的目录位于 <filename>/usr/share/doc/</filename> 层级中。Linux HOWTOs 以 "
+"<emphasis>.gz</emphasis> (压缩)格式,安装在 <filename>/usr/share/doc/HOWTO/en-txt/</"
+"filename> 中。安装 <command>dhelp</command>之后,可以在 <filename>/usr/share/doc/HTML/"
+"index.html</filename> 中找到可浏览的文档索引。"
#. Tag: para
#: boot-new.xml:298
diff --git a/po/zh_CN/gpl.po b/po/zh_CN/gpl.po
index db9c99a89..f86267aa6 100644
--- a/po/zh_CN/gpl.po
+++ b/po/zh_CN/gpl.po
@@ -1,4 +1,6 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
+# Ji YongGang <jungleji@gmail.com>, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 70952d30d..24e090c2a 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2020-08-23 23:02+0000\n"
-"PO-Revision-Date: 2017-06-12 15:07+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: hardware.xml:5
@@ -459,16 +460,7 @@ msgstr ""
#. Tag: para
#: hardware.xml:285
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The ARM architecture is used mainly in so-called <quote>system-on-chip</"
-#| "quote> (SoC) designs. These SoCs are designed by many different companies "
-#| "with vastly varying hardware components even for the very basic "
-#| "functionality required to bring the system up. System firmware interfaces "
-#| "have been increasingly standardised over time, but especially on older "
-#| "hardware firmware/boot interfaces vary a great deal, so on these systems "
-#| "the Linux kernel has to take care of many system-specific low-level "
-#| "issues which would be handled by the mainboard's BIOS in the PC world."
+#, no-c-format
msgid ""
"The ARM architecture is used mainly in so-called <quote>system-on-chip</"
"quote> (SoC) designs. These SoCs are designed by many different companies "
@@ -479,11 +471,9 @@ msgid ""
"Linux kernel has to take care of many system-specific low-level issues which "
"would be handled by the mainboard's BIOS/UEFI in the PC world."
msgstr ""
-"ARM 架构主要用于所谓的<quote>片上系统</quote>(SoC)设计。这些 SoC 由许多不同"
-"的公司设计,即使是对于系统工作所需的非常基本的功能,硬件组件变化也非常大。随"
-"着时间的推移,系统固件界面越来越标准化,但很多方面也发生了变化,尤其是对较旧"
-"的硬件固件/启动接口而言,所以在这些系统上,Linux 内核必须关注许多系统特定的低"
-"级问题,而在 PC 上这些问题则是由主板的 BIOS 负责解决。"
+"ARM 架构主要用于所谓的<quote>片上系统</quote>(SoC)设计。这些 SoC 由许多不同的公司设计,即使是对于系统工作所需的非常基本的功能"
+",硬件组件变化也非常大。随着时间的推移,系统固件界面越来越标准化,但很多方面也发生了变化,尤其是对较旧的硬件固件/启动接口而言,所以在这些系统上,"
+"Linux 内核必须关注许多系统特定的低级问题,而在 PC 上这些问题则是由主板的 BIOS/UEFI 负责解决。"
#. Tag: para
#: hardware.xml:297
@@ -1086,16 +1076,7 @@ msgstr "Orion5x"
#. Tag: para
#: hardware.xml:700
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Orion is a system-on-chip (SoC) from Marvell that integrates an ARM CPU, "
-#| "Ethernet, SATA, USB, and other functionality in one chip. There are many "
-#| "Network Attached Storage (NAS) devices on the market that are based on an "
-#| "Orion chip. &debian; currently supports the following Orion based "
-#| "devices: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</"
-#| "ulink>, <ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink> and "
-#| "<ulink url=\"&url-arm-cyrius-qnap;\">QNAP TS-109, TS-209, TS-409 and "
-#| "TS-409U and variants</ulink>."
+#, no-c-format
msgid ""
"Orion is a system-on-chip (SoC) from Marvell that integrates an ARM CPU, "
"Ethernet, SATA, USB, and other functionality in one chip. There are many "
@@ -1104,12 +1085,10 @@ msgid ""
"<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink> and "
"<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>."
msgstr ""
-"Orion 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一"
-"些功能。市场上有很多 NAS 设备基于 Orion 芯片。&debian; 目前支持以下几种基于 "
-"Orion 的设备:<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</"
-"ulink>、<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink> 和 <ulink "
-"url=\"&url-arm-cyrius-qnap;\">QNAP TS-109、TS-209、TS-409、TS-409U 及其变种</"
-"ulink>。"
+"Orion 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一些功能。市场上有很多 NAS "
+"设备基于 Orion 芯片。&debian; 目前支持以下几种基于 Orion 的设备:<ulink url=\"&url-arm-cyrius-"
+"kuroboxpro;\">Buffalo Kurobox</ulink> 和 <ulink url=\"&url-arm-cyrius-mv2120;"
+"\">HP mv2120</ulink> 。"
#. Tag: term
#: hardware.xml:714
@@ -1989,14 +1968,13 @@ msgid ""
"itemizedlist> A linux kernel for these machines and limited support is "
"available at <ulink url=\"http://nubus-pmac.sourceforge.net/\"></ulink>."
msgstr ""
-"NuBus 系统现在还不被 &debian;/powerpc 支持。单内核的 Linux/PPC 内核体系不支持"
-"这些机器;而必须使用 MkLinux Mach 微内核,而它未被 &debian; 支持。它们包括:"
-"<itemizedlist> <listitem><para> Power Macintosh 6100, 7100, 8100 </para></"
-"listitem> <listitem><para> Performa 5200, 6200, 6300 </para></listitem> "
-"<listitem><para> Powerbook 1400, 2300 和 5300 </para></listitem> "
-"<listitem><para> Workgroup Server 6150, 8150, 9150 </para></listitem> </"
-"itemizedlist> 对这些机器提供有限支持的 linux 内核位于 <ulink url=\"http://"
-"nubus-pmac.sourceforge.net/\"></ulink>"
+"NuBus 系统现在还不被 &debian;/powerpc 支持。单内核的 Linux/PPC 内核体系不支持这些机器;而必须使用 MkLinux "
+"Mach 微内核,而它未被 &debian; 支持。它们包括:<itemizedlist> <listitem><para> Power "
+"Macintosh 6100, 7100, 8100 </para></listitem> <listitem><para> Performa "
+"5200, 6200, 6300 </para></listitem> <listitem><para> Powerbook 1400, 2300 和 "
+"5300 </para></listitem> <listitem><para> Workgroup Server 6150, 8150, 9150 "
+"</para></listitem> </itemizedlist> 对这些机器提供有限支持的 linux 内核位于 <ulink url=\"http"
+"://nubus-pmac.sourceforge.net/\"></ulink> 。"
#. Tag: title
#: hardware.xml:1344
@@ -2015,10 +1993,9 @@ msgid ""
"These models usually have a Roman numeral or 3-digit model number such as "
"Mac IIcx, LCIII or Quadra 950."
msgstr ""
-"使用 680x0 系列的 Macintosh 计算机不属于 PowerPC 家族,而是 m68k 机器。这些机"
-"器型号自 <quote>Mac II</quote> 开始,经历 <quote>LC</quote> 家族,然后是 "
-"Centris 系列,至 Quadras 与 Performas 达到顶峰。这些型号使用罗马数字或 3 位数"
-"字,像 Mac IIcx、LCIII 或 Quadra 950。"
+"使用 680x0 系列处理器的 Macintosh 计算机<emphasis>不属于</emphasis> PowerPC 家族,而是属于 m68k "
+"机器。这些机器型号自 <quote>Mac II</quote> 开始,经历 <quote>LC</quote> 家族,然后是 Centris 系列,至 "
+"Quadras 与 Performas 达到顶峰。这些型号使用罗马数字或 3 位数字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
#: hardware.xml:1355
@@ -2043,8 +2020,8 @@ msgid ""
"and the PowerBook Duo 210-550c (excluding PowerBook 500 which is Nubus, "
"please see the section above)."
msgstr ""
-"便携机方面,它起始于 Mac Portable,然后是 PowerBook 100-190cs 和 PowerBook "
-"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
+"便携机方面,它起始于 Mac Portable,然后是 PowerBook 100-190cs 和 PowerBook Duo 210-550c ("
+"不包含带有 Nubus 的 PowerBook 500,见前面说明)。"
#. Tag: title
#: hardware.xml:1377
@@ -2090,17 +2067,7 @@ msgstr "zSeries 和 System z 机器类型"
#. Tag: para
#: hardware.xml:1416
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
-#| "Your machine needs to support the z/Architecture, 64-bit support is "
-#| "mandatory. The userland of the S/390 port is still compiled for ESA/390, "
-#| "though. All zSeries and System z hardware is fully supported. &arch-"
-#| "title; support software is included from the kernel 4.3 development "
-#| "stream. The most current information about IBM's Linux support can be "
-#| "found at the <ulink url=\"http://www.ibm.com/developerworks/linux/"
-#| "linux390/development_technical.html\"> Linux on <trademark class="
-#| "\"registered\">System z</trademark> page on developerWorks</ulink>."
+#, no-c-format
msgid ""
"The minimum required z/Architecture processor type is z196. The most current "
"information about IBM's Linux support can be found at the <ulink url="
@@ -2108,13 +2075,10 @@ msgid ""
"\"> Linux on <trademark class=\"registered\">System z</trademark> page on "
"developerWorks</ulink>."
msgstr ""
-"从 &debian; Squeeze 起已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/"
-"Architecture,必须支持 64 位。不过 S/390 移植的 userland 仍然为 ESA/390 编"
-"译。所有的 zSeries 和 System z 硬件完全获得支持。&arch-title; 支持的软件源自 "
-"3.1 内核开发流。关于 IBM Linux 最新的支持信息位于 <ulink url=\"http://www."
+"z/Architecture 处理器至少需要 z196 型。关于 IBM Linux 最新的支持信息位于 <ulink url=\"http://www."
"ibm.com/developerworks/linux/linux390/development_technical.html\"> Linux on "
"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
-"ulink>。"
+"ulink> 。"
#. Tag: title
#: hardware.xml:1429
@@ -2792,7 +2756,7 @@ msgstr ""
#: hardware.xml:1895
#, no-c-format
msgid "Hardware Speech Synthesis"
-msgstr "硬件语音合成(Hardware Speech Synthesis)"
+msgstr "硬件语音合成 (Hardware Speech Synthesis)"
#. Tag: para
#: hardware.xml:1896
@@ -3109,23 +3073,19 @@ msgstr "CD-ROM/DVD-ROM"
#. Tag: para
#: hardware.xml:2105
-#, fuzzy, no-c-format
-#| msgid "CD-ROM based installation is supported for most architectures."
+#, no-c-format
msgid "Installation from optical disc is supported for most architectures."
-msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
+msgstr "大多数体系都支持从光盘安装程序。"
#. Tag: para
#: hardware.xml:2109
-#, fuzzy, no-c-format
-#| msgid ""
-#| "On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are "
-#| "FireWire devices that are supported by the ohci1394 and sbp2 drivers."
+#, no-c-format
msgid ""
"On PCs SATA, IDE/ATAPI, USB and SCSI optical drives are supported, as are "
"FireWire devices that are supported by the ohci1394 and sbp2 drivers."
msgstr ""
-"USB CD-ROM 也是被支持的。而 FireWire 设备则是通过 ohci1394 和 sbp2 驱动程序来"
-"获得支持。"
+"在 PC 上支持 SATA 、 IDE/ATAPI 、 USB 和 SCSI 光盘驱动器,而 FireWire 设备则是通过 ohci1394 和 "
+"sbp2 驱动程序来获得支持。"
#. Tag: title
#: hardware.xml:2126
@@ -3135,14 +3095,7 @@ msgstr "U 盘"
#. Tag: para
#: hardware.xml:2128
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media is the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
msgid ""
"USB flash disks a.k.a. USB memory sticks have become a commonly used and "
"cheap storage device. Most modern computer systems also allow booting the &d-"
@@ -3151,9 +3104,8 @@ msgid ""
"from USB media is the standard way of installing a new operating system on "
"them."
msgstr ""
-"USB 闪存,也叫 U 盘已经成为常见的和廉价的存储设备。大多数现代计算机系统允许从"
-"它引导 &d-i;。大多数现代的计算机系统,特别是上网本和轻薄便携机,根本就不配备 "
-"CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
+"USB 闪存,也叫 U 盘已经成为常见的和廉价的存储设备。大多数现代计算机系统允许从它引导 "
+"&d-i;。大多数现代的计算机系统,特别是上网本和轻薄便携机,根本就不配备光盘驱动器,从 U 盘引导是安装操作系统的标准方法。"
#. Tag: title
#: hardware.xml:2140
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index d87b89e5e..fdd9d6ad0 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -1,4 +1,6 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
+# Ji YongGang <jungleji@gmail.com>, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 37175972c..cda4163f3 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -1,4 +1,4 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
#
msgid ""
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 6de7fd7e7..1e20e2e00 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -1,4 +1,5 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
+# Ji YongGang <jungleji@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 1ae62a519..38e4f06b7 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2019-08-11 15:17+0000\n"
-"PO-Revision-Date: 2017-06-11 22:15+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: post-install.xml:5
@@ -132,13 +133,7 @@ msgstr ""
#. Tag: para
#: post-install.xml:114
-#, fuzzy, no-c-format
-#| msgid ""
-#| "One of the best installation methods is apt. You can use the command line "
-#| "version of <command>apt</command> or full-screen text version "
-#| "<application>aptitude</application>. Note apt will also let you merge "
-#| "main, contrib, and non-free so you can have export-restricted packages as "
-#| "well as standard versions."
+#, no-c-format
msgid ""
"One of the best installation methods is apt. You can use the command line "
"version of <command>apt</command> as well as tools like "
@@ -148,10 +143,10 @@ msgid ""
"restricted packages (strictly speaking not belonging to &debian;) as well as "
"packages from &debian-gnu; at the same time."
msgstr ""
-"apt 是最好的安装方法之一。您可以使用命令行模式的 <command>apt-get</command> "
-"或者全屏幕文本模式的 <application>aptitude</application>。注意,apt 还可以让"
-"您合并 main、contrib 和 non-free,从而使您可以像使用标准版本那样使用具有出口"
-"限制的软件包。"
+"apt 是最好的安装方法之一。您可以使用命令行模式的 <command>apt-get</command> ,还有 "
+"<application>aptitude</application> 或 <application>synaptic</application> "
+"那样的工具(只是 <command>apt</command> 的图形化前端)。注意,apt 还可以让您合并 main、contrib 和 non-"
+"free,从而您可以同时具有限制的软件包(严格地讲不属于 &debian )以及来自 &debian-gnu 的软件包。"
#. Tag: title
#: post-install.xml:128
@@ -327,26 +322,20 @@ msgid ""
"Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
"books relating to Linux."
msgstr ""
+"Linux 是一种 Unix 的实施。 <ulink url=\"&url-ldp;\">Linux Documentation Project "
+"(LDP)</ulink> 收集了几种关于 Linux 的 HOWTOs 和在线书籍。"
#. Tag: para
#: post-install.xml:236
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are new to Unix, you probably should go out and buy some books and "
-#| "do some reading. A lot of valuable information can also be found in the "
-#| "<ulink url=\"&url-debian-reference;\">Debian Reference</ulink>. This "
-#| "<ulink url=\"&url-unix-faq;\">list of Unix FAQs</ulink> contains a number "
-#| "of UseNet documents which provide a nice historical reference."
+#, no-c-format
msgid ""
"If you are new to Unix, you probably should go out and buy some books and do "
"some reading. This <ulink url=\"&url-unix-faq;\">list of Unix FAQs</ulink> "
"contains a number of UseNet documents which provide a nice historical "
"reference."
msgstr ""
-"如果不熟悉 Unix,您也许应该出去买些书来读。从 <ulink url=\"&url-debian-"
-"reference;\">Debian Reference</ulink> 还可以找到到大量有用的信息。<ulink url="
-"\"&url-unix-faq;\">Unix 常见问题解答</ulink>里面包含了大量的 UseNet 文档,它"
-"提供了很好的历史参考。"
+"如果不熟悉 Unix,您也许应该出去买些书来读。<ulink url=\"&url-unix-faq;\">Unix 常见问题解答</"
+"ulink>里面包含了大量的 UseNet 文档,它提供了很好的历史参考。"
#. Tag: title
#: post-install.xml:251
@@ -411,18 +400,7 @@ msgstr ""
#. Tag: para
#: post-install.xml:282
-#, fuzzy, no-c-format
-#| msgid ""
-#| "With the increasing popularity of graphical desktop systems, the use of "
-#| "graphical e-mail programs like GNOME's <command>evolution</command>, "
-#| "KDE's <command>kmail</command> or Mozilla's <command>thunderbird</"
-#| "command> (in &debian; available as <command>icedove</command><footnote> "
-#| "<para> The reason that <command>thunderbird</command> has been renamed to "
-#| "<command>icedove</command> in &debian; has to do with licensing issues. "
-#| "Details are outside the scope of this manual. </para> </footnote>) is "
-#| "becoming more popular. These programs combine the function of a MUA, MTA "
-#| "and MDA, but can &mdash; and often are &mdash; also be used in "
-#| "combination with the traditional Linux tools."
+#, no-c-format
msgid ""
"With the increasing popularity of graphical desktop systems, the use of "
"graphical e-mail programs like GNOME's <command>evolution</command>, KDE's "
@@ -431,13 +409,9 @@ msgid ""
"MDA, but can &mdash; and often are &mdash; also be used in combination with "
"the traditional Linux tools."
msgstr ""
-"配合逐步流行的图形桌面系统,使用图形 e-mail 程序,像 GNOME 的 "
-"<command>evolution</command>、KDE 的 <command>kmail</command> 或 Mozilla 的 "
-"<command>thunderbird</command> (在 &debian; 中是 <command>icedove</"
-"command><footnote> <para> &debian; 中 <command>thunderbird</command> 改名为 "
-"<command>icedove</command> 的原因是许可证的问题。具体内容超出了本手册的范围。"
-"</para> </footnote>) 越来越流行。这些程序综合了 MUA、MTA 和 MDA 的功能,但也"
-"能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
+"配合逐步流行的图形桌面系统,使用图形 e-mail 程序,像 GNOME 的 <command>evolution</command>、KDE 的 "
+"<command>kmail</command> 或 Mozilla 的 <command>thunderbird</command> 已经变得更流行。"
+"这些程序综合了 MUA、MTA 和 MDA 的功能,但也能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
#. Tag: title
#: post-install.xml:294
@@ -447,16 +421,7 @@ msgstr "默认的 E-Mail 配置"
#. Tag: para
#: post-install.xml:295
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Even if you are planning to use a graphical mail program, it is important "
-#| "that a traditional MTA/MDA is also installed and correctly set up on your "
-#| "&debian-gnu; system. Reason is that various utilities running on the "
-#| "system<footnote> <para> Examples are: <command>cron</command>, "
-#| "<command>quota</command>, <command>logcheck</command>, <command>aide</"
-#| "command>, &hellip; </para> </footnote> can send important notices by e-"
-#| "mail to inform the system administrator of (potential) problems or "
-#| "changes."
+#, no-c-format
msgid ""
"Even if you are planning to use a graphical mail program, it would be "
"useful, to have a traditional MTA/MDA installed and correctly set up on your "
@@ -466,28 +431,14 @@ msgid ""
"command>, &hellip; </para> </footnote> can send important notices by e-mail "
"to inform the system administrator of (potential) problems or changes."
msgstr ""
-"即使您打算使用图形界面的邮件程序,安装传统的 MTA/MDA 并正确架设在您的 "
-"&debian-gnu; 系统上也是很重要的。其原因是很多运行在系统中的工具<footnote> "
-"<para> 例如:<command>cron</command>、<command>quota</command>、"
-"<command>logcheck</command>、<command>aide</command>,&hellip; </para> </"
-"footnote> 会通过邮件发送重要的提示通知系统管理员潜在的问题或变化。"
+"即使您打算使用图形界面的邮件程序,安装传统的 MTA/MDA 并正确架设在您的 &debian-gnu; 系统上会是很有用的。"
+"其原因是很多运行在系统中的工具<footnote> <para> 例如:<command>cron</command>、<command>quota</c"
+"ommand>、<command>logcheck</command>、<command>aide</command>,&hellip; </para> "
+"</footnote> 会通过邮件发送重要的提示通知系统管理员潜在的问题或变化。"
#. Tag: para
#: post-install.xml:310
-#, fuzzy, no-c-format
-#| msgid ""
-#| "For this reason the packages <classname>exim4</classname> and "
-#| "<classname>mutt</classname> will be installed by default (provided you "
-#| "did not unselect the <quote>standard</quote> task during the "
-#| "installation). <classname>exim4</classname> is a combination MTA/MDA that "
-#| "is relatively small but very flexible. By default it will be configured "
-#| "to only handle e-mail local to the system itself and e-mails addressed to "
-#| "the system administrator (root account) will be delivered to the regular "
-#| "user account created during the installation<footnote> <para> The "
-#| "forwarding of mail for root to the regular user account is configured in "
-#| "<filename>/etc/aliases</filename>. If no regular user account was "
-#| "created, the mail will of course be delivered to the root account itself. "
-#| "</para> </footnote>."
+#, no-c-format
msgid ""
"For this you can install <classname>exim4</classname> and <classname>mutt</"
"classname> with <command>apt install exim4 mutt</command>. <classname>exim4</"
@@ -500,13 +451,11 @@ msgid ""
"regular user account was created, the mail will of course be delivered to "
"the root account itself. </para> </footnote>."
msgstr ""
-"正因为如此,默认会安装 <classname>exim4</classname> 和 <classname>mutt</"
-"classname> 软件包 (安装过程中您没有取消 <quote>standard</quote> 任务将提供它"
-"们)。<classname>exim4</classname> 组合了 MTA/MDA 功能并相对小巧和灵活。它默认"
-"配置为只处理系统本地的 e-mail,系统管理员(root 帐号)的 e-mail 地址会发送到安"
-"装时创建的普通用户帐号<footnote> <para> 转发 root 邮件到普通用户帐号是在 "
-"<filename>/etc/aliases</filename> 里配置。如果没有创建普通用户帐号,邮件自然"
-"会发送给 root 帐号。</para> </footnote>。"
+"对此,您可以通过使用 <command>apt install exim4 mutt</command> ,来安装 <classname>exim4</"
+"classname> 和 <classname>mutt</classname> 。 <classname>exim4</classname> 组合了 "
+"MTA/MDA 功能并相对小巧和灵活。它默认配置为只处理系统本地的 e-mail,系统管理员(root 帐号)的 e-mail "
+"地址会发送到安装时创建的普通用户帐号<footnote> <para> 转发 root 邮件到普通用户帐号是在 <filename>/etc/"
+"aliases</filename> 里配置。如果没有创建普通用户帐号,邮件自然会发送给 root 帐号。</para> </footnote>。"
#. Tag: para
#: post-install.xml:328
@@ -782,7 +731,7 @@ msgid ""
"Why would someone want to compile a new kernel? It is most probably not "
"necessary since the default kernel shipped with &debian; handles almost all "
"configurations."
-msgstr ""
+msgstr "为什么有人想要编译新的内核?非常可能是不必要的,因为 &debian; 带的默认内核处理几乎所有配置。"
#. Tag: para
#: post-install.xml:511
@@ -793,6 +742,8 @@ msgid ""
"For more information read the <ulink url=\"&url-kernel-handbook;\">Debian "
"Linux Kernel Handbook</ulink>."
msgstr ""
+"如果您无论如何想要编译自己的内核,这当然是可能的,并且我们建议使用 <quote>make deb-pkg</quote> 目标。更多信息请阅读 "
+"<ulink url=\"&url-kernel-handbook;\">Debian Linux Kernel Handbook</ulink> 。"
#. Tag: title
#: post-install.xml:526
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 370dabad0..8d559e3a1 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -1,4 +1,6 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
+# Ji YongGang <jungleji@gmail.com>, 2010.
+#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 59b29c8a8..ff59b2f26 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -1,4 +1,4 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
#
msgid ""
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 17b9dd7e1..55033a73a 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1,4 +1,4 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
#
msgid ""
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 7d6f99ef4..dd8aaaf07 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2020-04-05 16:28+0000\n"
-"PO-Revision-Date: 2017-06-11 20:40+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: random-bits.xml:4
@@ -358,21 +359,15 @@ msgstr ""
#. Tag: para
#: random-bits.xml:188
-#, fuzzy, no-c-format
-#| msgid ""
-#| "By default the installer will install the GNOME desktop environment, but "
-#| "alternative desktop environments can be selected either by using one of "
-#| "the special CD images, or by specifying the desired desktop environment "
-#| "when the installer is booted (see <xref linkend=\"pkgsel\"/>)."
+#, no-c-format
msgid ""
"By default the installer will install the GNOME desktop environment, but "
"alternative desktop environments can be selected either by using one of the "
"special installation images, or by specifying the desired desktop "
"environment during installation (see <xref linkend=\"pkgsel\"/>)."
msgstr ""
-"默认情况下,安装程序安装 GNOME 桌面环境,其他的桌面环境可以通过使用另外特殊"
-"的 CD 映象,或者在安装程序引导时指定所需的桌面环境(参阅 <xref linkend="
-"\"pkgsel\"/>)。"
+"默认情况下,安装程序安装 GNOME 桌面环境,其他的桌面环境可以通过使用另外特殊的安装映象,或者在安装时指定所需的桌面环境(参阅 <xref "
+"linkend=\"pkgsel\"/>)。"
#. Tag: para
#: random-bits.xml:195
@@ -863,19 +858,14 @@ msgstr ""
#. Tag: para
#: random-bits.xml:437
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
-#| "filename>, you could substitute a file URL instead of the http URL: "
-#| "<userinput>file:/cdrom/debian/</userinput>"
+#, no-c-format
msgid ""
"If you have a &releasename; &debian-gnu; installation image mounted at "
"<filename>/cdrom</filename>, you could substitute a file URL instead of the "
"http URL: <userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"如果您已经把一张 &releasename; 版本的 &debian-gnu; CD 挂载到 <filename>/"
-"cdrom</filename>,那么也可以把 http URL 替换成 file URL,即:"
-"<userinput>file:/cdrom/debian/</userinput>"
+"如果您已经把一张 &releasename; 版本的 &debian-gnu; 安装映像挂载到 <filename>/cdrom</filename>,"
+"那么也可以把 http URL 替换成 file URL,即:<userinput>file:/cdrom/debian/</userinput>"
#. Tag: para
#: random-bits.xml:443
@@ -1023,48 +1013,7 @@ msgstr "分区的挂载"
#. Tag: para
#: random-bits.xml:541
-#, fuzzy, no-c-format
-#| msgid ""
-#| "You need to create <filename>/etc/fstab</filename>. "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/fstab\n"
-#| "</screen></informalexample> Here is a sample you can modify to suit: "
-#| "<informalexample><screen>\n"
-#| "# /etc/fstab: static file system information.\n"
-#| "#\n"
-#| "# file system mount point type options dump "
-#| "pass\n"
-#| "/dev/XXX / ext3 defaults 0 1\n"
-#| "/dev/XXX /boot ext3 ro,nosuid,nodev 0 2\n"
-#| "\n"
-#| "/dev/XXX none swap sw 0 0\n"
-#| "proc /proc proc defaults 0 0\n"
-#| "\n"
-#| "/dev/fd0 /media/floppy auto noauto,rw,sync,user,exec 0 0\n"
-#| "/dev/cdrom /media/cdrom iso9660 noauto,ro,user,exec 0 0\n"
-#| "\n"
-#| "/dev/XXX /tmp ext3 rw,nosuid,nodev 0 2\n"
-#| "/dev/XXX /var ext3 rw,nosuid,nodev 0 2\n"
-#| "/dev/XXX /usr ext3 rw,nodev 0 2\n"
-#| "/dev/XXX /home ext3 rw,nosuid,nodev 0 2\n"
-#| "</screen></informalexample> Use <userinput>mount -a</userinput> to mount "
-#| "all the file systems you have specified in your <filename>/etc/fstab</"
-#| "filename>, or, to mount file systems individually, use: "
-#| "<informalexample><screen>\n"
-#| "# mount /path # e.g.: mount /usr\n"
-#| "</screen></informalexample> Current &debian; systems have mountpoints for "
-#| "removable media under <filename>/media</filename>, but keep compatibility "
-#| "symlinks in <filename>/</filename>. Create these as as needed, for "
-#| "example: <informalexample><screen>\n"
-#| "# cd /media\n"
-#| "# mkdir cdrom0\n"
-#| "# ln -s cdrom0 cdrom\n"
-#| "# cd /\n"
-#| "# ln -s media/cdrom\n"
-#| "</screen></informalexample> You can mount the proc file system multiple "
-#| "times and to arbitrary locations, though <filename>/proc</filename> is "
-#| "customary. If you didn't use <userinput>mount -a</userinput>, be sure to "
-#| "mount proc before continuing:"
+#, no-c-format
msgid ""
"You need to create <filename>/etc/fstab</filename>. "
"<informalexample><screen>\n"
@@ -1106,8 +1055,8 @@ msgid ""
msgstr ""
"您需要新建 <filename>/etc/fstab</filename>。<informalexample><screen>\n"
"# editor /etc/fstab\n"
-"</screen></informalexample> 这里有个样板,您可以根据自己的情况对它进行修改:"
-"<informalexample><screen>\n"
+"</screen></informalexample> 这里有个样板,您可以根据自己的情况对它进行修改:<informalexample><screen>"
+"\n"
"# /etc/fstab: static file system information.\n"
"#\n"
"# file system mount point type options dump pass\n"
@@ -1117,7 +1066,6 @@ msgstr ""
"/dev/XXX none swap sw 0 0\n"
"proc /proc proc defaults 0 0\n"
"\n"
-"/dev/fd0 /media/floppy auto noauto,rw,sync,user,exec 0 0\n"
"/dev/cdrom /media/cdrom iso9660 noauto,ro,user,exec 0 0\n"
"\n"
"/dev/XXX /tmp ext3 rw,nosuid,nodev 0 2\n"
@@ -1125,21 +1073,20 @@ msgstr ""
"/dev/XXX /usr ext3 rw,nodev 0 2\n"
"/dev/XXX /home ext3 rw,nosuid,nodev 0 2\n"
"</screen></informalexample> 可以通过 <userinput>mount -a</userinput> 来挂载 "
-"<filename>/etc/fstab</filename> 中所标明的所有文件系统,您也可以逐个分别地挂"
-"载这些文件系统,像:<informalexample><screen>\n"
+"<filename>/etc/fstab</filename> "
+"中所标明的所有文件系统,您也可以逐个分别地挂载这些文件系统,像:<informalexample><screen>\n"
"# mount /path # e.g.: mount /usr\n"
-"</screen></informalexample> 当前的 &debian; 系统为可移动介质创建的挂载点位于 "
-"<filename>/media</filename>, 但为了保持兼容,仍有符号链接处于 <filename>/</"
-"filename> 目录下面。如果需要,可以像下面这样创建这些挂载点: "
+"</screen></informalexample> 当前的 &debian; 系统为可移动介质创建的挂载点位于 <filename>/media</"
+"filename>, 但为了保持兼容,仍有符号链接处于 <filename>/</filename> 目录下面。如果需要,可以像下面这样创建这些挂载点: "
"<informalexample><screen>\n"
"# cd /media\n"
"# mkdir cdrom0\n"
"# ln -s cdrom0 cdrom\n"
"# cd /\n"
"# ln -s media/cdrom\n"
-"</screen></informalexample> 您可以多次挂载 proc 文件系统,通常是在 "
-"<filename>/proc</filename> 位置,但也可以选择任意的地方。如果没有使用 "
-"<userinput>mount -a</userinput>,请在进入下一步前先将 proc 挂载:"
+"</screen></informalexample> 您可以多次挂载 proc 文件系统,通常是在 <filename>/proc</"
+"filename> 位置,但也可以选择任意的地方。如果没有使用 <userinput>mount -a</userinput>,请在进入下一步前先将 "
+"proc 挂载:"
#. Tag: screen
#: random-bits.xml:567
@@ -1513,26 +1460,15 @@ msgstr ""
#. Tag: para
#: random-bits.xml:710
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
-#| "up the bootloader. If you are keeping the system you used to install "
-#| "&debian;, just add an entry for the &debian; install to your existing "
-#| "<filename>yaboot.conf</filename>. You could also copy it to the new "
-#| "system and edit it there. After you are done editing, call ybin (remember "
-#| "it will use <filename>yaboot.conf</filename> relative to the system you "
-#| "call it from)."
+#, no-c-format
msgid ""
"Check <userinput>info grub</userinput> for instructions on setting up the "
"bootloader. If you are keeping the system you used to install &debian;, just "
"add an entry for the &debian; install to your existing grub2 <filename>grub."
"cfg</filename>."
msgstr ""
-"通过查阅 <userinput>man yaboot.conf</userinput> 可以得到一些有关设置 "
-"bootloader 的提示。如果您希望继续保留用来安装 &debian; 的系统,那么在 "
-"<filename>yaboot.conf</filename> 里为 &debian; 系统添加一条配置就可以了。您也"
-"可以把这个文件拷贝到新的系统里,然后在新的系统里编辑它。当您修改完毕配置,运"
-"行 ybin(请记住您在哪个系统里运行的 <filename>yaboot.conf</filename>)。"
+"通过查阅 <userinput>info grub</userinput> 可以得到一些有关设置 bootloader 的提示。"
+"如果您希望继续保留曾经安装 &debian; 的系统,那么安装到您现有的 grub2 <filename>grub.cfg</filename> 中。"
#. Tag: para
#: random-bits.xml:718
@@ -1902,10 +1838,9 @@ msgstr ""
#. Tag: guimenuitem
#: random-bits.xml:913
-#, fuzzy, no-c-format
-#| msgid "Load installer components from CD"
+#, no-c-format
msgid "Load installer components from installation media"
-msgstr "从光盘加载安装组件"
+msgstr "从安装介质加载安装组件"
#. Tag: para
#: random-bits.xml:915
@@ -2020,20 +1955,12 @@ msgstr ""
#. Tag: para
#: random-bits.xml:1002
-#, fuzzy, no-c-format
-#| msgid ""
-#| "To have the option of setting up and using PPPoE during the installation, "
-#| "you will need to install using one of the CD-ROM/DVD images that are "
-#| "available. It is not supported for other installation methods (e.g. "
-#| "netboot<phrase condition=\"supports-floppy-boot\"> or floppy</phrase>)."
+#, no-c-format
msgid ""
"To have the option of setting up and using PPPoE during the installation, "
"you will need to install using one of the CD-ROM/DVD images that are "
"available. It is not supported for other installation methods (e.g. netboot)."
-msgstr ""
-"要让安装过程中有建立和使用 PPPoE 的选项,您需要使用 CD-ROM/DVD 映像。其他的安"
-"装方式不支持(例如 netboot<phrase condition=\"supports-floppy-boot\"> 或软盘</"
-"phrase>)。"
+msgstr "要让安装过程中有建立和使用 PPPoE 的选项,您需要使用 CD-ROM/DVD 映像。其他的安装方式不支持(例如 netboot )。"
#. Tag: para
#: random-bits.xml:1009
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index fb42797c4..ad5870de3 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -1,4 +1,6 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
+# Ji YongGang <jungleji@gmail.com>, 2012.
+#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index f2017c7b6..430ffdc2e 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.po
@@ -1,20 +1,21 @@
-# Debian GNU/Linux Installation Guide
+# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Yangfl <mmyangfl@gmail.com>, 2017.
+# tao wang <tonywang5@163.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2019-09-22 23:04+0000\n"
-"PO-Revision-Date: 2017-06-11 21:21+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"PO-Revision-Date: 2020-08-28 12:22+0000\n"
+"Last-Translator: tao wang <tonywang5@163.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 4.2.1-dev\n"
#. Tag: title
#: welcome.xml:4
@@ -84,8 +85,8 @@ msgid ""
"published a number of documents that outline our values and serve as guides "
"to what it means to be a Debian Developer:"
msgstr ""
-"为了传递我们的理念并吸引那些与 Debian 有着相同信仰的开发人员,Debian 计划发表"
-"了众多文档,以阐明我们的价值观和成为 Debian 开发人员的意义。"
+"为了传递我们的理念并吸引那些与 Debian 有着相同信仰的开发人员,Debian 计划发表了众多文档,以阐明我们的价值观和成为 Debian "
+"开发人员的意义:"
#. Tag: para
#: welcome.xml:52
@@ -558,10 +559,9 @@ msgstr ""
#. Tag: title
#: welcome.xml:380
-#, fuzzy, no-c-format
-#| msgid "What is Debian?"
+#, no-c-format
msgid "What is the Debian Installer?"
-msgstr "什么是 Debian?"
+msgstr "什么是 Debian 安装程序?"
#. Tag: para
#: welcome.xml:382
@@ -572,6 +572,8 @@ msgid ""
"embedded devices, laptops, desktops and server machines is supported and a "
"large set of free software for many purposes is offered."
msgstr ""
+"Debian 安装程序,也被称为 <quote>d-i</quote> ,是安装 Debian "
+"系统进行基本工作的软件系统。嵌入式设备、笔记本计算机、台式机和服务器这样的大范围硬件被支持,并且提供了用于很多目的的大量自由软件。"
#. Tag: para
#: welcome.xml:389
@@ -585,6 +587,8 @@ msgid ""
"network. The installer supports localized installations in more than 80 "
"languages."
msgstr ""
+"通过回答一组基本问题来进行安装。还具有专家模式,允许控制安装的每个方面,并提供高级特性来进行自动安装。安装的系统可以直接使用或进一步定制。可以从多种来源进"
+"行安装: USB 、 CD/DVD/Blu-Ray 或网络。安装程序支持超过80种语言的本地化安装。"
#. Tag: para
#: welcome.xml:399
@@ -596,6 +600,9 @@ msgid ""
"has been continuously developed by volunteers improving and adding more "
"features."
msgstr ""
+"安装程序来源于安装软盘项目,是由 Joey Hess 在 2000 年 <ulink url=\"http://lists.debian.org/"
+"debian-boot/2000/06/msg00279.html\">首先提到</ulink> 。 从那时起,安装系统由志愿者不断开发,"
+"改进并添加了更多特性 。"
#. Tag: para
#: welcome.xml:407
@@ -606,6 +613,9 @@ msgid ""
"and on the <ulink url=\"&url-debian-boot-list;\">debian-boot mailing list</"
"ulink>."
msgstr ""
+"更多信息可以在 <ulink url=\"&url-d-i;\">Debian Installer page</ulink> 、 <ulink url="
+"\"&url-d-i-wiki;\">Wiki</ulink> 和 <ulink url=\"&url-debian-boot-list"
+";\">debian-boot mailing list</ulink> 上找到。"
#. Tag: title
#: welcome.xml:422
@@ -615,13 +625,7 @@ msgstr "获得 &debian;"
#. Tag: para
#: welcome.xml:424
-#, fuzzy, no-c-format
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
-#| "official &debian; mirrors, so you can easily find the nearest one."
+#, no-c-format
msgid ""
"For information on how to download &debian-gnu; from the Internet or from "
"whom official &debian; installation media can be purchased, see the <ulink "
@@ -629,10 +633,10 @@ msgid ""
"\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> contains a full "
"set of official &debian; mirrors, so you can easily find the nearest one."
msgstr ""
-"关于如何从因特网上下载 &debian-gnu; 或者购买官方 &debian; 光盘的信息,请参阅 "
-"<ulink url=\"&url-debian-distrib;\">distribution web page</ulink>。<ulink "
-"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> 包含完整的 "
-"&debian; 官方镜像,您可以很容易找到最近的一个。"
+"关于如何从因特网上下载 &debian-gnu; 或者购买官方 &debian; 安装介质的信息,请参阅 <ulink url=\"&url-"
+"debian-distrib;\">distribution web page</ulink>。<ulink url=\"&url-debian-"
+"mirrors;\">list of &debian; mirrors</ulink> 包含完整的 &debian; "
+"官方镜像,您可以很容易找到最近的一个。"
#. Tag: para
#: welcome.xml:433
@@ -741,29 +745,17 @@ msgstr ""
#. Tag: para
#: welcome.xml:512
-#, fuzzy, no-c-format
-#| msgid ""
-#| "describes booting into the installation system. This chapter also "
-#| "discusses troubleshooting procedures in case you have problems with this "
-#| "step."
+#, no-c-format
msgid ""
"The next <xref linkend=\"boot-installer\"/> describes booting into the "
"installation system. This chapter also discusses troubleshooting procedures "
"in case you have problems with this step."
-msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这步操作中会遇到的问题。"
+msgstr ""
+"下面的 <xref linkend=\"boot-installer\"/> 讲述的是如何启动安装系统。本章还将讨论如何解决这步操作中会遇到的问题。"
#. Tag: para
#: welcome.xml:519
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a &debian; server (if "
-#| "you are not installing from a CD/DVD set), partitioning your hard drives "
-#| "and installation of a base system, then selection and installation of "
-#| "tasks. (Some background about setting up the partitions for your &debian; "
-#| "system is explained in <xref linkend=\"partitioning\"/>.)"
+#, no-c-format
msgid ""
"Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
"This involves choosing your language, configuring peripheral driver modules, "
@@ -774,10 +766,9 @@ msgid ""
"(Some background about setting up the partitions for your &debian; system is "
"explained in <xref linkend=\"partitioning\"/>.)"
msgstr ""
-"执行真正的安装是在<xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边驱"
-"动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光盘"
-"方式安装),给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背景"
-"知识位于<xref linkend=\"partitioning\"/>。)"
+"执行真正的安装是在<xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边驱动模块、设置网络连接以从 &debian; "
+"服务器上获得后续安装文件(如果您不是采用一组 CD/DVD 安装映像的方式来安装),给硬盘分区和安装基本系统。(关如何为 &debian; "
+"系统建立分区的背景知识位于<xref linkend=\"partitioning\"/>。)"
#. Tag: para
#: welcome.xml:532
@@ -871,15 +862,7 @@ msgstr ""
#. Tag: para
#: welcome.xml:601
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Calling software <emphasis>free</emphasis> doesn't mean that the software "
-#| "isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
-#| "software must be distributed at no charge. Free software, in part, means "
-#| "that the licenses of individual programs do not require you to pay for "
-#| "the privilege of distributing or using those programs. Free software also "
-#| "means that not only may anyone extend, adapt, and modify the software, "
-#| "but that they may distribute the results of their work as well."
+#, no-c-format
msgid ""
"Calling software <emphasis>free</emphasis> doesn't mean that the software "
"isn't copyrighted, and it doesn't mean that installation media containing "
@@ -889,10 +872,8 @@ msgid ""
"means that not only may anyone extend, adapt, and modify the software, but "
"that they may distribute the results of their work as well."
msgstr ""
-"称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权,也不是指包含该软件"
-"的 CD/DVD 必须免费分派。自由软件,某种程度上意味着您不须为分发和使用这些程序"
-"付费。自由软件还是指任何人可以扩展、改写、修改该软件,并且他们工作的成果也这"
-"样发布。"
+"称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权,也不是指包含该软件的安装映像必须免费分派。自由软件,某种程度上意味着您不须"
+"为分发和使用这些程序付费。自由软件还是指任何人可以扩展、改写、修改该软件,并且他们工作的成果也这样发布。"
#. Tag: para
#: welcome.xml:612