Merging upstream version 2.12.1.

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

1 files changed, 57 insertions, 50 deletions

diff --git a/man/po4a/po/man-db-manpages.pot b/man/po4a/po/man-db-manpages.pot
index 0d09c01..6fbcb22 100644
--- a/man/po4a/po/man-db-manpages.pot
+++ b/man/po4a/po/man-db-manpages.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-08-06 21:18+0100\n"
+"POT-Creation-Date: 2024-03-28 09:55+0000\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"
@@ -270,7 +270,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../../man/man1/apropos.man1:176 ../../man/man1/lexgrog.man1:124
-#: ../../man/man1/man.man1:1051 ../../man/man1/man-recode.man1:75
+#: ../../man/man1/man.man1:1057 ../../man/man1/man-recode.man1:75
 #: ../../man/man1/manconv.man1:70 ../../man/man1/manpath.man1:81
 #: ../../man/man1/whatis.man1:180 ../../man/man1/zsoelim.man1:67
 #: ../../man/man8/accessdb.man8:36 ../../man/man8/catman.man8:71
@@ -279,7 +279,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../../man/man1/apropos.man1:179 ../../man/man1/lexgrog.man1:127
-#: ../../man/man1/man.man1:1054 ../../man/man1/manpath.man1:84
+#: ../../man/man1/man.man1:1060 ../../man/man1/manpath.man1:84
 #: ../../man/man1/whatis.man1:183 ../../man/man8/accessdb.man8:39
 #: ../../man/man8/catman.man8:74 ../../man/man8/mandb.man8:135
 msgid "Print a short usage message and exit."
@@ -287,7 +287,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../../man/man1/apropos.man1:182 ../../man/man1/lexgrog.man1:130
-#: ../../man/man1/man.man1:1057 ../../man/man1/man-recode.man1:78
+#: ../../man/man1/man.man1:1063 ../../man/man1/man-recode.man1:78
 #: ../../man/man1/manconv.man1:73 ../../man/man1/manpath.man1:87
 #: ../../man/man1/whatis.man1:186 ../../man/man1/zsoelim.man1:70
 #: ../../man/man8/accessdb.man8:42 ../../man/man8/catman.man8:77
@@ -296,7 +296,7 @@ msgstr ""
 
 #. type: SH
 #: ../../man/man1/apropos.man1:182 ../../man/man1/lexgrog.man1:130
-#: ../../man/man1/man.man1:1057 ../../man/man1/whatis.man1:186
+#: ../../man/man1/man.man1:1063 ../../man/man1/whatis.man1:186
 #: ../../man/man8/mandb.man8:138
 #, no-wrap
 msgid "EXIT STATUS"
@@ -304,19 +304,19 @@ msgstr ""
 
 #. type: Plain text
 #: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:134
-#: ../../man/man1/man.man1:1061 ../../man/man1/whatis.man1:190
+#: ../../man/man1/man.man1:1067 ../../man/man1/whatis.man1:190
 #: ../../man/man8/mandb.man8:142
 msgid "Successful program execution."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/apropos.man1:189 ../../man/man1/man.man1:1064
+#: ../../man/man1/apropos.man1:189 ../../man/man1/man.man1:1070
 #: ../../man/man1/whatis.man1:193
 msgid "Usage, syntax or configuration file error."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/apropos.man1:192 ../../man/man1/man.man1:1067
+#: ../../man/man1/apropos.man1:192 ../../man/man1/man.man1:1073
 #: ../../man/man1/whatis.man1:196 ../../man/man8/mandb.man8:148
 msgid "Operational error."
 msgstr ""
@@ -327,7 +327,7 @@ msgid "Nothing was found that matched the criteria specified."
 msgstr ""
 
 #. type: SH
-#: ../../man/man1/apropos.man1:195 ../../man/man1/man.man1:1073
+#: ../../man/man1/apropos.man1:195 ../../man/man1/man.man1:1079
 #: ../../man/man1/manpath.man1:87 ../../man/man1/whatis.man1:199
 #: ../../man/man8/catman.man8:77
 #, no-wrap
@@ -335,7 +335,7 @@ msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/apropos.man1:204 ../../man/man1/man.man1:1184
+#: ../../man/man1/apropos.man1:204 ../../man/man1/man.man1:1195
 #: ../../man/man1/manpath.man1:110 ../../man/man1/whatis.man1:208
 msgid ""
 "If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -351,7 +351,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/apropos.man1:217 ../../man/man1/man.man1:1087
+#: ../../man/man1/apropos.man1:217 ../../man/man1/man.man1:1093
 #: ../../man/man1/manpath.man1:102 ../../man/man1/whatis.man1:221
 #: ../../man/man8/catman.man8:101
 msgid ""
@@ -377,7 +377,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1269
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1280
 #: ../../man/man1/manpath.man1:110 ../../man/man1/whatis.man1:233
 #: ../../man/man8/catman.man8:101 ../../man/man8/mandb.man8:185
 #, no-wrap
@@ -403,7 +403,7 @@ msgstr ""
 
 #. type: SH
 #: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:226
-#: ../../man/man1/man.man1:1278 ../../man/man1/man-recode.man1:78
+#: ../../man/man1/man.man1:1289 ../../man/man1/man-recode.man1:78
 #: ../../man/man1/manconv.man1:73 ../../man/man1/manpath.man1:114
 #: ../../man/man1/whatis.man1:250 ../../man/man1/zsoelim.man1:70
 #: ../../man/man8/catman.man8:116 ../../man/man8/mandb.man8:207
@@ -423,7 +423,7 @@ msgstr ""
 
 #. type: SH
 #: ../../man/man1/apropos.man1:265 ../../man/man1/lexgrog.man1:249
-#: ../../man/man1/man.man1:1311 ../../man/man1/man-recode.man1:82
+#: ../../man/man1/man.man1:1322 ../../man/man1/man-recode.man1:82
 #: ../../man/man1/manconv.man1:81 ../../man/man1/manpath.man1:124
 #: ../../man/man1/whatis.man1:260 ../../man/man1/zsoelim.man1:81
 #: ../../man/man5/manpath.man5:240 ../../man/man8/accessdb.man8:48
@@ -1478,7 +1478,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:772 ../../man/man1/man.man1:1141
+#: ../../man/man1/man.man1:772 ../../man/man1/man.man1:1152
 msgid ""
 "The value may be a simple command name or a command with arguments, and may "
 "use shell quoting (backslashes, single quotes, or double quotes).  It may "
@@ -1714,22 +1714,22 @@ msgid "B<-T>[I<device\\/>], B<--troff-device>[=I<device\\/>]"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1001
+#: ../../man/man1/man.man1:1007
 msgid ""
 "This option is used to change B<groff> (or possibly B<troff's>)  output to "
 "be suitable for a device other than the default.  It implies B<-t>.  "
-"Examples (provided with Groff-1.17) include B<dvi>, B<latin1>, B<ps>, "
+"Examples (as of groff 1.23.0) include B<dvi>, B<latin1>, B<pdf>, B<ps>, "
 "B<utf8>, B<X75> and B<X100>."
 msgstr ""
 
 #. type: TP
-#: ../../man/man1/man.man1:1001
+#: ../../man/man1/man.man1:1007
 #, no-wrap
 msgid "B<-H>[I<browser\\/>], B<--html>[=I<browser\\/>]"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1017
+#: ../../man/man1/man.man1:1023
 msgid ""
 "This option will cause B<groff> to produce HTML output, and will display "
 "that output in a web browser.  The choice of browser is determined by the "
@@ -1740,13 +1740,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ../../man/man1/man.man1:1017
+#: ../../man/man1/man.man1:1023
 #, no-wrap
 msgid "B<-X>[I<dpi\\/>], B<--gxditview>[=I<dpi\\/>]"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1031
+#: ../../man/man1/man.man1:1037
 msgid ""
 "This option displays the output of B<groff> in a graphical window using the "
 "B<gxditview> program.  The I<dpi> (dots per inch) may be 75, 75-12, 100, or "
@@ -1756,7 +1756,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1047
+#: ../../man/man1/man.man1:1053
 msgid ""
 "B<groff> will run B<troff> and then use an appropriate post-processor to "
 "produce output suitable for the chosen device.  If I<%troff%> is B<groff>, "
@@ -1765,37 +1765,44 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ../../man/man1/man.man1:1047
+#: ../../man/man1/man.man1:1053
 #, no-wrap
 msgid "Getting help"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1070
+#: ../../man/man1/man.man1:1076
 msgid "A child process returned a non-zero exit status."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1073
+#: ../../man/man1/man.man1:1079
 msgid "At least one of the pages/files/keywords didn't exist or wasn't matched."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1080
+#: ../../man/man1/man.man1:1086
 msgid ""
 "If $B<MANPATH> is set, its value is used as the path to search for manual "
 "pages."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1099
+#: ../../man/man1/man.man1:1105
 msgid ""
 "Every time B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>), "
 "it adds the contents of $B<MANROFFOPT> to the formatter's command line."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1106
+#: ../../man/man1/man.man1:1110
+msgid ""
+"For example, B<MANROFFOPT=-P-i> tells the formatter to use italic text "
+"(which is only supported by some terminals) rather than underlined text."
+msgstr ""
+
+#. type: Plain text
+#: ../../man/man1/man.man1:1117
 msgid ""
 "If $B<MANROFFSEQ> is set, its value is used to determine the set of "
 "preprocessors to pass each manual page through.  The default preprocessor "
@@ -1803,7 +1810,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1118 ../../man/man8/catman.man8:88
+#: ../../man/man1/man.man1:1129 ../../man/man8/catman.man8:88
 msgid ""
 "If $B<MANSECT> is set, its value is a colon-delimited list of sections and "
 "it is used to determine which manual sections to search and in what order.  "
@@ -1812,7 +1819,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1135
+#: ../../man/man1/man.man1:1146
 msgid ""
 "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), "
 "its value is used as the name of the program used to display the manual "
@@ -1821,7 +1828,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1160
+#: ../../man/man1/man.man1:1171
 msgid ""
 "If $B<MANLESS> is set, its value will be used as the default prompt string "
 "for the B<less> pager, as if it had been passed using the B<-r> option (so "
@@ -1832,7 +1839,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1176
+#: ../../man/man1/man.man1:1187
 msgid ""
 "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each "
 "of which in turn is used to try to start a web browser for B<man> "
@@ -1842,7 +1849,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1199
+#: ../../man/man1/man.man1:1210
 msgid ""
 "If $B<MANOPT> is set, it will be parsed prior to B<%man%'s> command line and "
 "is expected to be in a similar format.  As all of the other B<%man%> "
@@ -1853,7 +1860,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1213
+#: ../../man/man1/man.man1:1224
 msgid ""
 "If $B<MANWIDTH> is set, its value is used as the line length for which "
 "manual pages should be formatted.  If it is not set, manual pages will be "
@@ -1865,7 +1872,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1224
+#: ../../man/man1/man.man1:1235
 msgid ""
 "Normally, when output is not being directed to a terminal (such as to a file "
 "or a pipe), formatting characters are discarded to make it easier to read "
@@ -1876,7 +1883,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1237
+#: ../../man/man1/man.man1:1248
 msgid ""
 "Normally, when output is being directed to a terminal (usually to a pager), "
 "any error output from the command used to produce formatted versions of "
@@ -1889,7 +1896,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1249
+#: ../../man/man1/man.man1:1260
 msgid ""
 "On Linux, B<%man%> normally confines subprocesses that handle untrusted data "
 "using a B<seccomp>(2)  sandbox.  This makes it safer to run complex parsing "
@@ -1899,7 +1906,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1268
 msgid ""
 "If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then "
 "B<%man%> will print debugging messages to standard error describing each "
@@ -1907,7 +1914,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1269
+#: ../../man/man1/man.man1:1280
 msgid ""
 "Depending on system and implementation, either or both of $B<LANG> and "
 "$B<LC_MESSAGES> will be interrogated for the current message locale.  "
@@ -1916,56 +1923,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1273 ../../man/man1/manpath.man1:114
+#: ../../man/man1/man.man1:1284 ../../man/man1/manpath.man1:114
 #: ../../man/man8/catman.man8:105 ../../man/man8/mandb.man8:189
 msgid "man-db configuration file."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1276
+#: ../../man/man1/man.man1:1287
 msgid "A global manual page hierarchy."
 msgstr ""
 
 #. type: SH
-#: ../../man/man1/man.man1:1276
+#: ../../man/man1/man.man1:1287
 #, no-wrap
 msgid "STANDARDS"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1278
+#: ../../man/man1/man.man1:1289
 msgid "POSIX.1-2001, POSIX.1-2008, POSIX.1-2017."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1295
+#: ../../man/man1/man.man1:1306
 msgid ""
 "Documentation for some packages may be available in other formats, such as "
 "B<info>(1)  or HTML."
 msgstr ""
 
 #. type: SH
-#: ../../man/man1/man.man1:1295
+#: ../../man/man1/man.man1:1306
 #, no-wrap
 msgid "HISTORY"
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1297
+#: ../../man/man1/man.man1:1308
 msgid ""
 "1990, 1991 \\(en Originally written by John W.\\& Eaton "
 "(jwe@che.utexas.edu)."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1300
+#: ../../man/man1/man.man1:1311
 msgid ""
 "Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
 "Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1304
+#: ../../man/man1/man.man1:1315
 msgid ""
 "30th April 1994 \\(en 23rd February 2000: Wilf.\\& "
 "(G.Wilford@ee.surrey.ac.uk)  has been developing and maintaining this "
@@ -1973,7 +1980,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1308
+#: ../../man/man1/man.man1:1319
 msgid ""
 "30th October 1996 \\(en 30th March 2001: Fabrizio Polacco "
 "E<lt>fpolacco@debian.orgE<gt> maintained and enhanced this package for the "
@@ -1981,7 +1988,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../../man/man1/man.man1:1311
+#: ../../man/man1/man.man1:1322
 msgid ""
 "31st March 2001 \\(en present day: Colin Watson "
 "E<lt>cjwatson@debian.orgE<gt> is now developing and maintaining man-db."