summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xhelp2man.PL22
-rw-r--r--help2man.texi14
-rw-r--r--po/fi.po68
-rw-r--r--po/fr.po68
-rw-r--r--po/help2man.pot68
-rw-r--r--po/pl.po68
-rw-r--r--po/sv.po68
8 files changed, 220 insertions, 159 deletions
diff --git a/debian/changelog b/debian/changelog
index 8c627f0..96a957c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ help2man (1.37.1) unstable; urgency=low
* Handle automake directory with explicit version number.
* Integrate NMU, thanks Stefano.
* Add @datarootdir@ used by new autoconf.
+ * Add --no-discard-stderr option, suggest use if no stdout (closes: #138752).
- -- Brendan O'Dea <bod@debian.org> Mon, 03 Aug 2009 23:07:55 +1000
+ -- Brendan O'Dea <bod@debian.org> Mon, 03 Aug 2009 23:55:47 +1000
help2man (1.36.4+nmu1) unstable; urgency=low
diff --git a/help2man.PL b/help2man.PL
index 5be32cf..a0c50b9 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -155,12 +155,13 @@ Usage: %s [OPTION]... EXECUTABLE
--help print this help, then exit
--version print version number, then exit
-EXECUTABLE should accept `--help' and `--version' options although
-alternatives may be specified using:
+EXECUTABLE should accept `--help' and `--version' options and produce output on
+stdout although alternatives may be specified using:
-h, --help-option=STRING help option string
-v, --version-option=STRING version option string
--version-string=STRING version string
+ --no-discard-stderr include stderr when parsing option output
Report bugs to <bug-help2man@gnu.org>.
EOT
@@ -171,6 +172,7 @@ my $source = '';
my $locale = 'C';
my $help_option = '--help';
my $version_option = '--version';
+my $discard_stderr = 1;
my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info, $version_text);
my %opt_def = (
@@ -186,7 +188,8 @@ my %opt_def = (
'N|no-info' => \$opt_no_info,
'h|help-option=s' => \$help_option,
'v|version-option=s' => \$version_option,
- 'version-string=s' => \$version_text,
+ 'version-string=s' => \$version_text,
+ 'discard-stderr!' => \$discard_stderr,
);
# Parse options.
@@ -690,9 +693,16 @@ exit;
sub get_option_value
{
my ($prog, $opt) = @_;
- my $value = join '', map { s/ +$//; expand $_ } `$prog $opt 2>/dev/null`
- or kark N_("%s: can't get `%s' info from %s"), $this_program, $opt,
- $prog;
+ my $stderr = $discard_stderr ? '/dev/null' : '&1';
+ my $value = join '', map { s/ +$//; expand $_ } `$prog $opt 2>$stderr`;
+ unless ($value)
+ {
+ my $err = N_("%s: can't get `%s' info from %s");
+ $err .= N_("\nTry `--no-discard-stderr' if option outputs to stderr")
+ if $discard_stderr;
+
+ kark $err, $this_program, $opt, $prog;
+ }
return $value;
}
diff --git a/help2man.texi b/help2man.texi
index a236147..4162d8b 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -161,6 +161,10 @@ does not require @var{file} to exist.
@itemx --output=@var{file}
Send output to @var{file} rather than @code{stdout}.
+@item -p @var{text}
+@itemx --info-page=@var{text}
+Name of Texinfo manual.
+
@item -N
@itemx --no-info
Suppress inclusion of a @samp{SEE ALSO} paragraph directing the reader
@@ -178,11 +182,17 @@ be specified using:
@table @samp
@item -h @var{option}
@itemx --help-option=@var{option}
-help option string
+Help option string.
@item -v @var{option}
@itemx --version-option=@var{option}
-version option string
+Version option string.
+
+@item --version-string=@var{string}
+Version string.
+
+@item --no-discard-stderr
+Include stderr when parsing option output.
@end table
@node --help recommendations
diff --git a/po/fi.po b/po/fi.po
index 6e2300d..1056fe8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: help2man-1.35.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 22:52+1000\n"
+"POT-Creation-Date: 2009-08-04 00:01+1000\n"
"PO-Revision-Date: 2005-09-17 12:21+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -55,12 +55,14 @@ msgid ""
" --help print this help, then exit\n"
" --version print version number, then exit\n"
"\n"
-"EXECUTABLE should accept `--help' and `--version' options although\n"
-"alternatives may be specified using:\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output "
+"on\n"
+"stdout although alternatives may be specified using:\n"
"\n"
" -h, --help-option=STRING help option string\n"
" -v, --version-option=STRING version option string\n"
" --version-string=STRING version string\n"
+" --no-discard-stderr include stderr when parsing option output\n"
"\n"
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
@@ -91,108 +93,108 @@ msgstr ""
"Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen\n"
"<bug-help2man@gnu.org>.\n"
-#: help2man:167
+#: help2man:170
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: ei voitu avata tiedostoa \"%s\" (%s)"
-#: help2man:224
+#: help2man:227
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: kelvollista tietoa ei löytynyt ohjelmasta \"%s\""
-#: help2man:247
+#: help2man:250
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: ei voi unlinkata/poistaa tiedostoa %s (%s)"
-#: help2man:251
+#: help2man:254
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: ei voitu luoda tiedostoa %s (%s)"
-#: help2man:290 help2man:588
+#: help2man:293 help2man:591
msgid "NAME"
msgstr "NIMI"
-#: help2man:302
+#: help2man:305
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- manuaalisivu %s %s"
-#: help2man:316
+#: help2man:319
msgid "System Administration Utilities"
msgstr "Järjestelmähallinnan sovellukset"
-#: help2man:317
+#: help2man:320
msgid "Games"
msgstr "Pelit"
-#: help2man:318
+#: help2man:321
msgid "User Commands"
msgstr "Käyttäjän sovellukset"
-#: help2man:323
+#: help2man:326
msgid "Usage"
msgstr "Käyttö"
-#: help2man:324
+#: help2man:327
msgid "or"
msgstr "tai"
-#: help2man:355 help2man:588
+#: help2man:358 help2man:591
msgid "SYNOPSIS"
msgstr "YLEISKATSAUS"
-#: help2man:359 help2man:588
+#: help2man:362 help2man:591
msgid "DESCRIPTION"
msgstr "KUVAUS"
-#: help2man:376
+#: help2man:379
msgid "Report +bugs|Email +bug +reports +to"
msgstr "Ilmoita +(ohjelmisto)?vioista|Lähetä +raportit +(ohjelmisto)?vioista"
-#: help2man:377
+#: help2man:380
msgid "Written +by"
msgstr "Kirjoittan(ut|eet)"
-#: help2man:378
+#: help2man:381
msgid "Options"
msgstr "Valitsimet"
-#: help2man:379
+#: help2man:382
msgid "Examples"
msgstr "Esimerkit"
-#: help2man:380
+#: help2man:383
msgid "This +is +free +software"
msgstr "Tämä +on +vapaa +ohjelmisto"
-#: help2man:392 help2man:588
+#: help2man:395 help2man:591
msgid "OPTIONS"
msgstr "VALITSIMET"
-#: help2man:397 help2man:589
+#: help2man:400 help2man:592
msgid "EXAMPLES"
msgstr "ESIMERKKEJÄ"
-#: help2man:404 help2man:591
+#: help2man:407 help2man:594
msgid "COPYRIGHT"
msgstr "TEKIJÄNOIKEUDET"
-#: help2man:433 help2man:591
+#: help2man:436 help2man:594
msgid "REPORTING BUGS"
msgstr "VIRHEISTÄ ILMOITTAMINEN"
-#: help2man:439 help2man:591
+#: help2man:442 help2man:594
msgid "AUTHOR"
msgstr "TEKIJÄ"
-#: help2man:563 help2man:591
+#: help2man:566 help2man:594
msgid "SEE ALSO"
msgstr "KATSO MYÖS"
-#: help2man:567
+#: help2man:570
#, perl-format
msgid ""
"The full documentation for\n"
@@ -219,12 +221,18 @@ msgstr ""
".PP\n"
"pitäisi antaa täydellinen manuaali luettavaksi.\n"
-#: help2man:620
+#: help2man:623
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: virhe kirjoitettaessa tiedostoon %s (%s)"
-#: help2man:630
+#: help2man:636
#, perl-format
msgid "%s: can't get `%s' info from %s"
msgstr "%s: ei saatu \"%s\"-tietoa ohjelmalta %s"
+
+#: help2man:637
+msgid ""
+"\n"
+"Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e3208f1..9992f86 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: help2man 1.36.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 22:52+1000\n"
+"POT-Creation-Date: 2009-08-04 00:01+1000\n"
"PO-Revision-Date: 2005-11-01 21:13+0100\n"
"Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -56,12 +56,14 @@ msgid ""
" --help print this help, then exit\n"
" --version print version number, then exit\n"
"\n"
-"EXECUTABLE should accept `--help' and `--version' options although\n"
-"alternatives may be specified using:\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output "
+"on\n"
+"stdout although alternatives may be specified using:\n"
"\n"
" -h, --help-option=STRING help option string\n"
" -v, --version-option=STRING version option string\n"
" --version-string=STRING version string\n"
+" --no-discard-stderr include stderr when parsing option output\n"
"\n"
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
@@ -96,49 +98,49 @@ msgstr ""
"\n"
"Signaler les bogues à <bug-help2man@gnu.org>.\n"
-#: help2man:167
+#: help2man:170
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: impossible d'ouvrir « %s » (%s)"
-#: help2man:224
+#: help2man:227
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: aucune information valable trouvée dans « %s »"
-#: help2man:247
+#: help2man:250
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: impossible d'effacer %s (%s)"
-#: help2man:251
+#: help2man:254
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: impossible de créer « %s » (%s)"
# Title of the NAME section in generated localized manual pages
-#: help2man:290 help2man:588
+#: help2man:293 help2man:591
msgid "NAME"
msgstr "NOM"
# Manual page title
-#: help2man:302
+#: help2man:305
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- page de manuel de %s %s"
# Name of a common manual section
-#: help2man:316
+#: help2man:319
msgid "System Administration Utilities"
msgstr "Utilitaires d'administration système"
# Name of a common manual section
-#: help2man:317
+#: help2man:320
msgid "Games"
msgstr "Jeux"
# Name of a common manual section
-#: help2man:318
+#: help2man:321
msgid "User Commands"
msgstr "Commandes"
@@ -149,30 +151,30 @@ msgstr "Commandes"
# 2. All French manual pages contain "Usage" when displaying their
# synopsis
# For these reasons, "Usage" has been kept.
-#: help2man:323
+#: help2man:326
msgid "Usage"
msgstr "Usage"
# This string is a delimiter used when parsing 'PROGRAM --help' output,
# when several synopsis commands are displayed. See for instance
# 'cp --help".
-#: help2man:324
+#: help2man:327
msgid "or"
msgstr "\\s*ou"
# Title of the SYNOPSIS section in generated localized manual pages
-#: help2man:355 help2man:588
+#: help2man:358 help2man:591
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
# Title of the DESCRIPTION section in generated localized manual pages
-#: help2man:359 help2man:588
+#: help2man:362 help2man:591
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
# When a string matches this regular expression, it is put into a
# BUGS section.
-#: help2man:376
+#: help2man:379
msgid "Report +bugs|Email +bug +reports +to"
msgstr ""
"Signaler +les +bogues|Rapporter +les +bogues|Rapporter +toutes +anomalies|"
@@ -180,61 +182,61 @@ msgstr ""
# When a string matches this regular expression, it is put into an
# AUTHOR section.
-#: help2man:377
+#: help2man:380
msgid "Written +by"
msgstr "Écrit +par"
# When a string matches this regular expression, it is put into an
# OPTIONS section.
-#: help2man:378
+#: help2man:381
msgid "Options"
msgstr "Options"
# When a string matches this regular expression, it is put into an
# EXAMPLE section.
-#: help2man:379
+#: help2man:382
msgid "Examples"
msgstr "Exemples"
# When a string matches this regular expression, the paragraph is
# reformatted so that copyright notice appears on a single line.
-#: help2man:380
+#: help2man:383
msgid "This +is +free +software"
msgstr "Ce +logiciel +est +libre"
# Title of the OPTIONS section in generated localized manual pages
-#: help2man:392 help2man:588
+#: help2man:395 help2man:591
msgid "OPTIONS"
msgstr "OPTIONS"
# Title of the EXAMPLES section in generated localized manual pages
-#: help2man:397 help2man:589
+#: help2man:400 help2man:592
msgid "EXAMPLES"
msgstr "EXEMPLES"
# Title of the COPYRIGHT section in generated localized manual pages
-#: help2man:404 help2man:591
+#: help2man:407 help2man:594
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
# Title of the BUGS section in generated localized manual pages
-#: help2man:433 help2man:591
+#: help2man:436 help2man:594
msgid "REPORTING BUGS"
msgstr "SIGNALER DES BOGUES"
# Title of the AUTHOR section in generated localized manual pages
-#: help2man:439 help2man:591
+#: help2man:442 help2man:594
msgid "AUTHOR"
msgstr "AUTEUR"
# Title of the SEE ALSO section in generated localized manual pages
-#: help2man:563 help2man:591
+#: help2man:566 help2man:594
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
# Paragraph added into localized manual pages to point to info
# documentation.
-#: help2man:567
+#: help2man:570
#, perl-format
msgid ""
"The full documentation for\n"
@@ -262,12 +264,18 @@ msgstr ""
".PP\n"
"devrait vous donner accès au manuel complet (en anglais).\n"
-#: help2man:620
+#: help2man:623
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: erreur d'écriture sur %s (%s)"
-#: help2man:630
+#: help2man:636
#, perl-format
msgid "%s: can't get `%s' info from %s"
msgstr "%s: impossible de récupérer l'information « %s » de %s"
+
+#: help2man:637
+msgid ""
+"\n"
+"Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
diff --git a/po/help2man.pot b/po/help2man.pot
index a82f96f..3498dc5 100644
--- a/po/help2man.pot
+++ b/po/help2man.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 23:01+1000\n"
+"POT-Creation-Date: 2009-08-04 00:06+1000\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"
@@ -49,118 +49,120 @@ msgid ""
" --help print this help, then exit\n"
" --version print version number, then exit\n"
"\n"
-"EXECUTABLE should accept `--help' and `--version' options although\n"
-"alternatives may be specified using:\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output "
+"on\n"
+"stdout although alternatives may be specified using:\n"
"\n"
" -h, --help-option=STRING help option string\n"
" -v, --version-option=STRING version option string\n"
" --version-string=STRING version string\n"
+" --no-discard-stderr include stderr when parsing option output\n"
"\n"
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
-#: help2man:167
+#: help2man:170
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr ""
-#: help2man:224
+#: help2man:227
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr ""
-#: help2man:247
+#: help2man:250
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr ""
-#: help2man:251
+#: help2man:254
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr ""
-#: help2man:290 help2man:588
+#: help2man:293 help2man:591
msgid "NAME"
msgstr ""
-#: help2man:302
+#: help2man:305
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr ""
-#: help2man:316
+#: help2man:319
msgid "System Administration Utilities"
msgstr ""
-#: help2man:317
+#: help2man:320
msgid "Games"
msgstr ""
-#: help2man:318
+#: help2man:321
msgid "User Commands"
msgstr ""
-#: help2man:323
+#: help2man:326
msgid "Usage"
msgstr ""
-#: help2man:324
+#: help2man:327
msgid "or"
msgstr ""
-#: help2man:355 help2man:588
+#: help2man:358 help2man:591
msgid "SYNOPSIS"
msgstr ""
-#: help2man:359 help2man:588
+#: help2man:362 help2man:591
msgid "DESCRIPTION"
msgstr ""
-#: help2man:376
+#: help2man:379
msgid "Report +bugs|Email +bug +reports +to"
msgstr ""
-#: help2man:377
+#: help2man:380
msgid "Written +by"
msgstr ""
-#: help2man:378
+#: help2man:381
msgid "Options"
msgstr ""
-#: help2man:379
+#: help2man:382
msgid "Examples"
msgstr ""
-#: help2man:380
+#: help2man:383
msgid "This +is +free +software"
msgstr ""
-#: help2man:392 help2man:588
+#: help2man:395 help2man:591
msgid "OPTIONS"
msgstr ""
-#: help2man:397 help2man:589
+#: help2man:400 help2man:592
msgid "EXAMPLES"
msgstr ""
-#: help2man:404 help2man:591
+#: help2man:407 help2man:594
msgid "COPYRIGHT"
msgstr ""
-#: help2man:433 help2man:591
+#: help2man:436 help2man:594
msgid "REPORTING BUGS"
msgstr ""
-#: help2man:439 help2man:591
+#: help2man:442 help2man:594
msgid "AUTHOR"
msgstr ""
-#: help2man:563 help2man:591
+#: help2man:566 help2man:594
msgid "SEE ALSO"
msgstr ""
-#: help2man:567
+#: help2man:570
#, perl-format
msgid ""
"The full documentation for\n"
@@ -176,12 +178,18 @@ msgid ""
"should give you access to the complete manual.\n"
msgstr ""
-#: help2man:620
+#: help2man:623
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr ""
-#: help2man:630
+#: help2man:636
#, perl-format
msgid "%s: can't get `%s' info from %s"
msgstr ""
+
+#: help2man:637
+msgid ""
+"\n"
+"Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index a1df69d..81d05f2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: help2man 1.36.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 22:52+1000\n"
+"POT-Creation-Date: 2009-08-04 00:01+1000\n"
"PO-Revision-Date: 2005-10-19 19:40+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -57,12 +57,14 @@ msgid ""
" --help print this help, then exit\n"
" --version print version number, then exit\n"
"\n"
-"EXECUTABLE should accept `--help' and `--version' options although\n"
-"alternatives may be specified using:\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output "
+"on\n"
+"stdout although alternatives may be specified using:\n"
"\n"
" -h, --help-option=STRING help option string\n"
" -v, --version-option=STRING version option string\n"
" --version-string=STRING version string\n"
+" --no-discard-stderr include stderr when parsing option output\n"
"\n"
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
@@ -92,109 +94,109 @@ msgstr ""
"\n"
"B³êdy proszê zg³aszaæ na adres <bug-help2man@gnu.org>.\n"
-#: help2man:167
+#: help2man:170
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: nie mo¿na otworzyæ `%s' (%s)"
-#: help2man:224
+#: help2man:227
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: nie znaleziono poprawnej informacji w `%s'"
-#: help2man:247
+#: help2man:250
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: nie mo¿na usun±æ %s (%s)"
-#: help2man:251
+#: help2man:254
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: nie mo¿na utworzyæ %s (%s)"
-#: help2man:290 help2man:588
+#: help2man:293 help2man:591
msgid "NAME"
msgstr "NAZWA"
-#: help2man:302
+#: help2man:305
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- strona podrêcznika dla %s %s"
-#: help2man:316
+#: help2man:319
msgid "System Administration Utilities"
msgstr "Narzêdzia administracyjne"
-#: help2man:317
+#: help2man:320
msgid "Games"
msgstr "Gry"
-#: help2man:318
+#: help2man:321
msgid "User Commands"
msgstr "Polecenia u¿ytkownika"
-#: help2man:323
+#: help2man:326
msgid "Usage"
msgstr "Sk³adnia|U¿ycie"
-#: help2man:324
+#: help2man:327
msgid "or"
msgstr "lub|albo"
-#: help2man:355 help2man:588
+#: help2man:358 help2man:591
msgid "SYNOPSIS"
msgstr "SK£ADNIA"
-#: help2man:359 help2man:588
+#: help2man:362 help2man:591
msgid "DESCRIPTION"
msgstr "OPIS"
-#: help2man:376
+#: help2man:379
msgid "Report +bugs|Email +bug +reports +to"
msgstr ""
"B³êdy +(proszê|prosimy) +zg³aszaæ +na +adres|Raporty +o +b³êdach +wysy³aj +do"
-#: help2man:377
+#: help2man:380
msgid "Written +by"
msgstr "Napisany +przez|Program +napisa(³a?|li)"
-#: help2man:378
+#: help2man:381
msgid "Options"
msgstr "Opcje"
-#: help2man:379
+#: help2man:382
msgid "Examples"
msgstr "Przyk³ady"
-#: help2man:380
+#: help2man:383
msgid "This +is +free +software"
msgstr "Ten +program +jest +darmowy"
-#: help2man:392 help2man:588
+#: help2man:395 help2man:591
msgid "OPTIONS"
msgstr "OPCJE"
-#: help2man:397 help2man:589
+#: help2man:400 help2man:592
msgid "EXAMPLES"
msgstr "PRZYK£ADY"
-#: help2man:404 help2man:591
+#: help2man:407 help2man:594
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
-#: help2man:433 help2man:591
+#: help2man:436 help2man:594
msgid "REPORTING BUGS"
msgstr "ZG£ASZANIE B£ÊDÓW"
-#: help2man:439 help2man:591
+#: help2man:442 help2man:594
msgid "AUTHOR"
msgstr "AUTOR"
-#: help2man:563 help2man:591
+#: help2man:566 help2man:594
msgid "SEE ALSO"
msgstr "ZOBACZ TAK¯E"
-#: help2man:567
+#: help2man:570
#, perl-format
msgid ""
"The full documentation for\n"
@@ -221,12 +223,18 @@ msgstr ""
".PP\n"
"powinno udostêpniæ kompletny podrêcznik.\n"
-#: help2man:620
+#: help2man:623
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: b³±d zapisu do %s (%s)"
-#: help2man:630
+#: help2man:636
#, perl-format
msgid "%s: can't get `%s' info from %s"
msgstr "%s: nie mo¿na uzyskaæ informacji `%s' z %s"
+
+#: help2man:637
+msgid ""
+"\n"
+"Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 222aca7..7473da2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: help2man 1.36.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 22:52+1000\n"
+"POT-Creation-Date: 2009-08-04 00:01+1000\n"
"PO-Revision-Date: 2006-01-23 20:33+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -57,12 +57,14 @@ msgid ""
" --help print this help, then exit\n"
" --version print version number, then exit\n"
"\n"
-"EXECUTABLE should accept `--help' and `--version' options although\n"
-"alternatives may be specified using:\n"
+"EXECUTABLE should accept `--help' and `--version' options and produce output "
+"on\n"
+"stdout although alternatives may be specified using:\n"
"\n"
" -h, --help-option=STRING help option string\n"
" -v, --version-option=STRING version option string\n"
" --version-string=STRING version string\n"
+" --no-discard-stderr include stderr when parsing option output\n"
"\n"
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
@@ -92,108 +94,108 @@ msgstr ""
"Rapportera fel till <bug-help2man@gnu.org>.\n"
"Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
-#: help2man:167
+#: help2man:170
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: kan inte öppna \"%s\" (%s)"
-#: help2man:224
+#: help2man:227
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: ingen giltig information funnen i \"%s\""
-#: help2man:247
+#: help2man:250
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: kan inte avlänka %s (%s)"
-#: help2man:251
+#: help2man:254
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: kan inte skapa %s (%s)"
-#: help2man:290 help2man:588
+#: help2man:293 help2man:591
msgid "NAME"
msgstr "NAMN"
-#: help2man:302
+#: help2man:305
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- manualsida för %s %s"
-#: help2man:316
+#: help2man:319
msgid "System Administration Utilities"
msgstr "Systemadministrationsverktyg"
-#: help2man:317
+#: help2man:320
msgid "Games"
msgstr "Spel"
-#: help2man:318
+#: help2man:321
msgid "User Commands"
msgstr "Användarkommandon"
-#: help2man:323
+#: help2man:326
msgid "Usage"
msgstr "Användning"
-#: help2man:324
+#: help2man:327
msgid "or"
msgstr "eller"
-#: help2man:355 help2man:588
+#: help2man:358 help2man:591
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
-#: help2man:359 help2man:588
+#: help2man:362 help2man:591
msgid "DESCRIPTION"
msgstr "BESKRIVNING"
-#: help2man:376
+#: help2man:379
msgid "Report +bugs|Email +bug +reports +to"
msgstr "Rapportera +fel|E-post +fel +rapport +till"
-#: help2man:377
+#: help2man:380
msgid "Written +by"
msgstr "Skrivet +av"
-#: help2man:378
+#: help2man:381
msgid "Options"
msgstr "Alternativ"
-#: help2man:379
+#: help2man:382
msgid "Examples"
msgstr "Exempel"
-#: help2man:380
+#: help2man:383
msgid "This +is +free +software"
msgstr "Det +här +är +fri +programvara"
-#: help2man:392 help2man:588
+#: help2man:395 help2man:591
msgid "OPTIONS"
msgstr "FLAGGOR"
-#: help2man:397 help2man:589
+#: help2man:400 help2man:592
msgid "EXAMPLES"
msgstr "EXEMPEL"
-#: help2man:404 help2man:591
+#: help2man:407 help2man:594
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
-#: help2man:433 help2man:591
+#: help2man:436 help2man:594
msgid "REPORTING BUGS"
msgstr "RAPPORTERA FEL"
-#: help2man:439 help2man:591
+#: help2man:442 help2man:594
msgid "AUTHOR"
msgstr "UPPHOVSMAN"
-#: help2man:563 help2man:591
+#: help2man:566 help2man:594
msgid "SEE ALSO"
msgstr "SE OCKSÃ…"
-#: help2man:567
+#: help2man:570
#, perl-format
msgid ""
"The full documentation for\n"
@@ -220,12 +222,18 @@ msgstr ""
".PP\n"
"bör ge dig tillgång till den kompletta manualen.\n"
-#: help2man:620
+#: help2man:623
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: fel vid skrivning till %s (%s)"
-#: help2man:630
+#: help2man:636
#, perl-format
msgid "%s: can't get `%s' info from %s"
msgstr "%s: kan inte få \"%s\" info från %s"
+
+#: help2man:637
+msgid ""
+"\n"
+"Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""