Merging upstream version 4.23.0.

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

1 files changed, 45 insertions, 19 deletions

diff --git a/templates/man8/lspci.8.pot b/templates/man8/lspci.8.pot
index b21cba4e..72d2d585 100644
--- a/templates/man8/lspci.8.pot
+++ b/templates/man8/lspci.8.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 17:00+0100\n"
+"POT-Creation-Date: 2024-06-01 06:01+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 "lspci"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "25 February 2024"
+msgid "05 April 2024"
 msgstr ""
 
 #. type: TH
-#: archlinux fedora-40 fedora-rawhide
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "pciutils-3.11.1"
+msgid "pciutils-3.12.0"
 msgstr ""
 
 #. type: TH
@@ -97,8 +97,8 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
 "If you are going to report bugs in PCI device drivers or in I<lspci> itself, "
-"please include output of \"lspci -vvx\" or even better \"lspci -"
-"vvxxx\" (however, see below for possible caveats)."
+"please include output of \"lspci -vvx\" or even better \"lspci -vvxxx\" "
+"(however, see below for possible caveats)."
 msgstr ""
 
 #. type: Plain text
@@ -397,14 +397,13 @@ msgid "B<-q>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron
 msgid ""
 "Use DNS to query the central PCI ID database if a device is not found in the "
 "local B<pci.ids> file. If the DNS query succeeds, the result is cached in "
-"B<~/.pciids-cache> and it is recognized in subsequent runs even if B<-q> is "
-"not given any more. Please use this switch inside automated scripts only "
-"with caution to avoid overloading the database servers."
+"B<$XDG_CACHE_HOME/pci-ids> and it is recognized in subsequent runs even if "
+"B<-q> is not given any more. Please use this switch inside automated scripts "
+"only with caution to avoid overloading the database servers."
 msgstr ""
 
 #. type: TP
@@ -998,10 +997,9 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide mageia-cauldron
 #, no-wrap
-msgid "B<~/.pciids-cache>"
+msgid "B<$XDG_CACHE_HOME/pci-ids>"
 msgstr ""
 
 #. type: Plain text
@@ -1075,6 +1073,16 @@ msgid "pciutils-3.9.0"
 msgstr ""
 
 #. type: Plain text
+#: debian-bookworm fedora-40 opensuse-leap-15-6 opensuse-tumbleweed
+msgid ""
+"Use DNS to query the central PCI ID database if a device is not found in the "
+"local B<pci.ids> file. If the DNS query succeeds, the result is cached in "
+"B<~/.pciids-cache> and it is recognized in subsequent runs even if B<-q> is "
+"not given any more. Please use this switch inside automated scripts only "
+"with caution to avoid overloading the database servers."
+msgstr ""
+
+#. type: Plain text
 #: debian-bookworm debian-unstable
 msgid ""
 "Use B<E<lt>fileE<gt>> as the PCI ID list instead of /usr/share/misc/pci.ids."
@@ -1092,16 +1100,22 @@ msgstr ""
 msgid "B</usr/share/misc/pci.ids.gz>"
 msgstr ""
 
+#. type: TP
+#: debian-bookworm fedora-40 opensuse-leap-15-6 opensuse-tumbleweed
+#, no-wrap
+msgid "B<~/.pciids-cache>"
+msgstr ""
+
 #. type: TH
-#: debian-unstable mageia-cauldron opensuse-tumbleweed
+#: fedora-40
 #, no-wrap
-msgid "01 May 2023"
+msgid "25 February 2024"
 msgstr ""
 
 #. type: TH
-#: debian-unstable mageia-cauldron opensuse-tumbleweed
+#: fedora-40
 #, no-wrap
-msgid "pciutils-3.10.0"
+msgid "pciutils-3.11.1"
 msgstr ""
 
 #. type: Plain text
@@ -1184,3 +1198,15 @@ msgstr ""
 #: opensuse-leap-15-6
 msgid "B<setpci>(8), B<update-pciids>(8), B<pcilib>(7)"
 msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "01 May 2023"
+msgstr ""
+
+#. type: TH
+#: opensuse-tumbleweed
+#, no-wrap
+msgid "pciutils-3.10.0"
+msgstr ""