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/man8/modprobe.8.pot | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'templates/man8/modprobe.8.pot')

diff --git a/templates/man8/modprobe.8.pot b/templates/man8/modprobe.8.pot
index 4f2b6ecc..144800a9 100644
--- a/templates/man8/modprobe.8.pot
+++ b/templates/man8/modprobe.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:01+0100\n"
+"POT-Creation-Date: 2024-06-01 06:04+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,9 +24,9 @@ msgid "MODPROBE"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide mageia-cauldron
+#: archlinux mageia-cauldron opensuse-tumbleweed
 #, no-wrap
-msgid "02/09/2023"
+msgid "03/05/2024"
 msgstr ""
 
 #. type: TH
@@ -101,7 +101,7 @@ msgstr ""
 
 #. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6
+#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "B<modprobe> intelligently adds or removes a module from the Linux kernel: "
 "note that for convenience, there is no difference between _ and - in module "
@@ -615,31 +615,17 @@ msgstr ""
 #. type: TH
 #: debian-unstable
 #, no-wrap
-msgid "02/13/2024"
+msgid "05/26/2024"
 msgstr ""
 
 #. type: TH
-#: opensuse-leap-15-6
+#: fedora-40 fedora-rawhide
 #, no-wrap
-msgid "01/29/2021"
+msgid "02/09/2023"
 msgstr ""
 
 #. type: TH
-#: opensuse-tumbleweed
+#: opensuse-leap-15-6
 #, no-wrap
-msgid "12/06/2023"
-msgstr ""
-
-#. type: Plain text
-#: opensuse-tumbleweed
-msgid ""
-"B<modprobe> intelligently adds or removes a module from the Linux kernel: "
-"note that for convenience, there is no difference between _ and - in module "
-"names (automatic underscore conversion is performed)\\&.  B<modprobe> looks "
-"in the module directory /usr/lib/modules/`uname -r` for all the modules and "
-"other files, except for the optional configuration files in the /etc/"
-"modprobe\\&.d directory (see B<modprobe.d>(5))\\&.  B<modprobe> will also "
-"use module options specified on the kernel command line in the form of "
-"E<lt>moduleE<gt>\\&.E<lt>optionE<gt> and blacklists in the form of "
-"modprobe\\&.blacklist=E<lt>moduleE<gt>\\&."
+msgid "01/29/2021"
 msgstr ""
-- 
cgit v1.2.3