[SILENT_COMMIT] Update of POT and PO files for the installation-guide

1 files changed, 169 insertions, 92 deletions

diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index d460f583c..4d8318d78 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-29 14:36+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2012-11-26 15:04+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -408,8 +408,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:230
-#, no-c-format
-msgid "Looks for and mounts a &debian; installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a &debian; installation CD."
+msgid "Looks for and mounts a &debian; installation media."
 msgstr "寻找并挂载 &debian; 安装光盘。"
 
 #. Tag: term
@@ -461,10 +462,13 @@ msgstr "cdrom-checker"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, 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."
 msgid ""
-"Checks integrity of a CD-ROM. This way, the user may assure him/herself that "
-"the installation CD-ROM was not corrupted."
+"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 没有损坏。"
 
 #. Tag: term
@@ -492,10 +496,13 @@ msgstr "anna"
 
 #. Tag: para
 #: using-d-i.xml:283
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Anna's Not Nearly APT. Installs packages which have been retrieved from "
+#| "the chosen mirror or CD."
 msgid ""
 "Anna's Not Nearly APT. Installs packages which have been retrieved from the "
-"chosen mirror or CD."
+"chosen mirror or installation medium."
 msgstr "Anna's Not Nearly APT。安装从选择的镜像或 CD 获取的软件包。"
 
 #. Tag: term
@@ -3529,10 +3536,10 @@ msgid ""
 "packages is called <command>dpkg</command>. However, this program is more of "
 "a low-level tool. <command>apt</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 "
+"packages from your installation media, 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."
@@ -3591,18 +3598,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:2341
-#, no-c-format
-msgid "Installing from more than one CD or DVD"
+#, fuzzy, no-c-format
+#| msgid "Installing from more than one CD or DVD"
+msgid "Installing from more than one CD or DVD image"
 msgstr "从多个 CD 或 DVD 安装"
 
 #. Tag: para
 #: using-d-i.xml:2343
-#, no-c-format
+#, 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."
 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."
+"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。如果您手头有这些光盘，检测后安装程序就可以使用它"
@@ -3610,24 +3623,35 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2350
-#, no-c-format
+#, 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."
 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."
+"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
-#, no-c-format
+#, 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."
 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 "
+"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 CDs in a set."
+"last images of a set."
 msgstr ""
 "CD(和 DVD) 里面包含的软件包按照流行程度排列次序。也就是说，第一张光盘里面是最"
 "常用的软件，而最后一张光盘里面包含的是很少有人用到的软件。"
@@ -3648,12 +3672,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2375
-#, 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 "
+#, 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."
+msgid ""
+"If you do scan multiple installation media, the installer will prompt you to "
+"exchange them when it needs packages from another media than the one "
+"currently in the drive. Note that only discs 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."
 msgstr ""
@@ -3680,14 +3711,20 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2396
-#, 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."
+#, 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."
+msgid ""
+"If you are <emphasis>not</emphasis> installing from a full CD or DVD or a "
+"corresponding 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."
 msgstr ""
 "如果<emphasis>没有</emphasis>使用完整版的 CD 或 DVD，或者完整版的 CD/DVD 映"
 "像，您就应该使用网络镜像，否则只能得到一个有限的系统。然而，假如您有互联网连"
@@ -3696,15 +3733,25 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2405
-#, 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)."
+#, 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)."
+msgid ""
+"If you are installing from a single full CD or the corresponding image, "
+"using a network mirror is not required, but is still strongly recommended "
+"because a single CD image 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 image and selectively "
+"install additional packages after the installation (i.e. after you have "
+"rebooted into the new system)."
 msgstr ""
 "如果您是从完整的 CD 或 CD 映像安装，虽然添加网络镜像并不是必须的，但仍建议您"
 "采用，这是因为单张 CD 所能容纳的软件包数量是有限的。假如您有互联网连接限制，"
@@ -3713,12 +3760,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2416
-#, no-c-format
+#, 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."
 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."
+"If you are installing from a DVD or the corresponding image, any packages "
+"needed during the installation should be present on the first DVD (image). "
+"The same is true if you have scanned multiple CD (images) as explained in "
+"the previous section. Use of a network mirror is optional."
 msgstr ""
 "如果您从 DVD 或使用 DVD 映象安装，安装过程中需要的软件包都应该在第一张 DVD 里"
 "面。如果您如前面章节所述检测了多张 CD，情况也是一样的。网络镜像的使用是一个选"
@@ -3726,26 +3778,38 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2423
-#, 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."
+#, 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."
+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 "
+"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."
 msgstr ""
 "添加网络镜像的优势在于有些内容已经更新，而 CD/DVD 只是在版本发布时创建，所以"
 "可以安装已经更新的内容，确保了系统的安全性和稳定性。。"
 
 #. Tag: para
 #: using-d-i.xml:2430
-#, no-c-format
+#, 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"
 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"
+"package is available from installation media, the installer will always use "
+"that. The amount of data that will be downloaded if you do select a mirror "
+"thus depends on"
 msgstr ""
 "总结：除非您不具备良好的互联网连接，选择网络镜像通常是一个好主意。如果 CD/"
 "DVD 上有软件包当前的版本，安装程序总会从这里安装。如果您选择了镜像，需要下载"
@@ -3765,9 +3829,13 @@ msgstr "这些任务所需的软件包，"
 
 #. Tag: para
 #: using-d-i.xml:2449
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "which of those packages are present on the CDs or DVDs you have scanned, "
+#| "and"
 msgid ""
-"which of those packages are present on the CDs or DVDs you have scanned, and"
+"which of those packages are present on the installation media you have "
+"scanned, and"
 msgstr "已检测的 CD 或 DVD 上的软件包，并且"
 
 #. Tag: para
@@ -3778,9 +3846,9 @@ msgstr "已检测的 CD 或 DVD 上的软件包，并且"
 #| "available from a mirror (either a regular package mirror, or a mirror for "
 #| "security or volatile updates)."
 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 stable-updates)."
+"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 上面的软件包在网络镜像里面是否有更新版本(普通软件包的网络镜像，或者"
 "安全更新的镜像)。"
@@ -3976,9 +4044,9 @@ 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 possibly need to be downloaded from a network "
-"mirror as some of the needed packages for your choice might only be included "
-"on later CDs. Installing any of the available desktop environments this way "
-"should work fine if you are using a DVD image or any other installation "
+"mirror as they might not be available on the CD image due to its limited "
+"amount of space. Installing any of the available desktop environments this "
+"way should work fine if you are using a DVD image or any other installation "
 "method."
 msgstr ""
 "注意，这只在该桌面环境对应的软件包可以获得的情况下有效。假如您安装时使用单个 "
@@ -4952,16 +5020,25 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:3314
-#, no-c-format
+#, 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>."
 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>."
+"you have to explicitly ask for it. If you are installing from optical media, "
+"you need to boot with medium priority or otherwise invoke the main "
+"installation menu and choose <guimenuitem>Load installer components from "
+"installation media</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>."
 msgstr ""
 "该组件默认不会加载到安装主菜单，因此必须单独指定。如果使用 CD，您需要使用 "
 "medium 优先级或者打开安装主菜单并选择 <guimenuitem>Load installer components "
@@ -5233,15 +5310,15 @@ msgstr "准备介质"
 #| "is most certain to be supported during the early stages of the "
 #| "installation."
 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), 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."
+"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 "
+"USB stick. Alternatively, unofficial installation images 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), 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."
 msgstr ""
 "官方的 CD 映像不含商用的固件。这些固件通常是从移动介质，比如 U 盘来加载。另"
 "外，包含这些商用固件的非官方的 CD 位于 <ulink url=\"&url-firmware-cds;\"></"