Merging upstream version 1.22.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 5 deletions

diff --git a/man/po/ja.po b/man/po/ja.po
index 30b4498..7fd0462 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-02-27 04:27+0100\n"
+"POT-Creation-Date: 2024-03-10 20:21+0100\n"
 "PO-Revision-Date: 2021-04-08 04:43+0200\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -10477,8 +10477,7 @@ msgid ""
 "i386 and kfreebsd-i386 since dpkg 1.22.5) enables 64-bit time_t support on "
 "32-bit architectures where their ABI does not include it by default, by "
 "adding B<-D_TIME_BITS=64> to B<CPPFLAGS>.  This setting automatically "
-"enables the B<lfs> feature from the B<abi> feature area, and the B<bug-"
-"implicit-func> feature from the B<qa> feature area as it requires them."
+"enables the B<lfs> feature from the B<abi> feature area."
 msgstr ""
 
 #. type: textblock
@@ -10548,8 +10547,8 @@ msgstr ""
 #| "injection vulnerabilities into denial of service or into non-issues "
 #| "(depending on the application)."
 msgid ""
-"This setting (since dpkg 1.22.3; disabled by default) adds B<-"
-"Werror=implicit-function-declaration> to B<CFLAGS>."
+"This setting (since dpkg 1.22.3; enabled by default since dpkg 1.22.6) adds "
+"B<-Werror=implicit-function-declaration> to B<CFLAGS>."
 msgstr ""
 "この設定 (デフォルト有効) により、B<CFLAGS> および B<CXXFLAGS> に B<-fstack-"
 "protector --param=ssp-buffer-size=4> が追加される。これにより、スタックの上書"
@@ -14805,6 +14804,13 @@ msgstr ""
 
 #. type: textblock
 #: dpkg-deb.pod
+#, fuzzy
+#| msgid "Cancels a previous B<--no-triggers>."
+msgid "Since dpkg 1.18.8."
+msgstr "先に指定した B<--no-triggers> を無効にする。"
+
+#. type: textblock
+#: dpkg-deb.pod
 msgid ""
 "Do not attempt to use just B<dpkg-deb> to install software! You must use "
 "B<dpkg> proper to ensure that all the files are correctly placed and the "
@@ -23510,6 +23516,13 @@ msgid ""
 "clamp the mtime in the L<tar(5)> file entries."
 msgstr ""
 
+#. type: textblock
+#: dpkg-source.pod dpkg-split.pod
+#, fuzzy
+#| msgid "Cancels a previous B<--no-triggers>."
+msgid "Since dpkg 1.18.11."
+msgstr "先に指定した B<--no-triggers> を無効にする。"
+
 #. type: =item
 #: dpkg-source.pod
 msgid "B<VISUAL>"