Merging upstream version 4.23.0.

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

1 files changed, 67 insertions, 28 deletions

diff --git a/templates/man1/numfmt.1.pot b/templates/man1/numfmt.1.pot
index e1ced5da..aa73cccc 100644
--- a/templates/man1/numfmt.1.pot
+++ b/templates/man1/numfmt.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-15 18:05+0100\n"
+"POT-Creation-Date: 2024-05-01 15:47+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 "NUMFMT"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable
 #, no-wrap
-msgid "January 2024"
+msgid "March 2024"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "GNU coreutils 9.4"
+msgid "GNU coreutils 9.5"
 msgstr ""
 
 #. type: TH
@@ -356,9 +356,8 @@ msgid "accept optional single/two letter suffix:"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "1K = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576,"
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "1K = 1000, 1k = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576,"
 msgstr ""
 
 #. type: TP
@@ -375,9 +374,8 @@ msgid "accept optional single letter suffix:"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "1K = 1000, 1M = 1000000, \\&..."
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "1k = 1000, 1K = 1000, 1M = 1000000, \\&..."
 msgstr ""
 
 #. type: TP
@@ -388,9 +386,8 @@ msgid "iec"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "1K = 1024, 1M = 1048576, \\&..."
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "1K = 1024, 1k = 1024, 1M = 1048576, \\&..."
 msgstr ""
 
 #. type: TP
@@ -407,9 +404,8 @@ msgid "accept optional two-letter suffix:"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "1Ki = 1024, 1Mi = 1048576, \\&..."
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "1Ki = 1024, 1ki = 1024, 1Mi = 1048576, \\&..."
 msgstr ""
 
 #. type: SS
@@ -528,9 +524,8 @@ msgid "CW<$ numfmt --to=si 1000>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "-E<gt> \"1.0K\""
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "-E<gt> \"1.0k\""
 msgstr ""
 
 #. type: Plain text
@@ -647,9 +642,9 @@ msgid "COPYRIGHT"
 msgstr ""
 
 #. 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 ""
 
@@ -688,28 +683,72 @@ msgid "September 2022"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm
 #, no-wrap
 msgid "GNU coreutils 9.1"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "1K = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576,"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "1K = 1000, 1M = 1000000, \\&..."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "1K = 1024, 1M = 1048576, \\&..."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "1Ki = 1024, 1Mi = 1048576, \\&..."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "-E<gt> \"1.0K\""
+msgstr ""
+
+#. 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>."
 msgstr ""
 
 #. type: TH
-#: mageia-cauldron
+#: debian-unstable fedora-40 mageia-cauldron
 #, no-wrap
-msgid "April 2022"
+msgid "GNU coreutils 9.4"
+msgstr ""
+
+#. 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 ""
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 opensuse-leap-15-6
+#, no-wrap
+msgid "January 2024"
+msgstr ""
+
+#. type: TH
+#: fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "April 2024"
+msgstr ""
+
+#. type: TH
+#: mageia-cauldron
 #, no-wrap
-msgid "October 2021"
+msgid "August 2023"
 msgstr ""
 
 #. type: TH