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

1 files changed, 104 insertions, 59 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 8b8b8a3e4..53d1fca51 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2022-05-19 22:02+0000\n"
+"POT-Creation-Date: 2023-02-15 23:04+0000\n"
 "PO-Revision-Date: 2022-08-13 14:20+0000\n"
 "Last-Translator: unstartdev <admin@edu.n-a.date>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -1735,19 +1735,11 @@ msgstr ""
 msgid ""
 "With many graphics cards, basic functionality is available without "
 "additional firmware, but the use of advanced features requires an "
-"appropriate firmware file to be installed in the system. In some cases, a "
-"successful installation can still end up in a black screen or garbled "
-"display when rebooting into the installed system. If that happens, some "
-"workarounds can be tried to log in anyway (see <xref linkend=\"completing-"
-"installed-system\"/>)."
+"appropriate firmware file to be installed in the system."
 msgstr ""
-"对于很多显卡而言，基本功能不需要额外固件即可使用，但高级特性则需要系统装有合"
-"适的固件文件。有些情况下，一次成功的安装仍可能在重启后黑屏或出现显示错误。如"
-"果发生这种情况，可以采取一些临时措施以登录系统（参见<xref linkend="
-"\"completing-installed-system\"/>）。"
 
 #. Tag: para
-#: hardware.xml:1636
+#: hardware.xml:1631
 #, no-c-format
 msgid ""
 "On many older devices which require firmware to work, the firmware file was "
@@ -1761,37 +1753,76 @@ msgstr ""
 "主系统上传到设备中。"
 
 #. Tag: para
-#: hardware.xml:1644
-#, no-c-format
+#: hardware.xml:1639
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In most cases firmware is non-free according to the criteria used by the "
+#| "&debian-gnu; project and thus cannot be included in the main distribution "
+#| "or in the installation system. If the device driver itself is included in "
+#| "the distribution and if &debian-gnu; legally can distribute the firmware, "
+#| "it will often be available as a separate package from the non-free "
+#| "section of the archive."
 msgid ""
 "In most cases firmware is non-free according to the criteria used by the "
-"&debian-gnu; project and thus cannot be included in the main distribution or "
-"in the installation system. If the device driver itself is included in the "
-"distribution and if &debian-gnu; legally can distribute the firmware, it "
-"will often be available as a separate package from the non-free section of "
-"the archive."
+"&debian-gnu; project and thus cannot be included in the main distribution. "
+"If the device driver itself is included in the distribution and if &debian-"
+"gnu; legally can distribute the firmware, it will often be available as a "
+"separate package from the non-free-firmware section of the archive (prior to "
+"&debian-gnu; 12.0: from the non-free section)."
 msgstr ""
 "根据 &debian-gnu; 项目的标准，大多数情况下这些固件属于 non-free，不能被包含在"
 "主发行版或安装系统里面。如果设备驱动程序被包含到发行版里面，并且 &debian-"
 "gnu; 可以合法地发布固件，它通常被单独地放置在仓库的 non-free 区里面。"
 
 #. Tag: para
-#: hardware.xml:1653
+#: hardware.xml:1648
 #, no-c-format
 msgid ""
-"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
+"However, this does not mean that such hardware cannot be used during "
+"installation. Starting with &debian-gnu; 12.0, following the <ulink url="
+"\"https://www.debian.org/vote/2022/vote_003\">2022 General Resolution about "
+"non-free firmware</ulink>, official installation images can include non-free "
+"firmware packages. By default, &d-i; will detect required firmware (based on "
+"kernel logs and modalias information), and install the relevant packages if "
+"they are found on an installation medium (e.g. on the netinst). The package "
+"manager gets automatically configured with the matching components so that "
+"those packages get security updates. This usually means that the non-free-"
+"firmware component gets enabled, in addition to main."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1662
+#, no-c-format
+msgid ""
+"Users who wish to disable firmware lookup entirely can do so by setting the "
+"<userinput>firmware=never</userinput> boot parameter. It's an alias for the "
+"longer <userinput>hw-detect/firmware-lookup=never</userinput> form."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1669
+#, fuzzy, no-c-format
+#| msgid ""
+#| "However, this does not mean that such hardware cannot be used during an "
+#| "installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
+#| "firmware files or packages containing firmware from a removable medium, "
+#| "such as a USB stick. See <xref linkend=\"loading-firmware\"/> for "
+#| "detailed information on how to load firmware files or packages during the "
+#| "installation."
+msgid ""
+"Unless firmware lookup is disabled entirely, &d-i; still supports loading "
 "firmware files or packages containing firmware from a removable medium, such "
 "as a USB stick. See <xref linkend=\"loading-firmware\"/> for detailed "
 "information on how to load firmware files or packages during the "
-"installation."
+"installation. Note that &d-i; is less likely to prompt for firmware files "
+"now that non-free firmware packages can be included on installation images."
 msgstr ""
 "然而，这并不意味着该硬件不能在安装时使用。从 &debian-gnu; 5.0 开始，&d-i; 支"
 "持从可移动的介质，比如 U 盘，加载固件或包含固件的软件包。参阅<xref linkend="
 "\"loading-firmware\"/>了解如何在安装时加载固件文件或软件包的的详细信息。"
 
 #. Tag: para
-#: hardware.xml:1662
+#: hardware.xml:1680
 #, no-c-format
 msgid ""
 "If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -1808,13 +1839,13 @@ msgstr ""
 "卡上)。"
 
 #. Tag: title
-#: hardware.xml:1679
+#: hardware.xml:1697
 #, no-c-format
 msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
 msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
-#: hardware.xml:1681
+#: hardware.xml:1699
 #, no-c-format
 msgid ""
 "There are several vendors, who ship systems with &debian; or other "
@@ -1828,7 +1859,7 @@ msgstr ""
 "心，因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
 
 #. Tag: para
-#: hardware.xml:1689
+#: hardware.xml:1707
 #, no-c-format
 msgid ""
 "If you do have to buy a machine with Windows bundled, carefully read the "
@@ -1842,7 +1873,7 @@ msgstr ""
 "<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
 
 #. Tag: para
-#: hardware.xml:1697
+#: hardware.xml:1715
 #, no-c-format
 msgid ""
 "Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -1858,13 +1889,13 @@ msgstr ""
 "&arch-kernel; 友好的硬件销售商。"
 
 #. Tag: title
-#: hardware.xml:1708
+#: hardware.xml:1726
 #, no-c-format
 msgid "Avoid Proprietary or Closed Hardware"
 msgstr "避免专有或封闭的硬件"
 
 #. Tag: para
-#: hardware.xml:1709
+#: hardware.xml:1727
 #, no-c-format
 msgid ""
 "Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -1879,7 +1910,7 @@ msgstr ""
 "于我们未被授权使用这些文档，造成它们无法在 &arch-kernel; 下工作。"
 
 #. Tag: para
-#: hardware.xml:1719
+#: hardware.xml:1737
 #, no-c-format
 msgid ""
 "In many cases there are standards (or at least some de-facto standards) "
@@ -1899,7 +1930,7 @@ msgstr ""
 "所有设备都是符合标准的。"
 
 #. Tag: para
-#: hardware.xml:1731
+#: hardware.xml:1749
 #, no-c-format
 msgid ""
 "In other fields, among them e.g. printers, this is unfortunately not the "
@@ -1917,7 +1948,7 @@ msgstr ""
 "厂商提供的闭源驱动程序。"
 
 #. Tag: para
-#: hardware.xml:1742
+#: hardware.xml:1760
 #, no-c-format
 msgid ""
 "Even if there is a vendor-provided closed-source driver for such hardware "
@@ -1938,7 +1969,7 @@ msgstr ""
 "统升级造成的不便。"
 
 #. Tag: para
-#: hardware.xml:1755
+#: hardware.xml:1773
 #, no-c-format
 msgid ""
 "You can help improve this situation by encouraging manufacturers of closed "
@@ -1949,13 +1980,13 @@ msgstr ""
 "来改变这种状况。"
 
 #. Tag: title
-#: hardware.xml:1770
+#: hardware.xml:1788
 #, no-c-format
 msgid "Installation Media"
 msgstr "安装介质"
 
 #. Tag: para
-#: hardware.xml:1772
+#: hardware.xml:1790
 #, no-c-format
 msgid ""
 "This section will help you determine which different media types you can use "
@@ -1969,19 +2000,19 @@ msgstr ""
 "章的时候，可能需要回过头来参考本页。"
 
 #. Tag: title
-#: hardware.xml:1782
+#: hardware.xml:1800
 #, no-c-format
 msgid "CD-ROM/DVD-ROM/BD-ROM"
 msgstr "CD-ROM/DVD-ROM"
 
 #. Tag: para
-#: hardware.xml:1784
+#: hardware.xml:1802
 #, no-c-format
 msgid "Installation from optical disc is supported for most architectures."
 msgstr "大多数体系都支持从光盘安装程序。"
 
 #. Tag: para
-#: hardware.xml:1788
+#: hardware.xml:1806
 #, no-c-format
 msgid ""
 "On PCs SATA, IDE/ATAPI, USB and SCSI optical drives are supported, as are "
@@ -1991,13 +2022,13 @@ msgstr ""
 "是通过 ohci1394 和 sbp2 驱动程序来获得支持。"
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1823
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "U 盘"
 
 #. Tag: para
-#: hardware.xml:1807
+#: hardware.xml:1825
 #, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
@@ -2012,13 +2043,13 @@ msgstr ""
 "光盘驱动器，从 U 盘引导是安装操作系统的标准方法。"
 
 #. Tag: title
-#: hardware.xml:1819
+#: hardware.xml:1837
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. Tag: para
-#: hardware.xml:1821
+#: hardware.xml:1839
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2035,7 +2066,7 @@ msgstr ""
 "用 ISDN 和 PPP。"
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1849
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2054,7 +2085,7 @@ msgstr ""
 "荐的安装技术。</phrase>"
 
 #. Tag: para
-#: hardware.xml:1844
+#: hardware.xml:1862
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2064,13 +2095,13 @@ msgstr ""
 "择。"
 
 #. Tag: title
-#: hardware.xml:1853
+#: hardware.xml:1871
 #, no-c-format
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. Tag: para
-#: hardware.xml:1855
+#: hardware.xml:1873
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2082,13 +2113,13 @@ msgstr ""
 "安装程序。该方式只推荐用在没有其他安装方式可以选的情况下。"
 
 #. Tag: title
-#: hardware.xml:1867
+#: hardware.xml:1885
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr "Un*x 或 GNU 系统"
 
 #. Tag: para
-#: hardware.xml:1869
+#: hardware.xml:1887
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2105,13 +2136,13 @@ msgstr ""
 ">。这种安装方法只推荐给高级用户在没有其他安装方法可选的情况下使用。"
 
 #. Tag: title
-#: hardware.xml:1882
+#: hardware.xml:1900
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr "受支持的存储系统"
 
 #. Tag: para
-#: hardware.xml:1884
+#: hardware.xml:1902
 #, no-c-format
 msgid ""
 "The &debian; installer contains a kernel which is built to maximize the "
@@ -2119,7 +2150,7 @@ msgid ""
 msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
 
 #. Tag: para
-#: hardware.xml:1888
+#: hardware.xml:1906
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for IDE (also "
@@ -2131,13 +2162,13 @@ msgstr ""
 "动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
 
 #. Tag: para
-#: hardware.xml:1905
+#: hardware.xml:1923
 #, no-c-format
 msgid "IDE systems are also supported."
 msgstr "IDE系统也被支持。"
 
 #. Tag: para
-#: hardware.xml:1915
+#: hardware.xml:1933
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2145,7 +2176,7 @@ msgid ""
 msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
 
 #. Tag: para
-#: hardware.xml:1920
+#: hardware.xml:1938
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2157,13 +2188,13 @@ msgstr ""
 "持。"
 
 #. Tag: title
-#: hardware.xml:1937
+#: hardware.xml:1955
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr "内存与磁盘空间的需求"
 
 #. Tag: para
-#: hardware.xml:1939
+#: hardware.xml:1957
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2176,7 +2207,7 @@ msgstr ""
 "hardware-reqts\"/>。"
 
 #. Tag: para
-#: hardware.xml:1946
+#: hardware.xml:1964
 #, no-c-format
 msgid ""
 "The installer normally automatically enables memory-saving tricks to be able "
@@ -2193,7 +2224,7 @@ msgstr ""
 "linkend=\"installer-args\"/>）。"
 
 #. Tag: para
-#: hardware.xml:1955
+#: hardware.xml:1973
 #, no-c-format
 msgid ""
 "On &architecture; the lowmem levels have not been tested, so automatic "
@@ -2204,7 +2235,7 @@ msgstr ""
 "您的系统内存很小，您可能<emphasis>需要</emphasis>传递这些引导参数。"
 
 #. Tag: para
-#: hardware.xml:1961
+#: hardware.xml:1979
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
@@ -2220,6 +2251,20 @@ msgstr ""
 "统上使用。如果可以在普通和图形界面两种方式之间选择，应选择普通方式。</para> "
 "</footnote>或磁盘空间上安装系统或许可行，但只针对有经验的用户。"
 
+#~ msgid ""
+#~ "With many graphics cards, basic functionality is available without "
+#~ "additional firmware, but the use of advanced features requires an "
+#~ "appropriate firmware file to be installed in the system. In some cases, a "
+#~ "successful installation can still end up in a black screen or garbled "
+#~ "display when rebooting into the installed system. If that happens, some "
+#~ "workarounds can be tried to log in anyway (see <xref linkend=\"completing-"
+#~ "installed-system\"/>)."
+#~ msgstr ""
+#~ "对于很多显卡而言，基本功能不需要额外固件即可使用，但高级特性则需要系统装有"
+#~ "合适的固件文件。有些情况下，一次成功的安装仍可能在重启后黑屏或出现显示错"
+#~ "误。如果发生这种情况，可以采取一些临时措施以登录系统（参见<xref linkend="
+#~ "\"completing-installed-system\"/>）。"
+
 #~ msgid "<entry>MIPS Malta</entry>"
 #~ msgstr "<entry>MIPS Malta</entry>"