Merging upstream version 4.23.0.

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

1 files changed, 42 insertions, 30 deletions

diff --git a/templates/man1/locale.1.pot b/templates/man1/locale.1.pot
index ca244ef9..6a573d2f 100644
--- a/templates/man1/locale.1.pot
+++ b/templates/man1/locale.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:00+0100\n"
+"POT-Creation-Date: 2024-06-01 06:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,15 +24,15 @@ msgid "locale"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2023-10-31"
+msgid "2024-05-02"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable
 #, no-wrap
-msgid "Linux man-pages 6.06"
+msgid "Linux man-pages 6.8"
 msgstr ""
 
 #. type: SH
@@ -101,13 +101,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--all-locales>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-a>"
 msgstr ""
@@ -121,13 +121,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--charmaps>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-m>"
 msgstr ""
@@ -178,13 +178,13 @@ msgid "When arguments are supplied, the following options are meaningful:"
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--category-name>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-c>"
 msgstr ""
@@ -214,13 +214,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--keyword-name>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-k>"
 msgstr ""
@@ -247,13 +247,13 @@ msgid "The B<locale> command also knows about the following options:"
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-v>"
 msgstr ""
@@ -267,13 +267,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-?>"
 msgstr ""
@@ -298,13 +298,13 @@ msgid "Display a short usage message and exit."
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 #. type: TQ
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
 #, no-wrap
 msgid "B<-V>"
 msgstr ""
@@ -506,43 +506,43 @@ msgid "Linux man-pages 6.03"
 msgstr ""
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-a>, B<--all-locales>"
 msgstr ""
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-m>, B<--charmaps>"
 msgstr ""
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-c>, B<--category-name>"
 msgstr ""
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-k>, B<--keyword-name>"
 msgstr ""
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-v>, B<--verbose>"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
@@ -553,15 +553,21 @@ msgid "POSIX.1-2001, POSIX.1-2008."
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide
 #, no-wrap
-msgid "2023-05-03"
+msgid "2023-10-31"
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.06"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
 msgstr ""
 
 #. type: TH
@@ -575,3 +581,9 @@ msgstr ""
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr ""