Merging upstream version 4.23.0.

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

1 files changed, 50 insertions, 13 deletions

diff --git a/templates/man8/debugfs.8.pot b/templates/man8/debugfs.8.pot
index 5feefd9d..52febce4 100644
--- a/templates/man8/debugfs.8.pot
+++ b/templates/man8/debugfs.8.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-06-01 05:46+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,17 +24,15 @@ msgid "DEBUGFS"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-bookworm debian-unstable
 #, no-wrap
-msgid "February 2023"
+msgid "May 2024"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable
 #, no-wrap
-msgid "E2fsprogs version 1.47.0"
+msgid "E2fsprogs version 1.47.1"
 msgstr ""
 
 #. type: SH
@@ -530,17 +528,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-bookworm debian-unstable
 #, no-wrap
-msgid "B<dx_hash>I< [-h hash_alg] [-s hash_seed] filename>"
+msgid "B<dx_hash>I< [-cv] [-h hash_alg] [-s hash_seed] filename>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-bookworm debian-unstable
 msgid ""
-"Calculate the directory hash of I<filename>.  The hash algorithm specified "
+"Calculate the directory hash of I<filename>.  The I<-c> option will casefold "
+"the filename before calculating the hash.  The I<-v> option will make the "
+"B<dx_hash> command more verbose and print the hash algorithm and hash seed "
+"to calculate the hash.  If a file system is open, use the hash_seed and "
+"default hash_algorithm used by the file system, although these can be "
+"overridden by the I<-h> and I<-s> options.  The hash algorithm specified "
 "with I<-h> may be B<legacy>,B< half_md4>, or B<tea>.  The hash seed "
 "specified with I<-s> must be in UUID format."
 msgstr ""
@@ -1658,3 +1659,39 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid "B<dumpe2fs>(8), B<tune2fs>(8), B<e2fsck>(8), B<mke2fs>(8), B<ext4>(5)"
 msgstr ""
+
+#. type: TH
+#: debian-bookworm
+#, no-wrap
+msgid "E2fsprogs version 1.47.1-rc2"
+msgstr ""
+
+#. type: TH
+#: fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "February 2023"
+msgstr ""
+
+#. type: TH
+#: fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "E2fsprogs version 1.47.0"
+msgstr ""
+
+#. type: TP
+#: fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "B<dx_hash>I< [-h hash_alg] [-s hash_seed] filename>"
+msgstr ""
+
+#. type: Plain text
+#: fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
+msgid ""
+"Calculate the directory hash of I<filename>.  The hash algorithm specified "
+"with I<-h> may be B<legacy>,B< half_md4>, or B<tea>.  The hash seed "
+"specified with I<-s> must be in UUID format."
+msgstr ""