Merging upstream version 4.23.0.

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

1 files changed, 73 insertions, 22 deletions

diff --git a/templates/man1/chgrp.1.pot b/templates/man1/chgrp.1.pot
index 3b71a2fe..64ed27ad 100644
--- a/templates/man1/chgrp.1.pot
+++ b/templates/man1/chgrp.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-15 17:56+0100\n"
+"POT-Creation-Date: 2024-05-01 15:36+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 "CHGRP"
 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
@@ -159,6 +159,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: archlinux fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "B<--from>=I<\\,CURRENT_OWNER\\/>:CURRENT_GROUP"
+msgstr ""
+
+#. type: Plain text
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid ""
+"change the ownership of each file only if its current owner and/or group "
+"match those specified here. Either may be omitted, in which case a match is "
+"not required for the omitted attribute"
+msgstr ""
+
+#. type: TP
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
@@ -192,9 +206,9 @@ msgid "B<--reference>=I<\\,RFILE\\/>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
-"use RFILE's group rather than specifying a GROUP.  RFILE is always "
+"use RFILE's ownership rather than specifying values RFILE is always "
 "dereferenced if a symbolic link."
 msgstr ""
 
@@ -212,12 +226,11 @@ msgid "operate on files and directories recursively"
 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 ""
 "The following options modify how a hierarchy is traversed when the B<-R> "
 "option is also specified.  If more than one is specified, only the final one "
-"takes effect."
+"takes effect. '-P' is the default."
 msgstr ""
 
 #. type: TP
@@ -255,9 +268,8 @@ msgid "B<-P>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "do not traverse any symbolic links (default)"
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "do not traverse any symbolic links"
 msgstr ""
 
 #. type: TP
@@ -361,9 +373,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 ""
 
@@ -408,33 +420,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 opensuse-leap-15-6
+#: debian-bookworm opensuse-leap-15-6
 msgid "use RFILE's group rather than specifying a GROUP value"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"The following options modify how a hierarchy is traversed when the B<-R> "
+"option is also specified.  If more than one is specified, only the final one "
+"takes effect."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "do not traverse any symbolic links (default)"
+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 "GNU coreutils 9.4"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-40 mageia-cauldron
+msgid ""
+"use RFILE's group rather than specifying a GROUP.  RFILE is always "
+"dereferenced if a symbolic link."
+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 "April 2022"
+msgid "January 2024"
 msgstr ""
 
 #. type: TH
-#: opensuse-leap-15-6
+#: 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