Update Japanese translation

1 files changed, 55 insertions, 170 deletions

diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 9a2ffe2f1..a66638b25 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -1,6 +1,6 @@
 # KURASAWA Nozomu <nabetaro@debian.or.jp>, 2010.
 # YOSHINO Yoshihito <yy.y.ja.jp@gmail.com>, 2021.
-# Hideki Yamane <henrich@debian.org>, 2021.
+# Hideki Yamane <henrich@debian.org>, 2021-2023.
 #
 msgid ""
 msgstr ""
@@ -219,9 +219,9 @@ msgid ""
 msgstr ""
 "言うまでもなく、事前設定ファイルが読み込まれる前に処理される質問は preseed で"
 "きません (最初のハードウェア検出のように、優先度が中や低でしか表示されない質"
-"問も同様です)。あまり便利ではありませんが <xref linkend=\"preseed-bootparms"
-"\"/> で説明しているように、ブートパラメータを経由して preseed することでそう"
-"いった質問が出ないようにする方法があります。"
+"問も同様です)。あまり便利ではありませんが <xref linkend=\"preseed-"
+"bootparms\"/> で説明しているように、ブートパラメータを経由して preseed するこ"
+"とでそういった質問が出ないようにする方法があります。"
 
 #. Tag: para
 #: preseed.xml:128
@@ -336,13 +336,13 @@ msgid ""
 msgstr ""
 "他の preseed 方法では、起動時にどのファイルを読み込むか、インストーラに指定す"
 "る必要があります。通常、カーネルのブートパラメータで渡して行います。これは起"
-"動時に手動で与えるか、ブートローダ設定ファイル <phrase arch=\"linux-any"
-"\">(例: <filename>syslinux.cfg</filename>) を編集し、カーネルへの append 行の"
-"最後にパラメータを追加します。</phrase><phrase arch=\"kfreebsd-any\">(例: "
-"<filename>grub.cfg</filename>) を編集し、カーネルへの 新しい <literal>set</"
-"literal> 行としてパラメータを追加します。</phrase><phrase arch=\"hurd-any"
-"\">(例: <filename>grub.cfg</filename>) を編集し、<filename>gnumach.gz</"
-"filename> 行の最後にパラメータを追加します。</phrase>"
+"動時に手動で与えるか、ブートローダ設定ファイル <phrase arch=\"linux-"
+"any\">(例: <filename>syslinux.cfg</filename>) を編集し、カーネルへの append "
+"行の最後にパラメータを追加します。</phrase><phrase arch=\"kfreebsd-"
+"any\">(例: <filename>grub.cfg</filename>) を編集し、カーネルへの 新しい "
+"<literal>set</literal> 行としてパラメータを追加します。</phrase><phrase "
+"arch=\"hurd-any\">(例: <filename>grub.cfg</filename>) を編集し、"
+"<filename>gnumach.gz</filename> 行の最後にパラメータを追加します。</phrase>"
 
 #. Tag: para
 #: preseed.xml:259
@@ -356,9 +356,9 @@ msgid ""
 "timeout to <literal>0</literal> in <filename>grub.cfg</filename>.</phrase>"
 msgstr ""
 "ブートローダの設定で事前設定ファイルを指定する場合、設定を変更すれば、インス"
-"トーラの起動時に ENTER を押す必要はありません。<phrase arch=\"linux-any"
-"\">syslinux ではこの設定をするのに、<filename>syslinux.cfg</filename> でタイ"
-"ムアウトを <literal>1</literal> にします。</phrase><phrase arch=\"kfrebsd-"
+"トーラの起動時に ENTER を押す必要はありません。<phrase arch=\"linux-"
+"any\">syslinux ではこの設定をするのに、<filename>syslinux.cfg</filename> でタ"
+"イムアウトを <literal>1</literal> にします。</phrase><phrase arch=\"kfrebsd-"
 "any;hurd-any\">grub ではこの設定をするのに、<filename>grub.cfg</filename> で"
 "タイムアウトを <literal>0</literal> にします。</phrase>"
 
@@ -1104,8 +1104,8 @@ msgstr "ブートプロンプトの preseed の例"
 #, no-c-format
 msgid ""
 "Here are some examples of how the boot prompt might look like (you will need "
-"to adapt this to your needs<phrase arch=\"x86\">; also see <xref linkend="
-"\"boot-screen\"/></phrase>)."
+"to adapt this to your needs<phrase arch=\"x86\">; also see <xref "
+"linkend=\"boot-screen\"/></phrase>)."
 msgstr ""
 "ここではブートプロンプトの見た目の例を示します (これを必要に応じて調整してく"
 "ださい<phrase arch=\"x86\">、<xref linkend=\"boot-screen\"/>もご覧ください</"
@@ -1660,80 +1660,6 @@ msgstr "以下の debconf 変数は、ネットワークの設定と関係があ
 #. Tag: screen
 #: preseed.xml:837
 #, 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"
@@ -1872,6 +1798,10 @@ msgstr ""
 "# 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"
@@ -1928,8 +1858,8 @@ msgstr ""
 #: preseed.xml:859
 #, no-c-format
 msgid ""
-"More information related to network-console can be found in <xref linkend="
-"\"network-console\"/>."
+"More information related to network-console can be found in <xref "
+"linkend=\"network-console\"/>."
 msgstr ""
 " network-consolse に関する詳細な情報は <xref linkend=\"network-console\"/> で"
 "参照してください。"
@@ -1983,7 +1913,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:893
-#, no-c-format
+#, fuzzy
 msgid ""
 "# Mirror protocol:\n"
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -2049,7 +1979,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:916
-#, no-c-format
+#, fuzzy
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
 "# use sudo).\n"
@@ -2149,7 +2079,7 @@ msgstr "時計と時間帯の設定"
 
 #. Tag: screen
 #: preseed.xml:941
-#, no-c-format
+#, fuzzy
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
 "d-i clock-setup/utc boolean true\n"
@@ -2248,7 +2178,7 @@ msgstr "パーティション分割の例"
 
 #. Tag: screen
 #: preseed.xml:986
-#, no-c-format
+#, fuzzy
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -2500,7 +2430,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1014
-#, no-c-format
+#, fuzzy
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2653,7 +2583,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1046
-#, no-c-format
+#, fuzzy
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
 "to\n"
@@ -2688,7 +2618,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1060
-#, no-c-format
+#, fuzzy
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
 "# option can result in an incomplete system and should only be used by very\n"
@@ -2732,43 +2662,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:1074
 #, 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 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"
-#| "# If the provided key file ends in \".asc\" the key file needs to be an\n"
-#| "# ASCII-armoured PGP key, if it ends in \".gpg\" it needs to use the\n"
-#| "# \"GPG key public keyring\" format, the \"keybox database\" format is\n"
-#| "# currently not supported.\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"
@@ -2822,9 +2715,16 @@ msgstr ""
 "# 追加インストールメディアをスキャンしたい場合は選んでください\n"
 "# (デフォルト: 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"
 "# non-free および contrib ソフトウェアのインストールを選択できます\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"
 "# ネットワークミラーを使いたくない場合は以下のコメントを外してください。\n"
 "#d-i apt-setup/use_mirror boolean false\n"
 "# どのアップデートを使うかを選択します; 利用するミラーを指定します。\n"
@@ -2842,10 +2742,16 @@ msgstr ""
 "ジトリ\n"
 "# に対して警告を出し、sources.list 行はコメントアウトされたままになります。\n"
 "#d-i apt-setup/local0/key string http://local.server/key\n"
-"# 指定した鍵ファイルが \".asc\" で終わる場合、\n"
-"# その鍵ファイルは ASCII 形式の PGP 鍵である必要が、\n"
-"# \".gpg\" で終わる場合は \"GPG key public keyring\" 形式である必要があり、\n"
-"# \"keybox database\" 形式は今の所サポートされていません。\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"
 "# デフォルトではインストーラーは既知の GPG 鍵で認証されたリポジトリを必要とし"
 "ます。\n"
@@ -2974,27 +2880,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:1142
 #, fuzzy, no-c-format
-#| msgid ""
-#| "#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
-#| "\n"
-#| "# Or choose to not get the tasksel dialog displayed at all (and don't "
-#| "install\n"
-#| "# any packages):\n"
-#| "#d-i pkgsel/run_tasksel boolean false\n"
-#| "\n"
-#| "# Individual additional packages to install\n"
-#| "#d-i pkgsel/include string openssh-server build-essential\n"
-#| "# Whether to upgrade packages after debootstrap.\n"
-#| "# Allowed values: none, safe-upgrade, full-upgrade\n"
-#| "#d-i pkgsel/upgrade select none\n"
-#| "\n"
-#| "# Some versions of the installer can report back on what software you "
-#| "have\n"
-#| "# installed, and what software you use. The default is not to report "
-#| "back,\n"
-#| "# but sending reports helps the project determine what software is most\n"
-#| "# popular and should be included on the first CD/DVD.\n"
-#| "#popularity-contest popularity-contest/participate boolean false"
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
@@ -3028,7 +2913,7 @@ msgstr ""
 "# Allowed values: none, safe-upgrade, full-upgrade\n"
 "#d-i pkgsel/upgrade select none\n"
 "\n"
-"# Some versions of the installer can report back on what software you have\n"
+"# You can choose, if your system will report back on what software you have\n"
 "# installed, and what software you use. The default is not to report back,\n"
 "# but sending reports helps the project determine what software is most\n"
 "# popular and should be included on the first CD/DVD.\n"
@@ -3042,7 +2927,7 @@ msgstr "ブートローダのインストール"
 
 #. Tag: screen
 #: preseed.xml:1149
-#, no-c-format
+#, fuzzy
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the boot loader (for x86).</"
 "phrase><phrase\n"
@@ -3141,8 +3026,8 @@ msgid ""
 "example in <xref linkend=\"preseed-account\"/>."
 msgstr ""
 "<classname>grub</classname> で使用するパスワードの MD5 ハッシュは、"
-"<command>grub-md5-crypt</command> を使用して生成するか、<xref linkend="
-"\"preseed-account\"/> にあるコマンドを使用して生成します。"
+"<command>grub-md5-crypt</command> を使用して生成するか、<xref "
+"linkend=\"preseed-account\"/> にあるコマンドを使用して生成します。"
 
 #. Tag: title
 #: preseed.xml:1161
@@ -3152,7 +3037,7 @@ msgstr "インストールの仕上げ"
 
 #. Tag: screen
 #: preseed.xml:1163
-#, no-c-format
+#, fuzzy
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
 "# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
@@ -3198,7 +3083,7 @@ msgstr "他パッケージの preseed"
 
 #. Tag: screen
 #: preseed.xml:1170
-#, no-c-format
+#, fuzzy
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
 "# during the installation process, it's possible that other questions may\n"
@@ -3252,7 +3137,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1195
-#, no-c-format
+#, fuzzy
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
 "# for attempts at buffer overflows or other exploits of the values of a\n"
@@ -3306,7 +3191,7 @@ msgstr "preseed を用いたデフォルト値変更"
 
 #. Tag: para
 #: preseed.xml:1201
-#, no-c-format
+#, fuzzy
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
 "question, but still have the question asked. To do this the <firstterm>seen</"
@@ -3404,7 +3289,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1255
-#, no-c-format
+#, fuzzy
 msgid ""
 "# More than one file can be listed, separated by spaces; all will be\n"
 "# loaded. The included files can have preseed/include directives of their\n"