Merging upstream version 4.23.0.

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

1 files changed, 38 insertions, 17 deletions

diff --git a/templates/man1/df.1.pot b/templates/man1/df.1.pot
index 66eb6438..b9f65ab9 100644
--- a/templates/man1/df.1.pot
+++ b/templates/man1/df.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-15 17:57+0100\n"
+"POT-Creation-Date: 2024-05-01 15:37+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 "DF"
 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
@@ -88,7 +88,8 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "If an argument is the absolute file name of a device node containing a "
 "mounted file system, B<df> shows the space available on that file system "
@@ -370,7 +371,8 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 msgid ""
 "The SIZE argument is an integer and optional unit (example: 10K is "
 "10*1024).  Units are K,M,G,T,P,E,Z,Y,R,Q (powers of 1024) or KB,MB,... "
@@ -428,9 +430,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 ""
 
@@ -468,13 +470,13 @@ 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
 msgid ""
 "If an argument is the absolute file name of a device node containing a "
 "mounted file system, B<df> shows the space available on that file system "
@@ -485,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron opensuse-leap-15-6
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "The SIZE argument is an integer and optional unit (example: 10K is "
 "10*1024).  Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers "
@@ -493,12 +495,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron
+#: 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
+#: debian-unstable fedora-40 mageia-cauldron
+#, no-wrap
+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
+#: fedora-40 opensuse-leap-15-6
+#, no-wrap
+msgid "January 2024"
+msgstr ""
+
 #. type: TP
 #: fedora-40 fedora-rawhide
 #, no-wrap
@@ -511,15 +532,15 @@ msgid "show statistics for a file instead of mount point"
 msgstr ""
 
 #. type: TH
-#: mageia-cauldron
+#: fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "April 2022"
+msgid "April 2024"
 msgstr ""
 
 #. type: TH
-#: opensuse-leap-15-6
+#: mageia-cauldron
 #, no-wrap
-msgid "October 2021"
+msgid "August 2023"
 msgstr ""
 
 #. type: TH