Merging upstream version 4.23.0.

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

1 files changed, 107 insertions, 39 deletions

diff --git a/templates/man1/cp.1.pot b/templates/man1/cp.1.pot
index 3b6503ab..3fb6be0d 100644
--- a/templates/man1/cp.1.pot
+++ b/templates/man1/cp.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: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 "CP"
 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
@@ -179,13 +179,15 @@ msgid "same as B<--no-dereference> B<--preserve>=I<\\,links\\/>"
 msgstr ""
 
 #. type: TP
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid "B<--debug>"
 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 "explain how a file is copied.  Implies B<-v>"
 msgstr ""
 
@@ -264,10 +266,8 @@ msgid "B<-n>, B<--no-clobber>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux fedora-40 fedora-rawhide opensuse-tumbleweed
-msgid ""
-"do not overwrite an existing file (overrides a B<-u> or previous B<-i> "
-"option). See also B<--update>"
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "(deprecated) silently skip existing files.  See also B<--update>"
 msgstr ""
 
 #. type: TP
@@ -304,7 +304,8 @@ msgid "B<--preserve>[=I<\\,ATTR_LIST\\/>]"
 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 "preserve the specified attributes"
 msgstr ""
 
@@ -454,27 +455,29 @@ msgid "treat DEST as a normal file"
 msgstr ""
 
 #. type: TP
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid "B<--update>[=I<\\,UPDATE\\/>]"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
-"control which existing files are updated; UPDATE={all,none,older(default)}.  "
-"See below"
+"control which existing files are updated; UPDATE={all,none,none-fail,"
+"older(default)}."
 msgstr ""
 
 #. type: TP
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-tumbleweed
 #, no-wrap
 msgid "B<-u>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
-msgid "equivalent to B<--update>[=I<\\,older\\/>]"
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "equivalent to B<--update>[=I<\\,older\\/>].  See below"
 msgstr ""
 
 #. type: TP
@@ -491,6 +494,17 @@ msgid "explain what is being done"
 msgstr ""
 
 #. type: TP
+#: archlinux fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "B<--keep-directory-symlink>"
+msgstr ""
+
+#. type: Plain text
+#: archlinux fedora-rawhide opensuse-tumbleweed
+msgid "follow existing symlinks to directories"
+msgstr ""
+
+#. type: TP
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 #, no-wrap
@@ -558,7 +572,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 ""
 "ATTR_LIST is a comma-separated list of attributes. Attributes are 'mode' for "
 "permissions (including any ACL and xattr permissions), 'ownership' for user "
@@ -580,16 +595,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 msgid ""
 "UPDATE controls which existing files in the destination are replaced.  "
 "\\&'all' is the default operation when an B<--update> option is not "
 "specified, and results in all existing files in the destination being "
-"replaced.  \\&'none' is similar to the B<--no-clobber> option, in that no "
-"files in the destination are replaced, but also skipped files do not induce "
-"a failure.  \\&'older' is the default operation when B<--update> is "
-"specified, and results in files being replaced if they're older than the "
-"corresponding source file."
+"replaced.  \\&'none' is like the B<--no-clobber> option, in that no files in "
+"the destination are replaced, and skipped files do not induce a failure.  "
+"\\&'none-fail' also ensures no files are replaced in the destination, but "
+"any skipped files are diagnosed and induce a failure.  \\&'older' is the "
+"default operation when B<--update> is specified, and results in files being "
+"replaced if they're older than the corresponding source file."
 msgstr ""
 
 #. type: Plain text
@@ -716,9 +732,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 ""
 
@@ -738,7 +754,8 @@ msgid "SEE ALSO"
 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 "B<install>(1)"
 msgstr ""
 
@@ -761,43 +778,49 @@ 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 "do not overwrite an existing file (overrides a previous B<-i> option)"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron opensuse-leap-15-6
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "preserve the specified attributes (default: mode,ownership,timestamps), if "
 "possible additional attributes: context, links, xattr, all"
 msgstr ""
 
 #. type: TP
-#: debian-bookworm mageia-cauldron opensuse-leap-15-6
+#: debian-bookworm opensuse-leap-15-6
 #, no-wrap
 msgid "B<-u>, B<--update>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm mageia-cauldron opensuse-leap-15-6
+#: debian-bookworm opensuse-leap-15-6
 msgid ""
 "copy only when the SOURCE file is newer than the destination file or when "
 "the destination file is missing"
 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
 msgid ""
@@ -806,16 +829,61 @@ msgid ""
 "none\\/>."
 msgstr ""
 
+#. type: Plain text
+#: debian-unstable fedora-40 mageia-cauldron
+msgid ""
+"control which existing files are updated; UPDATE={all,none,older(default)}.  "
+"See below"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-40 mageia-cauldron
+msgid "equivalent to B<--update>[=I<\\,older\\/>]"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-40 mageia-cauldron
+msgid ""
+"UPDATE controls which existing files in the destination are replaced.  "
+"\\&'all' is the default operation when an B<--update> option is not "
+"specified, and results in all existing files in the destination being "
+"replaced.  \\&'none' is similar to the B<--no-clobber> option, in that no "
+"files in the destination are replaced, but also skipped files do not induce "
+"a failure.  \\&'older' is the default operation when B<--update> is "
+"specified, and results in files being replaced if they're older than the "
+"corresponding source file."
+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
-#: mageia-cauldron
+#: fedora-40 opensuse-leap-15-6
 #, no-wrap
-msgid "April 2022"
+msgid "January 2024"
+msgstr ""
+
+#. type: Plain text
+#: fedora-40 mageia-cauldron
+msgid ""
+"do not overwrite an existing file (overrides a B<-u> or previous B<-i> "
+"option). See also B<--update>"
 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