[Commit from Weblate] Chinese (Simplified) translation update

1 files changed, 221 insertions, 448 deletions

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 文件系统，因为在安装过程的早期阶段它肯定能被支持。"