Merging upstream version 4.23.0.

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

1 files changed, 48 insertions, 27 deletions

diff --git a/templates/man1/dir.1.pot b/templates/man1/dir.1.pot
index ce157ef3..5d05ec6f 100644
--- a/templates/man1/dir.1.pot
+++ b/templates/man1/dir.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 "DIR"
 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
@@ -178,7 +178,8 @@ msgid "B<-c>"
 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 ""
 "with B<-lt>: sort by, and show, ctime (time of last change of file status "
 "information); with B<-l>: show ctime and sort by name; otherwise: sort by "
@@ -245,9 +246,8 @@ msgid "B<-f>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-tumbleweed
-msgid "list all entries in directory order"
+#: archlinux fedora-rawhide opensuse-leap-15-6 opensuse-tumbleweed
+msgid "do not sort, enable B<-aU>, disable B<-ls> B<--color>"
 msgstr ""
 
 #. type: TP
@@ -706,7 +706,8 @@ msgid "B<--time>=I<\\,WORD\\/>"
 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 ""
 "select which timestamp used to display or sort; access time (B<-u>): atime, "
 "access, use; metadata change time (B<-c>): ctime, status; modified time "
@@ -906,7 +907,8 @@ msgid "output version information and exit"
 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,... "
@@ -1031,9 +1033,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 ""
 
@@ -1071,13 +1073,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 opensuse-leap-15-6
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "with B<-lt>: sort by, and show, ctime (time of last modification of file "
 "status information); with B<-l>: show ctime and sort by name; otherwise: "
@@ -1085,14 +1087,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron opensuse-leap-15-6
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron
+msgid "list all entries in directory order"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "change the default of using modification times; access time (B<-u>): atime, "
 "access, use; change time (B<-c>): ctime, status; birth time: birth, creation;"
 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 "
@@ -1100,22 +1107,41 @@ 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
-#: 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
@@ -1131,11 +1157,6 @@ msgid ""
 "'never'; more info below"
 msgstr ""
 
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "do not sort, enable B<-aU>, disable B<-ls> B<--color>"
-msgstr ""
-
 #. type: TP
 #: opensuse-leap-15-6
 #, no-wrap