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

4 files changed, 397 insertions, 195 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>"
 
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index a3c9864ae..8d8763541 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -6,7 +6,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-11 15:17+0000\n"
+"POT-Creation-Date: 2023-02-15 23:04+0000\n"
 "PO-Revision-Date: 2022-11-10 16:49+0000\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -133,15 +133,23 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:114
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "One of the best installation methods is apt. You can use the command line "
+#| "version of <command>apt</command> as well as tools like "
+#| "<application>aptitude</application> or <application>synaptic</"
+#| "application> (which are just graphical frontends for <command>apt</"
+#| "command>). Note that apt will also let you merge main, contrib, and non-"
+#| "free so you can have restricted packages (strictly speaking not belonging "
+#| "to &debian;) as well as packages from &debian-gnu; at the same time."
 msgid ""
 "One of the best installation methods is apt. You can use the command line "
 "version of <command>apt</command> as well as tools like "
 "<application>aptitude</application> or <application>synaptic</application> "
 "(which are just graphical frontends for <command>apt</command>). Note that "
-"apt will also let you merge main, contrib, and non-free so you can have "
-"restricted packages (strictly speaking not belonging to &debian;) as well as "
-"packages from &debian-gnu; at the same time."
+"apt will also let you merge main, contrib, non-free, and non-free-firmware "
+"so you can have restricted packages (strictly speaking not belonging to "
+"&debian;) as well as packages from &debian-gnu; at the same time."
 msgstr ""
 "apt 是最好的安装方法之一。您可以使用命令行模式的 <command>apt-get</"
 "command> ，还有 <application>aptitude</application> 或 "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 0c7186f5f..729f74f3c 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2022-10-11 23:04+0000\n"
+"POT-Creation-Date: 2023-02-15 23:04+0000\n"
 "PO-Revision-Date: 2022-11-10 16:49+0000\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -1574,7 +1574,81 @@ msgstr "下面的 debconf 变量与网络配置相关。"
 
 #. Tag: screen
 #: preseed.xml:837
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Disable network configuration entirely. This is useful for cdrom\n"
+#| "# installations on non-networked devices where the network questions,\n"
+#| "# warning and long timeouts are a nuisance.\n"
+#| "#d-i netcfg/enable boolean false\n"
+#| "\n"
+#| "# netcfg will choose an interface that has link if possible. This makes "
+#| "it\n"
+#| "# skip displaying a list if there is more than one interface.\n"
+#| "d-i netcfg/choose_interface select auto\n"
+#| "\n"
+#| "# To pick a particular interface instead:\n"
+#| "#d-i netcfg/choose_interface select eth1\n"
+#| "\n"
+#| "# To set a different link detection timeout (default is 3 seconds).\n"
+#| "# Values are interpreted as seconds.\n"
+#| "#d-i netcfg/link_wait_timeout string 10\n"
+#| "\n"
+#| "# If you have a slow dhcp server and the installer times out waiting for\n"
+#| "# it, this might be useful.\n"
+#| "#d-i netcfg/dhcp_timeout string 60\n"
+#| "#d-i netcfg/dhcpv6_timeout string 60\n"
+#| "\n"
+#| "# Automatic network configuration is the default.\n"
+#| "# If you prefer to configure the network manually, uncomment this line "
+#| "and\n"
+#| "# the static network configuration below.\n"
+#| "#d-i netcfg/disable_autoconfig boolean true\n"
+#| "\n"
+#| "# If you want the preconfiguration file to work on systems both with and\n"
+#| "# without a dhcp server, uncomment these lines and the static network\n"
+#| "# configuration below.\n"
+#| "#d-i netcfg/dhcp_failed note\n"
+#| "#d-i netcfg/dhcp_options select Configure network manually\n"
+#| "\n"
+#| "# Static network configuration.\n"
+#| "#\n"
+#| "# IPv4 example\n"
+#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
+#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
+#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
+#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
+#| "#d-i netcfg/confirm_static boolean true\n"
+#| "#\n"
+#| "# IPv6 example\n"
+#| "#d-i netcfg/get_ipaddress string fc00::2\n"
+#| "#d-i netcfg/get_netmask string ffff:ffff:ffff:ffff::\n"
+#| "#d-i netcfg/get_gateway string fc00::1\n"
+#| "#d-i netcfg/get_nameservers string fc00::1\n"
+#| "#d-i netcfg/confirm_static boolean true\n"
+#| "\n"
+#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
+#| "# values set here. However, setting the values still prevents the "
+#| "questions\n"
+#| "# from being shown, even if values come from dhcp.\n"
+#| "d-i netcfg/get_hostname string unassigned-hostname\n"
+#| "d-i netcfg/get_domain string unassigned-domain\n"
+#| "\n"
+#| "# If you want to force a hostname, regardless of what either the DHCP\n"
+#| "# server returns or what the reverse DNS entry for the IP is, uncomment\n"
+#| "# and adjust the following line.\n"
+#| "#d-i netcfg/hostname string somehost\n"
+#| "\n"
+#| "# Disable that annoying WEP key dialog.\n"
+#| "d-i netcfg/wireless_wep string\n"
+#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
+#| "#d-i netcfg/dhcp_hostname string radish\n"
+#| "\n"
+#| "# If non-free firmware is needed for the network or other hardware, you "
+#| "can\n"
+#| "# configure the installer to always try to load it, without prompting. "
+#| "Or\n"
+#| "# change to false to disable asking.\n"
+#| "#d-i hw-detect/load_firmware boolean true"
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
 "# installations on non-networked devices where the network questions,\n"
@@ -1640,6 +1714,10 @@ msgid ""
 "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
 "#d-i netcfg/dhcp_hostname string radish\n"
 "\n"
+"# If you want to completely disable firmware lookup (i.e. not use firmware\n"
+"# files or packages that might be available on installation images):\n"
+"#d-i hw-detect/firmware-lookup string never\n"
+"\n"
 "# If non-free firmware is needed for the network or other hardware, you can\n"
 "# configure the installer to always try to load it, without prompting. Or\n"
 "# change to false to disable asking.\n"
@@ -2542,11 +2620,63 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1074
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Choose, if you want to scan additional installation media\n"
+#| "# (default: false).\n"
+#| "d-i apt-setup/cdrom/set-first boolean false\n"
+#| "# You can choose to install non-free and contrib software.\n"
+#| "#d-i apt-setup/non-free boolean true\n"
+#| "#d-i apt-setup/contrib boolean true\n"
+#| "# Uncomment the following line, if you don't want to have the sources."
+#| "list\n"
+#| "# entry for a DVD/BD installation image active in the installed system\n"
+#| "# (entries for netinst or CD images will be disabled anyway, regardless "
+#| "of\n"
+#| "# this setting).\n"
+#| "#d-i apt-setup/disable-cdrom-entries boolean true\n"
+#| "# Uncomment this if you don't want to use a network mirror.\n"
+#| "#d-i apt-setup/use_mirror boolean false\n"
+#| "# Select which update services to use; define the mirrors to be used.\n"
+#| "# Values shown below are the normal defaults.\n"
+#| "#d-i apt-setup/services-select multiselect security, updates\n"
+#| "#d-i apt-setup/security_host string security.debian.org\n"
+#| "\n"
+#| "# Additional repositories, local[0-9] available\n"
+#| "#d-i apt-setup/local0/repository string \\\n"
+#| "#       http://local.server/debian stable main\n"
+#| "#d-i apt-setup/local0/comment string local server\n"
+#| "# Enable deb-src lines\n"
+#| "#d-i apt-setup/local0/source boolean true\n"
+#| "# URL to the public key of the local repository; you must provide a key "
+#| "or\n"
+#| "# apt will complain about the unauthenticated repository and so the\n"
+#| "# sources.list line will be left commented out.\n"
+#| "#d-i apt-setup/local0/key string http://local.server/key\n"
+#| "# or one can provide it in-line by base64 encoding the contents of the\n"
+#| "# key file (with `base64 -w0`) and specifying it thus:\n"
+#| "#d-i apt-setup/local0/key string base64://"
+#| "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCi4uLgo=\n"
+#| "# The content of the key file is checked to see if it appears to be ASCII-"
+#| "armoured.\n"
+#| "# If so it will be saved with an \".asc\" extension, otherwise it gets a "
+#| "'.gpg' extension.\n"
+#| "# \"keybox database\" format is currently not supported. (see "
+#| "generators/60local in apt-setup's source)\n"
+#| "\n"
+#| "# By default the installer requires that repositories be authenticated\n"
+#| "# using a known gpg key. This setting can be used to disable that\n"
+#| "# authentication. Warning: Insecure, not recommended.\n"
+#| "#d-i debian-installer/allow_unauthenticated boolean true\n"
+#| "\n"
+#| "# Uncomment this to add multiarch configuration for i386\n"
+#| "#d-i apt-setup/multiarch string i386"
 msgid ""
 "# Choose, if you want to scan additional installation media\n"
 "# (default: false).\n"
 "d-i apt-setup/cdrom/set-first boolean false\n"
+"# You can choose to install non-free firmware.\n"
+"#d-i apt-setup/non-free-firmware boolean true\n"
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
 "#d-i apt-setup/contrib boolean true\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index e3613b5fa..0ba40b019 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -9,7 +9,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-05-20 01:15+0200\n"
 "Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -3443,13 +3443,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2301
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you are installing at a lower priority (e.g. in expert mode), you will "
+#| "be able to make more decisions yourself. You can choose whether or not to "
+#| "use the security and/or stable-updates services, and you can choose to "
+#| "add packages from the <quote>contrib</quote> and <quote>non-free</quote> "
+#| "sections of the archive."
 msgid ""
 "If you are installing at a lower priority (e.g. in expert mode), you will be "
 "able to make more decisions yourself. You can choose whether or not to use "
 "the security and/or stable-updates services, and you can choose to add "
-"packages from the <quote>contrib</quote> and <quote>non-free</quote> "
-"sections of the archive."
+"packages from the <quote>contrib</quote>, <quote>non-free</quote>, and "
+"<quote>non-free-firmware</quote> sections of the archive."
 msgstr ""
 "如果您采用较低的优先级安装 (比如，expert 模式)，就要自己做更多的判定。您可以"
 "选择是否使用安全、或者 stable-updates 更新服务，并能选择从 <quote>contrib</"
@@ -4577,6 +4583,18 @@ msgstr ""
 #: using-d-i.xml:3102
 #, no-c-format
 msgid ""
+"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 (like netinst) can include "
+"non-free firmware packages. Even with those firmware packages available, "
+"some firmware files might still be missing. Or one might be using netboot "
+"files, which don't include firmware packages."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:3113
+#, no-c-format
+msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
 "display a dialog offering to load the missing firmware. If this option is "
 "selected, &d-i; will scan available devices for either loose firmware files "
@@ -4590,7 +4608,7 @@ msgstr ""
 "序模块。"
 
 #. Tag: para
-#: using-d-i.xml:3112
+#: using-d-i.xml:3123
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -4605,7 +4623,7 @@ msgstr ""
 "arch=\"x86\">在 i386 和 amd64 上固件可以从 MMC 或 SD 卡加载。</phrase>"
 
 #. Tag: para
-#: using-d-i.xml:3122
+#: using-d-i.xml:3133
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -4615,44 +4633,33 @@ msgstr ""
 "假如了解设备毋需固件也可以工作，或者设备在安装时并不需要使用，您可以跳过加载"
 "固件。"
 
-#. Tag: para
-#: using-d-i.xml:3128
-#, no-c-format
-msgid ""
-"&d-i; only prompts for firmware needed by kernel modules loaded during the "
-"installation. Not all drivers are included in &d-i;, in particular radeon is "
-"not, so this implies that the capabilities of some devices may be no "
-"different at the end of the installation from what they were at the "
-"beginning. Consequently, some of your hardware may not be being used to its "
-"full potential. If you suspect this is the case, or are just curious, it is "
-"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:3142
+#: using-d-i.xml:3141
 #, no-c-format
 msgid "Preparing a medium"
 msgstr "准备介质"
 
 #. Tag: para
-#: using-d-i.xml:3143
-#, 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 "
-"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."
+#: using-d-i.xml:3142
+#, fuzzy, 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 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."
+msgid ""
+"The most common method to load such firmware is from some removable medium "
+"such as a USB stick. 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 ""
 "官方的安装映像不含商用的固件。这些固件通常是从移动介质，比如 U 盘来加载。另"
 "外，包含这些商用固件的非官方的安装映像位于 <ulink url=\"&url-firmware-cds;"
@@ -4661,34 +4668,28 @@ msgstr ""
 "下。推荐使用 FAT 文件系统，因为在安装过程的早期阶段它肯定能被支持。"
 
 #. Tag: para
-#: using-d-i.xml:3156
-#, no-c-format
+#: using-d-i.xml:3154
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Tarballs and zip files containing current packages for the most common "
+#| "firmware are available from: <itemizedlist> <listitem><para> <ulink url="
+#| "\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> "
+#| "Just download the tarball or zip file for the correct release and unpack "
+#| "it to the file system on the medium."
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
-"firmware are available from: <itemizedlist> <listitem><para> <ulink url="
-"\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> Just "
-"download the tarball or zip file for the correct release and unpack it to "
-"the file system on the medium."
+"firmware, and the associated metadata to ensure a proper detection by the "
+"installer (<filename>dep11</filename> directory), are available from: "
+"<itemizedlist> <listitem><para> <ulink url=\"&url-firmware-tarballs;\"></"
+"ulink> </para></listitem> </itemizedlist> Just download the tarball or zip "
+"file for the correct release and unpack it to the file system on the medium."
 msgstr ""
 "大多数固件的压缩包和 zip 文件可以从这里获得：<itemizedlist> <listitem><para> "
 "<ulink url=\"&url-firmware-tarballs;\"></ulink> </para></listitem> </"
 "itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文件系统里面。"
 
 #. Tag: para
-#: using-d-i.xml:3170
-#, no-c-format
-msgid ""
-"If the firmware you need is not included in the tarball, you can also "
-"download specific firmware packages from the (non-free section of the) "
-"archive. The following overview should list most available firmware packages "
-"but is not guaranteed to be complete and may also contain non-firmware "
-"packages:"
-msgstr ""
-"如果您需要的固件没有包含在压缩包里面，可以从档案库(non-free 部分)下载特定的固"
-"件。以下概要列出大多数固件软件包，但不保证完整，有些还是非固件软件包："
-
-#. Tag: para
-#: using-d-i.xml:3184
+#: using-d-i.xml:3169
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -4699,13 +4700,13 @@ msgstr ""
 "造商那里获得。"
 
 #. Tag: title
-#: using-d-i.xml:3193
+#: using-d-i.xml:3178
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr "固件和安装好的系统"
 
 #. Tag: para
-#: using-d-i.xml:3194
+#: using-d-i.xml:3179
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -4720,13 +4721,19 @@ msgstr ""
 "序不同的内核版本，有可能由于版本的偏差造成固件不能加载。"
 
 #. Tag: para
-#: using-d-i.xml:3203
-#, no-c-format
+#: using-d-i.xml:3188
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If the firmware was loaded from a firmware package, &d-i; will also "
+#| "install this package for the installed system and will automatically add "
+#| "the non-free section of the package archive in APT's <filename>sources."
+#| "list</filename>. This has the advantage that the firmware should be "
+#| "updated automatically if a new version becomes available."
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
 "this package for the installed system and will automatically add the non-"
-"free section of the package archive in APT's <filename>sources.list</"
-"filename>. This has the advantage that the firmware should be updated "
+"free-firmware section of the package archive in APT's <filename>sources."
+"list</filename>. This has the advantage that the firmware should be updated "
 "automatically if a new version becomes available."
 msgstr ""
 "如果固件从一个固件软件包加载，&d-i; 会为安装好的系统也安装该软件包，并自动添"
@@ -4734,7 +4741,7 @@ msgstr ""
 "做的优点在于如果有固件的新版本存在会自动更新。"
 
 #. Tag: para
-#: using-d-i.xml:3211
+#: using-d-i.xml:3196
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -4745,7 +4752,7 @@ msgstr ""
 "安装好固件或软件包。"
 
 #. Tag: para
-#: using-d-i.xml:3218
+#: using-d-i.xml:3203
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -4757,13 +4764,13 @@ msgstr ""
 "emphasis>自动更新，除非对应的固件软件包(如果有的话)在系统安装之后安装。"
 
 #. Tag: title
-#: using-d-i.xml:3228
+#: using-d-i.xml:3213
 #, no-c-format
 msgid "Completing the Installed System"
 msgstr "完善已安装的系统"
 
 #. Tag: para
-#: using-d-i.xml:3229
+#: using-d-i.xml:3214
 #, no-c-format
 msgid ""
 "Depending on how the installation was performed, it might be that the need "
@@ -4778,7 +4785,7 @@ msgstr ""
 "者出现显示错误。如果出现这种情况，可以尝试以下的临时解决办法："
 
 #. Tag: para
-#: using-d-i.xml:3243
+#: using-d-i.xml:3228
 #, no-c-format
 msgid ""
 "Pass the <code>nomodeset</code> option on the kernel command line. This "
@@ -4788,7 +4795,7 @@ msgstr ""
 "<quote>fallback graphics</quote>模式。"
 
 #. Tag: para
-#: using-d-i.xml:3247
+#: using-d-i.xml:3232
 #, no-c-format
 msgid ""
 "Use the <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F2</"
@@ -4798,68 +4805,14 @@ msgstr ""
 "使用 <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F2</keycap></"
 "keycombo> 组合键切换到 VT2，这可能可以提供一个可以使用的登录提示符。"
 
-#. Tag: para
-#: using-d-i.xml:3253
-#, no-c-format
-msgid ""
-"Once logged in into the installed system, it is possible to automate the "
-"detection of missing firmware, and to perform the required steps to enable "
-"them following this procedure:"
-msgstr ""
-"一旦登录进了已安装的系统，遵循以下步骤可能可以自动检测缺失的固件，并启用它"
-"们："
-
-#. Tag: para
-#: using-d-i.xml:3260
-#, no-c-format
-msgid "Install the <classname>isenkram-cli</classname> package."
-msgstr "安装 <classname>isenkram-cli</classname> 软件包。"
-
-#. Tag: para
-#: using-d-i.xml:3263
-#, no-c-format
-msgid ""
-"Run the <command>isenkram-autoinstall-firmware</command> command as the "
-"<quote>root</quote> user."
-msgstr ""
-"以<quote>root</quote>用户运行 <command>isenkram-autoinstall-firmware</"
-"command> 命令。"
-
-#. Tag: para
-#: using-d-i.xml:3266
-#, no-c-format
-msgid ""
-"Usually, rebooting is the simplest way to make sure all kernel modules are "
-"properly initialized; that's particularly important when one has booted the "
-"system with the <code>nomodeset</code> option as an interim measure."
-msgstr ""
-"通常，重启是保证各个内核模块已经正确初始化的最简单的方法；这在使用 "
-"<code>nomodeset</code> 参数作为临时措施以启动系统的情况下尤为重要。"
-
-#. Tag: para
-#: using-d-i.xml:3273
-#, no-c-format
-msgid ""
-"Installing firmware packages is very likely to require enabling the non-free "
-"section of the package archive. As of &debian-gnu; 11.0, running the "
-"<command>isenkram-autoinstall-firmware</command> command will do that "
-"automatically by creating a dedicated file (<filename>/etc/apt/sources.list."
-"d/isenkram-autoinstall-firmware.list</filename>), pointing at a generic "
-"mirror."
-msgstr ""
-"安装固件软件包很可能需要启用软件仓库的 non-free 区。截至 &debian-gnu; 11.0，"
-"运行 <command>isenkram-autoinstall-firmware</command> 命令会自动完成该工作，"
-"这是通过创建一个指向通用镜像的专门文件（<filename>/etc/apt/sources.list.d/"
-"isenkram-autoinstall-firmware.list</filename>）实现的。"
-
 #. Tag: title
-#: using-d-i.xml:3292
+#: using-d-i.xml:3245
 #, no-c-format
 msgid "Customization"
 msgstr "个性化配置"
 
 #. Tag: para
-#: using-d-i.xml:3293
+#: using-d-i.xml:3246
 #, no-c-format
 msgid ""
 "Using the shell (see <xref linkend=\"shell\"/>), the installation process "
@@ -4869,13 +4822,13 @@ msgstr ""
 "置以满足特别的使用需求："
 
 #. Tag: title
-#: using-d-i.xml:3298
+#: using-d-i.xml:3251
 #, no-c-format
 msgid "Installing an alternative init system"
 msgstr "安装替代的初始化系统"
 
 #. Tag: para
-#: using-d-i.xml:3299
+#: using-d-i.xml:3252
 #, no-c-format
 msgid ""
 "&debian; uses systemd as its default init system. However, other init "
@@ -4891,6 +4844,72 @@ msgstr ""
 "Init#Changing_the_init_system_-_at_installation_time\">Debian 维基的初始化系"
 "统页面</ulink>。"
 
+#~ msgid ""
+#~ "&d-i; only prompts for firmware needed by kernel modules loaded during "
+#~ "the installation. Not all drivers are included in &d-i;, in particular "
+#~ "radeon is not, so this implies that the capabilities of some devices may "
+#~ "be no different at the end of the installation from what they were at the "
+#~ "beginning. Consequently, some of your hardware may not be being used to "
+#~ "its full potential. If you suspect this is the case, or are just curious, "
+#~ "it is 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>。"
+
+#~ msgid ""
+#~ "If the firmware you need is not included in the tarball, you can also "
+#~ "download specific firmware packages from the (non-free section of the) "
+#~ "archive. The following overview should list most available firmware "
+#~ "packages but is not guaranteed to be complete and may also contain non-"
+#~ "firmware packages:"
+#~ msgstr ""
+#~ "如果您需要的固件没有包含在压缩包里面，可以从档案库(non-free 部分)下载特定"
+#~ "的固件。以下概要列出大多数固件软件包，但不保证完整，有些还是非固件软件包："
+
+#~ msgid ""
+#~ "Once logged in into the installed system, it is possible to automate the "
+#~ "detection of missing firmware, and to perform the required steps to "
+#~ "enable them following this procedure:"
+#~ msgstr ""
+#~ "一旦登录进了已安装的系统，遵循以下步骤可能可以自动检测缺失的固件，并启用它"
+#~ "们："
+
+#~ msgid "Install the <classname>isenkram-cli</classname> package."
+#~ msgstr "安装 <classname>isenkram-cli</classname> 软件包。"
+
+#~ msgid ""
+#~ "Run the <command>isenkram-autoinstall-firmware</command> command as the "
+#~ "<quote>root</quote> user."
+#~ msgstr ""
+#~ "以<quote>root</quote>用户运行 <command>isenkram-autoinstall-firmware</"
+#~ "command> 命令。"
+
+#~ msgid ""
+#~ "Usually, rebooting is the simplest way to make sure all kernel modules "
+#~ "are properly initialized; that's particularly important when one has "
+#~ "booted the system with the <code>nomodeset</code> option as an interim "
+#~ "measure."
+#~ msgstr ""
+#~ "通常，重启是保证各个内核模块已经正确初始化的最简单的方法；这在使用 "
+#~ "<code>nomodeset</code> 参数作为临时措施以启动系统的情况下尤为重要。"
+
+#~ msgid ""
+#~ "Installing firmware packages is very likely to require enabling the non-"
+#~ "free section of the package archive. As of &debian-gnu; 11.0, running the "
+#~ "<command>isenkram-autoinstall-firmware</command> command will do that "
+#~ "automatically by creating a dedicated file (<filename>/etc/apt/sources."
+#~ "list.d/isenkram-autoinstall-firmware.list</filename>), pointing at a "
+#~ "generic mirror."
+#~ msgstr ""
+#~ "安装固件软件包很可能需要启用软件仓库的 non-free 区。截至 &debian-gnu; "
+#~ "11.0，运行 <command>isenkram-autoinstall-firmware</command> 命令会自动完成"
+#~ "该工作，这是通过创建一个指向通用镜像的专门文件（<filename>/etc/apt/"
+#~ "sources.list.d/isenkram-autoinstall-firmware.list</filename>）实现的。"
+
 #~ msgid "partitioner"
 #~ msgstr "partitioner"