summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authortao wang <tonywang5@163.com>2020-10-20 00:30:40 +0200
committerHolger Wansing <hwansing@mailbox.org>2020-10-20 00:30:40 +0200
commitc8448fad06baf9860e11fe5d40721af50f8e8f35 (patch)
tree69f4925d20b6ed6921cec9be575cee6e6e8009c7 /po
parentcc747da7100b288303c4aae30b9121eb2daa3e4a (diff)
downloadinstallation-guide-c8448fad06baf9860e11fe5d40721af50f8e8f35.zip
[Commit from Weblate] Chinese (Simplified) translation update
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN/boot-installer.po173
-rw-r--r--po/zh_CN/gpl.po24
-rw-r--r--po/zh_CN/install-methods.po415
-rw-r--r--po/zh_CN/installation-howto.po54
-rw-r--r--po/zh_CN/partitioning.po43
-rw-r--r--po/zh_CN/preface.po15
-rw-r--r--po/zh_CN/preparing.po63
-rw-r--r--po/zh_CN/preseed.po640
-rw-r--r--po/zh_CN/random-bits.po104
-rw-r--r--po/zh_CN/using-d-i.po669
10 files changed, 710 insertions, 1490 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 5fcd6ea3d..dfeacb911 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -8,7 +8,7 @@ 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: 2020-10-05 12:12+0000\n"
+"PO-Revision-Date: 2020-10-19 21:44+0000\n"
"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: boot-installer.xml:4
@@ -1439,9 +1439,9 @@ msgstr ""
"IA-64 使用 Intel 最新的可扩展固件界面(EFI)。与传统的 x86 BIOS 只了解分区表"
"和主引导记录(MBR)而不知道其他引导设备的特点不同,EFI 可以对 FAT16 和 FAT32 "
"格式的硬盘分区进行读写操作。这个特点简化了通常很难以理解的系统启动过程。系统"
-"启动引导器以及 EFI 固件支持一个完全的文件系统,来保存引导一个机器所需要得所有"
-"文件。这意味着在一个 IA-64 系统上的系统磁盘,具有一个附加的专门为 EFI 服务的"
-"磁盘分区,而不是像传统系统上只是简单的 MBR 或者引导块记录。"
+"引导程序以及 EFI 固件支持一个完全的文件系统,来保存引导一个机器所需要得所有文"
+"件。这意味着在一个 IA-64 系统上的系统磁盘,具有一个附加的专门为 EFI 服务的磁"
+"盘分区,而不是像传统系统上只是简单的 MBR 或者引导块记录。"
#. Tag: para
#: boot-installer.xml:1054
@@ -1601,8 +1601,8 @@ msgid ""
"for you to select a boot kernel and options. Proceed to selecting the boot "
"kernel and options."
msgstr ""
-"这些步骤启动的 &debian; 启动引导器会显示一个菜单页用于选择启动内核和选项。进"
-"入选择启动内核和选项。"
+"这些步骤启动的 &debian; 引导程序会显示一个菜单页用于选择启动内核和选项。进入"
+"选择启动内核和选项。"
#. Tag: title
#: boot-installer.xml:1170
@@ -1698,9 +1698,9 @@ msgid ""
"command> command at the shell prompt. Proceed to selecting the boot kernel "
"and options."
msgstr ""
-"与选项 1 相同,这些步骤也会启动 &debian; 启动引导器,显示一个菜单页供选择启动"
-"内核和参数。您可在 shell 提示符下输入 <command>fs<replaceable>n</"
-"replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
+"与选项 1 相同,这些步骤也会启动 &debian; 引导程序,显示一个菜单页供选择启动内"
+"核和参数。您可在 shell 提示符下输入 <command>fs<replaceable>n</replaceable>:"
+"elilo</command>简短命令。进入选择启动内核和选项。"
#. Tag: title
#: boot-installer.xml:1237
@@ -2016,9 +2016,9 @@ msgid ""
"when the kernel has completed installing itself from the network, it will "
"start the &debian; Installer."
msgstr ""
-"在下载并且处理配置文件后,启动引导器将显示它的提示符。从这里开始,安装过程将"
-"和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到的"
-"引导选项,它将开始 &debian; 安装程序。"
+"在下载并且处理配置文件后,引导程序将显示它的提示符。从这里开始,安装过程将和 "
+"CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到的引"
+"导选项,它将开始 &debian; 安装程序。"
#. Tag: title
#: boot-installer.xml:1521
@@ -2228,7 +2228,7 @@ msgstr ""
"可以支持的机器上,可以接收输入的时候,引导菜单会哔一声。</phrase> 一些引导参"
"数可以 <phrase arch=\"x86\">接着</phrase> 被添加到后面打开这些辅助功能"
"<phrase arch=\"x86\">(请参见<xref linkend=\"boot-screen\"/>)</phrase>。需要"
-"注意在大多数架构下启动引导器 将视您的键盘为 QWERTY 布局。"
+"注意在大多数架构下引导程序 将视您的键盘为 QWERTY 布局。"
#. Tag: title
#: boot-installer.xml:2012
@@ -2337,8 +2337,10 @@ msgid ""
"the installer will then be automatically selected, and support for software "
"speech synthesis will be automatically installed on the target system."
msgstr ""
-"对于硬件语音合成设备的支持只在图形界面安装程序下有效。您需要在引导菜单里面选"
-"择 <quote>Graphical install</quote> 项。"
+"在具有图形安装程序的所有安装程序影像中,即所有的 netinst、CD 和 DVD 映像,以"
+"及上网本 gtk 变种,可以获得对软件语音合成的支持。可以通过在引导菜单输入"
+"<userinput>s</userinput>&enterkey; 选择它来启动。然后自动选择文本版本的安装程"
+"序,并且对软件语音合成的支持将自动安装在目标系统上。"
#. Tag: para
#: boot-installer.xml:2079
@@ -2357,9 +2359,8 @@ msgid ""
"installation is spoken in the selected language (if available in "
"<classname>espeak</classname>)."
msgstr ""
-"要支持软件语音合成,可以在引导菜单键入 <userinput>s</userinput> &enterkey; 激"
-"活。第一个问题(语言)使用英语发音,其余的问题则根据所选的语言来发音(如果存在 "
-"<classname>espeak</classname>)。"
+"第一个问题(语言)以英语讲出,而安装的其余部分以选择的语言讲出(如果在 "
+"<classname>espeak</classname>中可用的话)。"
#. Tag: para
#: boot-installer.xml:2090
@@ -2454,7 +2455,7 @@ msgid ""
"If desired a textual version of the bootloader can be activated before "
"adding the boot parameter by typing <userinput>h</userinput> &enterkey;."
msgstr ""
-"假如希望使用字符界面的启动引导器,可以在添加引导参数前输入 <userinput>h</"
+"假如希望使用字符界面的引导程序,可以在添加引导参数前输入 <userinput>h</"
"userinput> &enterkey;。"
#. Tag: title
@@ -2473,9 +2474,9 @@ msgid ""
"userinput> shortcut, or append the <userinput>theme=dark</userinput> boot "
"parameter."
msgstr ""
-"对于视力弱的用户,安装程序可以使用高亮主题增加可读性。为了打开它,可以从启动"
-"屏幕使用<userinput>d</userinput>快捷键,来使用<quote>Accessible high "
-"contrast</quote>入口,或者设置 <userinput>theme=dark</userinput> 引导参数即"
+"对于视力弱的用户,安装程序可以使用高亮彩色主题增加可读性。为了打开它,可以从"
+"引导屏幕使用<userinput>d</userinput>快捷键,来使用<quote>Accessible high "
+"contrast</quote>入口,或者添加 <userinput>theme=dark</userinput> 引导参数即"
"可。"
#. Tag: title
@@ -2505,19 +2506,7 @@ msgstr "专家安装、救援模式、自动安装"
#. Tag: para
#: boot-installer.xml:2182
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Expert, Rescue, and Automated installation choices are also available "
-#| "with accessibility support. To access them, one has to first enter the "
-#| "<quote>Advanced options</quote> submenu from the boot menu by typing "
-#| "<userinput>a</userinput>. When using a BIOS system (the boot menu will "
-#| "have beeped only once), this has to be followed by &enterkey;. Then, to "
-#| "enable speech synthesis, <userinput>s</userinput> can optionally be "
-#| "pressed (followed again by &enterkey; when using a BIOS system). From "
-#| "there, various shortcuts can be used: <userinput>x</userinput> for expert "
-#| "installation, <userinput>r</userinput> for rescue mode, or <userinput>a</"
-#| "userinput> for automated installation. When using a BIOS system, they "
-#| "must be followed by &enterkey;."
+#, no-c-format
msgid ""
"Expert, Rescue, and Automated installation choices are also available with "
"accessibility support. To access them, one has to first enter the "
@@ -2534,11 +2523,12 @@ msgid ""
msgstr ""
"专家、救援和自动安装选择也可以使用辅助功能。要访问它们,必须在引导菜单中键入 "
"<userinput>a</userinput> 进入<quote>高级选项</quote>子菜单。当使用 BIOS 系统"
-"时(启动菜单只有一次 beep 音),其之后必须按下 &enterkey;。然后,要启用语音合"
-"成,可以选择按下 <userinput>s</userinput>(使用 BIOS 系统时再次按下 "
+"时(引导菜单只有一次蜂鸣音),其之后必须按下 &enterkey;;对于 UEFI 系统(引导"
+"菜单会有两次蜂鸣音),必须不能这样做。然后,要启用语音合成,可以选择按下 "
+"<userinput>s</userinput>(使用 BIOS 系统而不是 UEFI 系统时,再次按下 "
"&enterkey;)。从那里可以使用各种快捷方式:用于专家安装的 <userinput>x</"
"userinput>,用于救援模式的 <userinput>r</userinput> 或用于自动安装的 "
-"<userinput>a</userinput>。使用 BIOS 系统时,必须紧接着按下 &enterkey;。"
+"<userinput>a</userinput>。当使用 BIOS 系统时,必须再次紧接着按下 &enterkey;。"
#. Tag: para
#: boot-installer.xml:2197
@@ -2702,13 +2692,7 @@ msgstr "&debian; 安装程序的参数"
#. Tag: para
#: boot-installer.xml:2300
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The installation system recognizes a few additional boot "
-#| "parameters<footnote> <para> With current kernels (2.6.9 or newer) you can "
-#| "use 32 command line options and 32 environment options. If these numbers "
-#| "are exceeded, the kernel will panic. </para> </footnote> which may be "
-#| "useful."
+#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
"parameters<footnote> <para> With current kernels (2.6.9 or newer) you can "
@@ -2718,8 +2702,9 @@ msgid ""
"truncated. </para> </footnote> which may be useful."
msgstr ""
"安装系统能识别一些额外的引导参数<footnote> <para> 当前的内核(2.6.9 或更新),"
-"您可以使用 32 个命令行参数和 32 个环境变量选项。如果超出,内核将会崩溃。</"
-"para> </footnote>,它们很有用。"
+"您可以使用 32 个命令行参数和 32 个环境变量选项。如果超出,内核将会崩溃。同"
+"样,整个内核命令行有 255 个字符的限制,超出这个限制的任何内容将被截掉而不会有"
+"提示。</para> </footnote>,它们很有用。"
#. Tag: para
#: boot-installer.xml:2315
@@ -2996,13 +2981,7 @@ msgstr "debian-installer/theme (theme)"
#. Tag: para
#: boot-installer.xml:2488
-#, fuzzy, no-c-format
-#| msgid ""
-#| "A theme determines how the user interface of the installer looks (colors, "
-#| "icons, etc.). What themes are available differs per frontend. Currently "
-#| "both the newt and gtk frontends only have a <quote>dark</quote> theme "
-#| "that was designed for visually impaired users. Set the theme by booting "
-#| "with <userinput>theme=<replaceable>dark</replaceable></userinput>."
+#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
"icons, etc.). Which themes are available may differ per frontend. Currently "
@@ -3013,9 +2992,10 @@ msgid ""
"the keyboard shortcut <userinput>d</userinput> for this in the boot menu)."
msgstr ""
"界面方案(theme)决定安装程序用户界面的外观(颜色、图标等)。不同的前端(frontend)"
-"有不同的界面方案。当前 newt 和 gtk 前端只有一个 <quote>dark</quote> 界面方案"
-"提供给视觉受损的用户。界面方案可以在引导的时候通过 "
-"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
+"会有不同的界面方案。当前 newt 和 gtk 前端有另外一个(除了默认的界面)被称为 "
+"<quote>dark</quote> 的界面方案,来提供给视觉受损的用户。界面方案可以在引导的"
+"时候通过 <userinput>theme=<replaceable>dark</replaceable></userinput> 来设置"
+"(在引导菜单中还有一个键盘快捷方式 <userinput>d</userinput> 用在这里)。"
#. Tag: term
#: boot-installer.xml:2503 boot-installer.xml:2736
@@ -3562,20 +3542,15 @@ msgstr "光盘媒体的可靠性"
#. Tag: para
#: boot-installer.xml:2852
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Sometimes, especially with older CD-ROM drives, the installer may fail to "
-#| "boot from a CD-ROM. The installer may also &mdash; even after booting "
-#| "successfully from CD-ROM &mdash; fail to recognize the CD-ROM or return "
-#| "errors while reading from it during the installation."
+#, no-c-format
msgid ""
"Sometimes, especially with older drives, the installer may fail to boot from "
"an optical disc. The installer may also &mdash; even after booting "
"successfully from such disc &mdash; fail to recognize the disc or return "
"errors while reading from it during the installation."
msgstr ""
-"有时,特别是旧的 CD-ROM 驱动器,安装程序无法从 CD-ROM 引导。安装程序还可能 "
-"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
+"有时,特别是较旧的驱动器,安装程序无法从光盘引导。安装程序还可能 &mdash; 即使"
+"是从这样的光盘成功引导 &mdash; 也无法识别光盘或在安装时读取错误。"
#. Tag: para
#: boot-installer.xml:2859
@@ -3627,10 +3602,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:2891
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you cannot get the installation working from CD-ROM, try one of the "
-#| "other installation methods that are available."
+#, no-c-format
msgid ""
"If you cannot get the installation working from optical disc, try one of the "
"other installation methods that are available."
@@ -4119,15 +4091,7 @@ msgstr "报告安装问题"
#. Tag: para
#: boot-installer.xml:3270
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you get through the initial boot phase but cannot complete the "
-#| "install, the menu option <guimenuitem>Save debug logs</guimenuitem> may "
-#| "be helpful. It lets you store system error logs and configuration "
-#| "information from the installer to a floppy, or download them using a web "
-#| "browser. This information may provide clues as to what went wrong and how "
-#| "to fix it. If you are submitting a bug report, you may want to attach "
-#| "this information to the bug report."
+#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
"the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful. "
@@ -4203,51 +4167,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3316
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Alternatively you can use this template when filling out installation "
-#| "reports, and file the report as a bug report against the "
-#| "<classname>installation-reports</classname> pseudo package, by sending it "
-#| "to <email>submit@bugs.debian.org</email>. <informalexample><screen>\n"
-#| "Package: installation-reports\n"
-#| "\n"
-#| "Boot method: &lt;How did you boot the installer? CD? floppy? network?"
-#| "&gt;\n"
-#| "Image version: &lt;Full URL to image you downloaded is best&gt;\n"
-#| "Date: &lt;Date and time of the install&gt;\n"
-#| "\n"
-#| "Machine: &lt;Description of machine (eg, IBM Thinkpad R32)&gt;\n"
-#| "Processor:\n"
-#| "Memory:\n"
-#| "Partitions: &lt;df -Tl will do; the raw partition table is preferred&gt;\n"
-#| "\n"
-#| "Output of lspci -knn (or lspci -nn):\n"
-#| "\n"
-#| "Base System Installation Checklist:\n"
-#| "[O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it\n"
-#| "\n"
-#| "Initial boot: [ ]\n"
-#| "Detect network card: [ ]\n"
-#| "Configure network: [ ]\n"
-#| "Detect CD: [ ]\n"
-#| "Load installer modules: [ ]\n"
-#| "Detect hard drives: [ ]\n"
-#| "Partition hard drives: [ ]\n"
-#| "Install base system: [ ]\n"
-#| "Clock/timezone setup: [ ]\n"
-#| "User/password setup: [ ]\n"
-#| "Install tasks: [ ]\n"
-#| "Install boot loader: [ ]\n"
-#| "Overall install: [ ]\n"
-#| "\n"
-#| "Comments/Problems:\n"
-#| "\n"
-#| "&lt;Description of the install, in prose, and any thoughts, comments\n"
-#| " and ideas you had during the initial install.&gt;\n"
-#| "</screen></informalexample> In the bug report, describe what the problem "
-#| "is, including the last visible kernel messages in the event of a kernel "
-#| "hang. Describe the steps that you did which brought the system into the "
-#| "problem state."
+#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
"reports, and file the report as a bug report against the "
@@ -4298,7 +4218,8 @@ msgstr ""
"email>。<informalexample><screen>\n"
"Package: installation-reports\n"
"\n"
-"Boot method: &lt;How did you boot the installer? CD? floppy? network?&gt;\n"
+"Boot method: &lt;How did you boot the installer? CD/DVD? USB stick? Network?"
+"&gt;\n"
"Image version: &lt;Full URL to image you downloaded is best&gt;\n"
"Date: &lt;Date and time of the install&gt;\n"
"\n"
@@ -4315,7 +4236,7 @@ msgstr ""
"Initial boot: [ ]\n"
"Detect network card: [ ]\n"
"Configure network: [ ]\n"
-"Detect CD: [ ]\n"
+"Detect media: [ ]\n"
"Load installer modules: [ ]\n"
"Detect hard drives: [ ]\n"
"Partition hard drives: [ ]\n"
diff --git a/po/zh_CN/gpl.po b/po/zh_CN/gpl.po
index f86267aa6..6d2fae36b 100644
--- a/po/zh_CN/gpl.po
+++ b/po/zh_CN/gpl.po
@@ -1,18 +1,21 @@
# 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-07 21:24+0000\n"
-"PO-Revision-Date: 2010-04-07 12:20+0800\n"
-"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
+"PO-Revision-Date: 2020-10-19 21:44+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.3.1-dev\n"
#. Tag: title
#: gpl.xml:4
@@ -724,8 +727,8 @@ msgid ""
"found."
msgstr ""
"为了做到这一点,请将以下声明附加到程序上。最安全的作法,是将声明放在每份源码"
-"挡案的起始处,以有效传达无担保责任的讯息;且每份挡案至少应有「著作权」列以及"
-"本份声明全文位置的提示。"
+"挡案的起始处,以有效传达无担保责任的讯息;且每份挡案至少应有 <quote>版权</"
+"quote> 行以及本份声明全文位置的提示。"
#. Tag: screen
#: gpl.xml:448
@@ -792,8 +795,9 @@ msgid ""
"for details."
msgstr ""
"Gnomovision 第69版,著作权所有 (C) <replaceable>年份 作者姓名</replaceable>\n"
-"Gnomovision不负担保责任,欲知详情请键入'show w'。这是一个自由软件,欢迎您在特"
-"定条件下再发布本程序;欲知详情请键入'show c'。"
+"Gnomovision不负担保责任,欲知详情请键入 <userinput>show w</userinput>。这是一"
+"个自由软件,欢迎您在特定条件下再发布本程序;欲知详情请键入 <userinput>show "
+"c</userinput>。"
#. Tag: para
#: gpl.xml:462
@@ -817,8 +821,8 @@ msgid ""
"school, if any, to sign a <quote>copyright disclaimer</quote> for the "
"program, if necessary. Here is a sample; alter the names:"
msgstr ""
-"如有需要,您亦应取得您的雇主(若您的工作为程序设计師)或学校就本程序所签署的"
-"「著作权放弃承諾书」。其范例如下,您只要修改姓名即可:"
+"如有需要,您亦应取得您的雇主(若您的工作为程序设计师)或学校就本程序所签署的 "
+"<quote>著作权放弃承諾书</quote>。其范例如下,您只要修改姓名即可:"
#. Tag: screen
#: gpl.xml:476
@@ -832,8 +836,8 @@ msgid ""
"<replaceable>signature of Ty Coon</replaceable>, 1 April 1989\n"
"Ty Coon, President of Vice"
msgstr ""
-"Yoyodyne 公司,茲此放弃 James Hacker 所写之'Gnomovision'程序(该程序产出编译"
-"器所需资讯)所有的著作权利益。\n"
+"Yoyodyne 公司,茲此放弃 James Hacker 所写之 <userinput>Gnomovision</"
+"userinput>程序(该程序产出编译器所需资讯)所有的著作权利益。\n"
"\n"
"<replaceable>Ty Coon 公司签章</replaceable>, 1989 年四月一日\n"
"Ty Coon 公司,副总裁"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index c1435f418..f4ce7b843 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -7,7 +7,7 @@ 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: 2020-10-05 12:12+0000\n"
+"PO-Revision-Date: 2020-10-17 02:00+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"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: install-methods.xml:5
@@ -31,21 +31,7 @@ msgstr "官方的 &debian-gnu; 安装映像"
#. Tag: para
#: install-methods.xml:13
-#, fuzzy, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official "
-#| "&debian; CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink "
-#| "url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). You may also "
-#| "download the CD/DVD-ROM images from a &debian; mirror and make your own "
-#| "set, if you have a fast network connection and a CD/DVD burner (see the "
-#| "<ulink url=\"&url-debian-cd;\">Debian CD page</ulink> and <ulink url="
-#| "\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> for detailed instructions). "
-#| "If you have a &debian; CD/DVD set and CDs/DVDs are bootable on your "
-#| "machine<phrase arch=\"x86\">, which is the case on all modern PCs</"
-#| "phrase>, you can skip right to <xref linkend=\"boot-installer\"/>. Much "
-#| "effort has been expended to ensure the most-used files are on the first "
-#| "CDs and DVDs, so that a basic desktop installation can be done with only "
-#| "the first DVD or - to a limited extent - even with only the first CD."
+#, no-c-format
msgid ""
"By far the easiest way to install &debian-gnu; is from a set of official "
"&debian; installation images. You can buy a set of CDs/DVDs from a vendor "
@@ -62,16 +48,16 @@ msgid ""
"with only the first DVD or - to a limited extent - even with only the first "
"CD image."
msgstr ""
-"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD/DVD-ROM 套件。您可"
-"以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
-"ulink>)。如果您有高速网络和 CD/DVD 刻录机,可以选择从 &debian; 镜像站点下载 "
-"CD/DVD-ROM 映像,然后自己刻录(参见 <ulink url=\"&url-debian-cd;\">Debian CD "
-"页</ulink>和 <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> 了解详"
-"细说明)。如果您已经有一套 &debian; CD/DVD 并能在机器上引导这些 CDs/"
-"DVD<phrase arch=\"x86\">,大多数现代 PC 都适用</phrase>,可以直接跳到 <xref "
-"linkend=\"boot-installer\"/>。我们尽力让最常用的文件包含在 CD 和 DVD 的第一张"
-"盘上,所以只使用第一张 DVD 就能完成基本的桌面安装,或者在有限的范围内可以只使"
-"用第一张 CD。"
+"目前安装 &debian-gnu; 最容易的方法是使用一组官方的 &debian; 安装映像。可以从"
+"一个销售商处购买一组CDs/DVDs(参见<ulink url=\"&url-debian-cd-vendors;\">CD "
+"销售商</ulink>)。如果有高速网络和 CD/DVD 刻录机,可以选择从 &debian; 镜像站"
+"点下载安装映像,然后自己刻录(参见 <ulink url=\"&url-debian-cd;\">Debian CD/"
+"DVD 页</ulink>和 <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> 了"
+"解详细说明)。如果您已经有这样的光盘安装介质,并能在机器上引导它们,大多数现"
+"代 PC 都适用<phrase arch=\"x86\">,这是在所有现代 PCs 的情况</phrase>,可以直"
+"接跳到 <xref linkend=\"boot-installer\"/>。我们尽力让最常用的文件包含在第一"
+"个 CD 和 DVD 映像中,所以只使用第一张 DVD 就能完成基本的桌面安装,或者在有限"
+"的范围内可以只使用第一个 CD 映像。"
#. Tag: para
#: install-methods.xml:30
@@ -97,23 +83,14 @@ msgid ""
"visit <ulink url=\"https://cdimage-search.debian.org/\">https://cdimage-"
"search.debian.org/</ulink>."
msgstr ""
+"同样,要记住:如果使用的安装介质不包括需要的软件包的话,总是可以以后从运行的"
+"新 Debian 系统来安装这些软件包(在安装结束后)。如果需要知道在哪个安装映像找"
+"到特定的软件包,请访问<ulink url=\"https://cdimage-search.debian.org/"
+"\">https://cdimage-search.debian.org/</ulink>。"
#. Tag: para
#: install-methods.xml:46
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
-#| "relevant on very old PC systems)</phrase>, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the &debian; network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
+#, no-c-format
msgid ""
"If your machine doesn't support booting from optical media<phrase arch="
"\"x86\"> (only relevant on very old PC systems)</phrase>, but you do have a "
@@ -128,37 +105,26 @@ msgid ""
"for those files in the same directories and subdirectories on your "
"installation media."
msgstr ""
-"如果您的机器不支持 CD 引导<phrase arch=\"x86\"> (仅限于非常古老的 PC 系统)</"
-"phrase>,但您有一套 CD,可以使用替代的方案,例如:<phrase condition="
-"\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、仿真磁"
-"带、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase "
-"condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp"
-"\">网络引导、</phrase> 或者从 CD 手工装载内核来初始化系统安装程序。CD 的里已"
-"经包含了用其他方法引导所需的文件;&debian; 网络存档和 CD 文件夹组织方式相同。"
-"因此当引导需要特定的文件时,可以从 CD 的相同目录和子目录中找到。"
+"如果您的机器不支持从光盘媒介引导<phrase arch=\"x86\"> (仅限于非常古老的 PC 系"
+"统)</phrase>,但您有一套 CD/DVD,可以使用替代的方案,例如:<phrase arch="
+"\"s390\">VM 读取器、</phrase> <phrase condition=\"bootable-disk\">硬盘、</"
+"phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase condition="
+"\"supports-tftp\">网络引导、</phrase> 或者从光盘手工装载内核来初始化系统安装"
+"程序。光盘的里已经包含了用其他方法引导所需的文件;&debian; 网络存档和文件夹组"
+"织方式相同。因此当引导需要特定的文件时,可以从安装媒介的相同目录和子目录中找"
+"到。"
#. Tag: para
#: install-methods.xml:67
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Once the installer is booted, it will be able to obtain all the other "
-#| "files it needs from the CD."
+#, no-c-format
msgid ""
"Once the installer is booted, it will be able to obtain all the other files "
"it needs from the disc."
-msgstr "一旦安装程序被引导,它将能够获得 CD 中其他所有必需的文件。"
+msgstr "一旦安装程序被引导,它将能够获得光盘中其他所有必需的文件。"
#. Tag: para
#: install-methods.xml:72
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you don't have a CD set, then you will need to download the installer "
-#| "system files and place them on the <phrase arch=\"s390\">installation "
-#| "tape</phrase> <phrase condition=\"supports-floppy-boot\">floppy disk or</"
-#| "phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase "
-#| "condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
-#| "\"supports-tftp\">a connected computer</phrase> so they can be used to "
-#| "boot the installer."
+#, no-c-format
msgid ""
"If you don't have an installation media set, then you will need to download "
"the installer system files and place them on the <phrase arch=\"s390\">VM "
@@ -167,11 +133,11 @@ msgid ""
"\"supports-tftp\">a connected computer</phrase> so they can be used to boot "
"the installer."
msgstr ""
-"如果您没有 CD 光盘套件,则需要下载安装程序系统文件并且把它们放到:<phrase "
-"arch=\"s390\">安装磁带</phrase> <phrase condition=\"supports-floppy-boot\">软"
-"盘或</phrase> <phrase condition=\"bootable-disk\">硬盘或</phrase> <phrase "
-"condition=\"bootable-usb\">U 盘或</phrase> <phrase condition=\"supports-tftp"
-"\">一台连网的计算机上</phrase>,然后它们可以被用来引导安装程序。"
+"如果您没有安装介质,则需要下载安装程序系统文件并且把它们放到<phrase arch="
+"\"s390\"> VM minidisk</phrase> <phrase condition=\"bootable-disk\">硬盘或</"
+"phrase> <phrase condition=\"bootable-usb\">U 盘或</phrase> <phrase condition="
+"\"supports-tftp\">一台连网的计算机上</phrase>,然后它们可以被用来引导安装程"
+"序。"
#. Tag: title
#: install-methods.xml:96
@@ -306,10 +272,9 @@ msgstr ""
#. Tag: title
#: install-methods.xml:179
-#, fuzzy, no-c-format
-#| msgid "QNAP Turbo Station Installation Files"
+#, no-c-format
msgid "Armhf Multiplatform Installation Files"
-msgstr "QNAP Turbo Station 安装文件"
+msgstr "Armhf 多平台安装文件"
#. Tag: para
#: install-methods.xml:180
@@ -324,13 +289,18 @@ msgid ""
"a bootable USB stick with the installer can be obtained from &armmp-hd-media-"
"tarball;."
msgstr ""
+"由 armhf 多平台内核(请参见 <xref linkend=\"armhf-armmp-supported-platforms"
+"\"/>)支持的系统的安装文件包括 Lixux 内核映像、标准 Linux 初始虚拟硬盘映像和"
+"基于系统的设备树 blob。用于 tftp 引导的内核和初始虚拟硬盘映像可以从 &armmp-"
+"firmware-img; 中得到,而设备树 blog 可以从 &armmp-dtb-img; 得到。生成带有安装"
+"程序的可引导 U 盘的 tar 档案可以从 &armmp-hd-media-tarball; 得到。"
#. Tag: para
#: install-methods.xml:192
#, no-c-format
msgid ""
"U-boot images for various armhf platforms are available at &armmp-uboot-img;."
-msgstr ""
+msgstr "各个 armhf 平台的 U-boot 映像可以在 &armmp-uboot-img; 得到。"
#. Tag: title
#: install-methods.xml:238
@@ -340,18 +310,7 @@ msgstr "为从 U 盘引导准备文件"
#. Tag: para
#: install-methods.xml:240
-#, fuzzy, no-c-format
-#| msgid ""
-#| "To prepare the USB stick, you will need a system where GNU/Linux is "
-#| "already running and where USB is supported. With current GNU/Linux "
-#| "systems the USB stick should be automatically recognized when you insert "
-#| "it. If it is not you should check that the usb-storage kernel module is "
-#| "loaded. When the USB stick is inserted, it will be mapped to a device "
-#| "named <filename>/dev/sdX</filename>, where the <quote>X</quote> is a "
-#| "letter in the range a-z. You should be able to see to which device the "
-#| "USB stick was mapped by running the command <command>dmesg</command> "
-#| "after inserting it. To write to your stick, you may have to turn off its "
-#| "write protection switch."
+#, no-c-format
msgid ""
"To prepare the USB stick, we recommend to use a system where GNU/Linux is "
"already running and where USB is supported. With current GNU/Linux systems "
@@ -363,12 +322,12 @@ msgid ""
"running the command <command>dmesg</command> after inserting it. To write to "
"your stick, you may have to turn off its write protection switch."
msgstr ""
-"为了准备 U 盘,您需要一台运行的支持 USB 的 GNU/Linux 系统。当前的 GNU/Linux "
-"系统会在您插入 U 盘的时候自动识别。如果没有,您应该确认 usb-storage 内核模块"
-"是否已经被加载。U 盘插入后,它将被映射到名为 <filename>/dev/sdX</filename> 的"
-"设备,其中的 <quote>X</quote> 是 a-z 的字母。您可以通过运行 <command>dmesg</"
-"command> 在插入 U 盘后确认是否被正确映射。要写入信息,请要先打开它上面的写保"
-"护开关。"
+"为了准备 U 盘,推荐使用一台运行的支持 USB 的 GNU/Linux 系统。当前的 GNU/"
+"Linux 系统会在您插入 U 盘的时候自动识别。如果没有,您应该确认 usb-storage 内"
+"核模块是否已经被加载。U 盘插入后,它将被映射到名为 <filename>/dev/sdX</"
+"filename> 的设备,其中的 <quote>X</quote> 是 a-z 的字母。您可以通过运行 "
+"<command>dmesg</command> 在插入 U 盘后确认是否被正确映射。要写入信息,请要先"
+"打开它上面的写保护开关。"
#. Tag: para
#: install-methods.xml:253
@@ -384,28 +343,22 @@ msgstr ""
#. Tag: title
#: install-methods.xml:263
-#, fuzzy, no-c-format
-#| msgid "Preparing a USB stick using a hybrid CD or DVD image"
+#, no-c-format
msgid "Preparing a USB stick using a hybrid CD/DVD image"
-msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
+msgstr "使用混合 CD/DVD 映像制作 U 盘"
#. Tag: para
#: install-methods.xml:264
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Debian CD and DVD images can now be written directly a USB stick, which "
-#| "is a very easy way to make a bootable USB stick. Simply choose a CD or "
-#| "DVD image that will fit on your USB stick. See <xref linkend=\"official-"
-#| "cdrom\"/> to get a CD or DVD image."
+#, no-c-format
msgid ""
"Debian installation images can now be written directly to a USB stick, which "
"is a very easy way to make a bootable USB stick. Simply choose an image "
"(such as the netinst, CD, DVD-1, or netboot) that will fit on your USB "
"stick. See <xref linkend=\"official-cdrom\"/> to get an installation image."
msgstr ""
-"现在 Debian CD 和 DVD 映像可以直接写入 U 盘,这是非常简单的制作启动 U 盘的方"
-"法。只需为 U 盘选择一个合适的 CD 或 DVD 映像。参阅 <xref linkend=\"official-"
-"cdrom\"/> 获取 CD 或 DVD 映像。"
+"现在 Debian安装映像可以直接写入 U 盘,这是非常简单的制作启动 U 盘的方法。只需"
+"为 U 盘选择一个映像(如 netint、CD、DVD-1 或 netboot)。参阅 <xref linkend="
+"\"official-cdrom\"/> 获取安装映像。"
#. Tag: para
#: install-methods.xml:272
@@ -421,12 +374,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:279
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The CD or DVD image you choose should be written directly to the USB "
-#| "stick, overwriting its current contents. For example, when using an "
-#| "existing GNU/Linux system, the CD or DVD image file can be written to a "
-#| "USB stick as follows, after having made sure that the stick is unmounted:"
+#, no-c-format
msgid ""
"The installation image you choose should be written directly to the USB "
"stick, overwriting its current contents. For example, when using an existing "
@@ -440,9 +388,14 @@ msgid ""
"operating systems can be found in the <ulink url=\"&url-debian-cd-faq-write-"
"usb;\">Debian CD FAQ</ulink>."
msgstr ""
-"您选中的 CD 或 DVD 映像应该被直接写入 U 盘,覆盖它当前的内容。例如,使用已有"
-"的 GNU/Linux 系统,CD 或 DVD 映像文件可以参照下面方法写入 U 盘,写之前请确认 "
-"U 盘已经卸载:"
+"您选中的安装映像应该被直接写入 U 盘,覆盖它当前的内容。例如,使用已有的 GNU/"
+"Linux 系统,映像文件可以参照下面方法写入 U 盘,写之前请确认 U 盘已经卸载: "
+"<informalexample><screen>\n"
+"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
+"<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
+"</screen></informalexample>在其它操作系统上如何做的信息可以在<ulink url="
+"\"&url-debian-cd-faq-write-usb;\">Debian CD FAQ</ulink>中找到。"
#. Tag: para
#: install-methods.xml:291
@@ -452,21 +405,19 @@ msgid ""
"g. /dev/sdb and not /dev/sdb1. Do not use tools like <command>unetbootin</"
"command> which alter the image."
msgstr ""
+"映像必须写入整个盘设备上而不是分区上,例如 /dev/sdb 而不是 /dev/sdb1。不要使"
+"用 <command>unetbootin</command> 的工具,它会更改映像。"
#. Tag: para
#: install-methods.xml:297
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Simply writing the CD or DVD image to USB like this should work fine for "
-#| "most users. The other options below are more complex, mainly for people "
-#| "with specialised needs."
+#, no-c-format
msgid ""
"Simply writing the installation image to USB like this should work fine for "
"most users. The other options below are more complex, mainly for people with "
"specialised needs."
msgstr ""
-"对大多数用户来说,简单地把 CD 或 DVD 映像写入 U 盘已经够用。下面更为复杂的选"
-"项主要提供给有特殊需要的用户。"
+"对大多数用户来说,简单地把安装映像写入 U 盘已经够用。下面更为复杂的选项主要提"
+"供给有特殊需要的用户。"
#. Tag: para
#: install-methods.xml:305
@@ -477,6 +428,9 @@ msgid ""
"packages or any other files of your choice. This could be useful if you have "
"only one stick or just want to keep everything you need on one device."
msgstr ""
+"U 盘上的混合映像不占据所有的存储空间,所以会值得考虑使用空余的空间来保存您选"
+"择的固件文件、软件包或任何其它文件。如果只有一块 U 盘或者只想将所需要的设备保"
+"存在一个设备上,这回有用。"
#. Tag: para
#: install-methods.xml:313
@@ -485,6 +439,8 @@ msgid ""
"Create a second, FAT partition on the stick, mount the partition and copy or "
"unpack the firmware onto it. For example:"
msgstr ""
+"在 U 盘上建立第二个,FAT格式的分区,挂载分期,并将固件解压并复制到上面。例"
+"如:"
#. Tag: screen
#: install-methods.xml:318
@@ -511,28 +467,25 @@ msgid ""
"nicely, it will already be present. Unplugging and replugging the USB stick "
"should make the two partitions visible."
msgstr ""
+"可以将 <filename>mini.iso</filename> 写到 U 盘上。在这种情况下,不必建立第二"
+"个分区,因为非常好地,它已经出现了。拔下在插上 U 盘将会使两个分区可见。"
#. Tag: title
#: install-methods.xml:334
#, no-c-format
msgid "Manually copying files to the USB stick"
-msgstr "手动复制文件到 U 盘。"
+msgstr "手动复制文件到 U 盘"
#. Tag: para
#: install-methods.xml:335
-#, fuzzy, no-c-format
-#| msgid ""
-#| "An alternative way to set up your USB stick is to manually copy the "
-#| "installer files, and also a CD image to it. Note that the USB stick "
-#| "should be at least 1 GB in size (smaller setups are possible if you "
-#| "follow <xref linkend=\"usb-copy-flexible\"/>)."
+#, no-c-format
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
"installer files, and also an installation image to it. Note that the USB "
"stick should be at least 1 GB in size (smaller setups are possible if you "
"follow <xref linkend=\"usb-copy-flexible\"/>)."
msgstr ""
-"另一种方法制作 U 盘是手动复制安装文件和 CD 映像。注意 U 盘最小容量为 1 GB (也"
+"另一种方法制作 U 盘是手动复制安装文件和安装映像。注意 U 盘最小容量为 1 GB (也"
"可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
@@ -595,16 +548,7 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
#: install-methods.xml:373
-#, fuzzy, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch="
-#| "\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</"
-#| "userinput>),</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a &debian; ISO "
-#| "image (netinst or full CD) to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
+#, no-c-format
msgid ""
"After that, mount the USB memory stick <phrase arch="
"\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</"
@@ -620,7 +564,7 @@ msgstr ""
"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
"userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>,然后复制 "
-"&debian; ISO 映像 (netinst 或完整的 CD) 到里面。卸载 U 盘 "
+"&debian; ISO 映像 (netinst 或完整的 CD/DVD) 到里面。卸载 U 盘 "
"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
@@ -631,13 +575,7 @@ msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
#: install-methods.xml:391
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you like more flexibility or just want to know what's going on, you "
-#| "should use the following method to put the files on your stick. One "
-#| "advantage of using this method is that &mdash; if the capacity of your "
-#| "USB stick is large enough &mdash; you have the option of copying a full "
-#| "CD ISO image to it."
+#, no-c-format
msgid ""
"If you like more flexibility or just want to know what's going on, you "
"should use the following method to put the files on your stick. One "
@@ -646,7 +584,8 @@ msgid ""
"even a DVD image, to it."
msgstr ""
"如果您需要更多的灵活性,或者只是想了解其间发生了什么,应该使用如下的方法来把"
-"文件放到 U 盘。"
+"文件放到 U 盘。使用这个方法的一个优点是,&mdash; 如果 U 盘的足够大&mdash;,那"
+"么可以选择将任何 ISO 映像复制到上面,甚至是 DVD 映像。"
#. Tag: title
#: install-methods.xml:406 install-methods.xml:528
@@ -696,15 +635,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:436
-#, fuzzy, no-c-format
-#| msgid ""
-#| "In order to start the kernel after booting from the USB stick, we will "
-#| "put a boot loader on the stick. Although any boot loader (e.g. "
-#| "<classname>lilo</classname>) should work, it's convenient to use "
-#| "<classname>syslinux</classname>, since it uses a FAT16 partition and can "
-#| "be reconfigured by just editing a text file. Any operating system which "
-#| "supports the FAT file system can be used to make changes to the "
-#| "configuration of the boot loader."
+#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
"boot loader on the stick. Although any boot loader should work, it's "
@@ -714,10 +645,9 @@ msgid ""
"configuration of the boot loader."
msgstr ""
"为了在 U 盘引导后启动内核,我们要在 U 盘上放入一个 boot loader。尽管任何 "
-"boot loader (比如 <classname>lilo</classname>)都应该可以胜任,不过还是使用 "
-"<classname>syslinux</classname> 更方便。主要原因是它可以使用 FAT16 分区,而且"
-"只需要编辑一个文本文件就能对其进行配置。任何支持 FAT 文件系统的操作系统都可以"
-"用来改变 boot loader 的配置文件。"
+"boot loader 都应该可以胜任,不过还是使用 <classname>syslinux</classname> 更方"
+"便。主要原因是它可以使用 FAT16 分区,而且只需要编辑一个文本文件就能对其进行配"
+"置。任何支持 FAT 文件系统的操作系统都可以用来改变 boot loader 的配置文件。"
#. Tag: para
#: install-methods.xml:446
@@ -750,18 +680,7 @@ msgstr "添加安装程序映像"
#. Tag: para
#: install-methods.xml:464
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</"
-#| "replaceable> /mnt</userinput>) and copy the following installer image "
-#| "files to the stick: <itemizedlist> <listitem><para> <filename>vmlinuz</"
-#| "filename> or <filename>linux</filename> (kernel binary) </para></"
-#| "listitem> <listitem><para> <filename>initrd.gz</filename> (initial "
-#| "ramdisk image) </para></listitem> </itemizedlist> You can choose between "
-#| "either the regular version or the graphical version of the installer. The "
-#| "latter can be found in the <filename>gtk</filename> subdirectory. If you "
-#| "want to rename the files, please note that <classname>syslinux</"
-#| "classname> can only process DOS (8.3) file names."
+#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
"mnt</userinput>) and copy the following installer image files to the stick: "
@@ -785,18 +704,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:488
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Next you should create a <filename>syslinux.cfg</filename> configuration "
-#| "file, which at a bare minimum should contain the following two lines "
-#| "(change the name of the kernel binary to <quote><filename>linux</"
-#| "filename></quote> if you used a <filename>netboot</filename> image): "
-#| "<informalexample><screen>\n"
-#| "default vmlinuz\n"
-#| "append initrd=initrd.gz\n"
-#| "</screen></informalexample> For the graphical installer you should add "
-#| "<userinput>vga=788</userinput> to the second line. Other parameters can "
-#| "be appended as desired."
+#, no-c-format
msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
"file, which at a bare minimum should contain the following line (change the "
@@ -808,11 +716,11 @@ msgid ""
"as desired."
msgstr ""
"接下来,您需要创建一个 <filename>syslinux.cfg</filename> 配置文件,里面最少要"
-"包含下面两行(如果您使用 <filename>netboot</filename> 映象,修改内核文件名为 "
-"<quote><filename>linux</filename></quote> ):<informalexample><screen>\n"
+"包含下面的行(如果使用 <filename>netboot</filename> 映象,修改内核文件的名称"
+"为 <quote><filename>linux</filename></quote> ):<informalexample><screen>\n"
"default vmlinuz initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序,您需要添加 <userinput>vga=788</"
-"userinput> 到第二行尾部。还可以添加其他的参数。"
+"</screen></informalexample> 对于图形安装程序,需要添加 <userinput>vga=788</"
+"userinput> 到这行的尾部。还可以添加其他的参数。"
#. Tag: para
#: install-methods.xml:500
@@ -825,15 +733,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:505
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy "
-#| "the ISO file of a &debian; ISO image<footnote> <para> You can use either "
-#| "a netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
+#, no-c-format
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
"ISO file of a &debian; ISO image<footnote> <para> You can use either a "
@@ -844,8 +744,8 @@ msgid ""
"(<userinput>umount /mnt</userinput>)."
msgstr ""
"如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映像"
-"文件<footnote> <para> 您可以选择 netinst 或完整 CD 映像 (参阅 <xref linkend="
-"\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"文件<footnote> <para> 您可以选择 netinst 或完整 CD/DVD 映像 (参阅 <xref "
+"linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
"<filename>mini.iso</filename></quote> 映象在这里并不适用。</para> </"
"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
@@ -1021,11 +921,7 @@ msgstr "为从硬盘引导准备文件"
#. Tag: para
#: install-methods.xml:644
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The installer may be booted using boot files placed on an existing hard "
-#| "drive partition, either launched from another operating system or by "
-#| "invoking a boot loader directly from the BIOS."
+#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
"drive partition, either launched from another operating system or by "
@@ -1034,24 +930,19 @@ msgid ""
"boot loader."
msgstr ""
"安装程序可以从硬盘分区上面用引导文件引导。它们可以在其它操作系统下面启动,或"
-"者直接使用 BIOS 提供的引导装载程序直接启动。"
+"者直接使用 BIOS 提供的引导装载程序直接启动。在现代的 UEFI 系统上,内核可以直"
+"接从 UEFI 分区引导,而无需引导程序。"
#. Tag: para
#: install-methods.xml:652
-#, fuzzy, no-c-format
-#| msgid ""
-#| "A full, <quote>pure network</quote> installation can be achieved using "
-#| "this technique. This avoids all hassles of removable media, like finding "
-#| "and burning CD images or struggling with too numerous and unreliable "
-#| "floppy disks."
+#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
"technique. This avoids all hassles of removable media, like finding and "
"burning CD/DVD images."
msgstr ""
"采用这个技术可以实现完全的<quote>纯网络</quote>的安装方式。这样可以避免一些使"
-"用可移动介质带来的的缺点,比如寻找和刻录 CD 映像,或是与大量且不可靠的软盘纠"
-"缠不清。"
+"用可移动介质带来的的缺点,比如寻找和刻录 CD/DVD 映像。"
#. Tag: para
#: install-methods.xml:658
@@ -1086,47 +977,34 @@ msgstr ""
#. Tag: title
#: install-methods.xml:678
-#, fuzzy, no-c-format
-#| msgid "Hard disk installer booting using <command>loadlin</command>"
+#, no-c-format
msgid "Hard disk installer booting from Linux using <command>GRUB</command>"
-msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
+msgstr "硬盘安装程序从 Linux 引导使用 <command>GRUB</command>"
#. Tag: para
#: install-methods.xml:680
-#, fuzzy, no-c-format
-#| msgid ""
-#| "This section explains how to add to or even replace an existing linux "
-#| "installation using either <command>LILO</command> or <command>GRUB</"
-#| "command>."
+#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
"installation using <command>GRUB</command>."
msgstr ""
-"这一节将解释如何增加或者甚至替换现有的 linux 安装,通过 <command>LILO</"
-"command> 或 <command>GRUB</command>。"
+"这一节将解释如何增加或者甚至替换现有的 linux 安装,通过<command>GRUB</"
+"command>。"
#. Tag: para
#: install-methods.xml:686
-#, fuzzy, no-c-format
-#| msgid ""
-#| "At boot time, both bootloaders support loading in memory not only the "
-#| "kernel, but also a disk image. This RAM disk can be used as the root file-"
-#| "system by the kernel."
+#, no-c-format
msgid ""
"At boot time, <command>GRUB</command> supports loading in memory not only "
"the kernel, but also a disk image. This RAM disk can be used as the root "
"file-system by the kernel."
msgstr ""
-"在启动时,两种 bootloader 都支持将内核和磁盘映像加载到内存中。这个内存虚拟磁"
-"盘可以被用做内核的根文件系统。"
+"在启动时,<command>GRUB</command> 支持将内核和磁盘映像加载到内存中。这个内存"
+"虚拟磁盘可以被用做内核的根文件系统。"
#. Tag: para
#: install-methods.xml:692
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Copy the following files from the &debian; archives to a convenient "
-#| "location on your hard drive (note that LILO can not boot from files on an "
-#| "NTFS file system), for instance to <filename>/boot/newinstall/</filename>."
+#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
"on your hard drive, for instance to <filename>/boot/newinstall/</filename>."
@@ -1162,7 +1040,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:720
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"Alternatively, if you intend to keep an existing partition on the hard drive "
"unchanged during the install, you can download the &x86-hdmedia-initrd; file "
@@ -1172,9 +1050,9 @@ msgid ""
"the installation image, without needing the network."
msgstr ""
"另一种方法,可以在安装时保持原硬盘的分区不变,您需要下载 &x86-hdmedia-"
-"initrd; 文件以及对应的内核,还需要一个 CD(或者 DVD) iso 文件的副本放在硬盘"
+"initrd; 文件以及对应的内核 &x86-hdmedia-vmlinuz;,还需要将安装文件复制到硬盘"
"上(确认文件名是以 <literal>.iso</literal> 结尾的)。这样安装程序就可以从硬盘"
-"引导,并从 CD/DVD 映像文件上安装,而不使用网络。"
+"引导,并从安装映像上安装,而无需使用网络。"
#. Tag: para
#: install-methods.xml:728
@@ -1186,10 +1064,9 @@ msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/
#. Tag: title
#: install-methods.xml:738
-#, fuzzy, no-c-format
-#| msgid "Hard disk installer booting using <command>loadlin</command>"
+#, no-c-format
msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
-msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
+msgstr "硬盘安装程序从 DOS 引导,使用 <command>loadlin</command>"
#. Tag: para
#: install-methods.xml:739
@@ -1202,14 +1079,11 @@ msgstr ""
#. Tag: para
#: install-methods.xml:744
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Copy the following directories from a &debian; CD image to <filename>c:"
-#| "\\</filename>."
+#, no-c-format
msgid ""
"Copy the following directories from a &debian; installation image to "
"<filename>c:\\</filename>."
-msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
+msgstr "从 &debian; 安装映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
#: install-methods.xml:749
@@ -1331,15 +1205,7 @@ msgstr "设置 RARP 服务器"
#. Tag: para
#: install-methods.xml:932
-#, fuzzy, no-c-format
-#| msgid ""
-#| "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
-#| "address) of the client computers to be installed. If you don't know this "
-#| "information, you can <phrase arch=\"sparc\"> pick it off the initial "
-#| "OpenPROM boot messages, use the OpenBoot <userinput>.enet-addr</"
-#| "userinput> command, or </phrase> boot into <quote>Rescue</quote> mode (e."
-#| "g., from the rescue floppy) and use the command <userinput>ip addr show "
-#| "dev eth0</userinput>."
+#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
"address) of the client computers to be installed. If you don't know this "
@@ -1351,23 +1217,12 @@ msgstr ""
"为了设置 RARP,需要知道需要安装系统的客户机以太网卡地址(网卡 MAC 地址)。如果"
"您还不知道这个信息,可以<phrase arch=\"sparc\">从 OpenPROM 的初始化引导信息中"
"获得,请使用 OpenBoot <userinput>.enet-addr</userinput> 命令,或者</phrase> "
-"启动进入<quote>Rescue</quote> 模式(例如使用恢复软盘)并使用 <userinput>ip "
-"addr show dev eth0</userinput> 命令。"
+"启动进入<quote>Rescue</quote> 模式,并使用 <userinput>ip addr show dev eth0</"
+"userinput> 命令。"
#. Tag: para
#: install-methods.xml:944
-#, fuzzy, no-c-format
-#| msgid ""
-#| "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/"
-#| "SunOS, you use the <command>rarpd</command> program. You need to ensure "
-#| "that the Ethernet hardware address for the client is listed in the "
-#| "<quote>ethers</quote> database (either in the <filename>/etc/ethers</"
-#| "filename> file, or via NIS/NIS+) and in the <quote>hosts</quote> "
-#| "database. Then you need to start the RARP daemon. Issue the command (as "
-#| "root): <userinput>/usr/sbin/rarpd -a</userinput> on most Linux systems "
-#| "and SunOS 5 (Solaris 2), <userinput>/usr/sbin/in.rarpd -a</userinput> on "
-#| "some other Linux systems, or <userinput>/usr/etc/rarpd -a</userinput> in "
-#| "SunOS 4 (Solaris 1)."
+#, no-c-format
msgid ""
"On a RARP server system using a Linux kernel or Solaris/SunOS, you use the "
"<command>rarpd</command> program. You need to ensure that the Ethernet "
@@ -1379,8 +1234,8 @@ msgid ""
"sbin/in.rarpd -a</userinput> on some other Linux systems, or <userinput>/usr/"
"etc/rarpd -a</userinput> in SunOS 4 (Solaris 1)."
msgstr ""
-"在一个使用 Linux 2.4 或 2.6 内核的 RARP 服务器系统,或者 Solaris/SunOS 上,使"
-"用 <command>rarpd</command> 程序。您需要确定客户机的以太网硬件地址已经列在 "
+"在一个使用 Linux 内核的 RARP 服务器系统,或者 Solaris/SunOS 上,使用 "
+"<command>rarpd</command> 程序。您需要确定客户机的以太网硬件地址已经列在 "
"<quote>ethers</quote> 数据库(可以在 <filename>/etc/ethers</filename> 文件中或"
"通过 NIS/NIS+)和 <quote>hosts</quote> 数据库中,然后您需要启动 RARP 守护程"
"序。使用(以 root 身份):在多数 Linux 系统和 SunOS 5 (Solaris 2) 上使用 "
@@ -1559,7 +1414,7 @@ msgstr ""
msgid ""
"If your machine uses UEFI to boot, you will have to specify a boot loader "
"appropriate for UEFI machines, for example"
-msgstr ""
+msgstr "如果机器使用 UEFI 来引导,那么必须指定适于 UEFI 机器的引导程序,例如"
#. Tag: screen
#: install-methods.xml:1008
@@ -1574,6 +1429,14 @@ msgid ""
" }\n"
"}"
msgstr ""
+"group {\n"
+" next-server 192.168.1.3;\n"
+" host tftpclient {\n"
+"# tftp client hardware address\n"
+" hardware ethernet 00:10:DC:27:6C:15;\n"
+" filename \"debian-installer/amd64/bootnetx64.efi\";\n"
+" }\n"
+"}"
#. Tag: title
#: install-methods.xml:1021
@@ -1836,13 +1699,7 @@ msgstr "boot.msg"
#. Tag: para
#: install-methods.xml:1183
-#, fuzzy, no-c-format
-#| msgid ""
-#| "For PXE booting, everything you should need is set up in the "
-#| "<filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this "
-#| "tarball into the <command>tftpd</command> boot image directory. Make sure "
-#| "your dhcp server is configured to pass <filename>pxelinux.0</filename> to "
-#| "<command>tftpd</command> as the filename to boot."
+#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
"<filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this "
@@ -1855,7 +1712,9 @@ msgstr ""
"对于用 PXE 引导来说,您所需的只是建立 <filename>netboot/netboot.tar.gz</"
"filename> 压缩包。只须将此包解压到 <command>tftpd</command> 引导映像目录下。"
"并确保您的 DHCP 服务器的配置将会把 <filename>pxelinux.0</filename> 作为启动所"
-"需的文件名传递给 <command>tftpd</command>。"
+"需的文件名传递给 <command>tftpd</command>。对于 UEFI 机器,需要传递适当的 "
+"EFI 引导映像名称(如 <filename>/debian-installer/amd64/bootnetx64.efi</"
+"filename>)。"
#. Tag: para
#: install-methods.xml:1193
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 1f6f673c3..39157e02c 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -1,12 +1,13 @@
# 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: 2020-09-15 11:36+0000\n"
+"PO-Revision-Date: 2020-10-19 08:55+0000\n"
"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -14,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: installation-howto.xml:5
@@ -211,12 +212,7 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:123
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Some BIOSes can boot USB storage directly, and some cannot. You may need "
-#| "to configure your BIOS to boot from a <quote>removable drive</quote> or "
-#| "even a <quote>USB-ZIP</quote> to get it to boot from the USB device. For "
-#| "helpful hints and details, see <xref linkend=\"usb-boot-x86\"/>."
+#, no-c-format
msgid ""
"While booting from USB storage is quite common on UEFI systems, this is "
"somewhat different in the older BIOS world. Some BIOSes can boot USB storage "
@@ -226,10 +222,12 @@ msgid ""
"<quote>USB-HDD</quote> to get it to boot from the USB device. For helpful "
"hints and details, see <xref linkend=\"usb-boot-x86\"/>."
msgstr ""
-"有些 BIOS 支持直接从 USB 的存储设备启动,有些不行。您或许需要设置一下 BIOS 让"
-"您的机器从 <quote>removable drive</quote> 或是 <quote>USB-ZIP</quote> 启动,"
-"以使计算机能从 USB 设备引导。参阅<xref linkend=\"usb-boot-x86\"/>,查看一些有"
-"用的提示和具体的细节说明。"
+"从 USB 存储设备启动在 UEFI 系统上非常常见,这与较老的 BIOS 不同。有些 BIOSes "
+"支持直接从 USB 的存储设备启动,有些不行。您或许需要设置一下 BIOS/UEFI 来允许 "
+"<quote>USB legacy support</quote>或<quote>Legacy support</quote>。启动设备选"
+"择菜单应该显示 <quote>removable drive</quote> 或是 <quote>USB-ZIP</quote>,以"
+"使计算机能从 USB 设备引导。参阅<xref linkend=\"usb-boot-x86\"/>,查看一些有用"
+"的提示和具体的细节说明。"
#. Tag: para
#: installation-howto.xml:134
@@ -367,15 +365,7 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:213
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Setting up your clock and time zone is followed by the creation of user "
-#| "accounts. By default you are asked to provide a password for the "
-#| "<quote>root</quote> (administrator) account and information necessary to "
-#| "create one regular user account. If you do not specify a password for the "
-#| "<quote>root</quote> user this account will be disabled but the "
-#| "<command>sudo</command> package will be installed later to enable "
-#| "administrative tasks to be carried out on the new system."
+#, no-c-format
msgid ""
"Setting up the network is followed by the creation of user accounts. By "
"default you are asked to provide a password for the <quote>root</quote> "
@@ -386,10 +376,11 @@ msgid ""
"new system. By default, the first user created on the system will be allowed "
"to use the <command>sudo</command> command to become root."
msgstr ""
-"设置您的时钟和时区,然后创建用户帐户。默认情况下,您将会要求为 <quote>root</"
-"quote>(管理员)帐户提供密码,并创建一个常规用户帐户。如果您没有为 "
-"<quote>root</quote> 用户指定密码,则此帐户将被禁用,但稍后将安装 "
-"<command>sudo</command> 软件包,以便在新系统上执行管理任务。"
+"设置网络,然后创建用户帐户。默认情况下,您将会要求为 <quote>root</quote>(管"
+"理员)帐户提供密码,并创建一个常规用户帐户。如果您没有为 <quote>root</quote> "
+"用户指定密码,则此帐户将被禁用,但稍后将安装 <command>sudo</command> 软件包,"
+"以便在新系统上执行管理任务。默认系统创建的第一个用户被允许使用 "
+"<command>sudo</command> 命令而称为 root。"
#. Tag: para
#: installation-howto.xml:224
@@ -487,14 +478,7 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:276
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The last step is to install a boot loader. If the installer detects other "
-#| "operating systems on your computer, it will add them to the boot menu and "
-#| "let you know. <phrase arch=\"any-x86\">By default GRUB will be installed "
-#| "to the master boot record of the first harddrive, which is generally a "
-#| "good choice. You'll be given the opportunity to override that choice and "
-#| "install it elsewhere. </phrase>"
+#, no-c-format
msgid ""
"The last step is to install a boot loader. If the installer detects other "
"operating systems on your computer, it will add them to the boot menu and "
@@ -505,8 +489,8 @@ msgid ""
msgstr ""
"最后一步就是安装启动引导器了。如果安装程序发现您的计算机还安装有其它的操作系"
"统,它会把它们加入启动菜单,并通知您。<phrase arch=\"any-x86\">缺省情况下,"
-"GRUB 将安装到第一块硬盘的引导记录上。一般来说,这样做没什么问题。您也可以不让"
-"它这样做,而是把 GRUB 装在其它什么地方。</phrase>"
+"GRUB 将安装到主硬盘的 UEFI 引导记录上。一般来说,这样做没什么问题。您也可以不"
+"让它这样做,而是把 GRUB 装在其它什么地方。</phrase>"
#. Tag: para
#: installation-howto.xml:286
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 48c2fba88..0400b7830 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -1,11 +1,13 @@
# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Ji YongGang <jungleji@gmail.com>, 2012.
+# 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-12 23:02+0000\n"
-"PO-Revision-Date: 2020-09-15 11:36+0000\n"
+"PO-Revision-Date: 2020-10-19 08:55+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"
@@ -13,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: partitioning.xml:5
@@ -402,6 +404,9 @@ msgid ""
"disk space for the root partition including <filename>/usr</filename>, or "
"5&ndash;6GB for a workstation or a server installation."
msgstr ""
+"现在推荐将<filename>/usr</filename>放置在根分区<filename>/</filename>,否则可"
+"能会在启动时导致一些问题。这意味着为根分区提供至少 600&ndash;750MB 的磁盘空间"
+"来包括<filename>/usr</filename>,或者对于工作站或服务器安装为 5&ndash;6GB。"
#. Tag: para
#: partitioning.xml:187
@@ -807,8 +812,7 @@ msgstr ""
"&arch-title; <command>fdisk</command> 的版本; 请阅读 <ulink url=\"fdasd.txt"
"\">fdasd 手册页</ulink>或者 <ulink url=\"http://oss.software.ibm.com/"
"developerworks/opensource/linux390/docu/l390dd08.pdf\"> Device Drivers and "
-"\"\n"
-"\"Installation Commands</ulink> 的第 13 章获得详细信息。"
+"Installation Commands</ulink> 的第 13 章获得详细信息。"
#. Tag: para
#: partitioning.xml:506
@@ -851,7 +855,7 @@ msgstr ""
#: partitioning.xml:786 partitioning.xml:863
#, no-c-format
msgid "Partitioning for &arch-title;"
-msgstr "为 &arch-title; 准备分区"
+msgstr "为 &arch-title; 分区"
#. Tag: para
#: partitioning.xml:533
@@ -893,6 +897,12 @@ msgid ""
"BIOS world the default value is <quote>msdos</quote>. In a standard priority "
"installation those defaults will be used automatically."
msgstr ""
+"如果使用新的硬盘(或者想要擦除硬盘上的整个分区表),那么需要创建新的分区表。"
+"<quote>Guided partitioning</quote> 会自动做这件事,但当手动分区时,需要在磁盘"
+"的顶层入口移动选项并点击 &enterkey; 按键。这会在磁盘上创建新的分区表。在专家"
+"模式中,然后您会被询问分区表的类型。基于 UEFI 系统默认为 <quote>gpt</quote>,"
+"而对于较旧的 BIOS 默认值为 <quote>msdos</quote>。在标准的优先安装中,会自动使"
+"用这些默认值。"
#. Tag: para
#: partitioning.xml:569
@@ -903,6 +913,8 @@ msgid ""
"the beginning of the disk. This is intended and required to embed the GRUB2 "
"bootloader."
msgstr ""
+"当选择 <quote>gpt</quote> 类型(对于 UEFI 系统是默认的)的分区表时,在磁盘的"
+"开始部分自动创建空余的 1MB 空间。这会要求用于嵌入 GRUB2 启动引导程序。"
#. Tag: para
#: partitioning.xml:576
@@ -923,15 +935,7 @@ msgstr ""
#. Tag: para
#: partitioning.xml:586
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The PC BIOS generally adds additional constraints for disk partitioning. "
-#| "There is a limit to how many <quote>primary</quote> and <quote>logical</"
-#| "quote> partitions a drive can contain. Additionally, with pre "
-#| "1994&ndash;98 BIOSes, there are limits to where on the drive the BIOS can "
-#| "boot from. More information can be found in the <ulink url=\"&url-"
-#| "partition-howto;\">Linux Partition HOWTO</ulink>, but this section will "
-#| "include a brief overview to help you plan most situations."
+#, no-c-format
msgid ""
"While modern UEFI systems don't have such limitations as listed below, the "
"old PC BIOS generally adds additional constraints for disk partitioning. "
@@ -942,11 +946,12 @@ msgid ""
"Partition HOWTO</ulink>, but this section will include a brief overview to "
"help you plan most situations."
msgstr ""
-"PC BIOS 通常会对磁盘分区加入一些额外约束。一个是限制单一磁盘可以包含多少个"
-"<quote>主分区</quote>和<quote>逻辑分区</quote>。还有,在 1994&ndash;98 前的 "
-"BIOS 里,限制 BIOS 可以引导的磁盘。详细的信息可以在 <ulink url=\"&url-"
-"partition-howto;\">Linux Partition HOWTO</ulink> 找到,但是本节将包含一个简单"
-"的介绍,帮助您在大多数情况下进行规划。"
+"现代的 UEFI 系统没有下面列出的这样的限制,旧的 PC BIOS 通常会对磁盘分区加入一"
+"些额外约束。一个是限制单一磁盘可以包含多少个<quote>主分区</quote>和<quote>逻"
+"辑分区</quote>。还有,在 1994&ndash;98 前的 BIOS 里,限制 BIOS 可以引导的磁"
+"盘。详细的信息可以在 <ulink url=\"&url-partition-howto;\">Linux Partition "
+"HOWTO</ulink> 找到,但是本节将包含一个简单的介绍,帮助您在大多数情况下进行规"
+"划。"
#. Tag: para
#: partitioning.xml:597
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 8d559e3a1..2c0e88e58 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -1,18 +1,21 @@
# 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: 2016-12-29 08:03+0000\n"
-"PO-Revision-Date: 2010-10-27 23:21+0800\n"
-"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
+"PO-Revision-Date: 2020-10-19 21:44+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.3.1-dev\n"
#. Tag: title
#: preface.xml:5
@@ -47,10 +50,10 @@ msgid ""
"for when things go wrong. The Installation Howto can be found in <xref "
"linkend=\"installation-howto\"/>."
msgstr ""
-"我们也知道大多数用户都希望能够不用阅读本手册而直接安装 &debian;。&debian; 安"
-"装程序的设计意图也就是尽力实现这个想法。如果您现在的确没有时间来阅读整个安装"
-"手册,我们推荐您看看安装指南一文。该文包含了基本安装过程的简要介绍,以及当处"
-"理运行错误或需要较专业内容时查询本手册的链接。您可以在 <xref linkend="
+"我们也知道大多数用户都希望能够不用阅读本手册而直接安装 &debian;,而 &debian; "
+"安装程序的设计意图也就是尽力实现这个想法。如果您现在的确没有时间来阅读整个安"
+"装手册,我们推荐您看看安装指南一文。该文包含了基本安装过程的简要介绍,以及当"
+"处理运行错误或需要较专业内容时查询本手册的链接。您可以在 <xref linkend="
"\"installation-howto\"/> 阅读此文。"
#. Tag: para
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 4cefa5c13..c95dc9b59 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -1,12 +1,13 @@
# 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: 2020-09-15 11:36+0000\n"
+"PO-Revision-Date: 2020-10-19 08:55+0000\n"
"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -14,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: preparing.xml:5
@@ -1153,6 +1154,8 @@ msgid ""
"The minimum values assumes that swap will be enabled. The <quote>No desktop</"
"quote> value assumes that the non-graphical installer is used."
msgstr ""
+"最小值假设启动了交换文件。<quote>No desktop</quote>值假设使用非图形界面安装程"
+"序。"
#. Tag: para
#: preparing.xml:795
@@ -2240,17 +2243,7 @@ msgstr "BIOS 设置"
#. Tag: para
#: preparing.xml:1559
-#, fuzzy, no-c-format
-#| msgid ""
-#| "In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
-#| "have first boot a kernel into the system. The boot mechanism of this "
-#| "platform is inherently different to other ones, especially from PC-like "
-#| "systems: there are no floppy devices available at all. You will notice "
-#| "another big difference while you work with this platform: most (if not "
-#| "all) of the time you will work remote, with the help of some client "
-#| "session software like telnet, or a browser. This is due to that special "
-#| "system architecture where the 3215/3270 console is line-based instead of "
-#| "character-based."
+#, no-c-format
msgid ""
"In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
"have first boot a kernel into the system. The boot mechanism of this "
@@ -2262,10 +2255,10 @@ msgid ""
"instead of character-based."
msgstr ""
"为了安装 &debian-gnu; 到 &arch-title; 或者 zSeries 机器上,您首先要将内核引导"
-"进系统。在此平台上的启动机制与其他类型,特别是类 PC 的系统,有着本质上的不"
-"同:它根本就没有软盘驱动器。您还会注意到此平台上的另外一个显著差异:大多数(如"
-"果不是全部)的时间,您将借助于其他客户机上的 telnet 这样的软件或者一个浏览器,"
-"通过远程方式使用。这归因于该系统上的 3215/3270 控制台是线型,而不是字符型的。"
+"进系统。在此平台上的启动机制与其他类型有着本质上的不同,特别是类 PC 的系统,"
+"并且您还会注意到此平台上的另外一个显著差异:大多数(如果不是全部)的时间,您将"
+"借助于其他客户机上的 telnet 这样的软件或者一个浏览器,通过远程方式使用。这归"
+"因于该系统上的 3215/3270 控制台是线型,而不是字符型的。"
#. Tag: para
#: preparing.xml:1571
@@ -2761,22 +2754,7 @@ msgstr "禁用 Windows 的<quote>快速引导</quote>/<quote>快速启动</quote
#. Tag: para
#: preparing.xml:1880
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Windows 8 offers a feature called <quote>fast boot</quote> to cut down "
-#| "system startup time. Technically, when this feature is enabled, Windows 8 "
-#| "does not do a real shutdown and a real cold boot afterwards when ordered "
-#| "to shut down, but instead does something resembling a partial suspend to "
-#| "disk to reduce the <quote>boot</quote> time. As long as Windows 8 is the "
-#| "only operating system on the machine, this is unproblematic, but it can "
-#| "result in problems and data loss when you have a dual boot setup in which "
-#| "another operating system accesses the same filesystems as Windows 8 does. "
-#| "In that case the real state of the filesystem can be different from what "
-#| "Windows 8 believes it to be after the <quote>boot</quote> and this could "
-#| "cause filesystem corruption upon further write accesses to the "
-#| "filesystem. Therefore in a dual boot setup, to avoid filesystem "
-#| "corruption the <quote>fast boot</quote> feature has to be disabled within "
-#| "Windows."
+#, no-c-format
msgid ""
"Windows offers a feature (called <quote>fast boot</quote> in Windows 8, "
"<quote>fast startup</quote> in Windows 10) to cut down system startup time. "
@@ -2793,14 +2771,15 @@ msgid ""
"avoid filesystem corruption the <quote>fast boot</quote>/<quote>fast "
"startup</quote> feature has to be disabled within Windows."
msgstr ""
-"Windows 8 提供了一个名为<quote>快速启动</quote>的功能来减少系统启动时间。从技"
-"术上讲,当启用此功能时,Windows 8 在执行关机命令后不会进行真正的关机和真正的"
-"冷启动,而是执行类似于部分挂起到磁盘的操作,以减少引导时间。只要 Windows 8 是"
-"机器上唯一的操作系统,这就没问题,但当您有双引导时,若另一个操作系统与 "
-"Windows 8 访问相同的文件系统,这就有可能会导致问题和数据丢失。在这种情况下,"
-"文件系统的真实状态可能与 Windows 8 认为在<quote>启动</quote>之后的情况不同,"
-"并且可能在进一步写入文件系统时导致文件系统损坏。因此,在双引导设置中,为了避"
-"免文件系统损坏,必须在 Windows 中禁用<quote>快速启动</quote>功能。"
+"Windows 提供了一个(在 Windows 8 中名为<quote>快速引导</quote>,在 Windows "
+"10 中名为<quote>快速启动</quote>)的功能,来减少系统启动时间。从技术上讲,当"
+"启用此功能时,Windows 在执行关机命令后不会进行真正的关机和真正的冷启动,而是"
+"执行类似于部分挂起到磁盘的操作,以减少引导时间。只要 Windows 是机器上唯一的操"
+"作系统,这就没问题,但当您有双引导时,若另一个操作系统与 Windows 访问相同的文"
+"件系统,这就有可能会导致问题和数据丢失。在这种情况下,文件系统的真实状态可能"
+"与 Windows 认为在<quote>启动</quote>之后的情况不同,并且可能在进一步写入文件"
+"系统时导致文件系统损坏。因此,在双引导设置中,为了避免文件系统损坏,必须在 "
+"Windows 中禁用<quote>快速引导</quote>/<quote>快速启动</quote>功能。"
#. Tag: para
#: preparing.xml:1897
@@ -2810,6 +2789,8 @@ msgid ""
"automatically re-enable this feature, after it has been previously disabled "
"by the user. It is suggested to re-check this setting periodically."
msgstr ""
+"进一步,Windows 更新机制已知(有时)会自动启动这些特性,即使此前已经被用户关"
+"闭了。建议定期再次检查这个设置。"
#. Tag: para
#: preparing.xml:1902
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 55033a73a..0a990a096 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1,20 +1,21 @@
# 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-03 20:59+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-10-19 21:44+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.3.1-dev\n"
#. Tag: title
#: preseed.xml:16
@@ -124,17 +125,16 @@ msgstr "network"
#. Tag: entry
#: preseed.xml:76
-#, fuzzy, no-c-format
-#| msgid "CD/DVD"
+#, no-c-format
msgid "CD/DVD/USB"
-msgstr "CD/DVD"
+msgstr "CD/DVD/USB"
#. Tag: entry
#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:101
#, no-c-format
msgid "<entry>yes</entry>"
-msgstr "<entry>yes</entry>"
+msgstr "<entry>是</entry>"
#. Tag: para
#: preseed.xml:81
@@ -154,7 +154,7 @@ msgstr "netboot"
#: preseed.xml:90 preseed.xml:100
#, no-c-format
msgid "<entry>no</entry>"
-msgstr "<entry>no</entry>"
+msgstr "<entry>否</entry>"
#. Tag: entry
#: preseed.xml:93
@@ -177,14 +177,7 @@ msgstr "generic"
#. Tag: para
#: preseed.xml:107
-#, fuzzy, no-c-format
-#| msgid ""
-#| "An important difference between the preseeding methods is the point at "
-#| "which the preconfiguration file is loaded and processed. For initrd "
-#| "preseeding this is right at the start of the installation, before the "
-#| "first question is even asked. For file preseeding this is after the CD or "
-#| "CD image has been loaded. For network preseeding it is only after the "
-#| "network has been configured."
+#, no-c-format
msgid ""
"An important difference between the preseeding methods is the point at which "
"the preconfiguration file is loaded and processed. For initrd preseeding "
@@ -197,18 +190,14 @@ msgid ""
"after the network has been configured."
msgstr ""
"这些预置方法的主要不同之处在于何时预置文件被加载和处理。对于 initrd 方法,它"
-"是在第一个问题询问之前,安装开始的时候。对于 file 方法,它是在加载 CD 或 CD "
-"映像之后。对 network 方法,它在网络配置完毕之后。"
+"是在第一个问题询问之前,安装开始的时候。来自内核命令行的前置尽在其后发生。这"
+"样能够通过编辑内核命令行,来否决 initrd 中设置的配置(或者在 bootloader配置,"
+"或者对于允许的 bootloader 在引导时手动)。对于 file 方法,它是在加载安装映像"
+"之后。对 network 方法,它在网络配置完毕之后。"
#. Tag: para
#: preseed.xml:119
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Obviously, any questions that have been processed before the "
-#| "preconfiguration file is loaded cannot be preseeded (this will include "
-#| "questions that are only displayed at medium or low priority, like the "
-#| "first hardware detection run). <xref linkend=\"preseed-bootparms\"/> "
-#| "offers a way to avoid these questions being asked."
+#, no-c-format
msgid ""
"Obviously, any questions that have been processed before the "
"preconfiguration file is loaded cannot be preseeded (this will include "
@@ -218,20 +207,13 @@ msgid ""
"described in <xref linkend=\"preseed-bootparms\"/>."
msgstr ""
"显而易见,在加载预置文件之前需要的过程都不能被预置(这里面包括只在 medium 或 "
-"low 优先级出现的问题,像首先运行的硬件检测)。<xref linkend=\"preseed-"
-"bootparms\"/> 提供了避免这些问题被询问的方法。"
+"low 优先级出现的问题,像首先运行的硬件检测)。避免询问这些问题的不那么方便的方"
+"法,是通过引导参数来预置它们,如在<xref linkend=\"preseed-bootparms\"/>中描述"
+"的。"
#. Tag: para
#: preseed.xml:128
-#, fuzzy, no-c-format
-#| msgid ""
-#| "In order to avoid the questions that would normally appear before the "
-#| "preseeding occurs, you can start the installer in <quote>auto</quote> "
-#| "mode. This delays questions that would normally be asked too early for "
-#| "preseeding (i.e. language, country and keyboard selection) until after "
-#| "the network comes up, thus allowing them to be preseeded. It also runs "
-#| "the installation at critical priority, which avoids many unimportant "
-#| "questions. See <xref linkend=\"preseed-auto\"/> for details."
+#, no-c-format
msgid ""
"In order to easily avoid the questions that would normally appear before the "
"preseeding occurs, you can start the installer in <quote>auto</quote> mode. "
@@ -241,10 +223,10 @@ msgid ""
"at critical priority, which avoids many unimportant questions. See <xref "
"linkend=\"preseed-auto\"/> for details."
msgstr ""
-"为了避免在预置之前询问,您可以让安装程序运行在 <quote>auto</quote> 模式。它延"
-"迟了预置之前出现询问问题(例如,语言、国家和键盘选择),直至连上网络,使它们可"
-"以进行预置。它还让安装运行在 critical 优先级下,避免不重要的问题。参阅 <xref "
-"linkend=\"preseed-auto\"/> 了解详细信息。"
+"为了容易地避免在预置之前询问,您可以让安装程序运行在 <quote>auto</quote> 模"
+"式。它延迟了预置之前出现询问问题(例如,语言、国家和键盘选择),直至连上网络,"
+"使它们可以进行预置。它还让安装运行在 critical 优先级下,避免不重要的问题。参"
+"阅 <xref linkend=\"preseed-auto\"/> 了解详细信息。"
#. Tag: title
#: preseed.xml:142
@@ -272,16 +254,7 @@ msgstr "使用预置"
#. Tag: para
#: preseed.xml:218
-#, fuzzy, no-c-format
-#| msgid ""
-#| "You will first need to create a preconfiguration file and place it in the "
-#| "location from where you want to use it. Creating the preconfiguration "
-#| "file is covered later in this appendix. Putting it in the correct "
-#| "location is fairly straightforward for network preseeding or if you want "
-#| "to read the file off a floppy or usb-stick. If you want to include the "
-#| "file on a CD or DVD, you will have to remaster the ISO image. How to get "
-#| "the preconfiguration file included in the initrd is outside the scope of "
-#| "this document; please consult the developers' documentation for &d-i;."
+#, no-c-format
msgid ""
"You will first need to create a preconfiguration file and place it in the "
"location from where you want to use it. Creating the preconfiguration file "
@@ -293,10 +266,9 @@ msgid ""
"consult the developers' documentation for &d-i;."
msgstr ""
"您首先要创建一个预置文件,并将它置于希望使用的地方。创建预置文件在后面的附录"
-"中有说明。如果您打算使用网络预置或者从软盘或 U 盘读取,直接将它放到正确的地方"
-"就可以了。如果您希望将它放到 CD 或 DVD 上面,那就需要重新制作一个 ISO 映像文"
-"件。而如何将预置文件包含到 initrd 里面,超出了本文档的范围;请查询 &d-i; 开发"
-"者文档。"
+"中有说明。如果您打算使用网络预置或者从 U 盘读取,直接将它放到正确的地方就可以"
+"了。如果您希望将它放到安装 ISO 映像上面,那就需要重新制作一个映像文件。而如何"
+"将预置文件包含到 initrd 里面,超出了本文档的范围;请查询 &d-i; 开发者文档。"
#. Tag: para
#: preseed.xml:229
@@ -381,22 +353,7 @@ msgstr ""
#. Tag: screen
#: preseed.xml:277
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Boot parameters to specify:\n"
-#| "- if you're netbooting:\n"
-#| " preseed/url=http://host/path/to/preseed.cfg\n"
-#| " preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
-#| "\n"
-#| "- if you're booting a remastered CD:\n"
-#| " preseed/file=/cdrom/preseed.cfg\n"
-#| " preseed/file/checksum=5da499872becccfeda2c4872f9171c3d\n"
-#| "\n"
-#| "- if you're installing from USB media (put the preconfiguration file in "
-#| "the\n"
-#| " toplevel directory of the USB stick):\n"
-#| " preseed/file=/hd-media/preseed.cfg\n"
-#| " preseed/file/checksum=5da499872becccfeda2c4872f9171c3d"
+#, no-c-format
msgid ""
"Boot parameters to specify:\n"
"- if you're netbooting:\n"
@@ -419,8 +376,11 @@ msgstr ""
"- 如果使用网络启动:\n"
" preseed/url=http://host/path/to/preseed.cfg\n"
" preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
+"-或者 \n"
+" preseed/url=tftp://host/path/to/preseed.cfg\n"
+" preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
"\n"
-"- 如果从定制的 CD 启动:\n"
+"- 如果从定制的安装映像启动:\n"
" preseed/file=/cdrom/preseed.cfg\n"
" preseed/file/checksum=5da499872becccfeda2c4872f9171c3d\n"
"\n"
@@ -593,6 +553,8 @@ msgid ""
"fairly simple command lines at the boot prompt to result in arbitrarily "
"complex customized automatic installs."
msgstr ""
+"有几个 &debian; 安装程序的特性结合到一起,在引导提示时允许相当简单的命令行,"
+"导致了任何复杂的定制化自动安装。"
#. Tag: para
#: preseed.xml:382
@@ -605,6 +567,11 @@ msgid ""
"parameters on the boot prompt. <phrase arch=\"x86\">See <xref linkend=\"boot-"
"screen\"/> for information on how to add a boot parameter.</phrase>"
msgstr ""
+"这通过使用 <literal>Automated install</literal> 引导选择来启动,对一些架构或"
+"引导方法也被称为 <literal>auto</literal>。 在这节中,这样 <literal>auto</"
+"literal> 不是参数,它意味着选择引导选项,并在引导提示上增补后面的引导参数。"
+"<phrase arch=\"x86\">请参见<xref linkend=\"boot-screen\"/> 如何添加引导参数的"
+"信息。</phrase>"
#. Tag: para
#: preseed.xml:391
@@ -749,17 +716,7 @@ msgstr ""
#. Tag: para
#: preseed.xml:475
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The <literal>auto</literal> boot label is not yet defined everywhere. The "
-#| "same effect may be achieved by simply adding the two parameters "
-#| "<literal>auto=true priority=critical</literal> to the kernel command "
-#| "line. The <literal>auto</literal> parameter is an alias for <literal>auto-"
-#| "install/enable</literal> and setting it to <literal>true</literal> delays "
-#| "the locale and keyboard questions until after there has been a chance to "
-#| "preseed them, while <literal>priority</literal> is an alias for "
-#| "<literal>debconf/priority</literal> and setting it to <literal>critical</"
-#| "literal> stops any questions with a lower priority from being asked."
+#, no-c-format
msgid ""
"The <literal>auto</literal> boot choice is not yet defined on all arches. "
"The same effect may be achieved by simply adding the two parameters "
@@ -771,10 +728,10 @@ msgid ""
"<literal>debconf/priority</literal> and setting it to <literal>critical</"
"literal> stops any questions with a lower priority from being asked."
msgstr ""
-"<literal>auto</literal> 引导标签并未在所有地方定义。在内核命令行上可以通过添"
-"加 <literal>auto=true priority=critical</literal> 两个参数达到同样的效果。"
-"<literal>auto</literal> 参数是 <literal>auto-install/enable</literal> 的别"
-"名,将其设为 <literal>true</literal> 可以延迟 locale 和键盘等问题的提出,使"
+"<literal>auto</literal> 引导先择并未在所有架构上定义。在内核命令行上可以通过"
+"添加 <literal>auto=true priority=critical</literal> 两个参数达到同样的效果。"
+"<literal>auto</literal> 内核参数是 <literal>auto-install/enable</literal> 的"
+"别名,将其设为 <literal>true</literal> 可以延迟 locale 和键盘等问题的提出,使"
"其可以提供预置,其中 <literal>priority</literal> 是 <literal>debconf/"
"priority</literal> 的别名,设置它为 <literal>critical</literal> 可以禁止在较"
"低优先级下的问题提出。"
@@ -1086,7 +1043,7 @@ msgstr "preseed/file/checksum"
#: preseed.xml:551
#, no-c-format
msgid "Examples of boot prompt preseeding"
-msgstr ""
+msgstr "引导提示预置的例子"
#. Tag: para
#: preseed.xml:552
@@ -1096,6 +1053,8 @@ msgid ""
"to adapt this to your needs<phrase arch=\"x86\">; also see <xref linkend="
"\"boot-screen\"/></phrase>)."
msgstr ""
+"这里是一些引导提示看起来什么样子的例子(还需要将这个与您的需要相适应<phrase "
+"arch=\"x86\">;还请参见<xref linkend=\"boot-screen\"/> </phrase>)。"
#. Tag: screen
#: preseed.xml:558
@@ -1115,6 +1074,19 @@ msgid ""
"/install.amd/vmlinuz initrd=/install.amd/initrd.gz tasksel:tasksel/first=web-"
"server ---"
msgstr ""
+"# To set French as language and France as country:\n"
+"/install.amd/vmlinuz vga=788 initrd=/install.amd/gtk/initrd.gz language=fr "
+"country=FR --- quiet\n"
+"# To set English as language and Germany as country, and use a German "
+"keyboard layout:\n"
+"/install.amd/vmlinuz vga=788 initrd=/install.amd/gtk/initrd.gz language=en "
+"country=DE locale=en_US.UTF-8 keymap=de --- quiet\n"
+"# To install the MATE desktop:\n"
+"/install.amd/vmlinuz vga=788 initrd=/install.amd/gtk/initrd.gz desktop=mate-"
+"desktop --- quiet\n"
+"# To install the web-server task:\n"
+"/install.amd/vmlinuz initrd=/install.amd/initrd.gz tasksel:tasksel/first=web-"
+"server ---"
#. Tag: title
#: preseed.xml:564
@@ -1207,7 +1179,7 @@ msgstr ""
#: preseed.xml:608
#, no-c-format
msgid "The file should start with <literal>#_preseed_V1</literal>"
-msgstr ""
+msgstr "文件应该以 <literal>#_preseed_V1</literal>开始"
#. Tag: para
#: preseed.xml:620
@@ -1278,7 +1250,7 @@ msgstr "有些问题在安装过程中显示值的代码而不是英文文本。
#: preseed.xml:656
#, no-c-format
msgid "Start with <literal>#_preseed_V1</literal>"
-msgstr ""
+msgstr "以<literal>#_preseed_V1</literal>开始"
#. Tag: para
#: preseed.xml:662
@@ -1305,18 +1277,16 @@ msgstr ""
#. Tag: screen
#: preseed.xml:674
-#, fuzzy, no-c-format
-#| msgid ""
-#| "$ debconf-get-selections --installer &gt; <replaceable>file</"
-#| "replaceable>\n"
-#| "$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
+#, no-c-format
msgid ""
"$ echo \"#_preseed_V1\" &gt; <replaceable>file</replaceable>\n"
"$ debconf-get-selections --installer &gt;&gt; <replaceable>file</"
"replaceable>\n"
"$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
msgstr ""
-"$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
+"$ echo \"#_preseed_V1\" &gt; <replaceable>file</replaceable>\n"
+"$ debconf-get-selections --installer &gt;&gt; <replaceable>file</"
+"replaceable>\n"
"$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
#. Tag: para
@@ -1428,6 +1398,10 @@ msgid ""
"<literal>auto</literal> preseed alias). This delays the asking of the "
"localisation questions, so that they can be preseeded by any method."
msgstr ""
+"在一般的安装中,首先询问地区信息,所以这些值只通过 initrd 或内核引导参数方法"
+"来预置。自动模式(<xref linkend=\"preseed-auto\"/>) 包括 <literal>auto-"
+"install/enable=true</literal> 的设置(通常通过<literal>auto</literal>预置别"
+"名)。这延迟询问地区问题,使它们可以被任何方法预置。"
#. Tag: para
#: preseed.xml:751
@@ -1523,8 +1497,8 @@ msgid ""
"<userinput>skip-config</userinput>. This will result in the kernel keymap "
"remaining active."
msgstr ""
-"使用 <userinput>skip-config</userinput> 可以跳过键盘预置 <classname>keymap</"
-"classname>。这将导致内核 keymap 保持活动。"
+"使用 <userinput>skip-config</userinput> 来预置 <classname>keymap</"
+"classname>,可以跳过键盘配置。这将导致内核 keymap 保持活动。"
#. Tag: title
#: preseed.xml:799
@@ -1534,13 +1508,7 @@ msgstr "网络设置"
#. Tag: para
#: preseed.xml:800
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Of course, preseeding the network configuration won't work if you're "
-#| "loading your preconfiguration file from the network. But it's great when "
-#| "you're booting from CD or USB stick. If you are loading preconfiguration "
-#| "files from the network, you can pass network config parameters by using "
-#| "kernel boot parameters."
+#, no-c-format
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
"your preconfiguration file from the network. But it's great when you're "
@@ -1548,7 +1516,7 @@ msgid ""
"files from the network, you can pass network config parameters by using "
"kernel boot parameters."
msgstr ""
-"显而易见,预置网络设置对于从网络加载预置文件无效。但对从 CD 和 U 盘引导很有帮"
+"显而易见,预置网络设置对于从网络加载预置文件无效。但对从光盘和 U 盘引导很有帮"
"助。如果您计划从网络加载预置文件,应该使用传递网络设置给内核引导参数的方式。"
#. Tag: para
@@ -1592,70 +1560,7 @@ msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
#: preseed.xml:832
-#, fuzzy, no-c-format
-#| msgid ""
-#| "# Disable network configuration entirely. This is useful for cdrom\n"
-#| "# installations on non-networked devices where the network questions,\n"
-#| "# warning and long timeouts are a nuisance.\n"
-#| "#d-i netcfg/enable boolean false\n"
-#| "\n"
-#| "# netcfg will choose an interface that has link if possible. This makes "
-#| "it\n"
-#| "# skip displaying a list if there is more than one interface.\n"
-#| "d-i netcfg/choose_interface select auto\n"
-#| "\n"
-#| "# To pick a particular interface instead:\n"
-#| "#d-i netcfg/choose_interface select eth1\n"
-#| "\n"
-#| "# To set a different link detection timeout (default is 3 seconds).\n"
-#| "# Values are interpreted as seconds.\n"
-#| "#d-i netcfg/link_wait_timeout string 10\n"
-#| "\n"
-#| "# If you have a slow dhcp server and the installer times out waiting for\n"
-#| "# it, this might be useful.\n"
-#| "#d-i netcfg/dhcp_timeout string 60\n"
-#| "\n"
-#| "# If you prefer to configure the network manually, uncomment this line "
-#| "and\n"
-#| "# the static network configuration below.\n"
-#| "#d-i netcfg/disable_autoconfig boolean true\n"
-#| "\n"
-#| "# If you want the preconfiguration file to work on systems both with and\n"
-#| "# without a dhcp server, uncomment these lines and the static network\n"
-#| "# configuration below.\n"
-#| "#d-i netcfg/dhcp_failed note\n"
-#| "#d-i netcfg/dhcp_options select Configure network manually\n"
-#| "\n"
-#| "# Static network configuration.\n"
-#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
-#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
-#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
-#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
-#| "#d-i netcfg/confirm_static boolean true\n"
-#| "\n"
-#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
-#| "# values set here. However, setting the values still prevents the "
-#| "questions\n"
-#| "# from being shown, even if values come from dhcp.\n"
-#| "d-i netcfg/get_hostname string unassigned-hostname\n"
-#| "d-i netcfg/get_domain string unassigned-domain\n"
-#| "\n"
-#| "# If you want to force a hostname, regardless of what either the DHCP\n"
-#| "# server returns or what the reverse DNS entry for the IP is, uncomment\n"
-#| "# and adjust the following line.\n"
-#| "#d-i netcfg/hostname string somehost\n"
-#| "\n"
-#| "# Disable that annoying WEP key dialog.\n"
-#| "d-i netcfg/wireless_wep string\n"
-#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
-#| "#d-i netcfg/dhcp_hostname string radish\n"
-#| "\n"
-#| "# If non-free firmware is needed for the network or other hardware, you "
-#| "can\n"
-#| "# configure the installer to always try to load it, without prompting. "
-#| "Or\n"
-#| "# change to false to disable asking.\n"
-#| "#d-i hw-detect/load_firmware boolean true"
+#, no-c-format
msgid ""
"# Disable network configuration entirely. This is useful for cdrom\n"
"# installations on non-networked devices where the network questions,\n"
@@ -1744,6 +1649,7 @@ msgstr ""
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
"#d-i netcfg/dhcp_timeout string 60\n"
+"#d-i netcfg/dhcpv6_timeout string 60\n"
"\n"
"# If you prefer to configure the network manually, uncomment this line and\n"
"# the static network configuration below.\n"
@@ -1756,10 +1662,19 @@ msgstr ""
"#d-i netcfg/dhcp_options select Configure network manually\n"
"\n"
"# Static network configuration.\n"
-"#d-i netcfg/get_nameservers string 192.168.1.1\n"
+"#\n"
+"# IPv4 example\n"
"#d-i netcfg/get_ipaddress string 192.168.1.42\n"
"#d-i netcfg/get_netmask string 255.255.255.0\n"
"#d-i netcfg/get_gateway string 192.168.1.1\n"
+"#d-i netcfg/get_nameservers string 192.168.1.1\n"
+"#d-i netcfg/confirm_static boolean true\n"
+"#\n"
+"# IPv6 example\n"
+"#d-i netcfg/get_ipaddress string fc00::2\n"
+"#d-i netcfg/get_netmask string ffff:ffff:ffff:ffff::\n"
+"#d-i netcfg/get_gateway string fc00::1\n"
+"#d-i netcfg/get_nameservers string fc00::1\n"
"#d-i netcfg/confirm_static boolean true\n"
"\n"
"# Any hostname and domain names assigned from dhcp take precedence over\n"
@@ -1906,28 +1821,18 @@ msgstr "帐号设置"
#. Tag: para
#: preseed.xml:887
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The password for the root account and name and password for a first "
-#| "regular user's account can be preseeded. For the passwords you can use "
-#| "either clear text values or MD5 <emphasis>hashes</emphasis>."
+#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
"user's account can be preseeded. For the passwords you can use either clear "
"text values or crypt(3) <emphasis>hashes</emphasis>."
msgstr ""
"root 帐号的密码和第一个普通用户的名字和密码都可以预置。您可以给密码使用纯文本"
-"或 MD5 <emphasis>哈希</emphasis> 值。"
+"或 crypt(3) <emphasis>哈希</emphasis> 值。"
#. Tag: para
#: preseed.xml:894
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Be aware that preseeding passwords is not completely secure as everyone "
-#| "with access to the preconfiguration file will have the knowledge of these "
-#| "passwords. Using MD5 hashes is considered slightly better in terms of "
-#| "security but it might also give a false sense of security as access to a "
-#| "MD5 hash allows for brute force attacks."
+#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
"access to the preconfiguration file will have the knowledge of these "
@@ -1935,39 +1840,13 @@ msgid ""
"hashing algorithm like DES or MD5 is used which allow for bruteforce "
"attacks. Recommended password hashing algorithms are SHA-256 and SHA512."
msgstr ""
-"要知道预置密码并不安全,每个可以访问预置文件的用户都可以看到这些密码。使用 "
-"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
+"要知道预置密码并不安全,每个可以访问预置文件的用户都可以看到这些密码。存储哈"
+"希密码被认为是安全的,除非使用了可以被暴力破解的弱哈希算法,如 DES 或 MD5。推"
+"荐的密码哈希算法为 SHA-256 和 SHA512。"
#. Tag: screen
#: preseed.xml:904
-#, fuzzy, no-c-format
-#| msgid ""
-#| "# Skip creation of a root account (normal user account will be able to\n"
-#| "# use sudo).\n"
-#| "#d-i passwd/root-login boolean false\n"
-#| "# Alternatively, to skip creation of a normal user account.\n"
-#| "#d-i passwd/make-user boolean false\n"
-#| "\n"
-#| "# Root password, either in clear text\n"
-#| "#d-i passwd/root-password password r00tme\n"
-#| "#d-i passwd/root-password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash.\n"
-#| "#d-i passwd/root-password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# To create a normal user account.\n"
-#| "#d-i passwd/user-fullname string Debian User\n"
-#| "#d-i passwd/username string debian\n"
-#| "# Normal user's password, either in clear text\n"
-#| "#d-i passwd/user-password password insecure\n"
-#| "#d-i passwd/user-password-again password insecure\n"
-#| "# or encrypted using an MD5 hash.\n"
-#| "#d-i passwd/user-password-crypted password [MD5 hash]\n"
-#| "# Create the first user with the specified UID instead of the default.\n"
-#| "#d-i passwd/user-uid string 1010\n"
-#| "\n"
-#| "# The user account will be added to some standard initial groups. To\n"
-#| "# override that, use this.\n"
-#| "#d-i passwd/user-default-groups string audio cdrom video"
+#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
"# use sudo).\n"
@@ -2005,8 +1884,8 @@ msgstr ""
"# Root password, either in clear text\n"
"#d-i passwd/root-password password r00tme\n"
"#d-i passwd/root-password-again password r00tme\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/root-password-crypted password [MD5 hash]\n"
+"# or encrypted using a crypt(3) hash.\n"
+"#d-i passwd/root-password-crypted password [crypt(3) hash]\n"
"\n"
"# To create a normal user account.\n"
"#d-i passwd/user-fullname string Debian User\n"
@@ -2014,8 +1893,8 @@ msgstr ""
"# Normal user's password, either in clear text\n"
"#d-i passwd/user-password password insecure\n"
"#d-i passwd/user-password-again password insecure\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/user-password-crypted password [MD5 hash]\n"
+"# or encrypted using a crypt(3) hash.\n"
+"#d-i passwd/user-password-crypted password [crypt(3) hash]\n"
"# Create the first user with the specified UID instead of the default.\n"
"#d-i passwd/user-uid string 1010\n"
"\n"
@@ -2042,14 +1921,14 @@ msgstr ""
#. Tag: para
#: preseed.xml:916
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The following command can be used to generate an MD5 hash for a password:"
+#, no-c-format
msgid ""
"The following command (available from the <classname>whois</classname> "
"package) can be used to generate a SHA-512 based crypt(3) hash for a "
"password:"
-msgstr "下面的命令可用于生成密码的 MD5 值。"
+msgstr ""
+"下面的命令(从 <classname>whois</classname> 软件包中获得)可用于生成密码的基"
+"于crypt(3)的 SHA-512 值:"
#. Tag: screen
#: preseed.xml:921
@@ -2159,88 +2038,7 @@ msgstr "分区示例"
#. Tag: screen
#: preseed.xml:974
-#, fuzzy, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# This is only honoured if partman-auto/method (below) is not set.\n"
-#| "#d-i partman-auto/init_automatically_partition select biggest_free\n"
-#| "\n"
-#| "# Alternatively, you may specify a disk to partition. If the system has "
-#| "only\n"
-#| "# one disk the installer will default to using that, but otherwise the "
-#| "device\n"
-#| "# name must be given in traditional, non-devfs format (so e.g. /dev/hda "
-#| "or\n"
-#| "# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
-#| "# For example, to use the first SCSI/SATA hard disk:\n"
-#| "#d-i partman-auto/disk string /dev/sda\n"
-#| "# In addition, you'll need to specify the method to use.\n"
-#| "# The presently available methods are:\n"
-#| "# - regular: use the usual partition types for your architecture\n"
-#| "# - lvm: use LVM to partition the disk\n"
-#| "# - crypto: use LVM within an encrypted partition\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# The same applies to pre-existing software RAID array:\n"
-#| "d-i partman-md/device_remove_md boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "d-i partman-lvm/confirm_nooverwrite boolean true\n"
-#| "\n"
-#| "# You can choose one of the three predefined partitioning recipes:\n"
-#| "# - atomic: all files in one partition\n"
-#| "# - home: separate /home partition\n"
-#| "# - multi: separate /home, /usr, /var, and /tmp partitions\n"
-#| "d-i partman-auto/choose_recipe select atomic\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string \\\n"
-#| "# boot-root :: \\\n"
-#| "# 40 50 100 ext3 \\\n"
-#| "# $primary{ } $bootable{ } \\\n"
-#| "# method{ format } format{ } \\\n"
-#| "# use_filesystem{ } filesystem{ ext3 } \\\n"
-#| "# mountpoint{ /boot } \\\n"
-#| "# . \\\n"
-#| "# 500 10000 1000000000 ext3 \\\n"
-#| "# method{ format } format{ } \\\n"
-#| "# use_filesystem{ } filesystem{ ext3 } \\\n"
-#| "# mountpoint{ / } \\\n"
-#| "# . \\\n"
-#| "# 64 512 300% linux-swap \\\n"
-#| "# method{ swap } format{ } \\\n"
-#| "# .\n"
-#| "\n"
-#| "# The full recipe format is documented in the file partman-auto-recipe."
-#| "txt\n"
-#| "# included in the 'debian-installer' package or available from D-I "
-#| "source\n"
-#| "# repository. This also documents how to specify settings such as file\n"
-#| "# system labels, volume group names and which physical devices to "
-#| "include\n"
-#| "# in a volume group.\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman-partitioning/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition select finish\n"
-#| "d-i partman/confirm boolean true\n"
-#| "d-i partman/confirm_nooverwrite boolean true"
+#, no-c-format
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
"# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -2352,8 +2150,8 @@ msgstr ""
"only\n"
"# one disk the installer will default to using that, but otherwise the "
"device\n"
-"# name must be given in traditional, non-devfs format (so e.g. /dev/hda or\n"
-"# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
+"# name must be given in traditional, non-devfs format (so e.g. /dev/sda\n"
+"# and not e.g. /dev/discs/disc0/disc).\n"
"# For example, to use the first SCSI/SATA hard disk:\n"
"#d-i partman-auto/disk string /dev/sda\n"
"# In addition, you'll need to specify the method to use.\n"
@@ -2363,6 +2161,11 @@ msgstr ""
"# - crypto: use LVM within an encrypted partition\n"
"d-i partman-auto/method string lvm\n"
"\n"
+"# You can define the amount of space that will be used for the LVM volume\n"
+"# group. It can either be a size with its unit (eg. 20 GB), a percentage of\n"
+"# free space or the 'max' keyword.\n"
+"d-i partman-auto-lvm/guided_size string max\n"
+"\n"
"# If one of the disks that are going to be automatically partitioned\n"
"# contains an old LVM configuration, the user will normally receive a\n"
"# warning. This can be preseeded away...\n"
@@ -2376,7 +2179,7 @@ msgstr ""
"# You can choose one of the three predefined partitioning recipes:\n"
"# - atomic: all files in one partition\n"
"# - home: separate /home partition\n"
-"# - multi: separate /home, /usr, /var, and /tmp partitions\n"
+"# - multi: separate /home, /var, and /tmp partitions\n"
"d-i partman-auto/choose_recipe select atomic\n"
"\n"
"# Or provide a recipe of your own...\n"
@@ -2411,12 +2214,35 @@ msgstr ""
"# system labels, volume group names and which physical devices to include\n"
"# in a volume group.\n"
"\n"
+"## Partitioning for EFI\n"
+"# If your system needs an EFI partition you could add something like\n"
+"# this to the recipe above, as the first element in the recipe:\n"
+"# 538 538 1075 free \\\n"
+"# $iflabel{ gpt } \\\n"
+"# $reusemethod{ } \\\n"
+"# method{ efi } \\\n"
+"# format{ } \\\n"
+"# . \\\n"
+"#\n"
+"# The fragment above is for the amd64 architecture; the details may be\n"
+"# different on other architectures. The 'partman-auto' package in the\n"
+"# D-I source repository may have an example you can follow.\n"
+"\n"
"# This makes partman automatically partition without confirmation, provided\n"
"# that you told it what to do using one of the methods above.\n"
"d-i partman-partitioning/confirm_write_new_label boolean true\n"
"d-i partman/choose_partition select finish\n"
"d-i partman/confirm boolean true\n"
-"d-i partman/confirm_nooverwrite boolean true"
+"d-i partman/confirm_nooverwrite boolean true\n"
+"\n"
+"# Force UEFI booting ('BIOS compatibility' will be lost). Default: false.\n"
+"#d-i partman-efi/non_efi_system boolean true\n"
+"# Ensure the partition table is GPT - this is required for EFI\n"
+"#d-i partman-partitioning/choose_label string gpt\n"
+"#d-i partman-partitioning/default_label string gpt\n"
+"\n"
+"# When disk encryption is enabled, skip wiping the partitions beforehand.\n"
+"#d-i partman-auto-crypto/erase_disks boolean false"
#. Tag: title
#: preseed.xml:978
@@ -2687,35 +2513,7 @@ msgstr ""
#. Tag: screen
#: preseed.xml:1062
-#, fuzzy, no-c-format
-#| msgid ""
-#| "# You can choose to install non-free and contrib software.\n"
-#| "#d-i apt-setup/non-free boolean true\n"
-#| "#d-i apt-setup/contrib boolean true\n"
-#| "# Uncomment this if you don't want to use a network mirror.\n"
-#| "#d-i apt-setup/use_mirror boolean false\n"
-#| "# Select which update services to use; define the mirrors to be used.\n"
-#| "# Values shown below are the normal defaults.\n"
-#| "#d-i apt-setup/services-select multiselect security, volatile\n"
-#| "#d-i apt-setup/security_host string security.debian.org\n"
-#| "#d-i apt-setup/volatile_host string volatile.debian.org\n"
-#| "\n"
-#| "# Additional repositories, local[0-9] available\n"
-#| "#d-i apt-setup/local0/repository string \\\n"
-#| "# http://local.server/debian stable main\n"
-#| "#d-i apt-setup/local0/comment string local server\n"
-#| "# Enable deb-src lines\n"
-#| "#d-i apt-setup/local0/source boolean true\n"
-#| "# URL to the public key of the local repository; you must provide a key "
-#| "or\n"
-#| "# apt will complain about the unauthenticated repository and so the\n"
-#| "# sources.list line will be left commented out\n"
-#| "#d-i apt-setup/local0/key string http://local.server/key\n"
-#| "\n"
-#| "# By default the installer requires that repositories be authenticated\n"
-#| "# using a known gpg key. This setting can be used to disable that\n"
-#| "# authentication. Warning: Insecure, not recommended.\n"
-#| "#d-i debian-installer/allow_unauthenticated boolean true"
+#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
"#d-i apt-setup/non-free boolean true\n"
@@ -2757,9 +2555,8 @@ msgstr ""
"#d-i apt-setup/use_mirror boolean false\n"
"# Select which update services to use; define the mirrors to be used.\n"
"# Values shown below are the normal defaults.\n"
-"#d-i apt-setup/services-select multiselect security, volatile\n"
+"#d-i apt-setup/services-select multiselect security, updates\n"
"#d-i apt-setup/security_host string security.debian.org\n"
-"#d-i apt-setup/volatile_host string volatile.debian.org\n"
"\n"
"# Additional repositories, local[0-9] available\n"
"#d-i apt-setup/local0/repository string \\\n"
@@ -2769,13 +2566,20 @@ msgstr ""
"#d-i apt-setup/local0/source boolean true\n"
"# URL to the public key of the local repository; you must provide a key or\n"
"# apt will complain about the unauthenticated repository and so the\n"
-"# sources.list line will be left commented out\n"
+"# sources.list line will be left commented out.\n"
"#d-i apt-setup/local0/key string http://local.server/key\n"
+"# If the provided key file ends in \".asc\" the key file needs to be an\n"
+"# ASCII-armoured PGP key, if it ends in \".gpg\" it needs to use the\n"
+"# \"GPG key public keyring\" format, the \"keybox database\" format is\n"
+"# currently not supported.\n"
"\n"
"# By default the installer requires that repositories be authenticated\n"
"# using a known gpg key. This setting can be used to disable that\n"
"# authentication. Warning: Insecure, not recommended.\n"
-"#d-i debian-installer/allow_unauthenticated boolean true"
+"#d-i debian-installer/allow_unauthenticated boolean true\n"
+"\n"
+"# Uncomment this to add multiarch configuration for i386\n"
+"#d-i apt-setup/multiarch string i386"
#. Tag: title
#: preseed.xml:1067
@@ -2793,73 +2597,63 @@ msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的
#. Tag: para
#: preseed.xml:1076
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>standard</userinput> (standard tools)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>standard</userinput>(标准工具)"
#. Tag: para
#: preseed.xml:1079
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>desktop</userinput> (graphical desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>desktop</userinput>(图形化桌面)"
#. Tag: para
#: preseed.xml:1082
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>gnome-desktop</userinput> (Gnome desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>gnome-desktop</userinput> (Gnome 桌面)"
#. Tag: para
#: preseed.xml:1085
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>xfce-desktop</userinput> (XFCE desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>xfce-desktop</userinput> (XFCE 桌面)"
#. Tag: para
#: preseed.xml:1088
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>kde-desktop</userinput> (KDE Plasma desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>kde-desktop</userinput> (KDE Plasma 桌面)"
#. Tag: para
#: preseed.xml:1091
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>cinnamon-desktop</userinput> (Cinnamon desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>cinnamon-desktop</userinput> (Cinnamon 桌面)"
#. Tag: para
#: preseed.xml:1094
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>mate-desktop</userinput> (MATE desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>mate-desktop</userinput> (MATE 桌面)desktop)"
#. Tag: para
#: preseed.xml:1097
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>lxde-desktop</userinput> (LXDE desktop)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>lxde-desktop</userinput> (LXDE 桌面)"
#. Tag: para
#: preseed.xml:1100
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>web-server</userinput> (web server)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>web-server</userinput> (web 服务器)"
#. Tag: para
#: preseed.xml:1103
-#, fuzzy, no-c-format
-#| msgid "<userinput>desktop</userinput>"
+#, no-c-format
msgid "<userinput>ssh-server</userinput> (SSH server)"
-msgstr "<userinput>desktop</userinput>"
+msgstr "<userinput>ssh-server</userinput> (SSH 服务器)"
#. Tag: para
#: preseed.xml:1108
@@ -2888,23 +2682,7 @@ msgstr ""
#. Tag: screen
#: preseed.xml:1124
-#, fuzzy, no-c-format
-#| msgid ""
-#| "#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
-#| "\n"
-#| "# Individual additional packages to install\n"
-#| "#d-i pkgsel/include string openssh-server build-essential\n"
-#| "# Whether to upgrade packages after debootstrap.\n"
-#| "# Allowed values: none, safe-upgrade, full-upgrade\n"
-#| "#d-i pkgsel/upgrade select none\n"
-#| "\n"
-#| "# Some versions of the installer can report back on what software you "
-#| "have\n"
-#| "# installed, and what software you use. The default is not to report "
-#| "back,\n"
-#| "# but sending reports helps the project determine what software is most\n"
-#| "# popular and include it on CDs.\n"
-#| "#popularity-contest popularity-contest/participate boolean false"
+#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
"\n"
@@ -2931,7 +2709,7 @@ msgstr ""
"# Some versions of the installer can report back on what software you have\n"
"# installed, and what software you use. The default is not to report back,\n"
"# but sending reports helps the project determine what software is most\n"
-"# popular and include it on CDs.\n"
+"# popular and should be included on the first CD/DVD.\n"
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
@@ -2942,51 +2720,7 @@ msgstr "安装 bootloader"
#. Tag: screen
#: preseed.xml:1131
-#, fuzzy, no-c-format
-#| msgid ""
-#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
-#| "If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true</phrase>\n"
-#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
-#| "uncomment this\n"
-#| "#d-i grub-installer/skip boolean true</phrase>\n"
-#| "\n"
-#| "# This is fairly safe to set, it makes grub install automatically to the "
-#| "MBR\n"
-#| "# if no other operating system is detected on the machine.\n"
-#| "d-i grub-installer/only_debian boolean true\n"
-#| "\n"
-#| "# This one makes grub-installer install to the MBR if it also finds some "
-#| "other\n"
-#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
-#| "d-i grub-installer/with_other_os boolean true\n"
-#| "\n"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev string (hd0,1)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev string (hd0,1) (hd1,1) (hd2,1)\n"
-#| "# To install to a particular device:\n"
-#| "#d-i grub-installer/bootdev string /dev/sda\n"
-#| "\n"
-#| "# Optional password for grub, either in clear text\n"
-#| "#d-i grub-installer/password password r00tme\n"
-#| "#d-i grub-installer/password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
-#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# Use the following option to add additional boot parameters for the\n"
-#| "# installed system (if supported by the bootloader installer).\n"
-#| "# Note: options passed to the installer will be added automatically.\n"
-#| "#d-i debian-installer/add-kernel-opts string nousb"
+#, no-c-format
msgid ""
"<phrase arch=\"linux-any\"># Grub is the boot loader (for x86).</"
"phrase><phrase\n"
@@ -3032,36 +2766,38 @@ msgid ""
"# Note: options passed to the installer will be added automatically.\n"
"#d-i debian-installer/add-kernel-opts string nousb"
msgstr ""
-"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
-"you want lilo installed\n"
-"# instead, uncomment this:\n"
-"#d-i grub-installer/skip boolean true\n"
-"# To also skip installing lilo, and install no bootloader, uncomment this\n"
-"# too:\n"
-"#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
-"this\n"
+"<phrase arch=\"linux-any\"># Grub is the boot loader (for x86).</"
+"phrase><phrase\n"
+"arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
"#d-i grub-installer/skip boolean true</phrase>\n"
"\n"
"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
-"# if no other operating system is detected on the machine.\n"
+"UEFI\n"
+"# partition/boot record if no other operating system is detected on the "
+"machine.\n"
"d-i grub-installer/only_debian boolean true\n"
"\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
-"# OS, which is less safe as it might not be able to boot that other OS.\n"
+"# This one makes grub-installer install to the UEFI partition/boot record, "
+"if\n"
+"# it also finds some other OS, which is less safe as it might not be able "
+"to\n"
+"# boot that other OS.\n"
"d-i grub-installer/with_other_os boolean true\n"
"\n"
-"# Alternatively, if you want to install to a location other than the mbr,\n"
-"# uncomment and edit these lines:\n"
+"# Due notably to potential USB sticks, the location of the primary drive "
+"can\n"
+"# not be determined safely in general, so this needs to be specified:\n"
+"#d-i grub-installer/bootdev string /dev/sda\n"
+"# To install to the primary device (assuming it is not a USB stick):\n"
+"#d-i grub-installer/bootdev string default\n"
+"\n"
+"# Alternatively, if you want to install to a location other than the UEFI\n"
+"# parition/boot record, uncomment and edit these lines:\n"
"#d-i grub-installer/only_debian boolean false\n"
"#d-i grub-installer/with_other_os boolean false\n"
"#d-i grub-installer/bootdev string (hd0,1)\n"
"# To install grub to multiple disks:\n"
"#d-i grub-installer/bootdev string (hd0,1) (hd1,1) (hd2,1)\n"
-"# To install to a particular device:\n"
-"#d-i grub-installer/bootdev string /dev/sda\n"
"\n"
"# Optional password for grub, either in clear text\n"
"#d-i grub-installer/password password r00tme\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index af48b50fc..5f489d18f 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -7,7 +7,7 @@ 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: 2020-08-28 12:22+0000\n"
+"PO-Revision-Date: 2020-10-19 21:43+0000\n"
"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -15,7 +15,7 @@ msgstr ""
"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"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: random-bits.xml:4
@@ -920,8 +920,15 @@ msgstr ""
"现在您的磁盘上已经有了一个功能虽弱但却是真正的 &debian; 系统。键入 "
"<command>chroot</command> 命令进入:<informalexample><screen>\n"
"# LANG=C.UTF-8 chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample> 然后您需要设置与 &debian; 基本系统兼容的终端定"
-"义,例如:"
+"</screen></informalexample>如果目标架构与主机不同,那么需要首先将 qemu-user-"
+"static 复制到新的主机:<informalexample><screen>\n"
+"# cp /usr/bin/qemu-ARCH-static /mnt/debinst/usr/bin\n"
+"# LANG=C.UTF-8 chroot /mnt/debinst qemu-ARCH-static /bin/bash\n"
+"</screen></informalexample> chrooting 之后,会需要设置终端定义与 &debian; 基"
+"本系统兼容,例如:<informalexample><screen>\n"
+"# export TERM=<replaceable>xterm-color</replaceable>\n"
+"</screen></informalexample> 依赖于 TERM 的值,会必须安装 <classname>ncurses-"
+"term</classname> 软件包,来从中得到支持。"
#. Tag: para
#: random-bits.xml:490
@@ -1004,7 +1011,7 @@ msgid ""
"files, so this option should only be used with care"
msgstr ""
"将 host 系统上加载的 /dev 绑定到 target 系统的 /dev;注意,有些软件包的 "
-"postinst 脚本会创建设备文件,所以要小心使用改选项。"
+"postinst 脚本会创建设备文件,所以要小心使用改选项"
#. Tag: title
#: random-bits.xml:540
@@ -1105,7 +1112,7 @@ msgid ""
"chroot:"
msgstr ""
"<userinput>ls /proc</userinput> 命令现在应该列出非空目录。如果失败,您应该从 "
-"chroot: 以外加载 proc。"
+"chroot: 以外加载 proc:"
#. Tag: screen
#: random-bits.xml:575
@@ -1135,8 +1142,15 @@ msgid ""
"</screen></informalexample> The following command allows you to choose your "
"timezone."
msgstr ""
-"<filename>/etc/default/rcS</filename> 文件中的选项决定系统是以 UTC 还是本地时"
-"间解释硬件时钟。下面命令可以让您设定和选择时区。"
+"将 <filename>/etc/adjtime</filename> 的第三行设置为 <quote>UTC</quote> 或 "
+"<quote>LOCAL</quote>,决定系统是否将认为硬件时钟被设置为UTC各自的本地时间。后"
+"面的命令允许设置它。<informalexample><screen>\n"
+"# editor /etc/adjtime\n"
+"</screen></informalexample> 这是个例子:<informalexample><screen>\n"
+"0.0 0 0.0\n"
+"0\n"
+"UTC\n"
+"</screen></informalexample> 后面的命令允许选择时区。"
#. Tag: screen
#: random-bits.xml:596
@@ -1152,68 +1166,7 @@ msgstr "网络的配置"
#. Tag: para
#: random-bits.xml:603
-#, fuzzy, no-c-format
-#| msgid ""
-#| "To configure networking, edit <filename>/etc/network/interfaces</"
-#| "filename>, <filename>/etc/resolv.conf</filename>, <filename>/etc/"
-#| "hostname</filename> and <filename>/etc/hosts</filename>. "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/network/interfaces\n"
-#| "</screen></informalexample> Here are some simple examples from <filename>/"
-#| "usr/share/doc/ifupdown/examples</filename>: <informalexample><screen>\n"
-#| "######################################################################\n"
-#| "# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)\n"
-#| "# See the interfaces(5) manpage for information on what options are\n"
-#| "# available.\n"
-#| "######################################################################\n"
-#| "\n"
-#| "# We always want the loopback interface.\n"
-#| "#\n"
-#| "auto lo\n"
-#| "iface lo inet loopback\n"
-#| "\n"
-#| "# To use dhcp:\n"
-#| "#\n"
-#| "# auto eth0\n"
-#| "# iface eth0 inet dhcp\n"
-#| "\n"
-#| "# An example static IP setup: (broadcast and gateway are optional)\n"
-#| "#\n"
-#| "# auto eth0\n"
-#| "# iface eth0 inet static\n"
-#| "# address 192.168.0.42\n"
-#| "# network 192.168.0.0\n"
-#| "# netmask 255.255.255.0\n"
-#| "# broadcast 192.168.0.255\n"
-#| "# gateway 192.168.0.1\n"
-#| "</screen></informalexample> Enter your nameserver(s) and search "
-#| "directives in <filename>/etc/resolv.conf</filename>: "
-#| "<informalexample><screen>\n"
-#| "# editor /etc/resolv.conf\n"
-#| "</screen></informalexample> A simple example <filename>/etc/resolv.conf</"
-#| "filename>: <informalexample><screen>\n"
-#| "search hqdom.local\n"
-#| "nameserver 10.1.1.36\n"
-#| "nameserver 192.168.9.100\n"
-#| "</screen></informalexample> Enter your system's host name (2 to 63 "
-#| "characters): <informalexample><screen>\n"
-#| "# echo DebianHostName &gt; /etc/hostname\n"
-#| "</screen></informalexample> And a basic <filename>/etc/hosts</filename> "
-#| "with IPv6 support: <informalexample><screen>\n"
-#| "127.0.0.1 localhost\n"
-#| "127.0.1.1 DebianHostName\n"
-#| "\n"
-#| "# The following lines are desirable for IPv6 capable hosts\n"
-#| "::1 ip6-localhost ip6-loopback\n"
-#| "fe00::0 ip6-localnet\n"
-#| "ff00::0 ip6-mcastprefix\n"
-#| "ff02::1 ip6-allnodes\n"
-#| "ff02::2 ip6-allrouters\n"
-#| "ff02::3 ip6-allhosts\n"
-#| "</screen></informalexample> If you have multiple network cards, you "
-#| "should arrange the names of driver modules in the <filename>/etc/modules</"
-#| "filename> file into the desired order. Then during boot, each card will "
-#| "be associated with the interface name (eth0, eth1, etc.) that you expect."
+#, no-c-format
msgid ""
"To configure networking, edit <filename>/etc/network/interfaces</filename>, "
"<filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> "
@@ -1287,17 +1240,18 @@ msgstr ""
"# available.\n"
"######################################################################\n"
"\n"
-"# We always want the loopback interface.\n"
+"# The loopback interface isn't really required any longer, but can be used\n"
+"# if needed.\n"
"#\n"
-"auto lo\n"
-"iface lo inet loopback\n"
+"# auto lo\n"
+"# iface lo inet loopback\n"
"\n"
"# To use dhcp:\n"
"#\n"
"# auto eth0\n"
"# iface eth0 inet dhcp\n"
"\n"
-"# An example static IP setup: (broadcast and gateway are optional)\n"
+"# An example static IP setup: (network, broadcast and gateway are optional)\n"
"#\n"
"# auto eth0\n"
"# iface eth0 inet static\n"
@@ -1311,7 +1265,7 @@ msgstr ""
"# editor /etc/resolv.conf\n"
"</screen></informalexample>来自 <filename>/etc/resolv.conf</filename> 的简单"
"示例:<informalexample><screen>\n"
-"search hqdom.local\n"
+"search example.com\n"
"nameserver 10.1.1.36\n"
"nameserver 192.168.9.100\n"
"</screen></informalexample>输入系统的主机名(2到63个字符):"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index c0574e901..ab37a88a3 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -1,12 +1,13 @@
# Debian GNU/Linux Installation Guide - translation into Chinese (simplified)
# Ji YongGang <jungleji@gmail.com>, 2012.
+# 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: 2020-09-12 12:36+0000\n"
+"PO-Revision-Date: 2020-10-19 21:44+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"
@@ -14,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.3.1-dev\n"
#. Tag: title
#: using-d-i.xml:5
@@ -73,13 +74,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:34
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Some of the defaults that the installer uses can be influenced by passing "
-#| "boot arguments when &d-i; is started. If, for example, you wish to force "
-#| "static network configuration (DHCP is used by default if available), you "
-#| "could add the boot parameter <userinput>netcfg/disable_autoconfig=true</"
-#| "userinput>. See <xref linkend=\"installer-args\"/> for available options."
+#, no-c-format
msgid ""
"Some of the defaults that the installer uses can be influenced by passing "
"boot arguments when &d-i; is started. If, for example, you wish to force "
@@ -89,9 +84,9 @@ msgid ""
"for available options."
msgstr ""
"在 &d-i; 启动的时候,加上一些引导参数,它将会影响安装程序使用的默认值。例如,"
-"您希望指定静态网络连接配置(默认会使用已有的 DHCP),可以加上引导参数 "
-"<userinput>netcfg/disable_autoconfig=true</userinput>。参阅 <xref linkend="
-"\"installer-args\"/> 了解可用的选项。"
+"您希望指定静态网络连接配置(默认会使用已有的 IPv6 自动配置和 DHCP),可以加上引"
+"导参数 <userinput>netcfg/disable_autoconfig=true</userinput>。参阅 <xref "
+"linkend=\"installer-args\"/> 了解可用的选项。"
#. Tag: para
#: using-d-i.xml:43
@@ -124,13 +119,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:60
-#, fuzzy, no-c-format
-#| msgid ""
-#| "For this architecture the &d-i; supports two different user interfaces: a "
-#| "character-based one and a graphical one. The character-based interface is "
-#| "used by default unless you selected the <quote>Graphical install</quote> "
-#| "option in the initial boot menu. For more information about the graphical "
-#| "installer, please refer to <xref linkend=\"graphical\"/>."
+#, no-c-format
msgid ""
"For this architecture the &d-i; supports two different user interfaces: a "
"graphical one and a character-based one. The graphical interface is used by "
@@ -138,19 +127,13 @@ msgid ""
"For more information about the graphical installer, please refer to <xref "
"linkend=\"graphical\"/>."
msgstr ""
-"本架构的 &d-i; 支持两种用户界面:字符界面和图形界面。除非您在引导菜单里面指"
-"定 <quote>Graphical install</quote> 选项,否则默认将使用字符界面。更多的图形"
-"界面安装程序信息,请参阅 <xref linkend=\"graphical\"/>。"
+"本架构的 &d-i; 支持两种用户界面:图形界面和字符界面。除非您在引导菜单里面指"
+"定 <quote>Install</quote> 选项,否则默认将使用图形界面。更多的图形界面安装程"
+"序信息,请参阅 <xref linkend=\"graphical\"/>。"
#. Tag: para
#: using-d-i.xml:68
-#, fuzzy, no-c-format
-#| msgid ""
-#| "For this architecture the &d-i; supports two different user interfaces: a "
-#| "character-based one and a graphical one. The character-based interface is "
-#| "used by default unless you selected the <quote>Graphical install</quote> "
-#| "option in the initial boot menu. For more information about the graphical "
-#| "installer, please refer to <xref linkend=\"graphical\"/>."
+#, no-c-format
msgid ""
"For this architecture the &d-i; supports two different user interfaces: a "
"character-based one and a graphical one. The character-based interface is "
@@ -158,9 +141,9 @@ msgid ""
"option on purpose. For more information about the graphical installer, "
"please refer to <xref linkend=\"graphical\"/>."
msgstr ""
-"本架构的 &d-i; 支持两种用户界面:字符界面和图形界面。除非您在引导菜单里面指"
-"定 <quote>Graphical install</quote> 选项,否则默认将使用字符界面。更多的图形"
-"界面安装程序信息,请参阅 <xref linkend=\"graphical\"/>。"
+"本架构的 &d-i; 支持两种用户界面:字符界面和图形界面。除非您特意选择 "
+"<quote>Graphical install</quote> 选项,否则默认将使用字符界面。更多的图形界面"
+"安装程序信息,请参阅 <xref linkend=\"graphical\"/>。"
#. Tag: para
#: using-d-i.xml:76
@@ -251,10 +234,9 @@ msgstr ""
#. Tag: title
#: using-d-i.xml:132
-#, fuzzy, no-c-format
-#| msgid "Using the &debian; Installer"
+#, no-c-format
msgid "Using the graphical installer"
-msgstr "使用 &debian; 安装程序"
+msgstr "使用图形安装程序"
#. Tag: para
#: using-d-i.xml:133
@@ -264,6 +246,8 @@ msgid ""
"and thus the rest of this manual can be used to guide you through the "
"installation process."
msgstr ""
+"图形安装程序基本上与文本安装程序相同地工作,这样,本手册的其它部分可以用于引"
+"导您走过安装过程。"
#. Tag: para
#: using-d-i.xml:139
@@ -277,22 +261,21 @@ msgid ""
"button after making your selections; hitting enter will toggle a selection, "
"not activate &BTN-CONT;."
msgstr ""
+"如果倾向于使用键盘而不是鼠标,那么需要知道两件事。为了将折叠的列表展开(例如"
+"用于在洲中选择国家),可以使用 <keycap>+</keycap> 和 <keycap>-</keycap> 按"
+"键。对于超过一项可以选择的问题(例如任务选择),首先需要在做出选择后用 制表符"
+"按键前往&BTN-CONT; 按键;按 enter 回车键会切换是否选择,而不启动 &BTN-CONT;。"
#. Tag: para
#: using-d-i.xml:149
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Some dialogs may offer additional help information. If help is available "
-#| "this will be indicated on the bottom line of the screen by displaying "
-#| "that help information can be accessed by pressing the <keycap>F1</keycap> "
-#| "key."
+#, no-c-format
msgid ""
"If a dialog offers additional help information, a <guibutton>Help</"
"guibutton> button will be displayed. The help information can be accessed "
"either by activating the button or by pressing the <keycap>F1</keycap> key."
msgstr ""
-"一些对话框可能会提供额外的帮助信息。如果有帮助信息,它们将在屏幕的最下面一行"
-"提示,可以通过 <keycap>F1</keycap> 键访问这些帮助信息。"
+"如果对话提供额外的帮助信息,那么会显示 <guibutton>Help</guibutton> 按钮。可以"
+"通过点击按钮或按 <keycap>F1</keycap> 按键,来访问这些帮助信息。"
#. Tag: para
#: using-d-i.xml:155
@@ -305,6 +288,11 @@ msgid ""
"installer itself runs on VT5, so you can use <keycombo> <keycap>Left Alt</"
"keycap> <keycap>F5</keycap> </keycombo> to switch back."
msgstr ""
+"要转换到另一个工作台,还需要使用 <keycap>Ctrl</keycap> 按键,就像使用 X "
+"Window 系统一样。例如,为了转换到 VT2 (第一个调试 shell)需要使用:"
+"<keycombo> <keycap>Ctrl</keycap> <keycap>左 Alt</keycap> <keycap>F2</keycap> "
+"</keycombo>。图形安装程序自身运行在 VT5 上,所以可以使用 <keycombo> <keycap>"
+"左 Alt</keycap> <keycap>F5</keycap> </keycombo> 来切换回去。"
#. Tag: title
#: using-d-i.xml:169
@@ -381,14 +369,11 @@ msgstr "console-setup"
#. Tag: para
#: using-d-i.xml:212
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Shows a list of keyboards, from which the user chooses the model which "
-#| "matches his own."
+#, no-c-format
msgid ""
"Shows a list of keyboard (layouts), from which the user chooses the one "
"which matches his own model."
-msgstr "显示键盘列表,用户在其中选择与自己匹配的模式。"
+msgstr "显示键盘(布局),用户在其中选择与自己的模式匹配的。"
#. Tag: term
#: using-d-i.xml:221
@@ -412,10 +397,9 @@ msgstr "cdrom-detect"
#. Tag: para
#: using-d-i.xml:230
-#, fuzzy, no-c-format
-#| msgid "Looks for and mounts a &debian; installation CD."
+#, no-c-format
msgid "Looks for and mounts a &debian; installation media."
-msgstr "寻找并挂载 &debian; 安装光盘。"
+msgstr "寻找并挂载 &debian; 安装介质。"
#. Tag: term
#: using-d-i.xml:238
@@ -466,14 +450,11 @@ msgstr "cdrom-checker"
#. Tag: para
#: using-d-i.xml:264
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Checks integrity of a CD-ROM. This way, the user may assure him/herself "
-#| "that the installation CD-ROM was not corrupted."
+#, no-c-format
msgid ""
"Checks integrity of installation media. This way, the user may assure him/"
"herself that the installation image was not corrupted."
-msgstr "检验 CD-ROM 的完整。这种方法让确保用户所用的安装 CD-ROM 没有损坏。"
+msgstr "检验安装介质的完整性。这种方法确保用户所用的安装映像没有损坏。"
#. Tag: term
#: using-d-i.xml:273
@@ -500,14 +481,11 @@ msgstr "anna"
#. Tag: para
#: using-d-i.xml:283
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Anna's Not Nearly APT. Installs packages which have been retrieved from "
-#| "the chosen mirror or CD."
+#, no-c-format
msgid ""
"Anna's Not Nearly APT. Installs packages which have been retrieved from the "
"chosen mirror or installation media."
-msgstr "Anna's Not Nearly APT。安装从选择的镜像或 CD 获取的软件包。"
+msgstr "Anna's Not Nearly APT。安装从选择的镜像或安装介质获取的软件包。"
#. Tag: term
#: using-d-i.xml:292
@@ -695,13 +673,7 @@ msgstr "bootloader-installer"
#. Tag: para
#: using-d-i.xml:406
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The various bootloader installers each install a boot loader program on "
-#| "the hard disk, which is necessary for the computer to start up using "
-#| "&arch-kernel; without using a floppy or CD-ROM. Many boot loaders allow "
-#| "the user to choose an alternate operating system each time the computer "
-#| "boots."
+#, no-c-format
msgid ""
"The various bootloader installers each install a boot loader program on the "
"hard disk, which is necessary for the computer to start up using &arch-"
@@ -709,8 +681,8 @@ msgid ""
"user to choose an alternate operating system each time the computer boots."
msgstr ""
"bootloader 安装程序在硬盘上安装 boot loader 程序,这是必须的一步,使得计算机"
-"启动 &arch-kernel; 不必依靠软盘和 CD-ROM。许多 boot loader 程序都允许用户在开"
-"机的时候选择启动哪个操作系统。"
+"启动 &arch-kernel; 不必依靠 U 盘和 CD-ROM。许多 boot loader 程序都允许用户在"
+"开机的时候选择启动哪个操作系统。"
#. Tag: term
#: using-d-i.xml:417
@@ -733,18 +705,13 @@ msgstr "save-logs"
#. Tag: para
#: using-d-i.xml:426
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Provides a way for the user to record information on a floppy disk, "
-#| "network, hard disk, or other media when trouble is encountered, in order "
-#| "to accurately report installer software problems to &debian; developers "
-#| "later."
+#, no-c-format
msgid ""
"Provides a way for the user to record information on a USB stick, network, "
"hard disk, or other media when trouble is encountered, in order to "
"accurately report installer software problems to &debian; developers later."
msgstr ""
-"当用户遇到麻烦时,提供一种方式记录信息到软盘、网络、硬盘或其他介质,用于以后"
+"当用户遇到麻烦时,提供一种方式记录信息到 U 盘、网络、硬盘或其他介质,用于以后"
"精确地给 &debian; 开发人员报告安装程序的问题。"
#. Tag: title
@@ -1127,21 +1094,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:716
-#, fuzzy, no-c-format
-#| msgid ""
-#| "At first, <command>iso-scan</command> automatically mounts all block "
-#| "devices (e.g. partitions) which have some known filesystem on them and "
-#| "sequentially searches for filenames ending with <filename>.iso</filename> "
-#| "(or <filename>.ISO</filename> for that matter). Beware that the first "
-#| "attempt scans only files in the root directory and in the first level of "
-#| "subdirectories (i.e. it finds <filename>/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, <filename>/data/<replaceable>whatever</"
-#| "replaceable>.iso</filename>, but not <filename>/data/tmp/"
-#| "<replaceable>whatever</replaceable>.iso</filename>). After an iso image "
-#| "has been found, <command>iso-scan</command> checks its content to "
-#| "determine if the image is a valid &debian; iso image or not. In the "
-#| "former case we are done, in the latter <command>iso-scan</command> seeks "
-#| "for another image."
+#, no-c-format
msgid ""
"At first, <command>iso-scan</command> automatically mounts all block devices "
"(e.g. partitions and logical volumes) which have some known filesystem on "
@@ -1156,15 +1109,15 @@ msgid ""
"the image is a valid &debian; iso image or not. In the former case we are "
"done, in the latter <command>iso-scan</command> seeks for another image."
msgstr ""
-"首先,<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如,分"
-"区),然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>.ISO</"
-"filename> 之类)。注意,首次只扫描位于根目录的文件,和第一层子目录 (例如,它找"
-"到 <filename>/<replaceable>whatever</replaceable>.iso</filename>,<filename>/"
-"data/<replaceable>whatever</replaceable>.iso</filename>,而不是 <filename>/"
-"data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 iso 映象文件"
-"找到后,<command>iso-scan</command> 检查它包含的内容,确定该映象文件是不是有"
-"效的 &debian; iso 映象。如为前者,任务结束;若是后者,<command>iso-scan</"
-"command> 搜索其它的映象。"
+"首先,<command>iso-scan</command> 自动挂载具有已知文件系统的块设备(比如,分区"
+"和逻辑卷),然后顺次搜索文件名结尾是 <filename>.iso</filename> (或 <filename>."
+"ISO</filename> 之类)。注意,首次只扫描位于根目录的文件,和第一层子目录 (例"
+"如,它找到 <filename>/<replaceable>whatever</replaceable>.iso</filename>,"
+"<filename>/data/<replaceable>whatever</replaceable>.iso</filename>,而不是 "
+"<filename>/data/tmp/<replaceable>whatever</replaceable>.iso</filename>)。在 "
+"iso 映象文件找到后,<command>iso-scan</command> 检查它包含的内容,确定该映象"
+"文件是不是有效的 &debian; iso 映象。如为前者,任务结束;若是后者,"
+"<command>iso-scan</command> 搜索其它的映象。"
#. Tag: para
#: using-d-i.xml:733
@@ -1205,6 +1158,10 @@ msgid ""
"controlled by the low priority <literal>iso-scan/copy_iso_to_ram</literal> "
"debconf question (it is only asked if the memory requirement is met)."
msgstr ""
+"注意,作为 ISO 映像主机的分区(或磁盘)不能在安装过程中再次使用,因为它将被安"
+"装程序使用。为了绕过这个限制,假设有充足的系统内存,安装程序能够在挂载前将 "
+"ISO 映像复制到内存中。这由低优先性的 <literal>iso-scan/copy_iso_to_ram</"
+"literal> debconf 问题(只在满足内存要求的时候询问)来控制。"
#. Tag: title
#: using-d-i.xml:770
@@ -1413,6 +1370,9 @@ msgid ""
"new system. By default, the first user created on the system will be allowed "
"to use the <command>sudo</command> command to become root."
msgstr ""
+"在这里没有为 <quote>root</quote> 用户指定密码的情况下,这个账户会被禁止,但 "
+"<command>sudo</command> 软件包将被安装,后面在新的系统上允许执行管理任务。默"
+"认系统上新建的第一个用户使用 <command>sudo</command> 命令变成根用户。"
#. Tag: title
#: using-d-i.xml:940
@@ -1749,19 +1709,14 @@ msgstr "支持下列的文件系统。"
#. Tag: para
#: using-d-i.xml:1179
-#, fuzzy, no-c-format
-#| msgid ""
-#| "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
-#| "<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
-#| "emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></"
-#| "phrase>"
+#, no-c-format
msgid ""
"<phrase arch=\"arm;mipsel;mips64el\"><emphasis>ext2r0</emphasis>,</phrase> "
"<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
"emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></"
"phrase>"
msgstr ""
-"<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
+"<phrase arch=\"arm;mipsel;mips64el\"><emphasis>ext2r0</emphasis>,</phrase> "
"<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
"emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></"
"phrase>"
@@ -2135,12 +2090,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1383
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you choose guided partitioning for your IA-64 system, there will be an "
-#| "additional partition, formatted as a FAT16 bootable filesystem, for the "
-#| "EFI boot loader. There is also an additional menu item in the formatting "
-#| "menu to manually set up a partition as an EFI boot partition."
+#, no-c-format
msgid ""
"If you have booted in EFI mode then within the guided partitioning setup "
"there will be an additional partition, formatted as a FAT32 bootable "
@@ -2148,9 +2098,9 @@ msgid ""
"System Partition (ESP). There is also an additional menu item in the "
"formatting menu to manually set up a partition as an ESP."
msgstr ""
-"倘若您为 IA-64 系统选择了导引式分区,就会有一个额外的分区,该分区格式化为 "
-"FAT16 可引导文件系统,用于 EFI boot loader。同时,菜单里也会加一项,让您可以"
-"手动把某个分区作为 EFI 引导分区。"
+"倘若您在 EFI 模式引导,然后再引导的分区设置,那么就会有一个额外的分区,该分区"
+"格式化为 FAT32 可引导文件系统,用于 EFI 引导程序。这个分区是 EFI 系统分区"
+"(ESP)。同时,格式化菜单里也会增加一项,可以手动把某个分区作为 ESP。"
#. Tag: para
#: using-d-i.xml:1391
@@ -2330,18 +2280,15 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1481
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you forget to select and format an EFI boot partition, "
-#| "<command>partman</command> will detect this and will not let you continue "
-#| "until you allocate one."
+#, no-c-format
msgid ""
"If you boot in EFI mode but forget to select and format an EFI System "
"Partition, <command>partman</command> will detect this and will not let you "
"continue until you allocate one."
msgstr ""
-"如果您忘记选择和格式化一个 EFI 启动分区 <command>partman</command> 会察觉这一"
-"点,不让您继续操作,直到您划分出这样一个分区。"
+"如果在 EFI 模式引导,但忘记选择并格式化一个 EFI 系统分区,那么 "
+"<command>partman</command> 会察觉这一点,不让您继续操作,直到划分出这样一个分"
+"区。"
#. Tag: para
#: using-d-i.xml:1487
@@ -2666,15 +2613,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1732
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Make sure that the system can be booted with the partitioning scheme you "
-#| "are planning. In general it will be necessary to create a separate file "
-#| "system for <filename>/boot</filename> when using RAID for the root "
-#| "(<filename>/</filename>) file system. Most boot loaders <phrase arch="
-#| "\"x86\">(including lilo and grub)</phrase> do support mirrored (not "
-#| "striped!) RAID1, so using for example RAID5 for <filename>/</filename> "
-#| "and RAID1 for <filename>/boot</filename> can be an option."
+#, no-c-format
msgid ""
"Make sure that the system can be booted with the partitioning scheme you are "
"planning. In general it will be necessary to create a separate file system "
@@ -2684,11 +2623,11 @@ msgid ""
"example RAID5 for <filename>/</filename> and RAID1 for <filename>/boot</"
"filename> can be an option."
msgstr ""
-"请确保系统可以从您规划的分区引导。当使用 RAID 作为根 (<filename>/</"
-"filename>) 文件系统时,通常需要创建一个单独的文件系统给 <filename>/boot</"
-"filename>。多数的 boot loaders <phrase arch=\"x86\">(包括 lilo 和 grub)</"
-"phrase> 支持 mirrored (而非 striped!) RAID1,所以例如使用 RAID5 给 "
-"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
+"请确保系统可以从您规划的分区引导。当使用 RAID 作为根(<filename>/</"
+"filename>)文件系统时,通常需要创建一个单独的文件系统给 <filename>/boot</"
+"filename>。多数的 boot loaders <phrase arch=\"x86\">(包括 grub)</phrase> 支"
+"持 mirrored(而非 striped!)RAID1,所以例如使用 RAID5 给 <filename>/</"
+"filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
#. Tag: para
#: using-d-i.xml:1743
@@ -2888,6 +2827,11 @@ msgid ""
"something different (like an encrypted volume). You need to remove such "
"disks from the system, before performing a new LVM setup!"
msgstr ""
+"注意:新的 LVM 设置将损坏由 LVM 类型编码标记的所有分区。所以,如果如果在您的"
+"一些盘上已经有 LVM 了,并想要另外安装 Debian 在那台机器上,那么旧的(已经存在"
+"的)LVM 将被擦除!有些分区(由于任何原因)被错误地标记了 LVM 类型编码,但包含"
+"了一些不同的(像加密的卷),这对它们也很重要。在执行新的 LVM 设置前,需要从系"
+"统中删除这样的盘!"
#. Tag: para
#: using-d-i.xml:1874
@@ -3006,19 +2950,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1945
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The two most important partitions to encrypt are: the home partition, "
-#| "where your private data resides, and the swap partition, where sensitive "
-#| "data might be stored temporarily during operation. Of course, nothing "
-#| "prevents you from encrypting any other partitions that might be of "
-#| "interest. For example <filename>/var</filename> where database servers, "
-#| "mail servers or print servers store their data, or <filename>/tmp</"
-#| "filename> which is used by various programs to store potentially "
-#| "interesting temporary files. Some people may even want to encrypt their "
-#| "whole system. The only exception is the <filename>/boot</filename> "
-#| "partition which must remain unencrypted, because currently there is no "
-#| "way to load the kernel from an encrypted partition."
+#, no-c-format
msgid ""
"The two most important partitions to encrypt are: the home partition, where "
"your private data resides, and the swap partition, where sensitive data "
@@ -3038,9 +2970,12 @@ msgstr ""
"有两个需要加密的重要分区:home 分区,驻留您的私人数据,以及交换分区,敏感的数"
"据在操作时会临时保存在这里。当然,这不影响您加密任何其他的分区。例如,数据库"
"服务器、邮件服务器或打印服务器上用来保存数据的 <filename>/var</filename>。或"
-"者 /tmp,很多程序用来保存临时文件。有些人或许需要加密整个系统。惟一的例外是,"
-"<filename>/boot</filename> 分区必须保持未加密,这是因为当前没有办法从加密分区"
-"加载内核。"
+"者 /tmp,很多程序用来保存临时文件。有些人或许需要加密整个系统。通常这里唯一的"
+"例外是,<filename>/boot</filename> 分区必须保持未加密,这是因为以前没有办法从"
+"加密分区加载内核。(GRUB 现在可以这样做了,但 &d-i; 当前缺少对加密的 "
+"<filename>/boot</filename> 的内在支持。这样,设置在 <ulink url=\"https://"
+"cryptsetup-team.pages.debian.net/cryptsetup/encrypted-boot.html\">separate "
+"document</ulink>中覆盖。)"
#. Tag: para
#: using-d-i.xml:1963
@@ -3079,24 +3014,21 @@ msgid ""
"The encryption method supported by &d-i; is <firstterm>dm-crypt</firstterm> "
"(included in newer Linux kernels, able to host LVM physical volumes)."
msgstr ""
+"由 &d-i; 支持的加密方法是 <firstterm>dm-crypt</firstterm>(包括在较新的 "
+"Linux 内科中,能够作为 LVM 物理卷的主机)。"
#. Tag: para
#: using-d-i.xml:1990
-#, fuzzy, no-c-format
-#| msgid ""
-#| "First, let's have a look at the options available when you select "
-#| "<userinput>Device-mapper (dm-crypt)</userinput> as the encryption method. "
-#| "As always: when in doubt, use the defaults, because they have been "
-#| "carefully chosen with security in mind."
+#, no-c-format
msgid ""
"Let's have a look at the options available when you select encryption via "
"<userinput>Device-mapper (dm-crypt)</userinput>. As always: when in doubt, "
"use the defaults, because they have been carefully chosen with security in "
"mind."
msgstr ""
-"首先,让我们来看看选择 <userinput>Device-mapper (dm-crypt)</userinput> 作为加"
-"密方法后可用的选项。一般规律:如果不能确定,就使用默认项,因为它们是经过审慎"
-"的安全考虑的选择。"
+"让我们来看看通过<userinput>Device-mapper (dm-crypt)</userinput> 选择加密方法"
+"后的可用选项。一般规律:如果不能确定,就使用默认项,因为它们是经过审慎的安全"
+"考虑的选择。"
#. Tag: term
#: using-d-i.xml:2000
@@ -3343,22 +3275,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2182
-#, fuzzy, no-c-format
-#| msgid ""
-#| "After returning to the main partitioning menu, you will see all encrypted "
-#| "volumes as additional partitions which can be configured in the same way "
-#| "as ordinary partitions. The following example shows two different "
-#| "volumes. The first one is encrypted via dm-crypt, the second one via loop-"
-#| "AES. <informalexample><screen>\n"
-#| "Encrypted volume (<replaceable>sda2_crypt</replaceable>) - 115.1 GB Linux "
-#| "device-mapper\n"
-#| " #1 115.1 GB F ext3\n"
-#| "\n"
-#| "Loopback (<replaceable>loop0</replaceable>) - 515.2 MB AES256 keyfile\n"
-#| " #1 515.2 MB F ext3\n"
-#| "</screen></informalexample> Now is the time to assign mount points to the "
-#| "volumes and optionally change the file system types if the defaults do "
-#| "not suit you."
+#, no-c-format
msgid ""
"After returning to the main partitioning menu, you will see all encrypted "
"volumes as additional partitions which can be configured in the same way as "
@@ -3372,27 +3289,17 @@ msgid ""
"suit you."
msgstr ""
"返回主分区菜单后,您将看到所有的加密卷作为额外的分区,它们可以像其他的普通分"
-"区一样配置。下面例子中显示了两种不同的卷。第一个是使用 dm-crypt 加密的,第二"
-"个采用 loop-AES。<informalexample><screen>\n"
+"区一样配置。下面例子中显示了通过 dm-crypt 加密的卷。"
+"<informalexample><screen>\n"
"Encrypted volume (<replaceable>sda2_crypt</replaceable>) - 115.1 GB Linux "
"device-mapper\n"
" #1 115.1 GB F ext3\n"
-"\n"
-"Loopback (<replaceable>loop0</replaceable>) - 515.2 MB AES256 keyfile\n"
-" #1 515.2 MB F ext3\n"
"</screen></informalexample> 现在可以给卷设置挂载点,如果默认的文件系统类型对"
"您不合适,可以进行修改。"
#. Tag: para
#: using-d-i.xml:2194
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
-#| "replaceable> and <replaceable>loop0</replaceable> in this case) and the "
-#| "mount points you assigned to each encrypted volume. You will need this "
-#| "information later when booting the new system. The differences between "
-#| "the ordinary boot process and the boot process with encryption involved "
-#| "will be covered later in <xref linkend=\"mount-encrypted-volumes\"/>."
+#, no-c-format
msgid ""
"Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
"replaceable> in this case) and the mount points you assigned to each "
@@ -3401,10 +3308,10 @@ msgid ""
"process with encryption involved will be covered later in <xref linkend="
"\"mount-encrypted-volumes\"/>."
msgstr ""
-"要留意括号里的标识(本例中 <replaceable>sda2_crypt</replaceable> 和 "
-"<replaceable>loop0</replaceable>) 和您为每个加密卷所设置的加载点。启动新系统"
-"的时候您会需要该信息。关于普通引导过程和使用加密后引导过程之间的差异,将在后"
-"面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
+"要留意括号里的标识(本例中 <replaceable>sda2_crypt</replaceable>) 和您为每个加"
+"密卷所设置的加载点。启动新系统的时候您会需要该信息。关于普通引导过程和使用加"
+"密后引导过程之间的差异,将在后面的 <xref linkend=\"mount-encrypted-volumes\"/"
+"> 说明。"
#. Tag: para
#: using-d-i.xml:2204
@@ -3525,22 +3432,7 @@ msgstr "配置 apt"
#. Tag: para
#: using-d-i.xml:2291
-#, fuzzy, no-c-format
-#| msgid ""
-#| "One of the tools used to install packages on a &debian-gnu; system is a "
-#| "program called <command>apt-get</command>, from the <classname>apt</"
-#| "classname> package<footnote> <para> Note that the program which actually "
-#| "installs the packages is called <command>dpkg</command>. However, this "
-#| "program is more of a low-level tool. <command>apt-get</command> is a "
-#| "higher-level tool, which will invoke <command>dpkg</command> as "
-#| "appropriate. It knows how to retrieve packages from your CD, the network, "
-#| "or wherever. It is also able to automatically install other packages "
-#| "which are required to make the package you're trying to install work "
-#| "correctly. </para> </footnote>. Other front-ends for package management, "
-#| "like <command>aptitude</command> and <command>synaptic</command>, are "
-#| "also in use. These front-ends are recommended for new users, since they "
-#| "integrate some additional features (package searching and status checks) "
-#| "in a nice user interface."
+#, no-c-format
msgid ""
"One of the tools used to install packages on a &debian-gnu; system is the "
"program <command>apt</command>, from the <classname>apt</classname> "
@@ -3556,15 +3448,15 @@ msgid ""
"recommended for new users, since they integrate some additional features "
"(package searching and status checks) in a nice user interface."
msgstr ""
-"在 &debian-gnu; 系统上,<command>apt-get</command> 是一个人们用来安装软件包的"
-"程序,它被包含在 <classname>apt</classname> 软件包中<footnote> <para> 其实,"
-"真正用来安装软件包的程序是 <command>dpkg</command>。但这是一个比较底层的工"
-"具。<command>apt-get</command> 是一个高级工具,它可以在适当的时候调用 "
-"<command>dpkg</command>。它知道从您的光盘、网络或其它地方获取软件包。它还可以"
-"在安装某个软件包时自动安装所需的其它软件包。</para> </footnote>。其他的包管理"
-"前端程序,像 <command>aptitude</command> 和 <command>synaptic</command> 也在"
-"使用。这些前端软件推荐给新用户使用,因为它们在良好的用户界面下集成了一些其他"
-"特性(搜索包与状态检验)。"
+"在 &debian-gnu; 系统上,<command>apt</command> 是用来安装软件包的一个程序,它"
+"被包含在 <classname>apt</classname> 软件包中<footnote> <para> 其实,真正用来"
+"安装软件包的程序是 <command>dpkg</command>。但这是一个比较底层的工具。"
+"<command>apt</command> 是一个高级工具,它可以在适当的时候调用 <command>dpkg</"
+"command>。它知道从您的安装介质、网络或其它地方获取软件包。它还可以在安装某个"
+"软件包时自动安装所需的其它软件包。</para> </footnote>。其他的包管理前端程序,"
+"像 <command>aptitude</command> 和 <command>synaptic</command> 也在使用。这些"
+"前端软件推荐给新用户使用,因为它们在良好的用户界面下集成了一些其他特性(搜索包"
+"与状态检验)。"
#. Tag: para
#: using-d-i.xml:2314
@@ -3610,63 +3502,46 @@ msgstr ""
#. Tag: title
#: using-d-i.xml:2341
-#, fuzzy, no-c-format
-#| msgid "Installing from more than one CD or DVD"
+#, no-c-format
msgid "Installing from more than one CD or DVD image"
-msgstr "从多个 CD 或 DVD 安装"
+msgstr "从多个 CD 或 DVD 映像来安装"
#. Tag: para
#: using-d-i.xml:2343
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are installing from a CD or a DVD that is part of a larger set, "
-#| "the installer will ask if you want to scan additional CDs or DVDs. If you "
-#| "have additional CDs or DVDs available, you probably want to do this so "
-#| "the installer can use the packages included on them."
+#, no-c-format
msgid ""
"If you are installing from a CD or DVD image that is part of a larger set, "
"the installer will ask if you want to scan additional installation media. If "
"you have such additional media available, you probably want to do this so "
"the installer can use the packages included on them."
msgstr ""
-"假如从一张 CD 或 DVD 安装,而它只属于所要安装程序的一部分,安装程序会询问您是"
-"否需要检测其他的 CD 或 DVD。如果您手头有这些光盘,检测后安装程序就可以使用它"
-"们里面的软件包了。"
+"假如从 CD 或 DVD 映像来安装,而它只属于所要安装程序的一部分,安装程序会询问您"
+"是否需要检测其它的安装介质。如果您手头有这样的介质,检测后安装程序就可以使用"
+"它们里面的软件包了。"
#. Tag: para
#: using-d-i.xml:2350
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you do not have any additional CDs or DVDs, that is no problem: using "
-#| "them is not required. If you also do not use a network mirror (as "
-#| "explained in the next section), it can mean that not all packages "
-#| "belonging to the tasks you select in the next step of the installation "
-#| "can be installed."
+#, no-c-format
msgid ""
"If you do not have any additional media, that is no problem: using them is "
"not required. If you also do not use a network mirror (as explained in the "
"next section), it can mean that not all packages belonging to the tasks you "
"select in the next step of the installation can be installed."
msgstr ""
-"假如您没有这些 CD 或 DVD,也没关系:它们不是必须的。如果您也不使用网络镜像(下"
-"节说明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
+"假如您没有这些介质,也没关系:它们不是必须的。如果您也不使用网络镜像(下节说"
+"明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
#. Tag: para
#: using-d-i.xml:2358
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Packages are included on CDs (and DVDs) in the order of their popularity. "
-#| "This means that for most uses only the first CDs in a set are needed and "
-#| "that only very few people actually use any of the packages included on "
-#| "the last CDs in a set."
+#, no-c-format
msgid ""
"Packages are included on CD and DVD images in the order of their popularity. "
"This means that for most uses only the first image of a set is needed and "
"that only very few people actually use any of the packages included on the "
"last images of a set."
msgstr ""
-"CD(和 DVD) 里面包含的软件包按照流行程度排列次序。也就是说,第一张光盘里面是最"
-"常用的软件,而最后一张光盘里面包含的是很少有人用到的软件。"
+"CD 和 DVD 映像中包含的软件包按照流行程度排列次序。也就是说,一组映像里面的第"
+"一个映像是最常用的软件,而最后一个映像包含的是很少有人用到的软件。"
#. Tag: para
#: using-d-i.xml:2365
@@ -3684,14 +3559,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2375
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you do scan multiple CDs or DVDs, the installer will prompt you to "
-#| "exchange them when it needs packages from another CD/DVD than the one "
-#| "currently in the drive. Note that only CDs or DVDs that belong to the "
-#| "same set should be scanned. The order in which they are scanned does not "
-#| "really matter, but scanning them in ascending order will reduce the "
-#| "chance of mistakes."
+#, no-c-format
msgid ""
"If you do scan multiple installation media, the installer will prompt you to "
"exchange them when it needs packages from one that isn't currently in the "
@@ -3699,9 +3567,9 @@ msgid ""
"The order in which they are scanned does not really matter, but scanning "
"them in ascending order will reduce the chance of mistakes."
msgstr ""
-"如果您检测了多张 CD 或 DVD,安装程序会在需要其他盘上的软件包时,提示您换盘。"
-"注意,只有同属于一个套件的 CD 或 DVD 需要检测。检测的次序并不是非常重要,但按"
-"照次序来可以降低出错的几率。"
+"如果您检测了多个安装介质,在需要的映像当前不在驱动器中时,安装程序会提示您换"
+"盘。注意,只有同属于一个套件的光盘需要检测。检测的次序并不是非常重要,但按照"
+"次序来可以降低出错的几率。"
#. Tag: title
#: using-d-i.xml:2388
@@ -3722,14 +3590,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2396
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
-#| "using a full CD/DVD image, you really should use a network mirror as "
-#| "otherwise you will end up with only a very minimal system. However, if "
-#| "you have a limited Internet connection it is best <emphasis>not</"
-#| "emphasis> to select the <literal>desktop</literal> task in the next step "
-#| "of the installation."
+#, no-c-format
msgid ""
"If you are <emphasis>not</emphasis> installing from a full CD/DVD image, you "
"really should use a network mirror as otherwise you will end up with only a "
@@ -3737,23 +3598,13 @@ msgid ""
"is best <emphasis>not</emphasis> to select the <literal>desktop</literal> "
"task in the next step of the installation."
msgstr ""
-"如果<emphasis>没有</emphasis>使用完整版的 CD 或 DVD,或者完整版的 CD/DVD 映"
-"像,您就应该使用网络镜像,否则只能得到一个有限的系统。然而,假如您有互联网连"
-"接限制,在安装过程的下一步最好<emphasis>不要</emphasis>选择 "
-"<literal>desktop</literal> 任务。"
+"如果<emphasis>没有</emphasis>使用完整版的 CD/DVD 映像,您就应该使用网络镜像,"
+"否则只能得到一个有限的系统。然而,假如您有互联网连接限制,在安装过程的下一步"
+"最好<emphasis>不要</emphasis>选择 <literal>desktop</literal> 任务。"
#. Tag: para
#: using-d-i.xml:2405
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are installing from a single full CD or using a full CD image, "
-#| "using a network mirror is not required, but is still strongly recommended "
-#| "because a single CD contains only a fairly limited number of packages. If "
-#| "you have a limited Internet connection it may still be best to "
-#| "<emphasis>not</emphasis> select a network mirror here, but to finish the "
-#| "installation using only what's available on the CD and selectively "
-#| "install additional packages after the installation (i.e. after you have "
-#| "rebooted into the new system)."
+#, no-c-format
msgid ""
"If you are installing from a single full CD image, using a network mirror is "
"not required, but is still strongly recommended because a single CD image "
@@ -3763,37 +3614,25 @@ msgid ""
"available on the CD image and selectively install additional packages after "
"the installation (i.e. after you have rebooted into the new system)."
msgstr ""
-"如果您是从完整的 CD 或 CD 映像安装,虽然添加网络镜像并不是必须的,但仍建议您"
-"采用,这是因为单张 CD 所能容纳的软件包数量是有限的。假如您有互联网连接限制,"
-"这里最好<emphasis>不要</emphasis>选择网络镜像,只使用当前 CD 上的软件包完成安"
-"装,以后(比如,重新启动到新系统)再安装额外的软件包。"
+"如果您是从完整的 CD 映像安装,虽然添加网络镜像并不是必须的,但仍建议您采用,"
+"这是因为单张 CD 映像所能容纳的软件包数量是有限的。假如您有互联网连接限制,这"
+"里最好<emphasis>不要</emphasis>选择网络镜像,只使用当前 CD 映像上的软件包完成"
+"安装,以后(比如,重新启动到新系统)再安装额外的软件包。"
#. Tag: para
#: using-d-i.xml:2416
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you are installing from a DVD or using a DVD image, any packages "
-#| "needed during the installation should be present on the first DVD. The "
-#| "same is true if you have scanned multiple CDs as explained in the "
-#| "previous section. Use of a network mirror is optional."
+#, no-c-format
msgid ""
"If you are installing from DVD, any packages needed during the installation "
"should be present on the first DVD image. Use of a network mirror is "
"optional."
msgstr ""
-"如果您从 DVD 或使用 DVD 映象安装,安装过程中需要的软件包都应该在第一张 DVD 里"
-"面。如果您如前面章节所述检测了多张 CD,情况也是一样的。网络镜像的使用是一个选"
-"项。"
+"如果您从 DVD 安装,安装过程中需要的软件包都应该在第一张 DVD 映像里面。网络镜"
+"像的使用是一个选项。"
#. Tag: para
#: using-d-i.xml:2422
-#, fuzzy, no-c-format
-#| msgid ""
-#| "One advantage of adding a network mirror is that updates that have "
-#| "occurred since the CD/DVD set was created and have been included in a "
-#| "point release, will become available for installation, thus extending the "
-#| "life of your CD/DVD set without compromising the security or stability of "
-#| "the installed system."
+#, no-c-format
msgid ""
"One advantage of adding a network mirror is that updates, that have occurred "
"since the CD/DVD images were created and have been included in a point "
@@ -3801,18 +3640,12 @@ msgid ""
"your CD/DVD set without compromising the security or stability of the "
"installed system."
msgstr ""
-"添加网络镜像的优势在于有些内容已经更新,而 CD/DVD 只是在版本发布时创建,所以"
-"可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
+"添加网络镜像的优势在于有些内容已经更新,而 CD/DVD 映像只是在版本发布时创建,"
+"所以可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
#. Tag: para
#: using-d-i.xml:2429
-#, fuzzy, no-c-format
-#| msgid ""
-#| "In summary: selecting a network mirror is generally a good idea, except "
-#| "if you do not have a good Internet connection. If the current version of "
-#| "a package is available from CD/DVD, the installer will always use that. "
-#| "The amount of data that will be downloaded if you do select a mirror thus "
-#| "depends on"
+#, no-c-format
msgid ""
"In summary: selecting a network mirror is generally a good idea, except if "
"you do not have a good Internet connection. If the current version of a "
@@ -3820,9 +3653,9 @@ msgid ""
"that. The amount of data that will be downloaded if you do select a mirror "
"thus depends on"
msgstr ""
-"总结:除非您不具备良好的互联网连接,选择网络镜像通常是一个好主意。如果 CD/"
-"DVD 上有软件包当前的版本,安装程序总会从这里安装。如果您选择了镜像,需要下载"
-"的数据量取决于"
+"总结:除非您不具备良好的互联网连接,选择网络镜像通常是一个好主意。如果安装介"
+"质上有软件包当前的版本,安装程序总会从这里安装。如果您选择了镜像,需要下载的"
+"数据量取决于"
#. Tag: para
#: using-d-i.xml:2438
@@ -3838,38 +3671,26 @@ msgstr "这些任务所需的软件包,"
#. Tag: para
#: using-d-i.xml:2448
-#, fuzzy, no-c-format
-#| msgid ""
-#| "which of those packages are present on the CDs or DVDs you have scanned, "
-#| "and"
+#, no-c-format
msgid ""
"which of those packages are present on the installation media you have "
"scanned, and"
-msgstr "已检测的 CD 或 DVD 上的软件包,并且"
+msgstr "已检测的安装介质上的软件包,并且"
#. Tag: para
#: using-d-i.xml:2453
-#, fuzzy, no-c-format
-#| msgid ""
-#| "whether any updated versions of packages included on the CDs or DVDs are "
-#| "available from a mirror (either a regular package mirror, or a mirror for "
-#| "security or volatile updates)."
+#, no-c-format
msgid ""
"whether any updated versions of packages included on the installation media "
"are available from a mirror (either a regular package mirror, or a mirror "
"for security or stable-updates)."
msgstr ""
-"CD 或 DVD 上面的软件包在网络镜像里面是否有更新版本(普通软件包的网络镜像,或者"
-"安全更新的镜像)。"
+"安装介质上的软件包在网络镜像里面是否有更新版本(普通软件包的网络镜像,或者安全"
+"或稳定更新的镜像)。"
#. Tag: para
#: using-d-i.xml:2462
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Note that the last point means that, even if you choose not to use a "
-#| "network mirror, some packages may still be downloaded from the Internet "
-#| "if there is a security or volatile update available for them and those "
-#| "services have been configured."
+#, no-c-format
msgid ""
"Note that the last point means that, even if you choose not to use a network "
"mirror, some packages may still be downloaded from the Internet if there is "
@@ -3877,7 +3698,7 @@ msgid ""
"have been configured."
msgstr ""
"注意,最后一点意味着,即使您没有选择使用网络镜像,如果配置了安全检测服务,并"
-"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"
+"且软件包有安全更新或稳定更新,仍然会从互联网下载更新后的软件包。"
#. Tag: title
#: using-d-i.xml:2473
@@ -3887,21 +3708,14 @@ msgstr "选择网络镜像"
#. Tag: para
#: using-d-i.xml:2474
-#, fuzzy, no-c-format
-#| msgid ""
-#| "If you have selected to use a network mirror during the installation "
-#| "(optional for CD/DVD installs, required for netboot images), you will be "
-#| "presented with a list of geographically nearby (and therefore hopefully "
-#| "fast) network mirrors, based upon your country selection earlier in the "
-#| "installation process. Choosing the offered default is usually fine."
+#, no-c-format
msgid ""
"Unless you chose not to use a network mirror, you will be presented with a "
"list of network mirrors based upon your country selection earlier in the "
"installation process. Choosing the offered default is usually fine."
msgstr ""
-"如果在安装过程中选择网络镜像(CD/DVD 安装时为选项,netboot 为必须),根据安装步"
-"骤签名进行的国家选择,您将看到根据就近地理位置(也希望速度最快)列出的网络镜像"
-"列表。通常选择默认的就行。"
+"除非选择不使用网络镜像,根据前面的安装步骤中您选择的国家,会显示网络镜像的列"
+"表。通常选择默认的就行。"
#. Tag: para
#: using-d-i.xml:2481
@@ -3912,6 +3726,8 @@ msgid ""
"support TLS (https protocol) and IPv6. This service is maintained by the "
"Debian System Administration (DSA) team."
msgstr ""
+"默认的是 deb.debian.org,这不是镜像自身,但将会重定向最新与最快的镜像。这些镜"
+"像支持 TLS (https 协议)和 IPv6。这个服务由 Debian 系统管理(DSA)团队维护。"
#. Tag: para
#: using-d-i.xml:2488
@@ -3923,6 +3739,9 @@ msgid ""
"IPv6 address, one has to add square brackets around it, for instance "
"<quote>[2001:db8::1]</quote>."
msgstr ""
+"可以通过选择 <quote>enter information manually</quote> 来说动指定镜像。可以指"
+"定镜像主机名称和可选的端口号。这实际上必须基于 URL ,也就是当指定 IPv6 地址"
+"时,必须添加方括号将它包起来,例如 <quote>[2001:db8::1]</quote>。"
#. Tag: para
#: using-d-i.xml:2496
@@ -4017,16 +3836,11 @@ msgstr "在安装程序的标准用户界面下,您可以使用空格键切换
#. Tag: para
#: using-d-i.xml:2569
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
-#| "environment</quote> task will install the GNOME desktop environment."
+#, no-c-format
msgid ""
"The <quote>Desktop environment</quote> task will install a graphical desktop "
"environment."
-msgstr ""
-"除非选择 KDE 或 Xfce/LXDE CD,<quote>Desktop environment</quote> 任务将安装 "
-"GNOME 桌面环境。"
+msgstr "<quote>Desktop environment</quote> 任务将安装图形桌面环境。"
#. Tag: para
#: using-d-i.xml:2574
@@ -4038,17 +3852,13 @@ msgid ""
"installation. It is also possible to install multiple desktops, but some "
"combinations of desktop may not be co-installable."
msgstr ""
+"默认 &d-i; 安装 <phrase arch=\"x86\">Gnome</phrase> <phrase arch=\"non-"
+"x86\">Xfce</phrase> 桌面环境。能够在安装过程中交互地选择不同的桌面环境。还能"
+"够安装多个桌面,但一些桌面的组合可能不能同时安装。"
#. Tag: para
#: using-d-i.xml:2582
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Note that this will only work if the packages needed for the desired "
-#| "desktop environment are actually available. If you are installing using a "
-#| "single full CD image, they will need to be downloaded from a mirror as "
-#| "most needed packages are only included on later CDs; installing KDE, Xfce "
-#| "or LXDE this way should work fine if you are using a DVD image or any "
-#| "other installation method."
+#, no-c-format
msgid ""
"Note that this will only work if the packages needed for the desired desktop "
"environment are actually available. If you are installing using a single "
@@ -4058,9 +3868,10 @@ msgid ""
"way should work fine if you are using a DVD image or any other installation "
"method."
msgstr ""
-"注意,这只在该桌面环境对应的软件包可以获得的情况下有效。假如您安装时使用单个 "
-"CD 映象,它们就像其他光盘上的软件包一样需要从网络镜像下载;这种方式安装 KDE、"
-"Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
+"注意,这只在该桌面环境对应的软件包可以获得的情况下有效。假如您安装时使用单个"
+"的完整 CD 映象,它们可能需要从网络镜像下载,因为由于 CD 映像的容量有限它们会"
+"不在 CD 上供使用;如果使用 DVD 映象或其他的安装方法的话,安装任何可用的桌面环"
+"境时这种方法应该有效工作。"
#. Tag: para
#: using-d-i.xml:2592
@@ -4070,6 +3881,9 @@ msgid ""
"server: <classname>apache2</classname>; Print server: <classname>cups</"
"classname>; SSH server: <classname>openssh</classname>."
msgstr ""
+"各种服务器任务大致按照后面来安装软件。Web 服务器:<classname>apache2</"
+"classname>;打印服务器:<classname>cups</classname>;SSH 服务器: "
+"<classname>openssh</classname>。"
#. Tag: para
#: using-d-i.xml:2599
@@ -4226,43 +4040,32 @@ msgstr "hppa FIXME ( need more info )"
#. Tag: title
#: using-d-i.xml:2715
-#, fuzzy, no-c-format
-#| msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
+#, no-c-format
msgid "Install the <command>Grub</command> Boot Loader on the drive"
-msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
+msgstr "在驱动器上 <command>Grub</command> 安装引导程序"
#. Tag: para
#: using-d-i.xml:2717
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The main &architecture; boot loader is called <quote>grub</quote>. Grub "
-#| "is a flexible and robust boot loader and a good default choice for new "
-#| "users and old hands alike."
+#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>grub</quote>. Grub is a "
"flexible and robust boot loader and a good default choice for new users and "
"old hands alike."
msgstr ""
-"&architecture; 上主要的 boot loader 是 <quote>grub</quote>。Grub 是个灵活和稳"
-"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
+"&architecture; 上的引导程序被称为 <quote>grub</quote>。Grub 是个灵活和稳定的 "
+"boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
#: using-d-i.xml:2723
-#, fuzzy, no-c-format
-#| msgid ""
-#| "By default, grub will be installed into the Master Boot Record (MBR), "
-#| "where it will take over complete control of the boot process. If you "
-#| "prefer, you can install it elsewhere. See the grub manual for complete "
-#| "information."
+#, no-c-format
msgid ""
"By default, grub will be installed on the UEFI partition/the Boot Record of "
"the primary drive, where it will take over complete control of the boot "
"process. If you prefer, you can install it elsewhere. See the grub manual "
"for complete information."
msgstr ""
-"缺省情况下,grub 会被装在主引导区(MBR)。如果装在那里的话,它将会完全主宰启动"
-"的整个过程。如果喜欢的话,您可以把 grub 装在其他地方。若要全面和完整的信息,"
-"请参阅 grub 的手册。"
+"缺省情况下,grub 会被装在UEFI分区/主盘的引导块上,它将会完全主宰引导过程。如"
+"果喜欢的话可以装在其它地方。若要全面和完整的信息,请参阅 grub 的手册。"
#. Tag: para
#: using-d-i.xml:2730
@@ -4528,19 +4331,11 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2928
-#, fuzzy, no-c-format
-#| msgid ""
-#| "By default, grub will be installed into the Master Boot Record (MBR), "
-#| "where it will take over complete control of the boot process. If you "
-#| "prefer, you can install it elsewhere. See the grub manual for complete "
-#| "information."
+#, no-c-format
msgid ""
"By default, Grub will be installed into the PReP partition, where it will "
"over complete control of the boot process."
-msgstr ""
-"缺省情况下,grub 会被装在主引导区(MBR)。如果装在那里的话,它将会完全主宰启动"
-"的整个过程。如果喜欢的话,您可以把 grub 装在其他地方。若要全面和完整的信息,"
-"请参阅 grub 的手册。"
+msgstr "缺省情况下,Grub 会被装在PReP分区,它将会完全主宰引导过程。"
#. Tag: title
#: using-d-i.xml:2941
@@ -4600,7 +4395,7 @@ msgstr ""
#: using-d-i.xml:2986
#, no-c-format
msgid "Making the system bootable with flash-kernel"
-msgstr ""
+msgstr "制作可以用 flash-kernel 引导的系统"
#. Tag: para
#: using-d-i.xml:2987
@@ -4614,6 +4409,10 @@ msgid ""
"various devices. It detects whether the current device is supported, and if "
"yes, performs the necessary operations."
msgstr ""
+"因为在所有的 ARM 平台上没有共同的固件接口,使 ARM 设备上的系统可引导所需的步"
+"骤非常依赖于设备。&debian; 使用被称为 <command>flash-kernel </command> 的工具"
+"来处理这个问题。Flash-kernel 包含数据库,描述了使各种设备上的系统可引导所需的"
+"特定操作。它检测当前的设备是否被支持,如果是,则执行必要的操作。"
#. Tag: para
#: using-d-i.xml:2998
@@ -4626,6 +4425,10 @@ msgid ""
"internal flash memory, i.e. running flash-kernel on them usually overwrites "
"the previous contents of the flash memory!"
msgstr ""
+"在从内部 NOR 闪存或 NAND 闪存引导的设备上,flash-kernel 将内核和初始虚拟盘写"
+"道这个内存上。这种方法在较老的 armel 设备上特别普通。请注意,多数这样的设备不"
+"允许在它们的内部闪存上具有多个内核和虚拟盘,也就是在它们上面运行 flash-"
+"kernel 通常会覆盖闪存上之前的内容!"
#. Tag: para
#: using-d-i.xml:3008
@@ -4636,6 +4439,9 @@ msgid ""
"USB mass storage devices or IDE/SATA harddisks), flash-kernel generates an "
"appropriate boot script to allow autobooting without user interaction."
msgstr ""
+"对于使用 U-Boot 作为其系统固件,并且从外部存储介质(如 MMC/SD 卡,USB 大容量"
+"存储设备或 IDE/SATA 硬盘)引导内核和初始虚拟盘的 ARM 系统,flash-kernel 生成"
+"适当的引导脚本,来允许自动引导而无需与用户交互。"
#. Tag: title
#: using-d-i.xml:3024
@@ -4743,17 +4549,13 @@ msgstr "重新启动系统"
#. Tag: para
#: using-d-i.xml:3101
-#, fuzzy, no-c-format
-#| msgid ""
-#| "You will be prompted to remove the boot media (CD, floppy, etc) that you "
-#| "used to boot the installer. After that the system will be rebooted into "
-#| "your new &debian; system."
+#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, USB stick, etc) that you "
"used to boot the installer. After that the system will be rebooted into your "
"new &debian; system."
msgstr ""
-"您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后,系统会启动到您的新 "
+"您会被提示拿出用于安装启动的媒介(CD、U 盘等)。之后,系统会启动到您的新 "
"&debian; 系统。"
#. Tag: para
@@ -4804,13 +4606,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:3143
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
-#| "allows you to save the log files to a floppy disk, network, hard disk, or "
-#| "other media. This can be useful if you encounter fatal problems during "
-#| "the installation and wish to study the logs on another system or attach "
-#| "them to an installation report."
+#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
"allows you to save the log files to a USB stick, network, hard disk, or "
@@ -4819,7 +4615,7 @@ msgid ""
"an installation report."
msgstr ""
"从主菜单上选择 <guimenuitem>Save debug logs</guimenuitem>,允许您将记录文件保"
-"存到软盘上、网络、硬盘或其他介质。这可用于安装过程中遭遇严重错误的时,您想在"
+"存到 U 盘上、网络、硬盘或其他介质。这可用于安装过程中遭遇严重错误的时,您想在"
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
@@ -4946,16 +4742,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:3245
-#, fuzzy, no-c-format
-#| msgid ""
-#| "This component is not loaded into the main installation menu by default, "
-#| "so you have to explicitly ask for it. If you are installing from CD, you "
-#| "need to boot with medium priority or otherwise invoke the main "
-#| "installation menu and choose <guimenuitem>Load installer components from "
-#| "CD</guimenuitem> and from the list of additional components select "
-#| "<guimenuitem>network-console: Continue installation remotely using SSH</"
-#| "guimenuitem>. Successful load is indicated by a new menu entry called "
-#| "<guimenuitem>Continue installation remotely using SSH</guimenuitem>."
+#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
"you have to explicitly ask for it. If you are installing from optical media, "
@@ -4966,12 +4753,12 @@ msgid ""
"SSH</guimenuitem>. Successful load is indicated by a new menu entry called "
"<guimenuitem>Continue installation remotely using SSH</guimenuitem>."
msgstr ""
-"该组件默认不会加载到安装主菜单,因此必须单独指定。如果使用 CD,您需要使用 "
-"medium 优先级或者打开安装主菜单并选择 <guimenuitem>Load installer components "
-"from CD</guimenuitem>,在额外的组件列表里面选择 <guimenuitem>network-"
-"console: Continue installation remotely using SSH</guimenuitem>。加载成功后会"
-"出现一个新的菜单项,名为 <guimenuitem>Continue installation remotely using "
-"SSH</guimenuitem>。"
+"该组件默认不会加载到安装主菜单,因此必须单独指定。如果使用光盘介质,您需要使"
+"用 medium 优先级或者打开安装主菜单并选择 <guimenuitem>Load installer "
+"components from installation media</guimenuitem>,在额外的组件列表里面选择 "
+"<guimenuitem>network-console: Continue installation remotely using SSH</"
+"guimenuitem>。加载成功后会出现一个新的菜单项,名为 <guimenuitem>Continue "
+"installation remotely using SSH</guimenuitem>。"
#. Tag: para
#: using-d-i.xml:3258
@@ -5169,14 +4956,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:3388
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Which devices are scanned and which file systems are supported depends on "
-#| "the architecture, the installation method and the stage of the "
-#| "installation. Especially during the early stages of the installation, "
-#| "loading the firmware is most likely to succeed from a FAT-formatted "
-#| "floppy disk or USB stick. <phrase arch=\"x86\">On i386 and amd64 firmware "
-#| "can also be loaded from an MMC or SD card.</phrase>"
+#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
"the architecture, the installation method and the stage of the installation. "
@@ -5186,9 +4966,8 @@ msgid ""
"</phrase>"
msgstr ""
"具体哪些设备会被扫描和支持哪个文件系统,取决于系统的架构、安装方法和安装的阶"
-"段。特别是在安装的早期阶段,从 FAT 格式的软盘或 U 盘加载固件更容易成功。"
-"<phrase arch=\"x86\">在 i386 和 amd64 上固件可以从 MMC 或 SD 卡加载。</"
-"phrase>"
+"段。特别是在安装的早期阶段,从 FAT 格式的 U 盘加载固件更容易成功。<phrase "
+"arch=\"x86\">在 i386 和 amd64 上固件可以从 MMC 或 SD 卡加载。</phrase>"
#. Tag: para
#: using-d-i.xml:3398
@@ -5214,6 +4993,11 @@ msgid ""
"not a bad idea to check the output of the <command>dmesg</command> command "
"on the newly booted system and search for <quote>firmware</quote>."
msgstr ""
+"在安装过程中,&d-i; 只提示装入的内核模块所需的固件。并不是所有的驱动程序都包"
+"含在 &d-i;中,特别是 radeon 没有包括在内,所以这说明一些设备的能力在安装开始"
+"前与安装结束后没有区别。结果,一些硬件没有能够用尽潜力。如果怀疑是这种情况的"
+"话,或者只是好奇,那么检查一下新引导的系统上 <command>dmesg</command> 命令的"
+"输出,并搜索 <quote>firmware</quote>。"
#. Tag: title
#: using-d-i.xml:3418
@@ -5223,18 +5007,7 @@ msgstr "准备介质"
#. Tag: para
#: using-d-i.xml:3419
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Official CD images do not include non-free firmware. The most common "
-#| "method to load such firmware is from some removable medium such as a USB "
-#| "stick. Alternatively, unofficial CD builds containing non-free firmware "
-#| "can be found at <ulink url=\"&url-firmware-cds;\"></ulink>. To prepare a "
-#| "USB stick (or other medium like a hard drive partition, or floppy disk), "
-#| "the firmware files or packages must be placed in either the root "
-#| "directory or a directory named <filename>/firmware</filename> of the file "
-#| "system on the medium. The recommended file system to use is FAT as that "
-#| "is most certain to be supported during the early stages of the "
-#| "installation."
+#, no-c-format
msgid ""
"Official installation images do not include non-free firmware. The most "
"common method to load such firmware is from some removable medium such as a "
@@ -5246,9 +5019,9 @@ msgid ""
"medium. The recommended file system to use is FAT as that is most certain to "
"be supported during the early stages of the installation."
msgstr ""
-"官方的 CD 映像不含商用的固件。这些固件通常是从移动介质,比如 U 盘来加载。另"
-"外,包含这些商用固件的非官方的 CD 位于 <ulink url=\"&url-firmware-cds;\"></"
-"ulink>。制作这种 U 盘(或者其他的介质,比如硬盘分区或者软盘)时,固件文件或软件"
+"官方的安装映像不含商用的固件。这些固件通常是从移动介质,比如 U 盘来加载。另"
+"外,包含这些商用固件的非官方的安装映像位于 <ulink url=\"&url-firmware-cds;"
+"\"></ulink>。制作这种 U 盘(或者其他的介质,比如硬盘分区)时,固件文件或软件"
"包必须放置在文件系统的根目录或者名为 <filename>/firmware</filename> 的目录"
"下。推荐使用 FAT 文件系统,因为在安装过程的早期阶段它肯定能被支持。"