Merging upstream version 4.23.0.

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

1 files changed, 58 insertions, 32 deletions

diff --git a/templates/man5/locale.5.pot b/templates/man5/locale.5.pot
index 6afb1e86..82516b19 100644
--- a/templates/man5/locale.5.pot
+++ b/templates/man5/locale.5.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 mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2024-01-28"
+msgid "2024-05-02"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable
 #, no-wrap
-msgid "Linux man-pages 6.06"
+msgid "Linux man-pages 6.8"
 msgstr ""
 
 #. type: SH
@@ -554,8 +554,9 @@ msgid "I<country_ab2>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-msgid "followed by the two-letter abbreviation of the country (ISO\\~3166)."
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
+msgid "followed by the two-letter abbreviation of the country (ISO\\ 3166)."
 msgstr ""
 
 #. type: TP
@@ -566,8 +567,9 @@ msgid "I<country_ab3>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-msgid "followed by the three-letter abbreviation of the country (ISO\\~3166)."
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
+msgid "followed by the three-letter abbreviation of the country (ISO\\ 3166)."
 msgstr ""
 
 #. type: TP
@@ -578,8 +580,9 @@ msgid "I<country_num>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-msgid "followed by the numeric country code (ISO\\~3166)."
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
+msgid "followed by the numeric country code (ISO\\ 3166)."
 msgstr ""
 
 #. type: TP
@@ -629,8 +632,9 @@ msgid "I<lang_ab>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-msgid "followed by the two-letter abbreviation of the language (ISO\\~639)."
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
+msgid "followed by the two-letter abbreviation of the language (ISO\\ 639)."
 msgstr ""
 
 #. type: TP
@@ -641,9 +645,10 @@ msgid "I<lang_term>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
-"followed by the three-letter abbreviation of the language (ISO\\~639-2/T)."
+"followed by the three-letter abbreviation of the language (ISO\\ 639-2/T)."
 msgstr ""
 
 #. type: TP
@@ -654,10 +659,11 @@ msgid "I<lang_lib>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "followed by the three-letter abbreviation of the language for library use "
-"(ISO\\~639-2/B).  Applications should in general prefer I<lang_term> over "
+"(ISO\\ 639-2/B).  Applications should in general prefer I<lang_term> over "
 "I<lang_lib>."
 msgstr ""
 
@@ -1181,7 +1187,8 @@ msgid "marks the end of the redefinition of a collation rule."
 msgstr ""
 
 #. type: TP
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid "I<reorder-sections-after>"
 msgstr ""
@@ -1688,11 +1695,12 @@ msgid "I<int_curr_symbol>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "followed by the international currency symbol.  This must be a 4-character "
-"string containing the international currency symbol as defined by the "
-"ISO\\~4217 standard (three characters) followed by a separator."
+"string containing the international currency symbol as defined by the ISO\\ "
+"4217 standard (three characters) followed by a separator."
 msgstr ""
 
 #. type: TP
@@ -3133,7 +3141,7 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "2023-02-05"
 msgstr ""
@@ -3145,33 +3153,33 @@ msgid "Linux man-pages 6.03"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the two-letter abbreviation of the country (ISO 3166)."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the three-letter abbreviation of the country (ISO 3166)."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the numeric country code (ISO 3166)."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid "followed by the two-letter abbreviation of the language (ISO 639)."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "followed by the three-letter abbreviation of the language (ISO 639-2/T)."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "followed by the three-letter abbreviation of the language for library use "
 "(ISO 639-2/B).  Applications should in general prefer I<lang_term> over "
@@ -3179,13 +3187,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "I<reorde\\r-sections-after>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm debian-unstable opensuse-leap-15-6 opensuse-tumbleweed
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "followed by the international currency symbol.  This must be a 4-character "
 "string containing the international currency symbol as defined by the ISO "
@@ -3193,9 +3201,21 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "2024-01-28"
+msgstr ""
+
+#. type: TH
+#: fedora-40 mageia-cauldron
+#, no-wrap
+msgid "Linux man-pages 6.06"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
 msgstr ""
 
 #. type: TH
@@ -3203,3 +3223,9 @@ msgstr ""
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr ""