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

1 files changed, 107 insertions, 62 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\"/> を参照してください)。"