Merging upstream version 4.23.0.

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

1 files changed, 90 insertions, 78 deletions

diff --git a/templates/man3/mbsinit.3.pot b/templates/man3/mbsinit.3.pot
index 2eaa9151..969507ef 100644
--- a/templates/man3/mbsinit.3.pot
+++ b/templates/man3/mbsinit.3.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:01+0100\n"
+"POT-Creation-Date: 2024-06-01 06:02+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 "mbsinit"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux debian-unstable opensuse-tumbleweed
 #, no-wrap
-msgid "2024-01-28"
+msgid "2024-05-03"
 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
@@ -90,71 +90,6 @@ msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
-msgid ""
-"Character conversion between the multibyte representation and the wide "
-"character representation uses conversion state, of type I<mbstate_t>.  "
-"Conversion of a string uses a finite-state machine; when it is interrupted "
-"after the complete conversion of a number of characters, it may need to save "
-"a state for processing the remaining characters.  Such a conversion state is "
-"needed for the sake of encodings such as ISO/IEC\\~2022 and UTF-7."
-msgstr ""
-
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid ""
-"The initial state is the state at the beginning of conversion of a string.  "
-"There are two kinds of state: the one used by multibyte to wide character "
-"conversion functions, such as B<mbsrtowcs>(3), and the one used by wide "
-"character to multibyte conversion functions, such as B<wcsrtombs>(3), but "
-"they both fit in a I<mbstate_t>, and they both have the same representation "
-"for an initial state."
-msgstr ""
-
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid ""
-"For 8-bit encodings, all states are equivalent to the initial state.  For "
-"multibyte encodings like UTF-8, EUC-*, BIG5, or SJIS, the wide character to "
-"multibyte conversion functions never produce non-initial states, but the "
-"multibyte to wide-character conversion functions like B<mbrtowc>(3)  do "
-"produce non-initial states when interrupted in the middle of a character."
-msgstr ""
-
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid ""
-"One possible way to create an I<mbstate_t> in initial state is to set it to "
-"zero:"
-msgstr ""
-
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-#, no-wrap
-msgid ""
-"mbstate_t state;\n"
-"memset(&state, 0, sizeof(state));\n"
-msgstr ""
-
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid ""
-"On Linux, the following works as well, but might generate compiler warnings:"
-msgstr ""
-
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-#, no-wrap
-msgid "mbstate_t state = { 0 };\n"
-msgstr ""
-
-#. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
@@ -296,10 +231,10 @@ msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable opensuse-tumbleweed
 msgid ""
-"B<mbrlen>(3), B<mbrtowc>(3), B<mbsrtowcs>(3), B<wcrtomb>(3), B<wcsrtombs>(3)"
+"B<mbstate_t>(3type), B<mbrlen>(3), B<mbrtowc>(3), B<mbsrtowcs>(3), "
+"B<wcrtomb>(3), B<wcsrtombs>(3)"
 msgstr ""
 
 #. type: TH
@@ -315,7 +250,7 @@ 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 ""
 "Character conversion between the multibyte representation and the wide "
 "character representation uses conversion state, of type I<mbstate_t>.  "
@@ -326,20 +261,91 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+msgid ""
+"The initial state is the state at the beginning of conversion of a string.  "
+"There are two kinds of state: the one used by multibyte to wide character "
+"conversion functions, such as B<mbsrtowcs>(3), and the one used by wide "
+"character to multibyte conversion functions, such as B<wcsrtombs>(3), but "
+"they both fit in a I<mbstate_t>, and they both have the same representation "
+"for an initial state."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+msgid ""
+"For 8-bit encodings, all states are equivalent to the initial state.  For "
+"multibyte encodings like UTF-8, EUC-*, BIG5, or SJIS, the wide character to "
+"multibyte conversion functions never produce non-initial states, but the "
+"multibyte to wide-character conversion functions like B<mbrtowc>(3)  do "
+"produce non-initial states when interrupted in the middle of a character."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+msgid ""
+"One possible way to create an I<mbstate_t> in initial state is to set it to "
+"zero:"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid ""
+"mbstate_t state;\n"
+"memset(&state, 0, sizeof(state));\n"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+msgid ""
+"On Linux, the following works as well, but might generate compiler warnings:"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid "mbstate_t state = { 0 };\n"
+msgstr ""
+
+#. type: Plain text
 #: debian-bookworm
 msgid "POSIX.1-2001, POSIX.1-2008, C99."
 msgstr ""
 
+#. type: Plain text
+#: debian-bookworm fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+msgid ""
+"B<mbrlen>(3), B<mbrtowc>(3), B<mbsrtowcs>(3), B<wcrtomb>(3), B<wcsrtombs>(3)"
+msgstr ""
+
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "2023-07-20"
+msgid "2024-01-28"
 msgstr ""
 
 #. type: TH
-#: debian-unstable opensuse-tumbleweed
+#: fedora-40 mageia-cauldron
 #, no-wrap
-msgid "Linux man-pages 6.05.01"
+msgid "Linux man-pages 6.06"
+msgstr ""
+
+#. type: Plain text
+#: fedora-40 fedora-rawhide mageia-cauldron
+msgid ""
+"Character conversion between the multibyte representation and the wide "
+"character representation uses conversion state, of type I<mbstate_t>.  "
+"Conversion of a string uses a finite-state machine; when it is interrupted "
+"after the complete conversion of a number of characters, it may need to save "
+"a state for processing the remaining characters.  Such a conversion state is "
+"needed for the sake of encodings such as ISO/IEC\\ 2022 and UTF-7."
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide
+#, no-wrap
+msgid "Linux man-pages 6.7"
 msgstr ""
 
 #. type: TH
@@ -353,3 +359,9 @@ msgstr ""
 #, no-wrap
 msgid "Linux man-pages 6.04"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "Linux man-pages (unreleased)"
+msgstr ""