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

4 files changed, 359 insertions, 206 deletions

diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 820e5f412..3852d18d6 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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: 2023-01-04 00:25+0200\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1856,22 +1856,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 "
@@ -1887,15 +1876,22 @@ 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 (非フ"
 "リー) であるため、main ディストリビューションや、インストールシステムに含むこ"
@@ -1904,15 +1900,47 @@ msgstr ""
 "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 "
+"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 ""
-"However, this does not mean that such hardware cannot be used during an "
-"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
+"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; は USB メモリなどのリムーバブルメディア"
@@ -1922,7 +1950,7 @@ msgstr ""
 "を参照してください。"
 
 #. 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 "
@@ -1941,13 +1969,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 "
@@ -1963,7 +1991,7 @@ msgstr ""
 "信できるわけですから。"
 
 #. 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 "
@@ -1979,7 +2007,7 @@ msgstr ""
 "にはいるかも知れません。"
 
 #. 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 "
@@ -1997,13 +2025,13 @@ msgstr ""
 "ハードウェアベンダを支援しましょう。"
 
 #. 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 "
@@ -2020,7 +2048,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) "
@@ -2043,7 +2071,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 "
@@ -2062,7 +2090,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 "
@@ -2087,7 +2115,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 "
@@ -2099,13 +2127,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 "
@@ -2120,13 +2148,13 @@ msgstr ""
 "ら、このページに、もう一度戻ってくるかもしれませんね。"
 
 #. Tag: title
-#: hardware.xml:1782
+#: hardware.xml:1800
 #, no-c-format
 msgid "CD-ROM/DVD-ROM/BD-ROM"
 msgstr "CD-ROM/DVD-ROM/BD-ROM"
 
 #. Tag: para
-#: hardware.xml:1784
+#: hardware.xml:1802
 #, no-c-format
 msgid "Installation from optical disc is supported for most architectures."
 msgstr ""
@@ -2134,7 +2162,7 @@ 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 "
@@ -2144,13 +2172,13 @@ msgstr ""
 "SATA や IDE/ATAPI、USB および SCSI の光学ドライブをサポートしています。"
 
 #. Tag: title
-#: hardware.xml:1805
+#: hardware.xml:1823
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr "USB メモリ"
 
 #. 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 "
@@ -2168,13 +2196,13 @@ msgstr ""
 "アからのブートは標準的な手段となっています。"
 
 #. 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 "
@@ -2193,7 +2221,7 @@ msgstr ""
 "用するようにシステムの設定ができます。"
 
 #. Tag: para
-#: hardware.xml:1831
+#: hardware.xml:1849
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2215,7 +2243,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 "
@@ -2225,13 +2253,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 "
@@ -2245,13 +2273,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 "
@@ -2270,13 +2298,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 "
@@ -2286,7 +2314,7 @@ msgstr ""
 "築されています。"
 
 #. Tag: para
-#: hardware.xml:1888
+#: hardware.xml:1906
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for IDE (also "
@@ -2299,13 +2327,13 @@ msgstr ""
 "サポートしているファイルシステムは、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 "
@@ -2315,7 +2343,7 @@ msgstr ""
 "ポートされています。"
 
 #. 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 "
@@ -2328,13 +2356,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 "
@@ -2348,7 +2376,7 @@ msgstr ""
 "をご覧ください。"
 
 #. Tag: para
-#: hardware.xml:1946
+#: hardware.xml:1964
 #, no-c-format
 msgid ""
 "The installer normally automatically enables memory-saving tricks to be able "
@@ -2366,7 +2394,7 @@ msgstr ""
 "ご覧ください)。"
 
 #. Tag: para
-#: hardware.xml:1955
+#: hardware.xml:1973
 #, no-c-format
 msgid ""
 "On &architecture; the lowmem levels have not been tested, so automatic "
@@ -2378,7 +2406,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> "
@@ -2396,3 +2424,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\"/> を参照してください)。"
diff --git a/po/ja/post-install.po b/po/ja/post-install.po
index d25855472..113da1286 100644
--- a/po/ja/post-install.po
+++ b/po/ja/post-install.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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: 2021-06-11 09:32+0000\n"
 "Last-Translator: YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -151,15 +151,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</command> を使うことも、<application>aptitude</application> や "
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 8e0f4e6dc..a9d27816d 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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: 2021-10-17 23:12+0000\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1659,7 +1659,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"
@@ -1725,6 +1799,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"
@@ -2695,6 +2773,8 @@ 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/ja/using-d-i.po b/po/ja/using-d-i.po
index 896f1140e..ee81322fd 100644
--- a/po/ja/using-d-i.po
+++ b/po/ja/using-d-i.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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: 2023-01-04 00:25+0200\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -3710,13 +3710,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 ""
 "低い優先度でインストールしている場合 (例: エキスパートモード)、もっと多くのこ"
 "とを自分で決定できます。セキュリティや stable-updates 更新サービスの有無や、"
@@ -4956,6 +4962,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 "
@@ -4971,7 +4989,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 "
@@ -4988,7 +5006,7 @@ msgstr ""
 "のファームウェアは、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 "
@@ -4999,47 +5017,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 ""
 "公式インストールイメージには non-free のファームウェアが含まれません。そのよ"
 "うなファームウェアを読み込むもっとも一般的な方法は、USB メモリのようなリムー"
@@ -5053,14 +5057,21 @@ msgstr ""
 "ます。"
 
 #. 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 ""
 "よくある一般的なファームウェアの最新パッケージを、tar や zip で固めたものが、"
 "以下のサイトで利用できます。<itemizedlist> <listitem><para> <ulink url="
@@ -5069,23 +5080,7 @@ msgstr ""
 "テムに展開するだけです。"
 
 #. 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 ""
-"必要なファームウェアが tarball に含まれていない場合、特定のファームウェアパッ"
-"ケージを、アーカイブ (の 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 "
@@ -5097,13 +5092,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 "
@@ -5121,13 +5116,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; はインス"
@@ -5137,7 +5138,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 "
@@ -5149,7 +5150,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 "
@@ -5163,13 +5164,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 "
@@ -5187,7 +5188,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 "
@@ -5197,7 +5198,7 @@ msgstr ""
 "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</"
@@ -5208,71 +5209,14 @@ msgstr ""
 "keycombo> の組み合わせを使って、動作しているログインプロンプトが表示される "
 "VT2 (仮想端末2) にスイッチする"
 
-#. 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 "
@@ -5282,13 +5226,13 @@ msgstr ""
 "ユースケースに合わせるため、じっくりとカスタマイズできます:"
 
 #. Tag: title
-#: using-d-i.xml:3298
+#: using-d-i.xml:3251
 #, no-c-format
 msgid "Installing an alternative init system"
 msgstr "代替 init システムのインストール"
 
 #. 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 "
@@ -5304,3 +5248,79 @@ msgstr ""
 "どのようにして切り替えるかの詳細な作業内容は<ulink url=\"https://wiki.debian."
 "org/Init#Changing_the_init_system_-_at_installation_time\">Debian wiki の "
 "Init のページ</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 ""
+#~ "必要なファームウェアが tarball に含まれていない場合、特定のファームウェア"
+#~ "パッケージを、アーカイブ (の 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>) を自動的"
+#~ "に生成します。"