Merging upstream version 4.23.0.

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

1 files changed, 55 insertions, 37 deletions

diff --git a/po/fr/man1/getent.1.po b/po/fr/man1/getent.1.po
index 4dd2a202..ef63aff7 100644
--- a/po/fr/man1/getent.1.po
+++ b/po/fr/man1/getent.1.po
@@ -19,8 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-l10n\n"
-"POT-Creation-Date: 2024-03-01 16:57+0100\n"
-"PO-Revision-Date: 2024-02-24 17:41+0100\n"
+"POT-Creation-Date: 2024-06-01 05:52+0200\n"
+"PO-Revision-Date: 2024-06-01 12:25+0200\n"
 "Last-Translator: Jean-Philippe MENGUAL <jpmengual@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -38,16 +38,16 @@ msgid "getent"
 msgstr "getent"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-11-01"
-msgstr "1 novembre 2023"
+msgid "2024-05-02"
+msgstr "2 mai 2024"
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable
 #, no-wrap
-msgid "Linux man-pages 6.06"
-msgstr "Pages du manuel de Linux 6.06"
+msgid "Linux man-pages 6.8"
+msgstr "Pages du manuel de Linux 6.8"
 
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
@@ -119,7 +119,7 @@ msgid "B<ahosts>"
 msgstr "B<ahosts>"
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 msgid ""
 "When no I<key> is provided, use B<sethostent>(3), B<gethostent>(3), and "
 "B<endhostent>(3)  to enumerate the hosts database.  This is identical to "
@@ -461,16 +461,16 @@ msgid "OPTIONS"
 msgstr "OPTIONS"
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "B<--service\\~>I<service>"
-msgstr "B<--service\\~>I<service>"
+msgid "B<--service\\ >I<service>"
+msgstr "B<--service\\ >I<service>"
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "B<-s\\~>I<service>"
-msgstr "B<-s\\~>I<service>"
+msgid "B<-s\\ >I<service>"
+msgstr "B<-s\\ >I<service>"
 
 #.  commit 9d0881aa76b399e6a025c5cf44bebe2ae0efa8af (glibc)
 #. type: Plain text
@@ -483,16 +483,16 @@ msgstr ""
 "glibc 2.2.5.)."
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "B<--service\\~>I<database>B<:>I<service>"
-msgstr "B<--service\\~>I<base_de_données>B<:>I<service>"
+msgid "B<--service\\ >I<database>B<:>I<service>"
+msgstr "B<--service\\ >I<base_de_données>B<:>I<service>"
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "B<-s\\~>I<database>B<:>I<service>"
-msgstr "B<-s\\~>I<base_de_données>B<:>I<service>"
+msgid "B<-s\\ >I<database>B<:>I<service>"
+msgstr "B<-s\\ >I<base_de_données>B<:>I<service>"
 
 #.  commit b4f6f4be85d32b9c03361c38376e36f08100e3e8 (glibc)
 #. type: Plain text
@@ -508,13 +508,13 @@ msgstr ""
 "chaque base de données sera utilisé (depuis glibc 2.4.)."
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--no-idn>"
 msgstr "B<--no-idn>"
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-i>"
 msgstr "B<-i>"
@@ -531,13 +531,13 @@ msgstr ""
 "B<getaddrinfo>(3) (depuis glibc-2.13.)."
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-?>"
 msgstr "B<-?>"
@@ -562,13 +562,13 @@ msgid "Print a short usage summary and exit."
 msgstr "Afficher une brève description sur l'utilisation et quitter."
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-V>"
 msgstr "B<-V>"
@@ -663,7 +663,7 @@ msgid "B<nsswitch.conf>(5)"
 msgstr "B<nsswitch.conf>(5)"
 
 #. type: TH
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "2023-01-07"
 msgstr "7 janvier 2023"
@@ -675,7 +675,7 @@ msgid "Linux man-pages 6.03"
 msgstr "Pages du manuel de Linux 6.03"
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "When no I<key> is provided, use B<sethostent>(3), B<gethostent>(3), and "
 "B<endhostent>(3)  to enumerate the hosts database.  This is identical to "
@@ -691,43 +691,61 @@ msgstr ""
 "de socket renvoyée."
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-s\\ >I<service>, B<--service\\ >I<service>"
 msgstr "B<-s\\ >I<service>, B<--service\\ >I<service>"
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-s\\ >I<database>B<:>I<service>, B<--service\\ >I<database>B<:>I<service>"
 msgstr "B<-s\\ >I<base_de_données>B<:>I<service>, B<--service\\ >I<base_de_données>B<:>I<service>"
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-i>, B<--no-idn>"
 msgstr "B<-i>, B<--no-idn>"
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-?>, B<--help>"
 msgstr "B<-?>, B<--help>"
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
-msgstr "Pages du manuel de Linux 6.05.01"
+msgid "2023-11-01"
+msgstr "1 novembre 2023"
+
+#. type: TH
+#: fedora-40
+#, no-wrap
+msgid "Linux man-pages 6.06"
+msgstr "Pages du manuel de Linux 6.06"
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
+msgstr "Pages du manuel de Linux 6.7"
 
 #. type: TH
 #: opensuse-leap-15-6
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr "Pages du manuel de Linux 6.04"
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr "Pages du manuel de Linux (non publiées)"