From 932e4432596447eb9331cc2a2bb74a26a35b4efc Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 17 Jun 2024 12:52:03 +0200
Subject: Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 templates/man5/integritytab.5.pot | 40 +++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

(limited to 'templates/man5/integritytab.5.pot')

diff --git a/templates/man5/integritytab.5.pot b/templates/man5/integritytab.5.pot
index a24c98e5..1c517efd 100644
--- a/templates/man5/integritytab.5.pot
+++ b/templates/man5/integritytab.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 16:58+0100\n"
+"POT-Creation-Date: 2024-06-01 05:56+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,7 +24,7 @@ msgid "INTEGRITYTAB"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-unstable fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux fedora-40 mageia-cauldron
 #, no-wrap
 msgid "systemd 255"
 msgstr ""
@@ -176,8 +176,7 @@ msgid "B<mode=(journal|bitmap|direct)>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron
+#: archlinux debian-bookworm fedora-40 mageia-cauldron
 msgid ""
 "Enable journaled, bitmapped or direct (passthrough) mode\\&. Journaled mode "
 "is the default when this option is not specified\\&. It provides safety "
@@ -361,8 +360,7 @@ msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron
+#: archlinux debian-bookworm fedora-40 mageia-cauldron
 msgid ""
 "B<systemd>(1), B<systemd-integritysetup@.service>(8), B<systemd-"
 "integritysetup-generator>(8), B<integritysetup>(8),"
@@ -399,3 +397,33 @@ msgstr ""
 #, no-wrap
 msgid "systemd 254"
 msgstr ""
+
+#. type: TH
+#: debian-unstable fedora-rawhide
+#, no-wrap
+msgid "systemd 256~rc3"
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"Enable journaled, bitmapped or direct (passthrough) mode\\&. Journaled mode "
+"is the default when this option is not specified\\&. It provides safety "
+"against crashes, but can be slow because all data has to be written "
+"twice\\&. Bitmap mode is more efficient since it requires only a single "
+"write, but it is less reliable because if data corruption happens when the "
+"machine crashes, it might not be detected\\&. Direct mode disables the "
+"journal and the bitmap\\&. Corresponds to the \"direct writes\" mode "
+"documented in \\m[blue]B<the dm-integrity "
+"documentation>\\m[]\\&\\s-2\\u[1]\\d\\s+2\\&. Note that without a journal, "
+"if there is a crash, it is possible that the integrity tags and data will "
+"not match\\&. If used, the journal-* options below will have no effect if "
+"passed\\&."
+msgstr ""
+
+#. type: Plain text
+#: debian-unstable fedora-rawhide
+msgid ""
+"B<systemd>(1), B<systemd-integritysetup@.service>(8), B<systemd-"
+"integritysetup-generator>(8), B<integritysetup>(8)"
+msgstr ""
-- 
cgit v1.2.3