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/fr.po b/man/po/fr.po
index fefe1af..1b76d8c 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.21.20\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: 2023-02-05 23:52+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -10400,8 +10400,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 ""
 "Ce paramètre (désactivé par défaut) active la prise en charge des gros "
 "fichiers (LFS) sur les architectures 32 bits où l'ABI n'inclut pas LFS par "
@@ -10478,8 +10477,8 @@ msgstr ""
 #| "This setting (disabled by default) adds B<-fsanitize=undefined> to "
 #| "B<CFLAGS>, B<CXXFLAGS> and B<LDFLAGS>."
 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 ""
 "Ce paramètre (désactivé par défaut) ajoute B<-fsanitize=undefined> à "
 "B<CFLAGS>, B<CXXFLAGS> et B<LDFLAGS>."
@@ -14718,6 +14717,13 @@ msgstr ""
 
 #. type: textblock
 #: dpkg-deb.pod
+#, fuzzy
+#| msgid "Since dpkg 1.21.10."
+msgid "Since dpkg 1.18.8."
+msgstr "depuis dpkg 1.21.10)."
+
+#. 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 "
@@ -23043,6 +23049,13 @@ msgstr ""
 "seconde à partir de « l'epoch ») pour fixer le « mtime » dans les entrées du "
 "fichier B<tar>(5)."
 
+#. type: textblock
+#: dpkg-source.pod dpkg-split.pod
+#, fuzzy
+#| msgid "Since dpkg 1.21.10."
+msgid "Since dpkg 1.18.11."
+msgstr "depuis dpkg 1.21.10)."
+
 #. type: =item
 #: dpkg-source.pod
 msgid "B<VISUAL>"