Merging upstream version 4.23.0.

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

1 files changed, 62 insertions, 26 deletions

diff --git a/po/fr/man1/join.1.po b/po/fr/man1/join.1.po
index 83e75115..b3dbf6a3 100644
--- a/po/fr/man1/join.1.po
+++ b/po/fr/man1/join.1.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: coreutils manpages\n"
-"POT-Creation-Date: 2024-02-15 18:02+0100\n"
-"PO-Revision-Date: 2022-10-19 19:22+0200\n"
+"POT-Creation-Date: 2024-05-01 15:43+0200\n"
+"PO-Revision-Date: 2024-05-02 16:46+0200\n"
 "Last-Translator: Jean-Philippe MENGUAL <jpmengual@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 22.12.3\n"
 
 #. type: TH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -28,16 +28,16 @@ msgid "JOIN"
 msgstr "JOIN"
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable
 #, no-wrap
-msgid "January 2024"
-msgstr "Janvier 2024"
+msgid "March 2024"
+msgstr "Mars 2024"
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "GNU coreutils 9.4"
-msgstr "GNU coreutils 9.4"
+msgid "GNU coreutils 9.5"
+msgstr "GNU coreutils 9.5"
 
 #. type: TH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -333,21 +333,20 @@ msgstr ""
 "chaque fichier détermine le nombre de champs affichés pour chaque ligne."
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
 "Important: FILE1 and FILE2 must be sorted on the join fields.  E.g., use "
 "\"sort B<-k> 1b,1\" if 'join' has no options, or use \"join B<-t> ''\" if "
-"'sort' has no options.  Note, comparisons honor the rules specified by "
+"'sort' has no options.  Comparisons honor the rules specified by "
 "'LC_COLLATE'.  If the input is not sorted and some lines cannot be joined, a "
 "warning message will be given."
 msgstr ""
 "Important\\ : les champs de I<FICHIER1> et I<FICHIER2> doivent être triés. "
 "Par exemple, utilisez «\\ I<sort -k 1b,1>\\ » si B<join> est utilisée sans "
 "option, ou utilisez « I<join -t &apos;&apos;> » si B<sort> est utilisée sans "
-"option. Notez que les comparaisons respectent les règles indiquées par "
-"« LC_COLLATE ». Si l'entrée n'est pas triée et quelques lignes ne peuvent "
-"être fusionnées, un message d'alerte sera fourni."
+"option. Les comparaisons respectent les règles indiquées par « LC_COLLATE ». "
+"Si l'entrée n'est pas triée et quelques lignes ne peuvent être fusionnées, "
+"un message d'alerte sera fourni."
 
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -395,12 +394,12 @@ msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
-"Copyright \\(co 2023 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
+"Copyright \\(co 2024 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
 "version 3 or later E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 msgstr ""
-"Copyright \\(co 2022 Free Software Foundation, Inc. Licence GPLv3+\\ : GNU "
+"Copyright \\(co 2024 Free Software Foundation, Inc. Licence GPLv3+\\ : GNU "
 "GPL version 3 ou ultérieure E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 
 #. type: Plain text
@@ -450,13 +449,29 @@ msgid "September 2022"
 msgstr "Septembre 2022"
 
 #. type: TH
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm
 #, no-wrap
 msgid "GNU coreutils 9.1"
 msgstr "GNU coreutils 9.1"
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Important: FILE1 and FILE2 must be sorted on the join fields.  E.g., use "
+"\"sort B<-k> 1b,1\" if 'join' has no options, or use \"join B<-t> ''\" if "
+"'sort' has no options.  Note, comparisons honor the rules specified by "
+"'LC_COLLATE'.  If the input is not sorted and some lines cannot be joined, a "
+"warning message will be given."
+msgstr ""
+"Important\\ : les champs de I<FICHIER1> et I<FICHIER2> doivent être triés. "
+"Par exemple, utilisez «\\ I<sort -k 1b,1>\\ » si B<join> est utilisée sans "
+"option, ou utilisez « I<join -t &apos;&apos;> » si B<sort> est utilisée sans "
+"option. Notez que les comparaisons respectent les règles indiquées par "
+"« LC_COLLATE ». Si l'entrée n'est pas triée et quelques lignes ne peuvent "
+"être fusionnées, un message d'alerte sera fourni."
+
+#. type: Plain text
+#: debian-bookworm
 msgid ""
 "Copyright \\(co 2022 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
 "version 3 or later E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
@@ -465,16 +480,37 @@ msgstr ""
 "GPL version 3 ou ultérieure E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 
 #. type: TH
-#: mageia-cauldron
+#: debian-unstable fedora-40 mageia-cauldron
 #, no-wrap
-msgid "April 2022"
-msgstr "Avril 2022"
+msgid "GNU coreutils 9.4"
+msgstr "GNU coreutils 9.4"
+
+#. type: Plain text
+#: debian-unstable fedora-40 mageia-cauldron
+msgid ""
+"Copyright \\(co 2023 Free Software Foundation, Inc.  License GPLv3+: GNU GPL "
+"version 3 or later E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
+msgstr ""
+"Copyright \\(co 2022 Free Software Foundation, Inc. Licence GPLv3+\\ : GNU "
+"GPL version 3 ou ultérieure E<lt>https://gnu.org/licenses/gpl.htmlE<gt>."
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 opensuse-leap-15-6
+#, no-wrap
+msgid "January 2024"
+msgstr "Janvier 2024"
+
+#. type: TH
+#: fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "April 2024"
+msgstr "Avril 2024"
+
+#. type: TH
+#: mageia-cauldron
 #, no-wrap
-msgid "October 2021"
-msgstr "Octobre 2021"
+msgid "August 2023"
+msgstr "Août 2023"
 
 #. type: TH
 #: opensuse-leap-15-6