Merging upstream version 4.23.0.

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

1 files changed, 60 insertions, 17 deletions

diff --git a/templates/man8/btrfs.8.pot b/templates/man8/btrfs.8.pot
index 079f2564..3d1b2517 100644
--- a/templates/man8/btrfs.8.pot
+++ b/templates/man8/btrfs.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 16:53+0100\n"
+"POT-Creation-Date: 2024-06-01 05:43+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 "BTRFS"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux
 #, no-wrap
-msgid "Feb 14, 2024"
+msgid "May 03, 2024"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide opensuse-tumbleweed
+#: archlinux fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "6.7.1"
+msgid "6.8.1"
 msgstr ""
 
 #. type: SH
@@ -132,13 +132,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux
 msgid ""
 "I<Sizes>, both upon input and output, can be expressed in either SI or IEC-I "
-"units (see I<\\%numfmt(1)>)  with the suffix I<B> appended.  All numbers "
-"will be formatted according to the rules of the I<C> locale (ignoring the "
-"shell locale, see I<\\%locale(7)>)."
+"units (see \\X'tty: link https://man7.org/linux/man-pages/man1/numfmt.1."
+"html'I<\\%numfmt(1)>\\X'tty: link')  with the suffix I<B> appended.  All "
+"numbers will be formatted according to the rules of the I<C> locale "
+"(ignoring the shell locale, see \\X'tty: link https://man7.org/linux/man-"
+"pages/man7/locale.7.html'I<\\%locale(7)>\\X'tty: link')."
 msgstr ""
 
 #. type: Plain text
@@ -581,11 +582,11 @@ msgid "AVAILABILITY"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
-#: opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux
 msgid ""
-"B<btrfs> is part of btrfs-progs.  Please refer to the documentation at I<\\"
-"%https://btrfs.readthedocs.io>\\&."
+"B<btrfs> is part of btrfs-progs.  Please refer to the documentation at "
+"\\X'tty: link https://btrfs.readthedocs.io'I<\\%https://btrfs.readthedocs."
+"io>\\X'tty: link'\\&."
 msgstr ""
 
 #. type: SH
@@ -637,6 +638,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: debian-bookworm debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: opensuse-leap-15-6 opensuse-tumbleweed
+msgid ""
+"I<Sizes>, both upon input and output, can be expressed in either SI or IEC-I "
+"units (see I<\\%numfmt(1)>)  with the suffix I<B> appended.  All numbers "
+"will be formatted according to the rules of the I<C> locale (ignoring the "
+"shell locale, see I<\\%locale(7)>)."
+msgstr ""
+
+#. type: Plain text
 #: debian-bookworm
 msgid "increase verbosity of the subcommandn\""
 msgstr ""
@@ -662,19 +673,45 @@ msgstr ""
 #. type: TH
 #: debian-unstable
 #, no-wrap
-msgid "Feb 28, 2024"
+msgid "Mar 24, 2024"
 msgstr ""
 
 #. type: TH
-#: debian-unstable mageia-cauldron
+#: debian-unstable
 #, no-wrap
 msgid "6.6.3"
 msgstr ""
 
+#. type: Plain text
+#: debian-unstable fedora-40 fedora-rawhide mageia-cauldron opensuse-leap-15-6
+#: opensuse-tumbleweed
+msgid ""
+"B<btrfs> is part of btrfs-progs.  Please refer to the documentation at I<\\"
+"%https://btrfs.readthedocs.io>\\&."
+msgstr ""
+
+#. type: TH
+#: fedora-40 fedora-rawhide
+#, no-wrap
+msgid "Mar 26, 2024"
+msgstr ""
+
+#. type: TH
+#: fedora-40
+#, no-wrap
+msgid "6.8"
+msgstr ""
+
 #. type: TH
 #: mageia-cauldron
 #, no-wrap
-msgid "Jan 09, 2024"
+msgid "Mar 10, 2024"
+msgstr ""
+
+#. type: TH
+#: mageia-cauldron
+#, no-wrap
+msgid "6.7.1"
 msgstr ""
 
 #. type: TH
@@ -688,3 +725,9 @@ msgstr ""
 #, no-wrap
 msgid "6.5.1"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "May 02, 2024"
+msgstr ""