Merging upstream version 4.23.0.

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

1 files changed, 65 insertions, 30 deletions

diff --git a/templates/man1/touch.1.pot b/templates/man1/touch.1.pot
index 4ce53d61..a418251e 100644
--- a/templates/man1/touch.1.pot
+++ b/templates/man1/touch.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-15 18:14+0100\n"
+"POT-Creation-Date: 2024-05-01 15:58+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 "TOUCH"
 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
@@ -199,16 +199,16 @@ msgid "use this file's times instead of current time"
 msgstr ""
 
 #. type: TP
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "B<-t> STAMP"
+msgid "B<-t> [[CC]YY]MMDDhhmm[.ss]"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "use [[CC]YY]MMDDhhmm[.ss] instead of current time"
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid ""
+"use specified time instead of current time, with a date-time format that "
+"differs from B<-d>'s"
 msgstr ""
 
 #. type: TP
@@ -219,11 +219,10 @@ msgid "B<--time>=I<\\,WORD\\/>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
-"change the specified time: WORD is access, atime, or use: equivalent to B<-"
-"a> WORD is modify or mtime: equivalent to B<-m>"
+"specify which time to change: access time (B<-a>): 'access', 'atime', 'use'; "
+"modification time (B<-m>): 'modify', 'mtime'"
 msgstr ""
 
 #. type: TP
@@ -252,13 +251,6 @@ msgstr ""
 msgid "output version information and exit"
 msgstr ""
 
-#. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid ""
-"Note that the B<-d> and B<-t> options accept different time-date formats."
-msgstr ""
-
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
@@ -324,9 +316,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 ""
 
@@ -365,28 +357,71 @@ msgid "September 2022"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm
 #, no-wrap
 msgid "GNU coreutils 9.1"
 msgstr ""
 
+#. type: TP
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid "B<-t> STAMP"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "use [[CC]YY]MMDDhhmm[.ss] instead of current time"
+msgstr ""
+
 #. type: Plain text
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"change the specified time: WORD is access, atime, or use: equivalent to B<-"
+"a> WORD is modify or mtime: equivalent to B<-m>"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Note that the B<-d> and B<-t> options accept different time-date formats."
+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