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

4 files changed, 37 insertions, 62 deletions

diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index ba2945be8..91ebd0307 100644
--- a/po/pt/using-d-i.po
+++ b/po/pt/using-d-i.po
@@ -944,15 +944,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:524
 #, 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 next be asked to select a country. If you choose "
-#| "<guimenuitem>Other</guimenuitem> at the bottom of the list, you will be "
-#| "presented with a list of all countries, grouped by continent. If the "
-#| "language has only one country associated with it, that country will be "
-#| "selected automatically."
 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 "
@@ -965,11 +956,12 @@ msgid ""
 msgstr ""
 "Se escolheu um idioma que é reconhecido como um idioma oficial para mais do "
 "que um país<footnote> <para> Em termos técnicos: onde existem várias "
-"definições locais para esse idioma com códigos de país distintos. </para> "
-"</footnote>, ser-lhe-á mostrada uma lista desses países. Para escolher um "
-"país que não esteja nessa lista, escolha <guimenuitem>Outro</guimenuitem> (a "
+"definições locais para esse idioma com códigos de país distintos. </para> </"
+"footnote>, ser-lhe-á mostrada uma lista desses países. Para escolher um país "
+"que não esteja nessa lista, escolha <guimenuitem>Outro</guimenuitem> (a "
 "última opção. Ser-lhe-á então apresentada uma lista de continentes; ao "
-"escolher um continente irá levar a uma lista dos países relevantes nesse continente."
+"escolher um continente irá levar a uma lista dos países relevantes nesse "
+"continente."
 
 #. Tag: para
 #: using-d-i.xml:542
@@ -983,8 +975,8 @@ msgid ""
 msgstr ""
 "Se o idioma tiver associado apenas um país, o país será automaticamente "
 "escolhido. Nesse caso apenas é possível escolher um país diferente baixando "
-"a prioridade do debconf para média, e de seguida voltar à opção de escolha de "
-"idioma no menu principal do instalador."
+"a prioridade do debconf para média, e de seguida voltar à opção de escolha "
+"de idioma no menu principal do instalador."
 
 #. Tag: para
 #: using-d-i.xml:550
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 48cc2fb5b..601ac23de 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3497,15 +3497,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:2840
 #, no-c-format
-#| msgid ""
-#| "If you are booting with a serial console, generally the kernel will "
-#| "autodetect this<phrase arch=\"mipsel\"> (although not on DECstations)</"
-#| "phrase>. If you have a videocard (framebuffer) and a keyboard also "
-#| "attached to the computer which you wish to boot via serial console, you "
-#| "may have to pass the <userinput>console=<replaceable>device</"
-#| "replaceable></userinput> argument to the kernel, where "
-#| "<replaceable>device</replaceable> is your serial device, which is usually "
-#| "something like <filename>ttyS0</filename>."
 msgid ""
 "If you are booting with a serial console, generally the kernel will "
 "autodetect this. If you have a videocard (framebuffer) and a keyboard also "
@@ -3514,7 +3505,12 @@ msgid ""
 "userinput> argument to the kernel, where <replaceable>device</replaceable> "
 "is your serial device, which is usually something like <filename>ttyS0</"
 "filename>."
-msgstr "假如您用串口控制台引导，一般情况下内核会自动检测到。如果在串口引导的计算机上有视频卡(framebuffer)和键盘，您可能必须传递 <userinput>console=<replaceable>device</replaceable></userinput> 参数给内核，其中 <replaceable>device</replaceable> 是串口设备，通常是 <filename>ttyS0</filename> 形式。"
+msgstr ""
+"假如您用串口控制台引导，一般情况下内核会自动检测到。如果在串口引导的计算机上"
+"有视频卡(framebuffer)和键盘，您可能必须传递 "
+"<userinput>console=<replaceable>device</replaceable></userinput> 参数给内核，"
+"其中 <replaceable>device</replaceable> 是串口设备，通常是 <filename>ttyS0</"
+"filename> 形式。"
 
 #. Tag: para
 #: boot-installer.xml:2852
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 3089f70e2..ff81f2a05 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -2056,23 +2056,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1012
 #, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> DECstation: various models of the DECstation are "
-#| "supported. </para></listitem> <listitem><para> Cobalt Microserver: only "
-#| "MIPS based Cobalt machines are covered here. This includes the Cobalt "
-#| "Qube 2700 (Qube1), RaQ, Qube2 and RaQ2, and the Gateway Microserver. </"
-#| "para></listitem> <listitem><para> Broadcom BCM91250A (SWARM): this is an "
-#| "ATX form factor evaluation board from Broadcom based on the dual-core SB1 "
-#| "1250 CPU. </para></listitem> <listitem><para> Broadcom BCM91480B "
-#| "(BigSur): this is an ATX form factor evaluation board from Broadcom based "
-#| "on the quad-core SB1A 1480 CPU. </para></listitem> </itemizedlist> "
-#| "Complete information regarding supported mips/mipsel machines can be "
-#| "found at the <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. "
-#| "In the following, only the systems supported by the Debian installer will "
-#| "be covered. If you are looking for support for other subarchitectures, "
-#| "please contact the <ulink url=\"&url-list-subscribe;\"> debian-&arch-"
-#| "listname; mailing list</ulink>."
 msgid ""
 "Debian on &arch-title; supports the following platforms: <itemizedlist> "
 "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -2088,7 +2071,17 @@ msgid ""
 "by the Debian installer will be covered. If you are looking for support for "
 "other subarchitectures, please contact the <ulink url=\"&url-list-subscribe;"
 "\"> debian-&arch-listname; mailing list</ulink>."
-msgstr "&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt Qube 2700 (Qube1)、RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> <listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 Broadcom 的双核 SB1 1250 CPU。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): 此为 ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 CPU。</para></listitem>  </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname;  邮件列表</ulink>。"
+msgstr ""
+"&arch-title; 上的 Debian 支持以下平台： <itemizedlist> <listitem><para> "
+"Cobalt Microserver：只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt Qube 2700 "
+"(Qube1)、RaQ、Qube2 和 RaQ2，以及 Gateway Microserver。</para></listitem> "
+"<listitem><para> Broadcom BCM91250A (SWARM)：此为 ATX 规格的开发板，基于 "
+"Broadcom 的双核 SB1 1250 CPU。</para></listitem> <listitem><para> Broadcom "
+"BCM91480B (BigSur): 此为 ATX 规格的开发板，基于 Broadcom 的四核 SB1A 1480 "
+"CPU。</para></listitem>  </itemizedlist> 关于支持 mips/mipsel 机器的完整信息"
+"见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 "
+"Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持，请联系 <ulink url="
+"\"&url-list-subscribe;\"> debian-&arch-listname;  邮件列表</ulink>。"
 
 #. Tag: title
 #: hardware.xml:1047
@@ -2942,19 +2935,15 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1618
 #, no-c-format
-#| msgid ""
-#| "The X.Org X Window System is supported on some DECstation models. The "
-#| "Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI "
-#| "slots and support VGA emulation or Linux framebuffer on a selected range "
-#| "of graphics cards. A <ulink url=\"&url-bcm91250a-hardware;"
-#| "\">compatibility listing</ulink> for Broadcom evaluation boards is "
-#| "available."
 msgid ""
 "The Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v "
 "PCI slots and support VGA emulation or Linux framebuffer on a selected range "
 "of graphics cards. A <ulink url=\"&url-bcm91250a-hardware;\">compatibility "
 "listing</ulink> for Broadcom evaluation boards is available."
-msgstr "Broadcom BCM91250A 和 BCM91480B 开发板具有标准的 3.3v PCI 插槽，并且可选配的显示卡支持 VGA 仿真或者 Linux framebuffer。有一份 Broadcom 开发板的 <ulink url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
+msgstr ""
+"Broadcom BCM91250A 和 BCM91480B 开发板具有标准的 3.3v PCI 插槽，并且可选配的"
+"显示卡支持 VGA 仿真或者 Linux framebuffer。有一份 Broadcom 开发板的 <ulink "
+"url=\"&url-bcm91250a-hardware;\">兼容列表</ulink>。"
 
 #. Tag: para
 #: hardware.xml:1625
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 56c83789d..1843fcdf8 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -823,15 +823,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:524
 #, 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 next be asked to select a country. If you choose "
-#| "<guimenuitem>Other</guimenuitem> at the bottom of the list, you will be "
-#| "presented with a list of all countries, grouped by continent. If the "
-#| "language has only one country associated with it, that country will be "
-#| "selected automatically."
 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 "
@@ -841,7 +832,11 @@ msgid ""
 "(the last option). You will be 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:542
@@ -852,7 +847,10 @@ msgid ""
 "different country by first lowering the debconf priority to medium, followed "
 "by revisiting the language selection option in the main menu of the "
 "installer."
-msgstr "如果此语言只对应一个国家，该国将会被自动选中。这种情况下如果要选择其他的国家，首先要降低 debconf 优先级为 medium，然后在安装程序的主菜单中重新选择语言。"
+msgstr ""
+"如果此语言只对应一个国家，该国将会被自动选中。这种情况下如果要选择其他的国"
+"家，首先要降低 debconf 优先级为 medium，然后在安装程序的主菜单中重新选择语"
+"言。"
 
 #. Tag: para
 #: using-d-i.xml:550