summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--man/man1/man.man125
-rw-r--r--man/po4a/po/da.po143
-rw-r--r--man/po4a/po/de.po161
-rw-r--r--man/po4a/po/fr.po159
-rw-r--r--man/po4a/po/id.po161
-rw-r--r--man/po4a/po/ja.po159
-rw-r--r--man/po4a/po/man-db-manpages.pot143
-rw-r--r--man/po4a/po/nl.po161
-rw-r--r--man/po4a/po/pl.po159
-rw-r--r--man/po4a/po/ru.po159
-rw-r--r--src/man.c9
12 files changed, 773 insertions, 675 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dcd4fed..228f91b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec 21 21:29:27 GMT 2012 Colin Watson <cjwatson@debian.org>
+
+ * src/man.c (main): Use $MANLESS as the default for prompt_string if
+ the -r option was not used.
+ (setenv_less): Remove code to copy $MANLESS verbatim into $LESS.
+ * man/man1/man.man1 (Controlling formatted output, ENVIRONMENT):
+ Describe new behaviour of $MANLESS.
+ * man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
+
Sun Dec 16 12:00:55 GMT 2012 Colin Watson <cjwatson@debian.org>
* src/man.c (escape_less): Handle incompatible change to option
diff --git a/man/man1/man.man1 b/man/man1/man.man1
index 951d30af..5f290539 100644
--- a/man/man1/man.man1
+++ b/man/man1/man.man1
@@ -932,11 +932,10 @@ sets the
.B \-ix8
options.
-If you want to override
-.BR %man% 's
-prompt string processing completely, use the
+The
.RB $ MANLESS
-environment variable described below.
+environment variable described below may be used to set a default prompt
+string if none is supplied on the command line.
.TP
.if !'po4a'hide' .BR \-7 ", " \-\-ascii
When viewing a pure
@@ -1223,21 +1222,21 @@ on standard input.
.if !'po4a'hide' .B MANLESS
If
.RB $ MANLESS
-is set,
-.B %man%
-will not perform any of its usual processing to set up a prompt string for
-the
+is set, its value will be used as the default prompt string for the
.B less
-pager.
-Instead, the value of
-.RB $ MANLESS
-will be copied verbatim into
-.RB $ LESS .
+pager, as if it had been passed using the
+.B \-r
+option (so any occurrences of the text
+.B $MAN_PN
+will be expanded in the same way).
For example, if you want to set the prompt string unconditionally to
\(lqmy prompt string\(rq, set
.RB $ MANLESS
to
.RB \(oq \-Psmy\ prompt\ string \(cq.
+Using the
+.B \-r
+option overrides this environment variable.
.TP
.if !'po4a'hide' .B BROWSER
If
diff --git a/man/po4a/po/da.po b/man/po4a/po/da.po
index b70edf3b..2e307c92 100644
--- a/man/po4a/po/da.po
+++ b/man/po4a/po/da.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.6.1-pre1\n"
-"POT-Creation-Date: 2012-02-05 01:41+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2012-12-13 07:50+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -319,7 +319,7 @@ msgstr "Brug denne brugerkonfigurationsfil frem for standarden I<~/.manpath>."
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -328,7 +328,7 @@ msgstr "Vis en hjælpebesked og afslut."
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -337,7 +337,7 @@ msgstr "Vis versionsinformation."
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -345,19 +345,19 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "Programkørsel endt uden fejl."
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "Brugs-, syntaks- eller konfigurationsfilfejl."
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "Operationel fejl."
@@ -368,7 +368,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "Intet blev fundet som matchede de angivne kriterier."
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -376,7 +376,7 @@ msgid "ENVIRONMENT"
msgstr "MILJØ"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -411,7 +411,7 @@ msgid ""
msgstr ""
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -419,14 +419,14 @@ msgid "FILES"
msgstr "FILER"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr ""
@@ -438,7 +438,7 @@ msgstr "En traditionel B<whatis>-tekstdatabase."
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1550,7 +1550,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -1629,14 +1629,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -1648,43 +1648,43 @@ msgid ""
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr "Beskrivelse"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -1695,20 +1695,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<kodning>,\\ B<--encoding>=I<kodning>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -1717,7 +1717,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -1727,7 +1727,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -1737,7 +1737,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -1745,7 +1745,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -1755,13 +1755,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<streng>,\\ B<--preprocessor=>I<streng>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -1772,20 +1772,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -1794,13 +1794,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<browser>], B<--html>[=I<browser>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -1811,13 +1811,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -1827,7 +1827,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -1836,18 +1836,18 @@ msgid ""
msgstr ""
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Få hjælp"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "En underproces returnerede en afslutningsstatus forskellig fra nul."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
@@ -1855,21 +1855,21 @@ msgstr ""
"matchet."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
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:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -1877,14 +1877,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -1892,17 +1892,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -1912,7 +1913,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -1923,7 +1924,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -1935,7 +1936,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -1946,7 +1947,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -1959,7 +1960,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -1968,41 +1969,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "konfigurationsfil for man-db."
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr "Manual for pakken man-db, B<FSSTND>"
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "HISTORIK"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr "1990, 1991 - Oprindelig skrevet af John W. Eaton (jwe@che.utexas.edu)."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
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:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2010,7 +2011,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2018,7 +2019,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 52bc7a2f..f194c38e 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.6.1-pre1\n"
"Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2012-02-05 01:41+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2012-05-03 21:16+0200\n"
"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -432,7 +432,7 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -444,7 +444,7 @@ msgstr "Hilfetext anzeigen und beenden"
# nicht hervor.
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -455,7 +455,7 @@ msgstr "Versionsinformation anzeigen und beenden"
# So steht es in der Wortliste.
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -463,19 +463,19 @@ msgstr "EXIT-STATUS"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "erfolgreiche Programmausführung"
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "Fehler beim Aufruf, in der Syntax oder in der Konfigurationsdatei"
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "betriebsbedingter Fehler"
@@ -491,7 +491,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "keine Ergebnisse für die angegebenen Suchkriterien"
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -501,7 +501,7 @@ msgstr "UMGEBUNGSVARIABLEN"
# #-#-#-#-# apropos.1.po (man-db 2.5.7) #-#-#-#-#
# Was ist gemeint, was ist eine gute Übersetzung?
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -550,7 +550,7 @@ msgstr ""
"ausgeführt. Heutzutage ist dies sowieso das Standardverhalten."
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -562,7 +562,7 @@ msgstr "DATEIEN"
# Für mich schon. Mehr als eine Eigenschaft für den Cache.
# Vielleicht doch Cache statt Zwischenpeicher?
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
@@ -571,7 +571,7 @@ msgstr "ein traditioneller, globaler Cache für die I<Index>-Datenbank"
# #-#-#-#-# apropos.1.po (man-db 2.5.7) #-#-#-#-#
# Komma s.o.
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "ein FHS-konformer, globaler Cache für die I<Index>-Datenbank"
@@ -583,7 +583,7 @@ msgstr "eine traditionelle B<whatis>-Textdatenbank"
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -2071,7 +2071,7 @@ msgstr ""
"verwendet."
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -2177,19 +2177,16 @@ msgstr ""
"ix8>."
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"Wenn Sie die Verarbeitung des Prompts durch B<%man%> vollständig außer Kraft "
-"setzen wollen, verwenden Sie die unten beschriebene Umgebungsvariable "
-"$B<MANLESS>."
# FIXME: ascii bold, sense: when do I know the display is right
# FIXME: l<latin1>(7)
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -2210,43 +2207,43 @@ msgstr ""
"B<GNU Nroff> verwendet wird."
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr "Beschreibung"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr "oktal"
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr "Bindestrich"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr "Aufzählungszeichen (middle dot)"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr "Accent aigu"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr "Multiplikationszeichen"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -2264,7 +2261,7 @@ msgstr ""
"Option ansehen."
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -2274,13 +2271,13 @@ msgstr ""
"Version von B<Nroff> verwenden."
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<Kodierung>,\\ B<--encoding>=I<Kodierung>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -2293,7 +2290,7 @@ msgstr ""
"wie B<UTF-8> sein."
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2308,7 +2305,7 @@ msgstr ""
"enthalten."
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2324,7 +2321,7 @@ msgstr ""
"trennbar kennzeichnen."
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2335,7 +2332,7 @@ msgstr ""
"damit an der rechten Seite unterschiedliche Leerräume (»ragged right«)."
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -2350,13 +2347,13 @@ msgstr ""
"Ausrichten und Füllen zu deaktivieren."
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<Zeichenkette>B<,\\ --preprocessor=>I<Zeichenkette>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2374,7 +2371,7 @@ msgstr ""
"erster gestartet."
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2384,14 +2381,14 @@ msgstr ""
"B<-T> oder B<-Z> ist diese Option nicht erforderlich."
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T\\ >I<Gerät>B<,\\ --troff-device> [\\|I<=Gerät>\\|]"
# FIXME: groff 1.17
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2405,14 +2402,14 @@ msgstr ""
"B<X75> und B<X100>."
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<Browser>], B<--html>[=I<Browser>]"
# FIXME: The compile time default should be set, not unset?
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2429,13 +2426,13 @@ msgstr ""
"arbeiten."
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2450,7 +2447,7 @@ msgstr ""
"X75-12, X100 oder X100-12 jeweils B<-T>."
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2463,18 +2460,18 @@ msgstr ""
"den Gebrauch eines Postprozessors. Diese Option impliziert B<-t>."
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Hilfe bekommen"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "Ein Kind-Prozess gab einen von Null verschiedenen EXIT-Status zurück."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
@@ -2482,7 +2479,7 @@ msgstr ""
"wurden keine Treffer dafür gefunden."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2491,7 +2488,7 @@ msgstr ""
"Handbuchseiten benutzt."
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2501,7 +2498,7 @@ msgstr ""
"Befehlszeile angehängt."
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2513,7 +2510,7 @@ msgstr ""
"B<tbl> (B<t>)."
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2523,7 +2520,7 @@ msgstr ""
"durchsuchenden Abschnitte und deren Reihenfolge zu bestimmen."
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2534,13 +2531,21 @@ msgstr ""
"Standardmäßig wird B<%pager%> verwendet."
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"Wenn $B<MANLESS> gesetzt ist, unterlässt B<%man%> die Festlegung einer "
"Eingabeaufforderung für das Anzeigeprogramm B<Less>. Stattdessen wird der "
@@ -2550,7 +2555,7 @@ msgstr ""
"PMeine\\ Eingabeaufforderung>\\(cq."
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2565,7 +2570,7 @@ msgstr ""
"Prozentzeichen und I<%c> durch einen Doppelpunkt (:) ersetzt."
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2583,7 +2588,7 @@ msgstr ""
"sind, geschützt werden."
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2603,7 +2608,7 @@ msgstr ""
"Zeilenlänge zwischen zwischen 66 und 80 Zeichen liegt."
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2620,7 +2625,7 @@ msgstr ""
"%man%> interpretieren und Formatierungszeichen verarbeiten können."
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2642,7 +2647,7 @@ msgstr ""
"gewohnt angezeigt werden."
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2655,35 +2660,35 @@ msgstr ""
"I<Locale> anzeigen. Für genaue Details siehe B<setlocale>(3)."
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "Konfigurationsdatei für Man-db"
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "globale Handbuchhierarchie."
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr "das Handbuch zum Paket man-db, B<FSSTND>"
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "GESCHICHTE"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
"1990, 1991 - John W. Eaton (jwe@che.utexas.edu) schrieb die erste Version."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2692,7 +2697,7 @@ msgstr ""
"unterstützt durch Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2703,7 +2708,7 @@ msgstr ""
"weiterentwickelt und gewartet."
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2714,7 +2719,7 @@ msgstr ""
"Paket für das Debian-Projekt."
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -4012,6 +4017,14 @@ msgstr ""
"Der frühere Abschnitt B<WAS BEDEUTET PARSEN> ist jetzt Teil von B<lexgrog>"
"(1)."
+#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "Wenn Sie die Verarbeitung des Prompts durch B<%man%> vollständig außer "
+#~ "Kraft setzen wollen, verwenden Sie die unten beschriebene "
+#~ "Umgebungsvariable $B<MANLESS>."
+
# #-#-#-#-# man.1.po (man-db 2.5.7) #-#-#-#-#
# type: tbl table
#~ msgid "_\n"
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 671c984e..99810bb9 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.6.1-pre1\n"
-"POT-Creation-Date: 2012-02-05 01:41+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2012-02-06 14:38-0400\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -373,7 +373,7 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -382,7 +382,7 @@ msgstr "Affiche un message d'aide et s'arrête."
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -391,7 +391,7 @@ msgstr "Affiche le numéro de version."
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -399,19 +399,19 @@ msgstr "CODE DE RETOUR"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "Programme exécuté sans erreur."
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "Erreur d'utilisation, de syntaxe ou de fichier de configuration."
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "Erreur d'exécution."
@@ -422,7 +422,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "Rien n'a été trouvé selon les critères indiqués."
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -430,7 +430,7 @@ msgid "ENVIRONMENT"
msgstr "ENVIRONNEMENT"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -476,7 +476,7 @@ msgstr ""
"comportement par défaut."
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -484,14 +484,14 @@ msgid "FILES"
msgstr "FICHIERS"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr "B<Base de données d'indexation> globale habituelle."
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "B<Base de données d'indexation> globale, conforme à FHS."
@@ -503,7 +503,7 @@ msgstr "Base de données texte B<whatis> traditionnelle."
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1980,7 +1980,7 @@ msgstr ""
"avec B<-f> ou B<-k>."
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -2084,16 +2084,14 @@ msgstr ""
"de B<less>. Par défaut, B<%man%> utilise l'option B<-ix8>."
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"Si vous voulez remplacer de façon permanente l'invite de B<%man%>, utilisez "
-"la variable d'environnement $B<MANLESS> décrite ci-dessous."
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -2114,43 +2112,43 @@ msgstr ""
"utilisant un périphérique I<latin1> conforme à B<GNU> B<nroff>."
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr "Description"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr "Octal"
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr "trait d'union"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr "point médian"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr "accent aigu"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr "symbole de multiplication"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -2167,7 +2165,7 @@ msgstr ""
"vous devriez utilisez cette option."
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -2176,13 +2174,13 @@ msgstr ""
"B<-Z> et peut être omise pour les B<nroff> autres que ceux du B<GNU>."
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<encodage>,\\ B<--encoding>=I<encodage>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -2195,7 +2193,7 @@ msgstr ""
"qu'une réelle valeur d'encodage comme B<UTF-8>."
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2210,7 +2208,7 @@ msgstr ""
"contiennent déjà un trait d'union."
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2225,7 +2223,7 @@ msgstr ""
"% » au début d'un mot pour l'empêcher d'être coupé."
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2236,7 +2234,7 @@ msgstr ""
"droite, aussi appelé « drapeau gauche »."
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -2251,13 +2249,13 @@ msgstr ""
"et le remplissage."
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<chaîne>,\\ B<--preprocessor=>I<chaîne>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2275,7 +2273,7 @@ msgstr ""
"comme le tout premier préprocesseur."
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2284,13 +2282,13 @@ msgstr ""
"standard. Cette option n'est pas nécessaire avec B<-H>, B<-T>, ou B<-Z>."
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T>[I<périphérique>], B<--troff-device>[=I<périphérique>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2304,13 +2302,13 @@ msgstr ""
"B<ps>, B<utf8>, B<X75> et B<X100>."
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<navigateur>], B<--html>[=I<navigateur>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2327,13 +2325,13 @@ msgstr ""
"option induit B<-t> et ne fonctionne qu'avec les B<troff> B<GNU>."
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<ppp>], B<--gxditview>[=I<ppp>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2348,7 +2346,7 @@ msgstr ""
"X75, X75-12, X100 ou X100-12."
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2361,18 +2359,18 @@ msgstr ""
"postprocesseur ne sera exécuté. Cette option induit B<-t>."
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Obtenir de l'aide"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "Un processus fils a produit une valeur de retour non nulle."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
@@ -2380,7 +2378,7 @@ msgstr ""
"ou n'a pas été trouvé."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2389,7 +2387,7 @@ msgstr ""
"recherche des pages de manuel."
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2398,7 +2396,7 @@ msgstr ""
"que B<man> appelle le processeur de format (B<nroff>, B<troff> ou B<groff>)."
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2409,7 +2407,7 @@ msgstr ""
"liste des préprocesseurs est dépendante du système utilisé."
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2419,7 +2417,7 @@ msgstr ""
"sections de manuel, et dans quel ordre la recherche doit s'effectuer."
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2430,13 +2428,21 @@ msgstr ""
"pages de manuel. Par défaut, B<%pager%> est utilisé."
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"Si $B<MANLESS> est définie, B<%man%> ne produira pas la chaîne de caractères "
"habituelle permettant d'obtenir l'invite de l'afficheur B<less>. Au lieu de "
@@ -2446,7 +2452,7 @@ msgstr ""
"\\ »."
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2462,7 +2468,7 @@ msgstr ""
"par un simple signe «\\ %\\ » et I<%c> est remplacé par «\\ :\\ »."
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2482,7 +2488,7 @@ msgstr ""
"protégées."
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2503,7 +2509,7 @@ msgstr ""
"comprise entre 66 et 80 colonnes."
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2520,7 +2526,7 @@ msgstr ""
"autour de B<%man%> capable d'interpréter ces caractères de mise en page."
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2543,7 +2549,7 @@ msgstr ""
"sera affichée comme d'habitude."
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2556,35 +2562,35 @@ msgstr ""
"(s'ils sont disponibles). Consultez B<setlocale>(3) pour plus de précisions."
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "Fichier de configuration de man-db."
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "Structure hiérarchique de pages de manuel globale"
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr "le manuel du programme man-db, B<FSSTND>"
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "HISTORIQUE"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
"1990, 1991 - Première version écrite par John W. Eaton (jwe@che.utexas.edu)."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2593,7 +2599,7 @@ msgstr ""
"fournis par Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2604,7 +2610,7 @@ msgstr ""
"personnes motivées."
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2615,7 +2621,7 @@ msgstr ""
"Debian avec l'aide de toute la communauté."
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -3934,6 +3940,13 @@ msgstr ""
"La section B<ANALYSE WHATIS> autrefois incluse dans cette page de manuel est "
"maintenant incorporée à B<lexgrog>(1)."
+#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "Si vous voulez remplacer de façon permanente l'invite de B<%man%>, "
+#~ "utilisez la variable d'environnement $B<MANLESS> décrite ci-dessous."
+
#~ msgid "1"
#~ msgstr "1"
diff --git a/man/po4a/po/id.po b/man/po4a/po/id.po
index bc19f470..046a539f 100644
--- a/man/po4a/po/id.po
+++ b/man/po4a/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.5.6-pre1\n"
-"POT-Creation-Date: 2012-02-04 23:37+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2009-09-09 07:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -373,7 +373,7 @@ msgstr "Gunakan berkas konfigurasi pengguna ini daripada I<~/.manpath>."
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -382,7 +382,7 @@ msgstr "Tampilkan sebuah pesan bantuan dan keluar."
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -391,7 +391,7 @@ msgstr "Tampilkan informasi versi."
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -399,19 +399,19 @@ msgstr "STATUS KELUAR"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "Eksekusi aplikasi sukses."
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "Penggunaan, sintaks atau berkas konfigurasi error."
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "Operasional error."
@@ -423,7 +423,7 @@ msgstr ""
"Tidak ditemukan apapun yang cocok dengan kriteria yang dispesifikasikan."
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -431,7 +431,7 @@ msgid "ENVIRONMENT"
msgstr "LINGKUNGAN"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -475,7 +475,7 @@ msgstr ""
"adalah perilaku baku."
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -483,14 +483,14 @@ msgid "FILES"
msgstr "BERKAS"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr "Sebuah persediaan basis data I<indeks> menyeluruh tradisional."
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "Sebuah persediaan basis data I<indeks> menyeluruh sesuai dengan FHS."
@@ -502,7 +502,7 @@ msgstr "Sebuah basis data teks B<whatis> tradisional."
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1981,7 +1981,7 @@ msgstr ""
"Ini tidak digunakan dengan konjungsi dengan B<-f> atau B<-k>."
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -2085,16 +2085,14 @@ msgstr ""
"%man%> menset pilihan B<-ix8>."
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"Jika anda ingin mengesampingkan pemrosesan prompt string B<%man%> secara "
-"lengkap , gunakan variabel lingkunan $B<MANLESS> dijelaskan dibawah."
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -2115,47 +2113,47 @@ msgstr ""
"I<latin1>(7)."
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, fuzzy, no-wrap
#| msgid "continuation hyphen@255@\\*[softhyphen]@-\n"
msgid "continuation hyphen"
msgstr "kelanjutan hyphen@255@\\*[softhyphen]@-\n"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, fuzzy, no-wrap
#| msgid "bullet (middle dot)@267@\\(bu@o\n"
msgid "bullet (middle dot)"
msgstr "bullet (tengah titik)@267@\\(bu@o\n"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, fuzzy, no-wrap
#| msgid "acute accent@264@\\(aa@'\n"
msgid "acute accent"
msgstr "acute accent@264@\\(aa@'\n"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, fuzzy, no-wrap
#| msgid "multiplication sign@327@\\(mu@x\n"
msgid "multiplication sign"
msgstr "perkalian tanda@327@\\(mu@x\n"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -2173,7 +2171,7 @@ msgstr ""
"pilihan ini."
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -2182,13 +2180,13 @@ msgstr ""
"B<-Z> dan mungkin tidak berguna untuk B<nroff> selain dari B<GNU's>."
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<pengkodean>,\\ B<--encoding>=I<pengkodean>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -2201,7 +2199,7 @@ msgstr ""
"karakter benar seperti B<UTF-8>."
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2216,7 +2214,7 @@ msgstr ""
"telah berisi hyphens."
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2232,7 +2230,7 @@ msgstr ""
"meletakan \"\\e%\" diawal dari sebuah kata untuk menjaga itu dari hyphenasi."
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2240,7 +2238,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, fuzzy
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
@@ -2257,13 +2255,13 @@ msgstr ""
"meletakan \"\\e%\" diawal dari sebuah kata untuk menjaga itu dari hyphenasi."
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2281,7 +2279,7 @@ msgstr ""
"pertaman."
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2290,13 +2288,13 @@ msgstr ""
"ini tidak dibutuhkan dalam konjungsi dengan B<-H>, B<-T>, atau B<-Z>."
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T>[I<perangkat>], B<-troff-device>[=I<perangkat>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2309,13 +2307,13 @@ msgstr ""
"B<latin1>, B<ps>, B<utf8>, B<X75> dan B<X100>."
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<browser>], B<--html>[=I<browser>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2332,13 +2330,13 @@ msgstr ""
"bekerja dengan B<GNU> B<troff>."
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<-gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2353,7 +2351,7 @@ msgstr ""
"atau X100-12 perangkat."
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2366,25 +2364,25 @@ msgstr ""
"penggunaan dari sebuah post-prosesor. Ini mengimplikasikan B<-t>."
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Mendapatkan bantuan"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "Sebuah proses anak mengembalikan sebuah status kembali tidak nol."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
"Paling tidak satu dari halaman/berkas/kata kunci tidak ada atau tidak cocok."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2393,7 +2391,7 @@ msgstr ""
"halaman buku panduan."
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2402,7 +2400,7 @@ msgstr ""
"memanggil pemformat (B<nroff>, B<troff>, atau B<groff>)."
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2413,7 +2411,7 @@ msgstr ""
"preprosesor adalah tergantung dari sistem."
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2423,7 +2421,7 @@ msgstr ""
"untuk dicari dan dalam urutan apa."
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2434,13 +2432,21 @@ msgstr ""
"untuk menampilkan halaman buku panduan. Secara baku, B<%pager%> digunakan."
#. type: Plain text
-#: ../../man/man1/man.man1:1241
-msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"Jika $B<MANLESS> diset, B<%man%> tidak akan melakukan pemrosesan biasa untuk "
"mengkonfigurasi prompt string untuk pager B<less>. Sebaliknya, nilai dari "
@@ -2449,7 +2455,7 @@ msgstr ""
"prompt string\\(rq, set $B<MANLESS> ke \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2464,7 +2470,7 @@ msgstr ""
"sebuah tanda persen tunggal (%) dan I<%c> digantikan oleh sebuah kolon (:)."
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2482,7 +2488,7 @@ msgstr ""
"keluar."
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2501,7 +2507,7 @@ msgstr ""
"baris terminal berada diantara 66 dan 80 karakter."
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2518,7 +2524,7 @@ msgstr ""
"dapat diinterpretasikan pemformatan karakter."
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2540,7 +2546,7 @@ msgstr ""
"apapun yang tidak kosong, keluaran error akan ditampilkan seperti biasa."
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2553,34 +2559,34 @@ msgstr ""
"(3) untuk detail lebih tepatnya."
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "berkas konfigurasi man-db."
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "Sebuah hierarki halaman buku panduan global."
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr ""
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "SEJARAH"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr "1990, 1991 - Awalnya ditulis oleh John W. Eaton (jwe@che.utexas.edu)."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2589,7 +2595,7 @@ msgstr ""
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2600,7 +2606,7 @@ msgstr ""
"orang berdedikasi."
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2611,7 +2617,7 @@ msgstr ""
"bantuan dari seluruh komunitas."
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -3882,6 +3888,13 @@ msgstr ""
"bagian dari B<lexgrog>(1)."
#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "Jika anda ingin mengesampingkan pemrosesan prompt string B<%man%> secara "
+#~ "lengkap , gunakan variabel lingkunan $B<MANLESS> dijelaskan dibawah."
+
+#~ msgid ""
#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis"
#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), "
#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), "
diff --git a/man/po4a/po/ja.po b/man/po4a/po/ja.po
index 8b2d5166..cd642128 100644
--- a/man/po4a/po/ja.po
+++ b/man/po4a/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.6.0.2\n"
-"POT-Creation-Date: 2012-02-04 23:37+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2011-09-11 22:32+0900\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -352,7 +352,7 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -361,7 +361,7 @@ msgstr "ヘルプメッセージを表示して終了します。"
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -370,7 +370,7 @@ msgstr "バージョン情報を表示します。"
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -378,19 +378,19 @@ msgstr "終了ステータス"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "プログラムが正常に実行されました。"
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "使用法、構文または設定ファイルのエラーです。"
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "操作のエラーです。"
@@ -401,7 +401,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "指定したキーワードにマッチしたページが見つかりませんでした。"
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -409,7 +409,7 @@ msgid "ENVIRONMENT"
msgstr "環境変数"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -453,7 +453,7 @@ msgstr ""
"が常にデフォルトです。"
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -461,14 +461,14 @@ msgid "FILES"
msgstr "ファイル"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr "伝統的な大域I<インデックス型>データベースキャッシュです。"
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "FHS 準拠の大域I<インデックス型>データベースキャッシュです。"
@@ -480,7 +480,7 @@ msgstr "伝統的な B<whatis> テキスト型データベースです。"
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1781,7 +1781,7 @@ msgstr ""
"変数より優先されます。 B<-f> または B<-k> と同時に指定することはできません。"
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -1883,16 +1883,14 @@ msgstr ""
"ションを設定します。"
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"B<%man%> のプロンプト文字列処理を完全に上書きしたい場合、後で説明する "
-"$B<MANLESS> 環境変数を使用してください。"
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -1911,43 +1909,43 @@ msgstr ""
"B<nroff> の I<latin1>(7) デバイス設定を使用した場合にのみ正しく表示されます。"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr "説明"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr "八進数"
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr "continuation hyphen"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr "bullet (中点)"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr "acute アクセント"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr "乗算記号"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -1963,7 +1961,7 @@ msgstr ""
"マニュアルページを参照する時にこのオプションを使用する必要があります。"
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -1972,13 +1970,13 @@ msgstr ""
"B<GNU> B<groff> 以外を使用している場合は意味がありません。"
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -1991,7 +1989,7 @@ msgstr ""
"ます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2005,7 +2003,7 @@ msgstr ""
"よって、ハイフンが含まれている単語のみハイフン区切りが行われます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2020,7 +2018,7 @@ msgstr ""
"語の最初に付加すると、その単語にはハイフンは付加されません。"
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2031,7 +2029,7 @@ msgstr ""
"\"ragged-right\" text と呼ばれます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -2045,13 +2043,13 @@ msgstr ""
"ad\" を使用すると一時的に字間調整や字詰めを無効にするように要求できます。"
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2068,7 +2066,7 @@ msgstr ""
"きします。 B<%zsoelim%> は常に最初の前処理系として使用されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2078,13 +2076,13 @@ msgstr ""
"ん。"
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T>[I<device>], B<--troff-device>[=I<device>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2097,13 +2095,13 @@ msgstr ""
"び B<X100> です。"
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<browser>], B<--html>[=I<browser>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2120,13 +2118,13 @@ msgstr ""
"のみ有効です。"
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2142,7 +2140,7 @@ msgstr ""
"れます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2155,24 +2153,24 @@ msgstr ""
"t> が暗黙的に指定されます。"
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "ヘルプの取得"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "子プロセスが 0 でない終了ステータスを返しました。"
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr "ページ、ファイル、キーワードの対象が存在しないか、一致しませんでした。"
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2181,7 +2179,7 @@ msgstr ""
"て使用されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2190,7 +2188,7 @@ msgstr ""
"B<groff>) を実行するたびに、コマンドラインに渡されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2200,7 +2198,7 @@ msgstr ""
"る前処理系の集合として使用されます。デフォルトの前処理系はシステム依存です。"
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2210,7 +2208,7 @@ msgstr ""
"す。"
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2221,13 +2219,21 @@ msgstr ""
"されます。デフォルトでは B<%pager%> が使用されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"$B<MANLESS> が設定されている場合、 B<%man%> は B<less> ページャーのプロンプト"
"文字列に対してデフォルト値を使用しません。そのかわり、 $B<MANLESS> の値を "
@@ -2236,7 +2242,7 @@ msgstr ""
"\\(cq と設定します。"
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2250,7 +2256,7 @@ msgstr ""
"一のパーセント記号 (%) に、 I<%c> はコロン (:) にそれぞれ置換されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2266,7 +2272,7 @@ msgstr ""
"引数の一部にスペースが含まれる場合はエスケープしなければいけません。"
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2284,7 +2290,7 @@ msgstr ""
"設定が使用され、端末幅が 66 から 80 文字の間にある場合のみ保存されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2299,7 +2305,7 @@ msgstr ""
"より B<%man%> と併せて使用するラッパーに書式文字を解釈させることができます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2319,7 +2325,7 @@ msgstr ""
"は通常通り表示されます。"
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2332,36 +2338,36 @@ msgstr ""
"てください。"
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "man-db 設定ファイルです。"
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "大域マニュアルページ階層です。"
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr ""
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "歴史"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
"1990, 1991 - John W. Eaton (jwe@che.utexas.edu) によって最初に作成されまし"
"た。"
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2370,7 +2376,7 @@ msgstr ""
"(wkasdo@nikhefk.nikef.nl) によって提供されたパッチを適用しました。"
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2380,7 +2386,7 @@ msgstr ""
"によってこのパッケージの開発と維持が行われました。"
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2391,7 +2397,7 @@ msgstr ""
"のパッケージの維持と拡張が行われました。"
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -3508,6 +3514,13 @@ msgstr ""
"動しました。"
#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "B<%man%> のプロンプト文字列処理を完全に上書きしたい場合、後で説明する "
+#~ "$B<MANLESS> 環境変数を使用してください。"
+
+#~ msgid ""
#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis"
#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), "
#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), "
diff --git a/man/po4a/po/man-db-manpages.pot b/man/po4a/po/man-db-manpages.pot
index de06b410..8035e963 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: 2012-09-17 23:35+0200\n"
+"POT-Creation-Date: 2012-12-21 21:21+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"
@@ -253,33 +253,33 @@ msgid "Use this user configuration file rather than the default of I<~/.manpath>
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86 ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69 ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190 ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47 ../../man/man8/catman.man8:71
+#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86 ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69 ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190 ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47 ../../man/man8/catman.man8:71
msgid "Print a help message and exit."
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89 ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72 ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193 ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50 ../../man/man8/catman.man8:74
+#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89 ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72 ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193 ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50 ../../man/man8/catman.man8:74
msgid "Display version information."
msgstr ""
#. type: SH
-#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89 ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193 ../../man/man8/mandb.man8:144
+#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89 ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193 ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93 ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197 ../../man/man8/mandb.man8:148
+#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93 ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197 ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163 ../../man/man1/whatis.man1:200
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162 ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166 ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165 ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr ""
@@ -289,13 +289,13 @@ msgid "Nothing was found that matched the criteria specified."
msgstr ""
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172 ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206 ../../man/man8/catman.man8:74
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171 ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206 ../../man/man8/catman.man8:74
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265 ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264 ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
"specified as the argument to the B<-m> option."
@@ -326,18 +326,18 @@ msgid ""
msgstr ""
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330 ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233 ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329 ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233 ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
msgid "FILES"
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342 ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96 ../../man/man8/mandb.man8:207
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341 ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96 ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr ""
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348 ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347 ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr ""
@@ -347,7 +347,7 @@ msgid "A traditional B<whatis> text database."
msgstr ""
#. type: SH
-#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191 ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72 ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250 ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102 ../../man/man8/mandb.man8:213
+#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191 ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72 ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250 ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102 ../../man/man8/mandb.man8:213
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -1430,7 +1430,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -1509,14 +1509,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the "
@@ -1528,43 +1528,43 @@ msgid ""
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -1575,20 +1575,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -1597,7 +1597,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -1607,7 +1607,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -1617,7 +1617,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -1625,7 +1625,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -1635,13 +1635,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or "
"B<troff>/B<groff>. Not all installations will have a full set of "
@@ -1653,20 +1653,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -1675,13 +1675,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -1692,13 +1692,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -1708,7 +1708,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -1717,37 +1717,37 @@ msgid ""
msgstr ""
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid "At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
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:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -1755,14 +1755,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -1770,17 +1770,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ "
+"string>\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> "
@@ -1790,7 +1791,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -1801,7 +1802,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -1813,7 +1814,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -1824,7 +1825,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -1837,7 +1838,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. "
@@ -1846,40 +1847,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125 ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125 ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr ""
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
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:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -1887,7 +1888,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco "
"E<lt>fpolacco@debian.orgE<gt> maintained and enhanced this package for the "
@@ -1895,7 +1896,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
diff --git a/man/po4a/po/nl.po b/man/po4a/po/nl.po
index aa918900..339c7938 100644
--- a/man/po4a/po/nl.po
+++ b/man/po4a/po/nl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.5.8-pre1\n"
-"POT-Creation-Date: 2012-02-04 23:37+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2010-10-24 20:48+0200\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -377,7 +377,7 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -386,7 +386,7 @@ msgstr "Een hulptekst tonen en stoppen."
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -395,7 +395,7 @@ msgstr "Versieinformatie tonen."
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -403,19 +403,19 @@ msgstr "STOPSTATUS"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "Programma correct uitgevoerd."
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "Gebruiks-, syntax- of configuratiebestandfout."
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "Uitvoeringsfout."
@@ -426,7 +426,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "Er is niets gevonden dat overeenkomt met de opgegeven criteria."
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -434,7 +434,7 @@ msgid "ENVIRONMENT"
msgstr "OMGEVING"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -478,7 +478,7 @@ msgstr ""
"(B<-r>). Momenteel is dit hoe dan ook het standaardgedrag."
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -486,14 +486,14 @@ msgid "FILES"
msgstr "BESTANDEN"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr "Een traditionele, algemene I<index>-database-cache."
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "Een algemene I<index>-database-cache, in overeenstemming met FHS."
@@ -505,7 +505,7 @@ msgstr "Een traditionele B<watis>-tekstdatabase."
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1962,7 +1962,7 @@ msgstr ""
"%> B<%pager%>."
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -2073,16 +2073,14 @@ msgstr ""
"opties."
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"Als u de verwerking van B<%man%>'s prompt volledig wilt overschrijven, "
-"gebruik dan de omgevingsvariabele $B<MANLESS> zoals hieronder beschreven."
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -2102,47 +2100,47 @@ msgstr ""
"B<nroff>'s I<latin1>(7)-apparaat."
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr ""
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, fuzzy, no-wrap
#| msgid "continuation hyphen@255@\\*[softhyphen]@-\n"
msgid "continuation hyphen"
msgstr "afbreekstreep@255@\\*[softhyphen]@-\n"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, fuzzy, no-wrap
#| msgid "bullet (middle dot)@267@\\(bu@o\n"
msgid "bullet (middle dot)"
msgstr "kogel (middenpunt)@267@\\(bu@o\n"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, fuzzy, no-wrap
#| msgid "acute accent@264@\\(aa@'\n"
msgid "acute accent"
msgstr "accent aigu@264@\\(aa@'\n"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, fuzzy, no-wrap
#| msgid "multiplication sign@327@\\(mu@x\n"
msgid "multiplication sign"
msgstr "vermenigvuldigingsteken@327@\\(mu@x\n"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -2160,7 +2158,7 @@ msgstr ""
"optie bekijken."
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -2170,13 +2168,13 @@ msgstr ""
"van B<GNU>."
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<codering>,\\ B<--encoding>=I<codering>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -2189,7 +2187,7 @@ msgstr ""
"zoals B<UTF-8>."
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2204,7 +2202,7 @@ msgstr ""
"afbreektekens bevatten."
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2220,7 +2218,7 @@ msgstr ""
"dat het wordt afgebroken."
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2231,7 +2229,7 @@ msgstr ""
"linker marge overblijft."
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -2245,13 +2243,13 @@ msgstr ""
"fi\" en \".ad\" gebruiken om aanpassing en uitvulling uit te schakelen."
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2269,7 +2267,7 @@ msgstr ""
"altijd als de allereerste preprocessor uitgevoerd."
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2278,13 +2276,13 @@ msgstr ""
"niet vereist in samenhang met B<-H>, B<-T> of B<-Z>."
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T>[I<apparaat>], B<--troff-device>[=I<apparaat>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2297,13 +2295,13 @@ msgstr ""
"B<latin1>, B<ps>, B<utf8>, B<X75> en B<X100>."
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<browser>], B<--html>[=I<browser>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2319,13 +2317,13 @@ msgstr ""
"werkt alleen samen met B<GNU> B<troff>."
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2340,7 +2338,7 @@ msgstr ""
"X100- resp. X100-12-apparaat."
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2353,18 +2351,18 @@ msgstr ""
"B<groff> en wordt er geen postprocessor gebruikt. Het impliceert B<-t>."
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Hulp krijgen"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "Een child-proces gaf een stopstatus ongelijk aan nul."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
@@ -2372,7 +2370,7 @@ msgstr ""
"overeen."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2381,7 +2379,7 @@ msgstr ""
"zoeken."
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2391,7 +2389,7 @@ msgstr ""
"B<groff>)."
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2402,7 +2400,7 @@ msgstr ""
"standaard preprocessorlijst is systeemafhankelijk."
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2412,7 +2410,7 @@ msgstr ""
"in welke volgorde."
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2423,13 +2421,21 @@ msgstr ""
"hiervoor B<%pager%> gebruikt."
#. type: Plain text
-#: ../../man/man1/man.man1:1241
-msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"Wanneer $B<MANLESS> is ingesteld, zal B<%man%> geen 'prompt-string' aanmaken "
"voor de B<less>-opmaker. In plaats daarvan wordt de waarde van $B<MANLESS> "
@@ -2438,7 +2444,7 @@ msgstr ""
"\\(oqB<-Psmy\\ prompt\\ string>\\(cq."
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2453,7 +2459,7 @@ msgstr ""
"procentteken (%) en I<%c> door een dubbelepunt (:)."
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2470,7 +2476,7 @@ msgstr ""
"gaan worden."
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2490,7 +2496,7 @@ msgstr ""
"is."
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2507,7 +2513,7 @@ msgstr ""
"die opmaaktekens kunnen interpreteren."
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2529,7 +2535,7 @@ msgstr ""
"normaal getoond worden."
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2542,36 +2548,36 @@ msgstr ""
"de details."
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "man-db-configuratiebestand."
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "Een algemene man-paginahierarchie."
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr ""
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "GESCHIEDENIS"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
"1990, 1991 - Oorspronkelijk geschreven door John W. Eaton (jwe@che.utexas."
"edu)."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2580,7 +2586,7 @@ msgstr ""
"geleverd door Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2591,7 +2597,7 @@ msgstr ""
"mensen."
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2602,7 +2608,7 @@ msgstr ""
"behulp van de gehele gemeenschap."
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -3625,6 +3631,13 @@ msgstr ""
"De voormalige sectie B<WAT IS ONTLEDEN> is nu onderdeel van B<lexgrog>(1)."
#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "Als u de verwerking van B<%man%>'s prompt volledig wilt overschrijven, "
+#~ "gebruik dan de omgevingsvariabele $B<MANLESS> zoals hieronder beschreven."
+
+#~ msgid ""
#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis"
#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), "
#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), "
diff --git a/man/po4a/po/pl.po b/man/po4a/po/pl.po
index fa8610cc..756b0873 100644
--- a/man/po4a/po/pl.po
+++ b/man/po4a/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.6.0.2\n"
-"POT-Creation-Date: 2012-02-04 23:37+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2011-11-01 22:26+0100\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -366,7 +366,7 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -375,7 +375,7 @@ msgstr "Wyświetla komunikat pomocy i kończy pracę."
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -384,7 +384,7 @@ msgstr "Wyświetla informację o wersji."
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -392,19 +392,19 @@ msgstr "KOD ZAKOŃCZENIA"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "Program zakończony bez żadnych błędów."
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr "Błąd użycia, składni lub pliku konfiguracyjnego."
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "Błąd działania."
@@ -415,7 +415,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "Nie znaleziono niczego, co spełniałoby kryteria wyszukiwania."
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -423,7 +423,7 @@ msgid "ENVIRONMENT"
msgstr "ŚRODOWISKO"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -468,7 +468,7 @@ msgstr ""
"i tak to jest domyślne zachowanie."
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -476,14 +476,14 @@ msgid "FILES"
msgstr "PLIKI"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr "Tradycyjny globalny I<indeks> bazy danych."
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "Zgodny z FHS globalny I<indeks> bazy danych."
@@ -495,7 +495,7 @@ msgstr "Tradycyjna tekstowa baza danych B<whatis>."
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1956,7 +1956,7 @@ msgstr ""
"$B<PAGER>. Nie jest używana w połączeniu z B<-f> lub B<-k>."
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -2060,16 +2060,14 @@ msgstr ""
"przekazywane do programu less. Domyślnie B<%man%> ustawia opcje B<-ix8>."
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"Aby całkowicie nadpisać łańcuch zachęty B<%man%>a, należy użyć zmiennej "
-"środowiskowej $B<MANLESS>, jak to opisano poniżej."
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -2090,43 +2088,43 @@ msgstr ""
"I<latin1>(7) B<GNU> B<nroff>a."
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr "Opis"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr "Ósemkowy"
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr "łącznik"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr "kula (kropka w środku)"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr "akcent ostry"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr "znak dzielenia"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -2144,7 +2142,7 @@ msgstr ""
"przeglądania stron podręcznika ekranowego."
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -2154,13 +2152,13 @@ msgstr ""
"innej niż B<GNU>."
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<kodowanie_znaków>,\\ B<--encoding>=I<kodowanie_znaków>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -2173,7 +2171,7 @@ msgstr ""
"znaków, takim jak B<UTF-8>."
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2188,7 +2186,7 @@ msgstr ""
"gdy zawierają łączniki."
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2204,7 +2202,7 @@ msgstr ""
"na początku słowa, co zabroni jego dzielenia."
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2216,7 +2214,7 @@ msgstr ""
"\"."
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -2231,13 +2229,13 @@ msgstr ""
"\", aby tymczasowo wyłączyć wyrównywanie linii i wypełnianie spacjami."
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<łańcuch_znaków>,\\ B<--preprocessor=>I<łańcuch_znaków>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2255,7 +2253,7 @@ msgstr ""
"preprocesor."
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2264,13 +2262,13 @@ msgstr ""
"wyjście. Opcja nie jest wymagana w połączeniu z B<-H>, B<-T> lub B<-Z>."
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T>[I<urządzenie>], B<--troff-device>[=I<urządzenie>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2283,13 +2281,13 @@ msgstr ""
"B<dvi>, B<latin1>, B<ps>, B<utf8>, B<X75> oraz B<X100>."
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<przeglądarka>], B<--html>[=I<przeglądarka>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2307,13 +2305,13 @@ msgstr ""
"B<troff>a."
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2327,7 +2325,7 @@ msgstr ""
"bazowej. Opcja włącza B<-T> z urządzeniem X75, X75-12, X100 lub X100-12."
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2340,18 +2338,18 @@ msgstr ""
"użycie postprocesora. Automatycznie włącza opcję B<-t>."
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Otrzymywanie pomocy"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "Proces potomny zwrócił niezerowy kod zakończenia."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
@@ -2359,7 +2357,7 @@ msgstr ""
"zostało dopasowane."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2368,7 +2366,7 @@ msgstr ""
"przeszukiwań hierarchii stron man."
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2378,7 +2376,7 @@ msgstr ""
"B<groff>)."
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2389,7 +2387,7 @@ msgstr ""
"Domyślna lista preprocesorów zależy od systemu."
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2399,7 +2397,7 @@ msgstr ""
"jakiej kolejności będą przeszukiwane."
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2411,13 +2409,21 @@ msgstr ""
"%pager%>."
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"Jeśli $B<MANLESS> jest ustawiona, to B<%man%> nie podejmie żadnych swoich "
"zwyczajowych działań ustawiających linię zachęty programu B<less>. Zamiast "
@@ -2426,7 +2432,7 @@ msgstr ""
"\\(rq, należy ustawić $B<MANLESS> na \\(oqB<-Psmoja\\ linia\\ zachęty>\\(cq."
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2442,7 +2448,7 @@ msgstr ""
"- dwukropkiem (:)."
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2461,7 +2467,7 @@ msgstr ""
"zostać poprzedzone znakiem odwrotnego ukośnika."
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2482,7 +2488,7 @@ msgstr ""
"między 66 a 80 znakami."
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2500,7 +2506,7 @@ msgstr ""
# FIXME
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2523,7 +2529,7 @@ msgstr ""
"normalnie wyświetlane."
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2536,35 +2542,35 @@ msgstr ""
"Szczegóły można znaleźć w B<setlocale>(3)."
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "Plik konfiguracyjny man-db."
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "Globalna hierarchia stron podręcznika ekranowego."
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr ""
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "HISTORIA"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
"1990, 1991 - Program napisany przez Johna W. Eatona (jwe@che.utexas.edu)."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2573,7 +2579,7 @@ msgstr ""
"nadesłane przez Willema Kasdorpa (wkasdo@nikhefk.nikef.nl)."
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2583,7 +2589,7 @@ msgstr ""
"pomocą paru osób rozwijał ten pakiet i nim zarządzał."
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2594,7 +2600,7 @@ msgstr ""
"całej społeczności."
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -3871,6 +3877,13 @@ msgstr ""
"została przeniesiona do B<lexgrog>(1)."
#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "Aby całkowicie nadpisać łańcuch zachęty B<%man%>a, należy użyć zmiennej "
+#~ "środowiskowej $B<MANLESS>, jak to opisano poniżej."
+
+#~ msgid ""
#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis"
#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), "
#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), "
diff --git a/man/po4a/po/ru.po b/man/po4a/po/ru.po
index 9eb7ab17..ffddf0e5 100644
--- a/man/po4a/po/ru.po
+++ b/man/po4a/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: man-db-manpages 2.6.1-pre1\n"
-"POT-Creation-Date: 2012-02-05 01:41+0000\n"
+"POT-Creation-Date: 2012-12-21 21:21+0000\n"
"PO-Revision-Date: 2012-02-06 20:48+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -363,7 +363,7 @@ msgstr ""
#. type: Plain text
#: ../../man/man1/apropos.man1:186 ../../man/man1/lexgrog.man1:86
-#: ../../man/man1/man.man1:1153 ../../man/man1/manconv.man1:69
+#: ../../man/man1/man.man1:1152 ../../man/man1/manconv.man1:69
#: ../../man/man1/manpath.man1:92 ../../man/man1/whatis.man1:190
#: ../../man/man1/zsoelim.man1:67 ../../man/man8/accessdb.man8:47
#: ../../man/man8/catman.man8:71
@@ -372,7 +372,7 @@ msgstr "Показать справочное сообщение и законч
#. type: Plain text
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1155 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:193
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/accessdb.man8:50
#: ../../man/man8/catman.man8:74
@@ -381,7 +381,7 @@ msgstr "Показать информацию о версии."
#. type: SH
#: ../../man/man1/apropos.man1:189 ../../man/man1/lexgrog.man1:89
-#: ../../man/man1/man.man1:1156 ../../man/man1/whatis.man1:193
+#: ../../man/man1/man.man1:1155 ../../man/man1/whatis.man1:193
#: ../../man/man8/mandb.man8:144
#, no-wrap
msgid "EXIT STATUS"
@@ -389,13 +389,13 @@ msgstr "КОД ВЫХОДА"
#. type: Plain text
#: ../../man/man1/apropos.man1:193 ../../man/man1/lexgrog.man1:93
-#: ../../man/man1/man.man1:1160 ../../man/man1/whatis.man1:197
+#: ../../man/man1/man.man1:1159 ../../man/man1/whatis.man1:197
#: ../../man/man8/mandb.man8:148
msgid "Successful program execution."
msgstr "Успешное выполнение программы."
#. type: Plain text
-#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1163
+#: ../../man/man1/apropos.man1:196 ../../man/man1/man.man1:1162
#: ../../man/man1/whatis.man1:200
msgid "Usage, syntax or configuration file error."
msgstr ""
@@ -403,7 +403,7 @@ msgstr ""
"проблемы в файле настройки."
#. type: Plain text
-#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1166
+#: ../../man/man1/apropos.man1:199 ../../man/man1/man.man1:1165
#: ../../man/man1/whatis.man1:203 ../../man/man8/mandb.man8:154
msgid "Operational error."
msgstr "Ошибка при работе."
@@ -414,7 +414,7 @@ msgid "Nothing was found that matched the criteria specified."
msgstr "По запросу ничего не найдено."
#. type: SH
-#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1172
+#: ../../man/man1/apropos.man1:202 ../../man/man1/man.man1:1171
#: ../../man/man1/manpath.man1:95 ../../man/man1/whatis.man1:206
#: ../../man/man8/catman.man8:74
#, no-wrap
@@ -422,7 +422,7 @@ msgid "ENVIRONMENT"
msgstr "ОКРУЖЕНИЕ"
#. type: Plain text
-#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1265
+#: ../../man/man1/apropos.man1:211 ../../man/man1/man.man1:1264
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:215
msgid ""
"If $B<SYSTEM> is set, it will have the same effect as if it had been "
@@ -470,7 +470,7 @@ msgstr ""
"поведением по умолчанию."
#. type: SH
-#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1330
+#: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1329
#: ../../man/man1/manpath.man1:121 ../../man/man1/whatis.man1:233
#: ../../man/man8/catman.man8:87 ../../man/man8/mandb.man8:191
#, no-wrap
@@ -478,14 +478,14 @@ msgid "FILES"
msgstr "ФАЙЛЫ"
#. type: Plain text
-#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1342
+#: ../../man/man1/apropos.man1:244 ../../man/man1/man.man1:1341
#: ../../man/man1/whatis.man1:239 ../../man/man8/catman.man8:96
#: ../../man/man8/mandb.man8:207
msgid "A traditional global I<index> database cache."
msgstr "Традиционный кэш глобальной базы данных I<index>."
#. type: Plain text
-#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1348
+#: ../../man/man1/apropos.man1:250 ../../man/man1/man.man1:1347
#: ../../man/man1/whatis.man1:245 ../../man/man8/mandb.man8:200
msgid "An FHS compliant global I<index> database cache."
msgstr "Соответствующий FHS глобальный кэш базы данных I<index>."
@@ -497,7 +497,7 @@ msgstr "Традиционная текстовая база данных B<what
#. type: SH
#: ../../man/man1/apropos.man1:255 ../../man/man1/lexgrog.man1:191
-#: ../../man/man1/man.man1:1348 ../../man/man1/manconv.man1:72
+#: ../../man/man1/man.man1:1347 ../../man/man1/manconv.man1:72
#: ../../man/man1/manpath.man1:125 ../../man/man1/whatis.man1:250
#: ../../man/man1/zsoelim.man1:70 ../../man/man8/catman.man8:102
#: ../../man/man8/mandb.man8:213
@@ -1946,7 +1946,7 @@ msgstr ""
"$B<PAGER>. Не используется вместе с B<-f> или B<-k>."
#. type: Plain text
-#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1222
+#: ../../man/man1/man.man1:873 ../../man/man1/man.man1:1221
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 "
@@ -2050,16 +2050,14 @@ msgstr ""
"параметры less. По умолчанию, B<%man%> указывает параметры B<-ix8>."
#. type: Plain text
-#: ../../man/man1/man.man1:940
+#: ../../man/man1/man.man1:939
msgid ""
-"If you want to override B<%man%>'s prompt string processing completely, use "
-"the $B<MANLESS> environment variable described below."
+"The $B<MANLESS> environment variable described below may be used to set a "
+"default prompt string if none is supplied on the command line."
msgstr ""
-"Если вы хотите полностью заменить строку приглашения, передаваемую B<%man%>, "
-"используйте переменную окружения $B<MANLESS>, описанную ниже."
#. type: Plain text
-#: ../../man/man1/man.man1:966
+#: ../../man/man1/man.man1:965
msgid ""
"When viewing a pure I<ascii>(7) manual page on a 7 bit terminal or terminal "
"emulator, some characters may not display correctly when using the I<latin1>"
@@ -2079,43 +2077,43 @@ msgstr ""
"правильно только при использовании B<GNU> B<nroff> устройства I<latin1>(7)."
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Description"
msgstr "Описание"
#. type: tbl table
-#: ../../man/man1/man.man1:974
+#: ../../man/man1/man.man1:973
#, no-wrap
msgid "Octal"
msgstr "Восьмеричный код"
#. type: tbl table
-#: ../../man/man1/man.man1:976
+#: ../../man/man1/man.man1:975
#, no-wrap
msgid "continuation hyphen"
msgstr "длинный перенос"
#. type: tbl table
-#: ../../man/man1/man.man1:979
+#: ../../man/man1/man.man1:978
#, no-wrap
msgid "bullet (middle dot)"
msgstr "bullet (точка в центре)"
#. type: tbl table
-#: ../../man/man1/man.man1:982
+#: ../../man/man1/man.man1:981
#, no-wrap
msgid "acute accent"
msgstr "значок ударения"
#. type: tbl table
-#: ../../man/man1/man.man1:985
+#: ../../man/man1/man.man1:984
#, no-wrap
msgid "multiplication sign"
msgstr "знак ударения"
#. type: Plain text
-#: ../../man/man1/man.man1:1008
+#: ../../man/man1/man.man1:1007
msgid ""
"If the I<latin1> column displays correctly, your terminal may be set up for "
"I<latin1> characters and this option is not necessary. If the I<latin1> and "
@@ -2133,7 +2131,7 @@ msgstr ""
"помощью этого параметра."
#. type: Plain text
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
msgid ""
"This option is ignored when using options B<-t>, B<-H>, B<-T>, or B<-Z> and "
"may be useless for B<nroff> other than B<GNU's>."
@@ -2142,13 +2140,13 @@ msgstr ""
"или B<-Z>, и может быть бесполезен для B<nroff>, если он не от B<GNU>."
#. type: TP
-#: ../../man/man1/man.man1:1019
+#: ../../man/man1/man.man1:1018
#, no-wrap
msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>"
msgstr "B<-E\\ >I<кодировка>,\\ B<--encoding>=I<кодировка>"
#. type: Plain text
-#: ../../man/man1/man.man1:1030
+#: ../../man/man1/man.man1:1029
msgid ""
"Generate output for a character encoding other than the default. For "
"backward compatibility, I<encoding> may be an B<nroff> device such as "
@@ -2161,7 +2159,7 @@ msgstr ""
"B<ascii>, B<latin1> или B<utf8>."
#. type: Plain text
-#: ../../man/man1/man.man1:1039
+#: ../../man/man1/man.man1:1038
msgid ""
"Normally, B<nroff> will automatically hyphenate text at line breaks even in "
"words that do not contain hyphens, if it is necessary to do so to lay out "
@@ -2176,7 +2174,7 @@ msgstr ""
"символы переноса."
#. type: Plain text
-#: ../../man/man1/man.man1:1048
+#: ../../man/man1/man.man1:1047
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"hyphenating a word at an inappropriate point, do not use this option, but "
@@ -2191,7 +2189,7 @@ msgstr ""
"слова, что не даст его разорвать совсем."
#. type: Plain text
-#: ../../man/man1/man.man1:1055
+#: ../../man/man1/man.man1:1054
msgid ""
"Normally, B<nroff> will automatically justify text to both margins. This "
"option disables full justification, leaving justified only to the left "
@@ -2202,7 +2200,7 @@ msgstr ""
"краю, получается так называемый текст \"без выключки по правому краю\"."
#. type: Plain text
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
msgid ""
"If you are writing a manual page and simply want to prevent B<nroff> from "
"justifying certain paragraphs, do not use this option, but consult the "
@@ -2217,13 +2215,13 @@ msgstr ""
"и заполнения."
#. type: TP
-#: ../../man/man1/man.man1:1062
+#: ../../man/man1/man.man1:1061
#, no-wrap
msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>"
msgstr "B<-p\\ >I<строка>,\\ B<--preprocessor=>I<строка>"
#. type: Plain text
-#: ../../man/man1/man.man1:1081
+#: ../../man/man1/man.man1:1080
msgid ""
"Specify the sequence of preprocessors to run before B<nroff> or B<troff>/"
"B<groff>. Not all installations will have a full set of preprocessors. "
@@ -2241,7 +2239,7 @@ msgstr ""
"быстрого препроцессора."
#. type: Plain text
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
msgid ""
"Use I<%troff%> to format the manual page to stdout. This option is not "
"required in conjunction with B<-H>, B<-T>, or B<-Z>."
@@ -2251,13 +2249,13 @@ msgstr ""
"или B<-Z>."
#. type: TP
-#: ../../man/man1/man.man1:1091
+#: ../../man/man1/man.man1:1090
#, no-wrap
msgid "B<-T>[I<device>], B<--troff-device>[=I<device>]"
msgstr "B<-T>[I<устройство>], B<--troff-device>[=I<устройство>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
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>. "
@@ -2270,13 +2268,13 @@ msgstr ""
"включают B<dvi>, B<latin1>, B<ps>, B<utf8>, B<X75> и B<X100>."
#. type: TP
-#: ../../man/man1/man.man1:1103
+#: ../../man/man1/man.man1:1102
#, no-wrap
msgid "B<-H>[I<browser>], B<--html>[=I<browser>]"
msgstr "B<-H>[I<браузер>], B<--html>[=I<браузер>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
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 "
@@ -2293,13 +2291,13 @@ msgstr ""
"B<troff>."
#. type: TP
-#: ../../man/man1/man.man1:1119
+#: ../../man/man1/man.man1:1118
#, no-wrap
msgid "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
msgstr "B<-X>[I<dpi>], B<--gxditview>[=I<dpi>]"
#. type: Plain text
-#: ../../man/man1/man.man1:1133
+#: ../../man/man1/man.man1:1132
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 "
@@ -2314,7 +2312,7 @@ msgstr ""
"значениями устройств X75, X75-12, X100 и X100-12 соответственно."
#. type: Plain text
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
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>, "
@@ -2327,18 +2325,18 @@ msgstr ""
"использование постпроцессора отменяется. Подразумевает B<-t>."
#. type: SS
-#: ../../man/man1/man.man1:1149
+#: ../../man/man1/man.man1:1148
#, no-wrap
msgid "Getting help"
msgstr "Выдача справки"
#. type: Plain text
-#: ../../man/man1/man.man1:1169
+#: ../../man/man1/man.man1:1168
msgid "A child process returned a non-zero exit status."
msgstr "Дочерний процесс завершился с ненулевым кодом выхода."
#. type: Plain text
-#: ../../man/man1/man.man1:1172
+#: ../../man/man1/man.man1:1171
msgid ""
"At least one of the pages/files/keywords didn't exist or wasn't matched."
msgstr ""
@@ -2346,7 +2344,7 @@ msgstr ""
"неё при поиске ничего не найдено."
#. type: Plain text
-#: ../../man/man1/man.man1:1179
+#: ../../man/man1/man.man1:1178
msgid ""
"If $B<MANPATH> is set, its value is used as the path to search for manual "
"pages."
@@ -2355,7 +2353,7 @@ msgstr ""
"используется в качестве пути поиска справочных страниц."
#. type: Plain text
-#: ../../man/man1/man.man1:1190
+#: ../../man/man1/man.man1:1189
msgid ""
"The contents of $B<MANROFFOPT> are added to the command line every time "
"B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)."
@@ -2365,7 +2363,7 @@ msgstr ""
"B<troff> или B<groff>)."
#. type: Plain text
-#: ../../man/man1/man.man1:1197
+#: ../../man/man1/man.man1:1196
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 "
@@ -2376,7 +2374,7 @@ msgstr ""
"справочной страницы. Список препроцессоров по умолчанию зависит от системы."
#. type: Plain text
-#: ../../man/man1/man.man1:1203 ../../man/man8/catman.man8:81
+#: ../../man/man1/man.man1:1202 ../../man/man8/catman.man8:81
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."
@@ -2387,7 +2385,7 @@ msgstr ""
"порядке."
#. type: Plain text
-#: ../../man/man1/man.man1:1216
+#: ../../man/man1/man.man1:1215
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 "
@@ -2398,13 +2396,21 @@ msgstr ""
"отображения справочной страницы. По умолчанию, используется B<%pager%>."
#. type: Plain text
-#: ../../man/man1/man.man1:1241
+#: ../../man/man1/man.man1:1240
+#, fuzzy
+#| msgid ""
+#| "If $B<MANLESS> is set, B<%man%> will not perform any of its usual "
+#| "processing to set up a prompt string for the B<less> pager. Instead, the "
+#| "value of $B<MANLESS> will be copied verbatim into $B<LESS>. For example, "
+#| "if you want to set the prompt string unconditionally to \\(lqmy prompt "
+#| "string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
msgid ""
-"If $B<MANLESS> is set, B<%man%> will not perform any of its usual processing "
-"to set up a prompt string for the B<less> pager. Instead, the value of "
-"$B<MANLESS> will be copied verbatim into $B<LESS>. For example, if you want "
-"to set the prompt string unconditionally to \\(lqmy prompt string\\(rq, set "
-"$B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
+"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 "
+"any occurrences of the text B<$MAN_PN> will be expanded in the same way). "
+"For example, if you want to set the prompt string unconditionally to \\(lqmy "
+"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>"
+"\\(cq. Using the B<-r> option overrides this environment variable."
msgstr ""
"Если установлена переменная окружения $B<MANLESS>, то B<%man%> не будет "
"выполнять все свои обычные операции для установки строки приглашения для "
@@ -2414,7 +2420,7 @@ msgstr ""
"равной \\(oqB<-Psmy\\ prompt\\ string>\\(cq."
#. type: Plain text
-#: ../../man/man1/man.man1:1257
+#: ../../man/man1/man.man1:1256
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> B<--"
@@ -2430,7 +2436,7 @@ msgstr ""
"двоеточием (:)."
#. type: Plain text
-#: ../../man/man1/man.man1:1280
+#: ../../man/man1/man.man1:1279
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%> "
@@ -2447,7 +2453,7 @@ msgstr ""
"которые должны быть частью значения параметра, нужно экранировать."
#. type: Plain text
-#: ../../man/man1/man.man1:1294
+#: ../../man/man1/man.man1:1293
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 "
@@ -2467,7 +2473,7 @@ msgstr ""
"промежутке между 66 и 80 символами."
#. type: Plain text
-#: ../../man/man1/man.man1:1305
+#: ../../man/man1/man.man1:1304
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 "
@@ -2484,7 +2490,7 @@ msgstr ""
"%>, которые распознают символы форматирования."
#. type: Plain text
-#: ../../man/man1/man.man1:1318
+#: ../../man/man1/man.man1:1317
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 "
@@ -2506,7 +2512,7 @@ msgstr ""
"как обычно."
#. type: Plain text
-#: ../../man/man1/man.man1:1330
+#: ../../man/man1/man.man1:1329
msgid ""
"Depending on system and implementation, either or both of $B<LANG> and "
"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man"
@@ -2519,36 +2525,36 @@ msgstr ""
"есть). Подробней смотрите в B<setlocale>(3)."
#. type: Plain text
-#: ../../man/man1/man.man1:1334 ../../man/man1/manpath.man1:125
+#: ../../man/man1/man.man1:1333 ../../man/man1/manpath.man1:125
#: ../../man/man8/catman.man8:91 ../../man/man8/mandb.man8:195
msgid "man-db configuration file."
msgstr "Файл настройки man-db."
#. type: Plain text
-#: ../../man/man1/man.man1:1337
+#: ../../man/man1/man.man1:1336
msgid "A global manual page hierarchy."
msgstr "Глобальная иерархия справочных страниц."
#. type: Plain text
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
msgid "the man-db package manual, B<FSSTND>"
msgstr "руководство к пакету man-db, B<FSSTND>"
#. type: SH
-#: ../../man/man1/man.man1:1366
+#: ../../man/man1/man.man1:1365
#, no-wrap
msgid "HISTORY"
msgstr "ИСТОРИЯ"
#. type: Plain text
-#: ../../man/man1/man.man1:1368
+#: ../../man/man1/man.man1:1367
msgid "1990, 1991 - Originally written by John W. Eaton (jwe@che.utexas.edu)."
msgstr ""
"1990, 1991: изначально написана Джоном В. Итоном (John W. Eaton, jwe@che."
"utexas.edu)."
#. type: Plain text
-#: ../../man/man1/man.man1:1371
+#: ../../man/man1/man.man1:1370
msgid ""
"Dec 23 1992: Rik Faith (faith@cs.unc.edu) applied bug fixes supplied by "
"Willem Kasdorp (wkasdo@nikhefk.nikef.nl)."
@@ -2557,7 +2563,7 @@ msgstr ""
"найденные Виллемом Касдорпом (Willem Kasdorp, wkasdo@nikhefk.nikef.nl)."
#. type: Plain text
-#: ../../man/man1/man.man1:1375
+#: ../../man/man1/man.man1:1374
msgid ""
"30th April 1994 - 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) has "
"been developing and maintaining this package with the help of a few "
@@ -2567,7 +2573,7 @@ msgstr ""
"разрабатывал и сопровождал этот пакет с помощью некоторых других людей."
#. type: Plain text
-#: ../../man/man1/man.man1:1379
+#: ../../man/man1/man.man1:1378
msgid ""
"30th October 1996 - 30th March 2001: Fabrizio Polacco E<lt>fpolacco@debian."
"orgE<gt> maintained and enhanced this package for the Debian project, with "
@@ -2578,7 +2584,7 @@ msgstr ""
"Debian с помощью всего сообщества."
#. type: Plain text
-#: ../../man/man1/man.man1:1381
+#: ../../man/man1/man.man1:1380
msgid ""
"31st March 2001 - present day: Colin Watson E<lt>cjwatson@debian.orgE<gt> is "
"now developing and maintaining man-db."
@@ -3841,6 +3847,13 @@ msgstr ""
"Прежде в этой странице был раздел B<ЧТО АНАЛИЗИРУЕТСЯ>, но теперь он "
"перенесён в B<lexgrog>(1)."
+#~ msgid ""
+#~ "If you want to override B<%man%>'s prompt string processing completely, "
+#~ "use the $B<MANLESS> environment variable described below."
+#~ msgstr ""
+#~ "Если вы хотите полностью заменить строку приглашения, передаваемую B<%man"
+#~ "%>, используйте переменную окружения $B<MANLESS>, описанную ниже."
+
#~ msgid "1"
#~ msgstr "1"
diff --git a/src/man.c b/src/man.c
index 485b394e..6b8dc581 100644
--- a/src/man.c
+++ b/src/man.c
@@ -1153,6 +1153,9 @@ int main (int argc, char *argv[])
pager = get_def_user ("cat", CAT);
if (prompt_string == NULL)
+ prompt_string = getenv ("MANLESS");
+
+ if (prompt_string == NULL)
#ifdef LESS_PROMPT
prompt_string = LESS_PROMPT;
#else
@@ -1902,12 +1905,6 @@ static void setenv_less (pipecmd *cmd, const char *title)
{
const char *esc_title;
char *less_opts, *man_pn;
- const char *force = getenv ("MANLESS");
-
- if (force) {
- pipecmd_setenv (cmd, "LESS", force);
- return;
- }
esc_title = escape_less (title);
less_opts = xasprintf (LESS_OPTS, prompt_string, prompt_string);