Merging upstream version 4.23.0.

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

1 files changed, 37 insertions, 62 deletions

diff --git a/templates/man8/blkdiscard.8.pot b/templates/man8/blkdiscard.8.pot
index 246b9652..d9d611c6 100644
--- a/templates/man8/blkdiscard.8.pot
+++ b/templates/man8/blkdiscard.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-08-27 16:50+0200\n"
+"POT-Creation-Date: 2024-03-29 09:36+0100\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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "BLKDISCARD"
 msgstr ""
@@ -35,41 +35,41 @@ msgid "util-linux 2.38.1"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "System Administration"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "blkdiscard - discard sectors on a device"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<blkdiscard> [options] [B<-o> I<offset>] [B<-l> I<length>] I<device>"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "B<blkdiscard> is used to discard device sectors. This is useful for solid-"
 "state drivers (SSDs) and thinly-provisioned storage. Unlike B<fstrim>(8), "
@@ -77,31 +77,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "By default, B<blkdiscard> will discard all blocks on the device. Options may "
 "be used to modify this behavior based on range or size, as explained below."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "The I<device> argument is the pathname of the block device."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "B<WARNING: All data in the discarded region on the device will be lost!>"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The I<offset> and I<length> arguments may be followed by the multiplicative "
 "suffixes KiB (=1024), MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, "
@@ -111,7 +111,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-f>, B<--force>"
 msgstr ""
 
@@ -124,24 +124,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-o>, B<--offset> I<offset>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Byte offset into the device from which to start discarding. The provided "
 "value must be aligned to the device sector size. The default value is zero."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-l>, B<--length> I<length>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The number of bytes to discard (counting from the starting point). The "
 "provided value must be aligned to the device sector size. If the specified "
@@ -150,24 +150,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-p>, B<--step> I<length>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The number of bytes to discard within one iteration. The default is to "
 "discard all by one ioctl call."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-s>, B<--secure>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Perform a secure discard. A secure discard is the same as a regular discard "
 "except that all copies of the discarded blocks that were possibly created by "
@@ -176,39 +176,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-z>, B<--zeroout>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "Zero-fill rather than discard."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-v>, B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Display the aligned values of I<offset> and I<length>. If the B<--step> "
 "option is specified, it prints the discard progress every second."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-h>, B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "Display help text and exit."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-V>, B<--version>"
 msgstr ""
 
@@ -218,67 +218,42 @@ msgid "Print version and exit."
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<fstrim>(8)"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "For bug reports, use the issue tracker at"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "AVAILABILITY"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The B<blkdiscard> command is part of the util-linux package which can be "
 "downloaded from"
 msgstr ""
-
-#. type: TH
-#: opensuse-leap-15-6
-#, no-wrap
-msgid "2022-02-14"
-msgstr ""
-
-#. type: TH
-#: opensuse-leap-15-6
-#, no-wrap
-msgid "util-linux 2.37.4"
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"Disable all checking. Since v2.36 the block device is open in exclusive mode "
-"(O_EXCL) by default to avoid collision with mounted filesystem or another "
-"kernel subsystem. The B<--force> option disables the exclusive access mode."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "Display version information and exit."
-msgstr ""