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

1 files changed, 147 insertions, 128 deletions

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"