[SILENT_COMMIT] Update of POT and PO files for the manual

3 files changed, 57 insertions, 132 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index a121460fa..31b2d197b 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -2297,29 +2297,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:1050
 #, no-c-format
-#| msgid ""
-#| "#tasksel tasksel/first multiselect standard, web-server\n"
-#| "# If the desktop task is selected, install the kde and xfce desktops\n"
-#| "# instead of the default gnome desktop.\n"
-#| "#tasksel tasksel/desktop multiselect kde, xfce\n"
-#| "\n"
-#| "# Individual additional packages to install\n"
-#| "#d-i pkgsel/include string openssh-server build-essential\n"
-#| "# By default, packages that are only Recommended by packages installed "
-#| "using\n"
-#| "# pkgsel/include (as opposed to their dependencies) will not be "
-#| "installed.\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"
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
 "# If the desktop task is selected, install the kde and xfce desktops\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 1d0dca9f1..aa3a43301 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -1320,66 +1320,6 @@ msgstr "网络的配置"
 #. Tag: para
 #: random-bits.xml:646
 #, 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 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."
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
 "<filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> "
@@ -1440,9 +1380,12 @@ msgid ""
 "file into the desired order. Then during boot, each card will be associated "
 "with the interface name (eth0, eth1, etc.) that you expect."
 msgstr ""
-"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"
+"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"
+"</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"
@@ -1468,15 +1411,19 @@ msgstr ""
 "#     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"
+"</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"
+"</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"
+"</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"
+"</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"
@@ -1487,7 +1434,10 @@ msgstr ""
 "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."
+"</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."
 
 #. Tag: title
 #: random-bits.xml:687
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index efb20c39a..8e2e5e525 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -811,17 +811,14 @@ msgstr "选择地区选项"
 #. Tag: para
 #: using-d-i.xml:516
 #, no-c-format
-#| msgid ""
-#| "In most cases the first questions you will be asked concern the selection "
-#| "of localization options to be used both for the installation and for the "
-#| "installed system. The localization options consist of language, country "
-#| "and locales."
 msgid ""
 "In most cases the first questions you will be asked concern the selection of "
 "localization options to be used both for the installation and for the "
 "installed system. The localization options consist of language, location and "
 "locales."
-msgstr "大多时候，您遇到的第一个问题是关于地区的选项，将用于安装过程和安装后的系统。地区选项由语言、位置和地区组成。"
+msgstr ""
+"大多时候，您遇到的第一个问题是关于地区的选项，将用于安装过程和安装后的系统。"
+"地区选项由语言、位置和地区组成。"
 
 #. Tag: para
 #: using-d-i.xml:523
@@ -838,18 +835,16 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:530
 #, no-c-format
-#| msgid ""
-#| "The selected country will be used later in the installation process to "
-#| "pick the default timezone and a Debian mirror appropriate for your "
-#| "geographic location. Language and country together will be used to set "
-#| "the default locale for your system and to help select your keyboard."
 msgid ""
 "The selected geographic location (in most cases a country) will be used "
 "later in the installation process to select the correct time zone and a "
 "Debian mirror appropriate for that country. Language and country together "
 "will help determine the default locale for your system and select the "
 "correct keyboard layout."
-msgstr "在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时区和该国对应的 Debian 镜像。语言和国家合起来还有助于确定您系统默认的 locale，以及键盘布局。"
+msgstr ""
+"在之后的安装过程中，所选择的地理位置(多数情况下是国家)还会被用于选择正确的时"
+"区和该国对应的 Debian 镜像。语言和国家合起来还有助于确定您系统默认的 locale，"
+"以及键盘布局。"
 
 #. Tag: para
 #: using-d-i.xml:538
@@ -874,15 +869,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:550
 #, no-c-format
-#| msgid ""
-#| "If you selected a language that is recognized as an official language for "
-#| "more than one country<footnote> <para> In technical terms: where multiple "
-#| "locales exist for that language with differing country codes. </para> </"
-#| "footnote>, you will be shown a list of only those countries. To select a "
-#| "country that is not in that list, choose <guimenuitem>Other</guimenuitem> "
-#| "(the last option). You will then be presented with a list of continents; "
-#| "selecting a continent will lead to a list of relevant countries on that "
-#| "continent."
 msgid ""
 "Next you will be asked to select your geographic location. If you selected a "
 "language that is recognized as an official language for more than one "
@@ -892,7 +878,12 @@ msgid ""
 "not in that list, choose <guimenuitem>other</guimenuitem> (the last option). "
 "You will then be presented with a list of continents; selecting a continent "
 "will lead to a list of relevant countries on that continent."
-msgstr "接下来将要求您选择地理位置。如果您选择的语言被多个国家作为官方语言<footnote> <para> 科技术语：一种语言针对不同国家代码有多个不同 locale 存在。</para> </footnote>，列表中只列出这些国家。如果想要选择列表之外的国家，选择 <guimenuitem>other</guimenuitem>(最后一项)。您将看到大洲列表；选择洲之后会看到该大洲上的国家。"
+msgstr ""
+"接下来将要求您选择地理位置。如果您选择的语言被多个国家作为官方语言<footnote> "
+"<para> 科技术语：一种语言针对不同国家代码有多个不同 locale 存在。</para> </"
+"footnote>，列表中只列出这些国家。如果想要选择列表之外的国家，选择 "
+"<guimenuitem>other</guimenuitem>(最后一项)。您将看到大洲列表；选择洲之后会看"
+"到该大洲上的国家。"
 
 #. Tag: para
 #: using-d-i.xml:567
@@ -902,7 +893,9 @@ msgid ""
 "will be displayed for the continent or region the country belongs to, with "
 "that country selected as the default. Use the <guibutton>Go Back</guibutton> "
 "option to select countries on a different continent."
-msgstr "如果语言只对应一个国家，国家列表只显示该国所属的大洲和地区，并且该国被选中作为默认。使用 <guibutton>Go Back</guibutton> 选项可以选择其他大洲的国家。"
+msgstr ""
+"如果语言只对应一个国家，国家列表只显示该国所属的大洲和地区，并且该国被选中作"
+"为默认。使用 <guibutton>Go Back</guibutton> 选项可以选择其他大洲的国家。"
 
 #. Tag: para
 #: using-d-i.xml:574
@@ -925,7 +918,12 @@ msgid ""
 "for the selected language (if there's more than one). </para> </footnote>. "
 "In all other cases a default locale will be selected based on the selected "
 "language and country."
-msgstr "如果您组合的语言和国家没有对应的 locale，而该语言有多个对应的 locale，安装程序允许您从中选择一个默认的 locale 用于安装完成的系统。<footnote> <para> 在 medium 和 low 优先级下，如果该语言有多个对应的 locale，您总是可以选择所需要的那个 locale。</para> </footnote>。其余情况下，默认会选择基于该语言和国家的 locale。"
+msgstr ""
+"如果您组合的语言和国家没有对应的 locale，而该语言有多个对应的 locale，安装程"
+"序允许您从中选择一个默认的 locale 用于安装完成的系统。<footnote> <para> 在 "
+"medium 和 low 优先级下，如果该语言有多个对应的 locale，您总是可以选择所需要的"
+"那个 locale。</para> </footnote>。其余情况下，默认会选择基于该语言和国家的 "
+"locale。"
 
 #. Tag: para
 #: using-d-i.xml:595
@@ -933,7 +931,9 @@ msgstr "如果您组合的语言和国家没有对应的 locale，而该语言�
 msgid ""
 "Any default locale selected as described in the previous paragraph will use "
 "<firstterm>UTF-8</firstterm> as character encoding."
-msgstr "前面章节选择的任何默认 locale 都将使用 <firstterm>UTF-8</firstterm> 作为字符编码。"
+msgstr ""
+"前面章节选择的任何默认 locale 都将使用 <firstterm>UTF-8</firstterm> 作为字符"
+"编码。"
 
 #. Tag: para
 #: using-d-i.xml:600
@@ -947,7 +947,12 @@ msgid ""
 "footnote>, to be generated for the installed system; if you do, you will be "
 "asked which of the selected locales should be the default for the installed "
 "system."
-msgstr "如果您使用 low 优先级安装，您可以选择额外的 locale，包括那些称为<quote>传统</quote>的 locale <footnote> <para> 传统 locale 是那些没有使用 UTF-8 的 locale，它们使用旧的字符编码标准，比如 ISO&nbsp;8859-1 (西欧语言) 或 EUC-JP (日语)。</para> </footnote>，用于安装完成的系统； 如果这样选择，您将被询问使用哪种 locale 作为安装完成系统中的默认 locale。"
+msgstr ""
+"如果您使用 low 优先级安装，您可以选择额外的 locale，包括那些称为<quote>传统</"
+"quote>的 locale <footnote> <para> 传统 locale 是那些没有使用 UTF-8 的 "
+"locale，它们使用旧的字符编码标准，比如 ISO&nbsp;8859-1 (西欧语言) 或 EUC-JP "
+"(日语)。</para> </footnote>，用于安装完成的系统； 如果这样选择，您将被询问使"
+"用哪种 locale 作为安装完成系统中的默认 locale。"
 
 #. Tag: title
 #: using-d-i.xml:624
@@ -1164,7 +1169,6 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:812
 #, no-c-format
-#| msgid "Configuring the Clock"
 msgid "Configuring the Clock and Time Zone"
 msgstr "配置时钟和时区"
 
@@ -1192,17 +1196,14 @@ msgstr "在 s390 平台，安装程序不会修改系统时钟。"
 #. Tag: para
 #: using-d-i.xml:836
 #, no-c-format
-#| msgid ""
-#| "Depending on the location selected earlier in the installation process, "
-#| "you may be shown a list of timezones relevant for that location. If your "
-#| "location has only one time zone, you will not be asked anything and the "
-#| "system will assume that time zone."
 msgid ""
 "Depending on the location selected earlier in the installation process, you "
 "may be shown a list of time zones relevant for that location. If your "
 "location has only one time zone and you are doing a default installation, "
 "you will not be asked anything and the system will assume that time zone."
-msgstr "基于安装过程前面所选择的地理位置，您将看到系统只列出与其地点相关的时区列表。如果该地只对应一个时区并且是默认安装，那么系统就不会询问而直接使用该时区。"
+msgstr ""
+"基于安装过程前面所选择的地理位置，您将看到系统只列出与其地点相关的时区列表。"
+"如果该地只对应一个时区并且是默认安装，那么系统就不会询问而直接使用该时区。"
 
 #. Tag: para
 #: using-d-i.xml:844
@@ -1211,7 +1212,9 @@ msgid ""
 "In expert mode or when installing at medium priority, you will have the "
 "additional option to select <quote>Coordinated Universal Time</quote> (UTC) "
 "as time zone."
-msgstr "expert 模式或者使用 medium 优先级安装，您可以通过额外的选项选择 <quote>Coordinated Universal Time</quote> (UTC) 作为时区。"
+msgstr ""
+"expert 模式或者使用 medium 优先级安装，您可以通过额外的选项选择 "
+"<quote>Coordinated Universal Time</quote> (UTC) 作为时区。"
 
 #. Tag: para
 #: using-d-i.xml:850
@@ -1227,15 +1230,13 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:861
 #, no-c-format
-#| msgid ""
-#| "The simplest option is to just select a different timezone after the "
-#| "installation has been completed and you've booted into the new system. "
-#| "The command to do this is:"
 msgid ""
 "The simplest option is to just select a different time zone after the "
 "installation has been completed and you've booted into the new system. The "
 "command to do this is:"
-msgstr "最简单的方法，是在安装完成后重新启动，进入新系统，选择一个不同的时区。该命令为："
+msgstr ""
+"最简单的方法，是在安装完成后重新启动，进入新系统，选择一个不同的时区。该命令"
+"为："
 
 #. Tag: screen
 #: using-d-i.xml:867
@@ -1261,9 +1262,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:887
 #, no-c-format
-#| msgid ""
-#| "For automated installations the time zone can also be set using "
-#| "preseeding."
 msgid ""
 "For automated installations the time zone can be set to any desired value "
 "using preseeding."