diff --git a/INSTALL b/INSTALL
index 2550dab..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,10 @@ Installation Instructions
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
@@ -13,7 +15,11 @@ Basic Installation
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@ may remove or edit it.
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
@@ -120,7 +144,8 @@ Installation Names
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
Particular systems
==================
@@ -288,7 +351,7 @@ operates.
`configure' can determine that directory automatically.
`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
+ Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
diff --git a/Makefile.in b/Makefile.in
index b26e052..121b4cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,5 @@
# Makefile for help2man
-SHELL = @SHELL@
-VPATH = @srcdir@
-
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -15,6 +12,9 @@ datadir = @datadir@
infodir = @infodir@
localedir = $(datadir)/locale
+export SHELL = @SHELL@
+export VPATH = .:$(srcdir)
+
DESTDIR =
LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
@@ -32,6 +32,10 @@ MKINSTALLDIRS = $(srcdir)/mkinstalldirs
target = help2man
preload = bindtextdomain
+# find file in vpath
+vpath_file = $$($(PERL) -e 'print +(grep -f, map "$$_/$$ARGV[0]", \
+ map +(length) ? $$_ : ".", split ":", $$ENV{VPATH} || ".")[0]' $(1))
+
all: $(target) man info @extra_make_all@
install: all install_base @extra_make_install@
@@ -42,28 +46,28 @@ install_base:
$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
- $(INSTALL_DATA) $(srcdir)/$(target).1 $(DESTDIR)$(mandir)/man1
- $(INSTALL_DATA) $(srcdir)/$(target).info \
+ $(INSTALL_DATA) $(call vpath_file,$(target).1) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) $(call vpath_file,/$(target).info) \
$(DESTDIR)$(infodir)/$(target).info
if test -f $(DESTDIR)$(infodir)/dir; \
then \
$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \
- $(srcdir)/$(target).info; \
+ $(DESTDIR)$(infodir)/$(target).info; \
fi
install_preload: preload
$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(libdir)
-install_l10n: man_l10n
+install_l10n: msg_l10n man_l10n
for lang in $(LINGUAS); \
do \
- $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/$$lang/man1; \
$(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- $(INSTALL_DATA) $(srcdir)/$(target).$$lang.1 \
- $(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
- $(INSTALL_DATA) $(srcdir)/po/$$lang.gmo \
+ $(INSTALL_DATA) $(call vpath_file,po/$$lang.gmo) \
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(target).mo; \
+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/$$lang/man1; \
+ $(INSTALL_DATA) $(call vpath_file,$(target).$$lang.1) \
+ $(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
done
uninstall:
@@ -81,7 +85,7 @@ uninstall:
fi
clean:
- -rm -f $(target) $(preload).so
+ -rm -f $(target) $(target).h2m $(target).*.h2m $(preload).so
-rm -rf localetmp
mostlyclean: clean
@@ -101,29 +105,45 @@ maintainer-clean: realclean
$(target): $(srcdir)/$(target).PL
$(PERL) $? @extra_extract_args@
+$(target).h2m: $(srcdir)/$(target).h2m.PL
+ $(PERL) $?
+
preload: $(preload).so
$(preload).so: $(srcdir)/$(preload).c
$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
man: $(target).1
-$(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
- $(MAKE) $(target)
- ./$(target) --include=$(srcdir)/$(target).h2m \
- --output=$@ ./$(target)
+$(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL
+ $(MAKE) $(target).h2m
+ ./$(target) --include=$(target).h2m --output=$@ ./$(target)
+
+msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS)))
+po/%.gmo: $(srcdir)/po/%.po
+ test -d po || mkdir po
+ $(MSGFMT) -o $@ $?
+
+localetmp/%/LC_MESSAGES/$(target).mo: po/%.gmo
+ lang=$(patsubst localetmp/%/LC_MESSAGES/$(target).mo,%,$@); \
+ $(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
+ $(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo
man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))
-$(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).%.h2m $(srcdir)/po/%.po
+$(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \
+ $(srcdir)/po/%.po
lang=$(patsubst $(target).%.1,%,$@); \
- $(MAKE) $(target) $(preload).so po/$$lang.gmo && \
- $(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
- $(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo && \
+ $(MAKE) $(preload).so localetmp/$$lang/LC_MESSAGES/$(target).mo \
+ $(target).$$lang.h2m; \
LD_PRELOAD=./$(preload).so LOCALEDIR=localetmp TEXTDOMAIN=help2man \
- ./$(target) --include=$(srcdir)/$(target).$$lang.h2m \
+ ./$(target) --include=$(call vpath_file,$(target).$$lang.h2m) \
--output=$@ ./$(target)
-po/%.gmo: $(srcdir)/po/%.po
- test -d po || mkdir po
- $(MSGFMT) -o $@ $?
+$(target).%.h2m: $(srcdir)/$(target).h2m.PL $(srcdir)/po/%.po
+ lang=$(patsubst $(target).%.h2m,%,$@); \
+ locale=$$(echo $$lang $$lang | \
+ sed -n "/^$$lang"'\s/{s/^\S\+\s\+//p; q}' $(srcdir)/locales -); \
+ $(MAKE) localetmp/$$lang/LC_MESSAGES/$(target).mo; \
+ $(PERL) $(srcdir)/$(target).h2m.PL --locale="$$locale" \
+ --message-dir=localetmp --output=$@
info: $(target).info
$(target).info: $(srcdir)/$(target).texi
@@ -143,11 +163,11 @@ update-po: $(srcdir)/po/$(target).pot
msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \
done
-$(srcdir)/po/$(target).pot: $(target)
- xgettext -L Perl -k_ -kN_ \
- --msgid-bugs-address="Brendan O'Dea <bug-help2man@gnu.org>" -o $@ $?
+$(srcdir)/po/$(target).pot: $(target) $(target).h2m.PL
+ xgettext -L Perl -k_ -kN_ -cTranslators: \
+ --msgid-bugs-address="Brendan O'Dea <bug-help2man@gnu.org>" -o $@ $^
-.PHONY: all clean distclean preload man man_l10n info dvi install \
+.PHONY: all clean distclean preload man msg_l10n man_l10n info dvi install \
install_base install_preload install_l10n mostlyclean realclean \
uninstall
diff --git a/NEWS b/NEWS
index 5afed49..de63294 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Version 1.38 April 26, 2010
+
+ * Support ENVIRONMENT and FILES sections.
+ * Move all translated text into .po files (previously .h2m include
+ files were handled seperately).
+ * Submit package to the Translation Project (translationproject.org).
+ * Add Vietnamese translation.
+ * Add some comments for translators.
+
Version 1.37 November 14, 2009
* Update GPL to v3.
diff --git a/README b/README
index 48e0171..4f79d0f 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
- README for GNU help2man version 1.37.1
+ README for GNU help2man version 1.38.1
help2man is a script to create simple man pages from the --help and
--version output of programs.
http://www.gnu.org/software/help2man/
- ftp://ftp.gnu.org/gnu/help2man/help2man-1.37.1.tar.gz
+ ftp://ftp.gnu.org/gnu/help2man/help2man-1.38.1.tar.gz
git://git.debian.org/users/bod/help2man.git
http://git.debian.org/?p=users/bod/help2man.git
diff --git a/THANKS b/THANKS
index f6dc17d..53cdee7 100644
--- a/THANKS
+++ b/THANKS
@@ -1,6 +1,6 @@
A list of people who have contributed to the development of `help2man'
-by reporting problems, suggesting various improvements or submitting
-actual code follows.
+by reporting problems, suggesting various improvements and submitting
+code or translations follows.
Denis Barbier <barbier@debian.org>
Karl Berry <karl@freefriends.org>
@@ -19,13 +19,16 @@ Jim Meyering <jim@meyering.net>
Lionel Elie Mamane <lionel@mamane.lu>
Dave Morrison <dave@bnl.gov>
Peter Moulder <reiter@netspace.net.au>
+Daniel Nylander <yeager@lidkoping.net>
François Pinard <pinard@iro.umontreal.ca>
Richard Pixley <rpixley@zhone.com>
+Maciej W. Rozyc <macro@ds2.pg.gda.pl>
Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de>
+Clytie Siddall <clytie@riverland.net.au>
suzukis <suzukis@cmpt.phys.tohoku.ac.jp>
Reuben Thomas <rrt@sc3d.org>
Patrick Tullmann <tullmann@cs.utah.edu>
-Maciej W. Rozyc <macro@ds2.pg.gda.pl>
+Sven Utcke <sven.utcke@gmx.de>
Tommi Vainikainen <thv+debian@iki.fi>
Christopher Yeoh <cyeoh@users.sourceforge.net>
Okuji Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
diff --git a/debian/changelog b/debian/changelog
index b5f63c0..a20f14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+help2man (1.38.1) unstable; urgency=low
+
+ * Add support for ENVIRONMENT and FILES sections (Sven Utcke).
+ * Ensure THANKS file includes translators.
+ * Fix handling of translated --no-discard-stderr instruction.
+ * Move tranlsated .h2m contents into .po files.
+ * Update Polish translation (thanks to Jakub Bogusz).
+ * Add Vietnamese translation (thanks to Clytie Siddall).
+ * Add some comments for translators.
+
+ -- Brendan O'Dea <bod@debian.org> Mon, 26 Apr 2010 15:59:32 +1000
+
help2man (1.37.1) unstable; urgency=low
* Fix typo in comment (Paul Eggert).
diff --git a/debian/rules b/debian/rules
index d590e5c..024b503 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ build-stamp:
--infodir='$${prefix}/share/info' $(CONFARGS)
$(MAKE)
+ $(MAKE) help2man.h2m # for examples
touch build-stamp
clean:
diff --git a/help2man.1 b/help2man.1
index beb4c40..df2207b 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "December 2009" "help2man 1.37.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "April 2010" "help2man 1.38.1" "User Commands"
.SH NAME
help2man \- generate a simple manual page
.SH SYNOPSIS
@@ -96,6 +96,8 @@ The section output order (for those included) is:
SYNOPSIS
DESCRIPTION
OPTIONS
+ ENVIRONMENT
+ FILES
EXAMPLES
\fIother\fR
AUTHOR
@@ -104,9 +106,9 @@ The section output order (for those included) is:
SEE ALSO
Any
-.B [name]
+.B [NAME]
or
-.B [synopsis]
+.B [SYNOPSIS]
sections appearing in the include file will replace what would have
automatically been produced (although you can still override the
former with
@@ -126,7 +128,7 @@ Written by Brendan O'Dea <bod@debian.org>
.SH "REPORTING BUGS"
Report bugs to <bug\-help2man@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
diff --git a/help2man.PL b/help2man.PL
index dbf5aee..420fc3b 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
use Config;
use Getopt::Long;
-my ($program, $version) = ('help2man', '1.37.1');
+my ($program, $version) = ('help2man', '1.38.1');
my %opts;
die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"
@@ -58,7 +58,7 @@ eval 'exec $Config{perlpath} -wS \$0 \${1+"\$@"}'
print OUT <<'!NO!SUBS!';
# Generate a short man page from --help and --version output.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@ print OUT <<'!NO!SUBS!';
# Written by Brendan O'Dea <bod@debian.org>
# Available from ftp://ftp.gnu.org/gnu/help2man/
-use 5.005;
+use 5.008;
use strict;
use Getopt::Long;
use Text::Tabs qw(expand);
@@ -154,7 +154,7 @@ sub N_ { $_[0] }
my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version;
GNU %s %s
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -378,6 +378,9 @@ $program =~ s!.*/!!;
# No info for `info' itself.
$opt_no_info = 1 if $program eq 'info';
+# Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+# upper case are manual page section headings. The man(1) manual page in your
+# language, if available should provide the conventional translations.
for ($include{_('NAME')})
{
if ($opt_name) # --name overrides --include contents.
@@ -411,6 +414,12 @@ unless ($manual)
}
# Extract usage clause(s) [if any] for SYNOPSIS.
+# Translators: "Usage" and "or" here are patterns (regular expressions) which
+# are used to match the usage synopsis in program output. An example from cp
+# (GNU coreutils) which contains both strings:
+# Usage: cp [OPTION]... [-T] SOURCE DEST
+# or: cp [OPTION]... SOURCE... DIRECTORY
+# or: cp [OPTION]... -t DIRECTORY SOURCE...
my $PAT_USAGE = _('Usage');
my $PAT_USAGE_CONT = _('or');
if ($help_text =~ s/^($PAT_USAGE):( +(\S+))(.*)((?:\n(?: {6}\1| *($PAT_USAGE_CONT): +\S).*)*)//om)
@@ -464,9 +473,19 @@ s/^\./\x80/mg;
s/^'/\x81/mg;
s/\\/\x82/g;
-my $PAT_BUGS = _('Report +(?:[\w-]* +)?bugs|Email +bug +reports +to');
+# Translators: patterns are used to match common program output. In the source
+# these strings are all of the form of "my $PAT_something = _('...');" and are
+# regular expressions. If there is more than one commonly used string, you
+# may separate alternatives with "|". Spaces in these expressions are written
+# as " +" to indicate that more than one space may be matched. The string
+# "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+# optional word, so that either "Report bugs" or "Report _program_ bugs" will
+# be matched.
+my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to');
my $PAT_AUTHOR = _('Written +by');
my $PAT_OPTIONS = _('Options');
+my $PAT_ENVIRONMENT = _('Environment');
+my $PAT_FILES = _('Files');
my $PAT_EXAMPLES = _('Examples');
my $PAT_FREE_SOFTWARE = _('This +is +free +software');
@@ -487,6 +506,16 @@ while (length)
$sect = _('OPTIONS');
next;
}
+ if (s/^($PAT_ENVIRONMENT): *\n//o)
+ {
+ $sect = _('ENVIRONMENT');
+ next;
+ }
+ if (s/^($PAT_FILES): *\n//o)
+ {
+ $sect = _('FILES');
+ next;
+ }
elsif (s/^($PAT_EXAMPLES): *\n//o)
{
$sect = _('EXAMPLES');
@@ -674,7 +703,7 @@ EOT
# Section ordering.
my @pre = (_('NAME'), _('SYNOPSIS'), _('DESCRIPTION'), _('OPTIONS'),
- _('EXAMPLES'));
+ _('ENVIRONMENT'), _('FILES'), _('EXAMPLES'));
my @post = (_('AUTHOR'), _('REPORTING BUGS'), _('COPYRIGHT'), _('SEE ALSO'));
my $filter = join '|', @pre, @post;
@@ -721,11 +750,12 @@ sub get_option_value
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;
+ my $err = N_("%s: can't get `%s' info from %s%s");
+ my $extra = $discard_stderr
+ ? "\n" . N_("Try `--no-discard-stderr' if option outputs to stderr")
+ : '';
- kark $err, $this_program, $opt, $prog;
+ kark $err, $this_program, $opt, $prog, $extra;
}
return $value;
@@ -760,4 +790,5 @@ unless ($opts{stdout})
exit 0;
+# DATA handle used for mtime
__END__
diff --git a/help2man.de.1 b/help2man.de.1
index 0a40ae7..eae23ba 100644
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "Dezember 2009" "help2man 1.37.1" "Benutzerkommandos"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "April 2010" "help2man 1.38.1" "Benutzerkommandos"
.SH NAME
help2man \- generiert eine einfache Handbuchseite
.SH ÃœBERSICHT
@@ -97,23 +97,24 @@ ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was
Sie wollen benutzt werden.
Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:
-The section output order is:
NAME
ÃœBERSICHT
BESCHREIBUNG
OPTIONEN
+ ENVIRONMENT
+ FILES
BEISPIELE
\fIandere\fR
AUTOR
- FEHLER BERICHTEN
+ FEHLERBERICHTE
COPYRIGHT
SIEHE AUCH
Jeder
-.B [Name]
-or
-.B [Ãœbersicht]
+.B [NAME]
+oder
+.B [ÃœBERSICHT]
-Abschnitt, der in der eingefügten Datei erscheint, wird das
ersetzen, was automatisch generiert würde (obwohl Sie das
weitere immer noch, wenn nötigt, mit
@@ -134,7 +135,7 @@ Geschrieben von Brendan O'Dea <bod@debian.org>
.SH FEHLERBERICHTE
Berichten Sie Fehler an <bug\-help2man@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
.br
Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen
diff --git a/help2man.de.h2m b/help2man.de.h2m
deleted file mode 100644
index 1aebf64..0000000
--- a/help2man.de.h2m
+++ /dev/null
@@ -1,80 +0,0 @@
-Encoding charset: UTF-8
-Language: German
-Locale: de_DE
-Translator: Chris Leick <c.leick@vollbio.de>
-
-Include-Datei für die help2man-Handbuchseite
-
---locale=de_DE.UTF-8
-
-[Name]
-help2man \- generiert eine einfache Handbuchseite
-
-[Dateien zum Einfügen]
-Zusätzliches Material kann in die generierte Ausgabe mit den
-.B \-\-include
-und
-.B \-\-opt\-include
-Optionen eingefügt werden. Das Format ist einfach:
-
- [Abschnitt]
- Text
-
- /Muster/
- Text
-
-Blöcke aus wörtlichem *roff-Text werden entweder beim Start durch
-Angabe von
-.BI [ Abschnitt ]
-(unabhängig von Groß-/Kleinschreibung) in die Ausgabe eingefügt oder
-nach einen passenden Absatz
-.BI / Muster /\fR.
-
-Muster benutzen die Syntax von regulären Perl-Ausdrücken und können
-von
-.IR i ,
-.I s
-oder
-.I m
-Bestimmungswörtern gefolgt sein (siehe
-.BR perlre (1)).
-
-Zeilen vor dem ersten Abschnitt oder Muster, die mit »\-« beginnen,
-werden als Optionen behandelt. Alles andere wird stillschweigend
-ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was
-Sie wollen benutzt werden.
-
-Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:
-The section output order is:
-
- NAME
- ÃœBERSICHT
- BESCHREIBUNG
- OPTIONEN
- BEISPIELE
- \fIandere\fR
- AUTOR
- FEHLER BERICHTEN
- COPYRIGHT
- SIEHE AUCH
-
-Jeder
-.B [Name]
-or
-.B [Ãœbersicht]
--Abschnitt, der in der eingefügten Datei erscheint, wird das
-ersetzen, was automatisch generiert würde (obwohl Sie das
-weitere immer noch, wenn nötigt, mit
-.B --name
-überschreiben können.
-
-Andere Abschnitte werden der automatisch erzeugten Ausgabe für die
-oben angegebenen Standardabschnitte vorangestellt oder unter
-.I andere
-(oben) in der Reihenfolge, in der sie in der eingefügten Datei
-vorgefunden werden, eingefügt.
-
-[Verfügbarkeit]
-Die neuste Version dieser Distribution ist Online erhältlich von:
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.fi.1 b/help2man.fi.1
index 816e90a..f0c2272 100644
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "joulukuu 2009" "help2man 1.37.1" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "huhtikuu 2010" "help2man 1.38.1" "Käyttäjän sovellukset"
.SH NIMI
help2man \- luo yksinkertainen man-sivu
.SH KUVAUS
@@ -59,12 +59,11 @@ version string
include stderr when parsing option output
.SH "SISÄLLYTÄ TIEDOSTOJA"
Lisämateriaalia voi sisällyttää luotavaan tulosteeseen valitsimilla
-..B \-\-include
+.B \-\-include
ja
-..B \-\-opt\-include .
+.BR \-\-opt\-include .
Muoto on yksinkertainen:
-
[kappale]
teksti
@@ -72,20 +71,20 @@ Muoto on yksinkertainen:
teksti
Kappaleita puhdasta *roff-tekstiä lisätään tulosteeseen joko kun alkaa
-..BI [ kappale ]
+.BI [ kappale ]
(kirjainkoko merkitsevä) tai sellaisen kappaleen jälkeen, joka täsmää
säännölliseen lausekkeeseen
-..BI / hakuehto /\fR.
+.BI / hakuehto /\fR.
Hakuehdoissa käytetään Perlin säännöllisten lausekkeiden syntaksia, ja
niiden perässä voi olla
-..IR i ,
-..I s
+.IR i ,
+.I s
tai
-..I m
+.I m
muuntimet (katso
-..BR perlre (1)).
+.BR perlre (1)).
Rivit ennen ensimmäistä kappaletta tai hakuehtoa, jotka alkavat "\-",
käsitellään valitsimina. Kaikki muu ohitetaan, joten ne voivat olla
@@ -97,6 +96,8 @@ Kappaleiden tulostusj
YLEISKATSAUS
KUVAUS
VALITSIMET
+ ENVIRONMENT
+ FILES
ESIMERKKEJÄ
\fImuut\fR
TEKIJÄ
@@ -105,17 +106,17 @@ Kappaleiden tulostusj
KATSO MYÖS
Kappale
-..B [nimi]
+.B [NIMI]
tai
-..B [yleiskatsaus]
-, joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti
+.BR [YLEISKATSAUS] ,
+joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti
tuotettavan osan (vaikka tämänkin voi korvata
-..B --name
+.B --name
-valitsimella tarvittaessa).
Muut kappaleet aloittavat automaattisesti tuotetun tulosteen aiemmin
mainituille vakiokappaleille, tai ne sisällytetään kohtaan
-..I muut
+.I muut
samassa järjestyksessä kuin ne esiintyvät sisällytystiedostossa.
.SH SAATAVUUS
Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:
@@ -126,7 +127,7 @@ Kirjoittanut Brendan O'Dea <bod@debian.org>
.SH "VIRHEISTÄ ILMOITTAMINEN"
Report bugs to <bug\-help2man@gnu.org>.
.SH TEKIJÄNOIKEUDET
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
Tämä on vapaa ohjelmist; katsokaa kopiointiehdot lähdekoodista. Takuuta EI OLE;
ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA tai SOPIVUUDESTA TIETTYYN
diff --git a/help2man.fi.h2m b/help2man.fi.h2m
deleted file mode 100644
index b647c7f..0000000
--- a/help2man.fi.h2m
+++ /dev/null
@@ -1,77 +0,0 @@
-Encoding charset: ISO-8859-15
-Language: Finnish
-Locale: fi_FI@euro (and also fi_FI)
-Translator: Tommi Vainikainen
-
-Suomennos help2man-ohjelman man-sivusta.
-
---locale=fi_FI@euro
-
-[nimi]
-help2man \- luo yksinkertainen man-sivu
-
-[sisällytä tiedostoja]
-Lisämateriaalia voi sisällyttää luotavaan tulosteeseen valitsimilla
-..B \-\-include
-ja
-..B \-\-opt\-include .
-Muoto on yksinkertainen:
-
-
- [kappale]
- teksti
-
- /hakuehto/
- teksti
-
-Kappaleita puhdasta *roff-tekstiä lisätään tulosteeseen joko kun alkaa
-..BI [ kappale ]
-(kirjainkoko merkitsevä) tai sellaisen kappaleen jälkeen, joka täsmää
-säännölliseen lausekkeeseen
-
-..BI / hakuehto /\fR.
-
-Hakuehdoissa käytetään Perlin säännöllisten lausekkeiden syntaksia, ja
-niiden perässä voi olla
-..IR i ,
-..I s
-tai
-..I m
-muuntimet (katso
-..BR perlre (1)).
-
-Rivit ennen ensimmäistä kappaletta tai hakuehtoa, jotka alkavat "\-",
-käsitellään valitsimina. Kaikki muu ohitetaan, joten ne voivat olla
-käyttäjän kommentteja, RCS-avainsanoja ja muuta sellaista.
-
-Kappaleiden tulostusjärjestys on:
-
- NIMI
- YLEISKATSAUS
- KUVAUS
- VALITSIMET
- ESIMERKKEJÄ
- \fImuut\fR
- TEKIJÄ
- VIRHEISTÄ ILMOITTAMINEN
- TEKIJÄNOIKEUDET
- KATSO MYÖS
-
-Kappale
-..B [nimi]
-tai
-..B [yleiskatsaus]
-, joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti
-tuotettavan osan (vaikka tämänkin voi korvata
-..B --name
--valitsimella tarvittaessa).
-
-Muut kappaleet aloittavat automaattisesti tuotetun tulosteen aiemmin
-mainituille vakiokappaleille, tai ne sisällytetään kohtaan
-..I muut
-samassa järjestyksessä kuin ne esiintyvät sisällytystiedostossa.
-
-[saatavuus]
-Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.fr.1 b/help2man.fr.1
index 7fb0a86..bfc64b6 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "décembre 2009" "help2man 1.37.1" "Commandes"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "avril 2010" "help2man 1.38.1" "Commandes"
.SH NOM
help2man \- génère une page de manuel sommaire
.SH SYNOPSIS
@@ -98,6 +98,8 @@ L'ordre des sections produites est\ :
SYNOPSIS
DESCRIPTION
OPTIONS
+ ENVIRONMENT
+ FILES
EXEMPLES
\fIautres\fR
AUTEUR
@@ -106,9 +108,9 @@ L'ordre des sections produites est\ :
VOIR AUSSI
Toute section
-.B [nom]
+.B [NOM]
ou
-.B [synopsis]
+.B [SYNOPSIS]
apparaissant dans le fichier inclus va remplacer celle qui aurait êté
générée automatiquement (mais vous pouvez encore remplacer la première
avec
@@ -131,7 +133,7 @@ La derni
.SH "SIGNALER DES BOGUES"
Report bugs to <bug\-help2man@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
.br
Ce logiciel est libre\ ; voir les sources pour les conditions de
diff --git a/help2man.fr.h2m b/help2man.fr.h2m
deleted file mode 100644
index 4f90c5b..0000000
--- a/help2man.fr.h2m
+++ /dev/null
@@ -1,82 +0,0 @@
-Encoding charset: ISO-8859-15
-Language: French
-Locale: fr_FR@euro (and also fr_FR)
-Translator: Denis Barbier <barbier@linuxfr.org>
-
-Traduction française du fichier inclus pour générer la page
-de manuel de help2man
-
---locale=fr_FR@euro
-
-[nom]
-help2man \- génère une page de manuel sommaire
-
-[fichiers inclus]
-On peut ajouter un supplément de texte aux indications fournies par le
-programme grâce aux options
-.B \-\-include
-et
-.BR \-\-opt\-include .
-Le format est simple\ :
-
- [section]
- texte
-
- /motif/
- texte
-
-Les blocs de texte (au format *roff) sont insérés tels quels dans la
-sortie, soit au début de la zone désignée par
-.BI [ section ]
-(balise insensible à la casse), soit après un paragraphe correspondant à
-.BI / motif /\fR.
-
-Les motifs obéissent à la syntaxe des expressions rationnelles de Perl
-et peuvent être suivis des modificateurs
-.IR i ,
-.I s
-ou
-.I m
-(voir
-.BR perlre (1)).
-
-Les lignes précédant la première section (ou le premier motif) et
-commençant par «\ \-\ » sont traitées comme des options. Tout le
-reste est ignoré sans aucun avertissement, et peut être utilisé pour
-des commentaires, des mots clés RCS ou d'autres éléments.
-
-L'ordre des sections produites est\ :
-
- NOM
- SYNOPSIS
- DESCRIPTION
- OPTIONS
- EXEMPLES
- \fIautres\fR
- AUTEUR
- SIGNALER DES BOGUES
- COPYRIGHT
- VOIR AUSSI
-
-Toute section
-.B [nom]
-ou
-.B [synopsis]
-apparaissant dans le fichier inclus va remplacer celle qui aurait êté
-générée automatiquement (mais vous pouvez encore remplacer la première
-avec
-.B --name
-si nécessaire).
-
-Le texte supplémentaire aux autres sections usuelles (celles
-apparaissant dans cette liste) est inséré avant la sortie générée
-automatiquement pour elles.
-Les sections non usuelles sont insérées à la place marquée
-.I autres
-dans la liste ci-dessus, dans l'ordre dans lequel ces sections
-apparaissent dans le fichier inclus.
-
-[disponibilité]
-La dernière version de cette distribution est disponible en ligne sur\ :
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.h2m b/help2man.h2m
deleted file mode 100644
index 86a228f..0000000
--- a/help2man.h2m
+++ /dev/null
@@ -1,71 +0,0 @@
-Include file for help2man man page
-
---locale=C
-
-[name]
-help2man \- generate a simple manual page
-
-[include files]
-Additional material may be included in the generated output with the
-.B \-\-include
-and
-.B \-\-opt\-include
-options. The format is simple:
-
- [section]
- text
-
- /pattern/
- text
-
-Blocks of verbatim *roff text are inserted into the output either at
-the start of the given
-.BI [ section ]
-(case insensitive), or after a paragraph matching
-.BI / pattern /\fR.
-
-Patterns use the Perl regular expression syntax and may be followed by
-the
-.IR i ,
-.I s
-or
-.I m
-modifiers (see
-.BR perlre (1)).
-
-Lines before the first section or pattern which begin with `\-' are
-processed as options. Anything else is silently ignored and may be
-used for comments, RCS keywords and the like.
-
-The section output order (for those included) is:
-
- NAME
- SYNOPSIS
- DESCRIPTION
- OPTIONS
- EXAMPLES
- \fIother\fR
- AUTHOR
- REPORTING BUGS
- COPYRIGHT
- SEE ALSO
-
-Any
-.B [name]
-or
-.B [synopsis]
-sections appearing in the include file will replace what would have
-automatically been produced (although you can still override the
-former with
-.B --name
-if required).
-
-Other sections are prepended to the automatically produced output for
-the standard sections given above, or included at
-.I other
-(above) in the order they were encountered in the include file.
-
-[availability]
-The latest version of this distribution is available on-line from:
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.h2m.PL b/help2man.h2m.PL
new file mode 100755
index 0000000..ed7818a
--- /dev/null
+++ b/help2man.h2m.PL
@@ -0,0 +1,176 @@
+#!/usr/bin/perl
+
+#
+# Self extracting help2man.h2m script.
+#
+# -q, --quiet Suppress extraction message
+# -s, --stdout Extract to stdout
+# -o, --output=FILE Extract to FILE
+# -l, --locale=STRING Output file for locale STRING
+# -m, --message-dir=DIR Directory for message catalogs
+#
+
+use 5.008;
+use Config;
+use Getopt::Long;
+use POSIX qw(setlocale LC_ALL);
+
+my %opts;
+die "Usage: $0 [--quiet] [--stdout|--output=FILE] [--locale=STRING] ",
+ "[--message-dir=DIR]\n" unless GetOptions \%opts,
+ qw(quiet stdout output=s locale=s message-dir=s) and !@ARGV;
+
+my $DOMAIN = 'help2man';
+my $target = $0;
+if ($opts{stdout})
+{
+ *OUT = *STDOUT;
+ $opts{quiet} = 1;
+}
+else
+{
+ if ($opts{output})
+ {
+ $target = $opts{output};
+ }
+ else
+ {
+ $target =~ s!.*/!!;
+ $target =~ s/\.PL$// or die "$0: can't determine target name\n";
+ if ($opts{locale})
+ {
+ $target =~ s/(\.[^.]*)$/.$opts{locale}$1/
+ or $target =~ s/$/.$opts{locale}/;
+ }
+ }
+
+ unlink $target or die "$0: can't unlink $target ($!)\n" if -e $target;
+ open OUT, ">$target" or die "$0: can't create $target ($!)\n";
+}
+
+my $msg = "Extracting $target";
+$msg .= ' (with locale substitutions)' if $opts{locale};
+print $msg, "\n" unless $opts{quiet};
+
+sub _;
+if ($opts{locale})
+{
+ delete @ENV{qw(LANGUAGE LC_MESSAGES LANG)};
+ setlocale LC_ALL, $ENV{LC_ALL} = $opts{locale};
+
+ require Locale::gettext;
+ require I18N::Langinfo;
+ require Encode;
+ my $gettext = Locale::gettext->domain($DOMAIN);
+ $gettext->dir($opts{'message-dir'}) if $opts{'message-dir'};
+ my $encoding = I18N::Langinfo::langinfo(I18N::Langinfo::CODESET());
+ *_ = sub { Encode::encode($encoding, $gettext->get($_[0])) }
+}
+else
+{
+ *_ = sub { $_[0] }
+}
+
+print OUT _('Include file for help2man man page'), "\n";
+print OUT "\n";
+print OUT '--locale=', $opts{locale} || 'C', "\n";
+print OUT "\n";
+
+print OUT '[', _('NAME'), "]\n";
+print OUT _('help2man \- generate a simple manual page'), "\n";
+print OUT "\n";
+
+print OUT '[', _('INCLUDE FILES'), "]\n";
+print OUT _(<<'EOT');
+Additional material may be included in the generated output with the
+.B \-\-include
+and
+.B \-\-opt\-include
+options. The format is simple:
+
+ [section]
+ text
+
+ /pattern/
+ text
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Blocks of verbatim *roff text are inserted into the output either at
+the start of the given
+.BI [ section ]
+(case insensitive), or after a paragraph matching
+.BI / pattern /\fR.
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Patterns use the Perl regular expression syntax and may be followed by
+the
+.IR i ,
+.I s
+or
+.I m
+modifiers (see
+.BR perlre (1)).
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Lines before the first section or pattern which begin with `\-' are
+processed as options. Anything else is silently ignored and may be
+used for comments, RCS keywords and the like.
+EOT
+print OUT "\n";
+
+print OUT _('The section output order (for those included) is:'), "\n";
+print OUT "\n";
+print OUT ' ', _('NAME'), "\n";
+print OUT ' ', _('SYNOPSIS'), "\n";
+print OUT ' ', _('DESCRIPTION'), "\n";
+print OUT ' ', _('OPTIONS'), "\n";
+print OUT ' ', _('ENVIRONMENT'), "\n";
+print OUT ' ', _('FILES'), "\n";
+print OUT ' ', _('EXAMPLES'), "\n";
+print OUT ' \fI', _('other'), "\\fR\n";
+print OUT ' ', _('AUTHOR'), "\n";
+print OUT ' ', _('REPORTING BUGS'), "\n";
+print OUT ' ', _('COPYRIGHT'), "\n";
+print OUT ' ', _('SEE ALSO'), "\n";
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Any
+.B [NAME]
+or
+.B [SYNOPSIS]
+sections appearing in the include file will replace what would have
+automatically been produced (although you can still override the
+former with
+.B --name
+if required).
+EOT
+print OUT "\n";
+
+print OUT _(<<'EOT');
+Other sections are prepended to the automatically produced output for
+the standard sections given above, or included at
+.I other
+(above) in the order they were encountered in the include file.
+EOT
+print OUT "\n";
+
+print OUT '[', _('AVAILABILITY'), "]\n";
+print OUT _('The latest version of this distribution is available on-line from:'), "\n";
+print OUT "\n";
+print OUT " ftp://ftp.gnu.org/gnu/help2man/\n";
+
+# Fix output file permissions
+unless ($opts{stdout})
+{
+ close OUT;
+ chmod 0444, $target or warn "$0: can't change mode of $target ($!)\n";
+}
+
+exit 0;
diff --git a/help2man.info b/help2man.info
index 0abff3b..ab0738b 100644
--- a/help2man.info
+++ b/help2man.info
@@ -9,8 +9,8 @@ END-INFO-DIR-ENTRY
This file documents the GNU `help2man' command which produces simple
manual pages from the `--help' and `--version' output of other commands.
- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free
-Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
+Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
@@ -267,6 +267,8 @@ used for comments, RCS keywords and the like.
SYNOPSIS
DESCRIPTION
OPTIONS
+ ENVIRONMENT
+ FILES
EXAMPLES
_other_
AUTHOR
@@ -393,15 +395,15 @@ The latest version of this distribution is available on-line from:
Tag Table:
-Node: Top1125
-Node: Overview1832
-Node: Invoking help2man2539
-Node: --help recommendations4890
-Node: Including text8308
-Node: Makefile usage9991
-Node: Localised man pages10930
-Ref: Localised man pages-Footnote-112841
-Node: Reports12991
-Node: Availability13449
+Node: Top1131
+Node: Overview1838
+Node: Invoking help2man2545
+Node: --help recommendations4896
+Node: Including text8314
+Node: Makefile usage10025
+Node: Localised man pages10964
+Ref: Localised man pages-Footnote-112875
+Node: Reports13025
+Node: Availability13483
End Tag Table
diff --git a/help2man.pl.1 b/help2man.pl.1
index c753c2e..456683d 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,69 +1,70 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "grudzie? 2009" "help2man 1.37.1" "Polecenia u¿ytkownika"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "kwiecie? 2010" "help2man 1.38.1" "Polecenia u¿ytkownika"
.SH NAZWA
help2man \- generowanie prostej strony podrêcznika
+.SH SK£ADNIA
+.B help2man
+[\fIOPCJA\fR]... \fIPROGRAM\fR
.SH OPIS
-`help2man' generates a man page out of `\-\-help' and `\-\-version' output.
-.PP
-Usage: help2man [OPTION]... EXECUTABLE
+`help2man' generuje stronê podrêcznika z wyj¶cia `\-\-help' i `\-\-version'.
.TP
-\fB\-n\fR, \fB\-\-name\fR=\fISTRING\fR
-description for the NAME paragraph
+\fB\-n\fR, \fB\-\-name\fR=\fI£AÑCUCH\fR
+opis akapitu NAZWA
.TP
-\fB\-s\fR, \fB\-\-section\fR=\fISECTION\fR
-section number for manual page (1, 6, 8)
+\fB\-s\fR, \fB\-\-section\fR=\fISEKCJA\fR
+numer sekcji dla strony podrêcznika (1, 6, 8)
.TP
-\fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
-name of manual (User Commands, ...)
+\fB\-m\fR, \fB\-\-manual\fR=\fITEKST\fR
+nazwa podrêcznika (Polecenia u¿ytkownika, ...)
.TP
-\fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
-source of program (FSF, Debian, ...)
+\fB\-S\fR, \fB\-\-source\fR=\fITEKST\fR
+pochodzenie programu (FSF, Debian, ...)
.TP
-\fB\-L\fR, \fB\-\-locale\fR=\fISTRING\fR
-select locale (default "C")
+\fB\-L\fR, \fB\-\-locale\fR=\fI£AÑCUCH\fR
+ustawienie lokalizacji (domy¶lnie "C")
.TP
-\fB\-i\fR, \fB\-\-include\fR=\fIFILE\fR
-include material from `FILE'
+\fB\-i\fR, \fB\-\-include\fR=\fIPLIK\fR
+do³±czenie materia³u z `PLIKU'
.TP
-\fB\-I\fR, \fB\-\-opt\-include\fR=\fIFILE\fR
-include material from `FILE' if it exists
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fIPLIK\fR
+do³±czenie materia³u z `PLIKU', je¶li takowy istnieje
.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-send output to `FILE'
+\fB\-o\fR, \fB\-\-output\fR=\fIPLIK\fR
+zapisanie wyj¶cia do `PLIKU'
.TP
-\fB\-p\fR, \fB\-\-info\-page\fR=\fITEXT\fR
-name of Texinfo manual
+\fB\-p\fR, \fB\-\-info\-page\fR=\fITEKST\fR
+nazwa podrêcznika Texinfo
.TP
\fB\-N\fR, \fB\-\-no\-info\fR
-suppress pointer to Texinfo manual
+pominiêcie wskazania do podrêcznika Texinfo
.TP
\fB\-\-help\fR
-print this help, then exit
+wy¶wietlenie tego opisu i zakoñczenie pracy
.TP
\fB\-\-version\fR
-print version number, then exit
+wy¶wietlenie numeru wersji i zakoñczenie pracy
.PP
-EXECUTABLE should accept `\-\-help' and `\-\-version' options and produce output on
-stdout although alternatives may be specified using:
+PROGRAM powinien przyjmowaæ opcje `\-\-help' i `\-\-version', aczkolwiek mo¿na
+podaæ alternatywne nazwy opcji przy pomocy:
.TP
-\fB\-h\fR, \fB\-\-help\-option\fR=\fISTRING\fR
-help option string
+\fB\-h\fR, \fB\-\-help\-option\fR=\fI£AÑCUCH\fR
+³añcuch opcji pomocy
.TP
-\fB\-v\fR, \fB\-\-version\-option\fR=\fISTRING\fR
-version option string
+\fB\-v\fR, \fB\-\-version\-option\fR=\fI£AÑCUCH\fR
+³añcuch opcji wersji
.TP
-\fB\-\-version\-string\fR=\fISTRING\fR
-version string
+\fB\-\-version\-string\fR=\fI£AÑCUCH\fR
+³añcuch wersji
.TP
\fB\-\-no\-discard\-stderr\fR
-include stderr when parsing option output
+do³±czenie stderr przy analizie wyj¶cia
.SH "DO£¡CZANE PLIKI"
Do generowanego pliku mo¿na do³±czyæ dodatkowy materia³ przy pomocy
opcji
.B \-\-include
i
-.B \-\-opt\-include
-. Format jest prosty:
+.BR \-\-opt\-include .
+Format jest prosty:
[sekcja]
tekst
@@ -96,6 +97,8 @@ Kolejno
SK£ADNIA
OPIS
OPCJE
+ ¦RODOWISKO
+ PLIKI
PRZYK£ADY
\fIinne\fR
AUTOR
@@ -124,9 +127,9 @@ Najnowsza wersja tego oprogramowania jest dost
.SH AUTOR
Program napisa³ Brendan O'Dea <bod@debian.org>
.SH "ZG£ASZANIE B£ÊDÓW"
-Report bugs to <bug\-help2man@gnu.org>.
+B³êdy prosimy zg³aszaæ na adres <bug\-help2man@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
.br
Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.
diff --git a/help2man.pl.h2m b/help2man.pl.h2m
deleted file mode 100644
index df17f10..0000000
--- a/help2man.pl.h2m
+++ /dev/null
@@ -1,77 +0,0 @@
-Encoding charset: ISO-8859-2
-Language: Polish
-Locale: pl_PL
-Translator: Jakub Bogusz <qboosh@pld-linux.org>
-
-Include file for Polish help2man man page
-
---locale=pl_PL
-
-[nazwa]
-help2man \- generowanie prostej strony podrêcznika
-
-[do³±czane pliki]
-Do generowanego pliku mo¿na do³±czyæ dodatkowy materia³ przy pomocy
-opcji
-.B \-\-include
-i
-.B \-\-opt\-include
-. Format jest prosty:
-
- [sekcja]
- tekst
-
- /wzorzec/
- tekst
-
-Bloki sformatowanego tekstu *roff s± wstawiane do wyj¶cia na pocz±tku
-podanej
-.BI [ sekcji ]
-(bez rozró¿niania wielko¶ci liter) lub po akapicie pasuj±cym do
-.BI / wzorca /\fR.
-
-Wzorce zapisuje siê przy u¿yciu sk³adni perlowych wyra¿eñ regularnych
-i mo¿na je zakoñczyæ modyfikatorami
-.IR i ,
-.I s
-lub
-.I m
-(patrz
-.BR perlre (1)).
-
-Linie przed pierwsz± sekcj± lub wzorzec zaczynaj±cy siê od `\-' s±
-przetwarzane jako opcje. Ca³a reszta jest po cichu ignorowana i mo¿e
-byæ u¿ywana jako komentarze, s³owa kluczowe RCS itp.
-
-Kolejno¶æ sekcji na wyj¶ciu to:
-
- NAZWA
- SK£ADNIA
- OPIS
- OPCJE
- PRZYK£ADY
- \fIinne\fR
- AUTOR
- ZG£ASZANIE B£ÊDÓW
- COPYRIGHT
- ZOBACZ TAK¯E
-
-Ka¿da sekcja
-.B [nazwa]
-lib
-.B [sk³adnia]
-wystêpuj±ca w pliku do³±czanym zastêpuje to, co zosta³oby automatycznie
-wyprodukowane (aczkolwiek mo¿na w razie potrzeby obej¶æ to zachowanie przez
-.B --name
-).
-
-Inne sekcje s± do³±czane do automatycznie generowanego wyj¶cia
-w przypadku standardowych, wy¿ej wymienionych sekcji lub w³±czane
-w miejscu
-.I inne
-(jak wy¿ej) w kolejno¶ci, w jakiej wyst±pi³y w do³±czanym pliku.
-
-[dostêpno¶æ]
-Najnowsza wersja tego oprogramowania jest dostêpna pod:
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.pt_BR.1 b/help2man.pt_BR.1
index 407df49..3f088cc 100644
--- a/help2man.pt_BR.1
+++ b/help2man.pt_BR.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "dezembro 2009" "help2man 1.37.1" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "abril 2010" "help2man 1.38.1" "Comandos de usuário"
.SH NOME
help2man \- gera uma página de manual simples
.SH DESCRIÇÃO
@@ -96,6 +96,8 @@ A ordem da saÃda das seções é:
SINOPSE
DESCRIÇÃO
OPÇÕES
+ ENVIRONMENT
+ FILES
EXEMPLOS
\fIoutra\fR
AUTOR
@@ -124,7 +126,7 @@ A última versão desta distribuição está disponÃvel on-line em:
.SH "RELATANDO PROBLEMAS"
Report bugs to <bug\-help2man@gnu.org>.
.SH "DIREITOS AUTORAIS"
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/help2man.pt_BR.h2m b/help2man.pt_BR.h2m
deleted file mode 100644
index 0252726..0000000
--- a/help2man.pt_BR.h2m
+++ /dev/null
@@ -1,77 +0,0 @@
-Encoding charset: UTF-8
-Language: Brazilian Portuguese
-Locale: pt_BR
-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
-
-Arquivo de inclusão para a página de manual do help2man
-
---locale=pt_BR.UTF-8
-
-[nome]
-help2man \- gera uma página de manual simples
-
-[arquivos inclusos]
-Materiais adicionais podem ser incluÃdos na saÃda gerada com as opções
-.B \-\-include
-e
-.B \-\-opt\-include
-. O formato é simples:
-
- [seção]
- texto
-
- /padrão/
- texto
-
-Blocos de texto *roff literais são inseridos na saÃda ou no inÃcio de
-uma dada
-.BI [ seção ]
-(indiferente à maiusculização), ou após um parágrafo que coincida com o
-.BI / padrão /\fR.
-
-Os padrões usam a sintaxe Perl de expressão regular e podem ser seguidos
-pelos modificadores
-.IR i ,
-.I s
-ou
-.I m
-(veja
-.BR perlre (1)).
-
-As linhas antes da primeira seção ou de um padrão que comece com
-"\-" são processados como opções. Qualquer outra coisa é ignorada
-silenciosamente e pode ser usada para comentários, palavras-chaves
-RCS e coisas do tipo.
-
-A ordem da saÃda das seções é:
-
- NOME
- SINOPSE
- DESCRIÇÃO
- OPÇÕES
- EXEMPLOS
- \fIoutra\fR
- AUTOR
- RELATANDO PROBLEMAS
- DIREITOS AUTORAIS
- VEJA TAMBÉM
-
-Quaisquer seções
-.B [nome]
-ou
-.B [sinopse]
-que apareçam no arquivo de inclusão substituirá o que seria
-produzido automaticamente (embora você ainda possa sobrepor
-o primeiro com
-.B --name
-se necessário).
-
-Outras seções são acrescentadas antes da saÃda produzida automaticamente
-para as seções padrões citadas acima ou inclusas na posição
-.I outra
-(acima) na ordem em que elas forem encontradas no arquivo de inclusão.
-
-[disponibilidade]
-A última versão desta distribuição está disponÃvel on-line em:
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.sv.1 b/help2man.sv.1
index db692bb..a56e447 100644
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH HELP2MAN "1" "december 2009" "help2man 1.37.1" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "april 2010" "help2man 1.38.1" "Användarkommandon"
.SH NAMN
help2man \- generera en enkel manualsida
.SH BESKRIVNING
@@ -94,6 +94,8 @@ Ordning p
SYNOPSIS
BESKRIVNING
FLAGGOR
+ ENVIRONMENT
+ FILES
EXEMPEL
\fIövrigt\fR
UPPHOVSMAN
@@ -124,7 +126,7 @@ Skrivet av Brendan O'Dea <bod@debian.org>
.SH "RAPPORTERA FEL"
Report bugs to <bug\-help2man@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
.br
Det här är fri programvara; se källkoden för kopieringsvillkor. Det finns INGEN
diff --git a/help2man.sv.h2m b/help2man.sv.h2m
deleted file mode 100644
index d2bdf98..0000000
--- a/help2man.sv.h2m
+++ /dev/null
@@ -1,75 +0,0 @@
-Encoding charset: ISO-8859-15
-Language: Swedish
-Locale: sv_SE
-Translator: Daniel Nylander <po@danielnylander.se>
-
-Include file for Swedish help2man man page
-
---locale=sv_SE.ISO-8859-15
-
-[namn]
-help2man \- generera en enkel manualsida
-
-[inkludera filer]
-Ytterligare material kan inkluderas i den genererade utskriften med flaggorna
-.B \-\-include
-och
-.B \-\-opt\-include
-Formatet är enkelt:
-
- [sektion]
- text
-
- /mönster/
- text
-
-Block av *roff-text infogas ord för ord i utskriften antingen vid
-början av angiven
-.BI [ section ]
-(okänslig för skiftläge), eller efter en paragraf som matchar
-.BI / mönster /\fR.
-
-Mönster använder Perls syntax för reguljära uttryck och kan efterföljas av modifierarna
-.IR i ,
-.I s
-eller
-.I m
-(se
-.BR perlre (1)).
-
-Rader före den första sektionen eller mönstret som börjar med "\-"
-behandlas som flaggor. Allt annat ignoreras tyst och kan användas
-för kommentarer, RCS-nyckelord och liknande.
-
-Ordning på sektionsutskriften är:
-
- NAMN
- SYNOPSIS
- BESKRIVNING
- FLAGGOR
- EXEMPEL
- \fIövrigt\fR
- UPPHOVSMAN
- RAPPORTERA FEL
- COPYRIGHT
- SE OCKSÅ
-
-Alla sektioner
-.B [namn]
-eller
-.B [synopsis]
-som visas i inkluderingsfilen kommer att ersätta vad som skulle
-automatiskt bli producerat (även om du fortfarande kan åsidosätta
-de senare med
-.B --name
-om det krävs).
-
-Andra sektioner läggs till i början av den automatiskt producerade utskriften
-för standardsektionerna angivna ovan, eller inkluderas vid
-.I övrigt
-(ovan) i den ordning de påträffades i inkluderingsfilen.
-
-[tillgänglighet]
-Senaste versionen av den här utgåvan finns tillgänglig online från:
-
- ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.texi b/help2man.texi
index 1d06988..d0aa7c3 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -14,7 +14,7 @@ This file documents the GNU @command{help2man} command which produces
simple manual pages from the @samp{--help} and @samp{--version} output
of other commands.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
@@ -321,6 +321,8 @@ NAME
SYNOPSIS
DESCRIPTION
OPTIONS
+ENVIRONMENT
+FILES
EXAMPLES
@emph{other}
AUTHOR
diff --git a/help2man.vi.1 b/help2man.vi.1
new file mode 100644
index 0000000..e883876
--- /dev/null
+++ b/help2man.vi.1
@@ -0,0 +1,154 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.1.
+.TH HELP2MAN "1" "Tháng tÆ° 2010" "help2man 1.38.1" "Lệnh ngÆ°á»i dùng"
+.SH TÊN
+help2man \- tạo một trang hướng dẫn đơn giản
+.SH "TÓM TẮT"
+.B help2man
+[\fITÙY_CHỌN\fR]... \fIBẢN_THá»°C_HIỆN_ÄƯỢC\fR
+.SH "MÔ TẢ"
+« help2man » tạo má»™t trang hÆ°á»›ng dẫn dá»±a và o kết xuất của tuỳ chá»n
+`\-\-help' (trợ giúp) và `\-\-version' (phiên bản).
+.TP
+\fB\-n\fR, \fB\-\-name\fR=\fICHUá»–I\fR
+mô tả cho đoạn văn TÊN (NAME)
+.TP
+\fB\-s\fR, \fB\-\-section\fR=\fIPHẦN\fR
+số thứ tự phần cho trang hướng dẫn (1, 6, 8)
+.TP
+\fB\-m\fR, \fB\-\-manual\fR=\fITÊN\fR
+tên của trang hướng dẫn (User Commands, ...)
+.TP
+\fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
+nguồn của chương trình (FSF, Debian, ...)
+.TP
+\fB\-L\fR, \fB\-\-locale\fR=\fICHUá»–I\fR
+chá»n miá»n địa phÆ°Æ¡ng (mặc định "C";
+đối với tiếng Việt thì là « vi_VN.UTF\-8 »)
+.TP
+\fB\-i\fR, \fB\-\-include\fR=\fITỆP\fR
+bao gồm dữ liệu từ táºp tin nà y
+.TP
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fITỆP\fR
+bao gồm dữ liệu từ táºp tin nà y nếu có
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fITỆP\fR
+gá»i kết xuất cho táºp tin nà y
+.TP
+\fB\-p\fR, \fB\-\-info\-page\fR=\fITÊN\fR
+tên của trang hướng dẫn loại Texinfo
+.TP
+\fB\-N\fR, \fB\-\-no\-info\fR
+thu hồi cái chỉ tới trang hướng dẫn Texinfo
+.TP
+\fB\-\-help\fR
+hiển thị trợ giúp nà y, sau đó thoát
+.TP
+\fB\-\-version\fR
+hiển thị số thứ tự phiên bản, sau đó thoát
+.PP
+BẢN_THá»°C_HIỆN_ÄƯỢC nên chấp nháºn hai tuỳ chá»n `\-\-help' và `\-\-version'
+thì xuất qua đầu ra tiêu chuẩn (stdout) dù cÅ©ng có thể ghi rõ thêm tuỳ chá»n:
+.TP
+\fB\-h\fR, \fB\-\-help\-option\fR=\fICHUá»–I\fR
+chuá»—i là tuỳ chá»n trợ giúp
+.TP
+\fB\-v\fR, \fB\-\-version\-option\fR=\fICHUá»–I\fR
+chuá»—i là tuỳ chá»n phiên bản
+.TP
+\fB\-\-version\-string\fR=\fICHUá»–I\fR
+chuỗi phiên bản
+.TP
+\fB\-\-no\-discard\-stderr\fR
+bao gồm đầu lỗi tiêu chuẩn
+khi phân tÃch cú pháp của kết xuất tuỳ chá»n
+.SH "TỆP BAO GỒM"
+CÅ©ng có thể bao gồm dữ liệu bổ sung trong kết xuất, dùng tuỳ chá»n
+.B \-\-include
+vÃ
+.B \-\-opt\-include
+Có một định dạng đơn giản:
+
+ [phần]
+ chuá»—i
+
+ /mẫu/
+ chuá»—i
+
+Khối văn bản định dạng *roff đúng nguyên văn được chèn và o kết xuất
+hoặc ở đầu của phần
+.BI [ phần ]
+(không phân biệt chữ hoa/thÆ°á»ng),
+hoặc đẳng sau một đoạn văn tương ứng với mẫu
+.BI / mẫu /\fR.
+
+Mẫu chấp nháºn cú pháp của biểu thức chÃnh quy Perl,
+và cÅ©ng cho phép dấu sá»a đổi
+.IR i ,
+.I s
+hay
+.I m
+(xem
+.BR perlre (1)).
+
+Dòng nà o đẳng trÆ°á»›c phần đầu tiên hoặc mẫu bắt đầu vá»›i « \- » thì được xá»
+lý dÆ°á»›i dạng tuỳ chá»n. Dữ liệu khác (nếu có) bị bá» qua mà không xuất chi
+tiết, và có thể được sỠdụng là m ghi chú, từ khoá RCS v.v.
+
+Thứ tự xuất phần (đã bao gồm):
+
+ TÊN
+ TÓM TẮT
+ MÔ TẢ
+ TÙY CHỌN
+ MÔI TRƯỜNG
+ TỆP
+ Và DỤ
+ \fIkhác\fR
+ TÃC GIẢ
+ THÔNG BÃO Lá»–I
+ BẢN QUYỀN
+ XEM THÊM
+
+Bắt cứ phần
+.B [NAME]
+hoặc
+.B [SYNOPSIS]
+nà o xuất hiện trong táºp tin bao gồm thì thay thế kết xuất tá»± Ä‘á»™ng tạo
+(dù bạn vẫn còn có dịp ghi đè lên phần [NAME] bằng:
+.B --name
+nếu cần).
+
+NAME: TÊN
+SYNOPSIS: TÓM TẮT
+
+Các phần khác được thêm và o đầu của kết xuất tự động tạo
+cho những phần tiêu chuẩn đưa ra trên, hoặc được bao gồm tại
+.I other
+(bên trên) theo thứ tá»± gặp trong táºp tin bao gồm.
+.SH "TÃNH SẴN SÀNG"
+Phiên bản mới nhất của bản phân phối nà y có sẵn sà ng trực tuyến từ :
+
+ ftp://ftp.gnu.org/gnu/help2man/
+.SH "TÃC GIẢ"
+Viết bởi Brendan O'Dea <bod@debian.org>
+.SH "THÔNG BÃO Lá»–I"
+Thông báo lỗi nà o cho <bug\-help2man@gnu.org>.
+.PP
+Tác quyá»n © năm 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010
+của Tổ chức Phần má»m Tá»± do.
+Äây là phần má»m tá»± do; hãy xem mã nguồn để biết vá» Ä‘iá»u kiện sao chép.
+KHÔNG có sá»± đảm bảo nà o; THẬM CHà KHÔNG CÓ KHẢ NÄ‚NG THÆ¯Æ NG MẠI
+HAY CHO MỘT MỤC ÄÃCH RIÊNG NÀO ÄÓ.
+.SH "XEM THÊM"
+Tà i liệu hÆ°á»›ng dẫn đầy đủ vá»
+.B help2man
+được bảo tồn dưới dạng một sổ tay Texinfo.
+Nếu chương trình
+.B info
+vÃ
+.B help2man
+được cà i đặt đúng ở địa chỉ của bạn thì câu lệnh
+.IP
+.B info help2man
+.PP
+nên cho phép bạn truy cáºp đến sổ tay hoà n toà n.
diff --git a/locales b/locales
new file mode 100644
index 0000000..a424017
--- /dev/null
+++ b/locales
@@ -0,0 +1,7 @@
+de de_DE.UTF-8
+fi fi_FI@euro
+fr fr_FR@euro
+pl pl_PL
+pt_BR pt_BR.UTF-8
+sv sv_SE.ISO-8859-15
+vi vi_VN.UTF-8
diff --git a/po/de.gmo b/po/de.gmo
index 13cab52..bd1c2c2 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index d648b2c..a4da3b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: help2man 1.36.4\n"
"Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
"PO-Revision-Date: 2009-09-14 22:12+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -16,12 +16,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -30,7 +31,8 @@ msgid ""
msgstr ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"Dies ist freie Software. Lesen Sie die Quelle, um die Kopierbedingungen\n"
"zu erhalten. Es gibt KEINE Gewährleistung, nicht einmal für\n"
@@ -38,7 +40,7 @@ msgstr ""
"\n"
"Geschrieben von Brendan O'Dea <bod@debian.org>\n"
-#: help2man:59
+#: help2man:80
#, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -100,108 +102,141 @@ msgstr ""
"\n"
"Berichten Sie Fehler an <bug-help2man@gnu.org>.\n"
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: »%s« kann nicht geöffnet werden (%s)"
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: Keine gültigen Informationen in »%s« gefunden"
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: %s kann nicht entfernt werden (%s)"
-#: help2man:226
+#: help2man:249
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: %s kann nicht erzeugt werden (%s)"
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr "NAME"
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- Handbuchseite für %s %s"
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr "Systemadministrator-Werkzeuge"
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr "Spiele"
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr "Benutzerkommandos"
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
msgid "Usage"
msgstr "Aufruf"
-#: help2man:299
+#: help2man:331
msgid "or"
msgstr "oder"
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr "ÃœBERSICHT"
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr "BESCHREIBUNG"
-#: help2man:351
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr "Fehlerberichte|Fehler bitte|Fehlermeldungen|Berichten Sie Fehler"
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr "Geschrieben +von"
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr "Optionen"
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
msgid "Examples"
msgstr "Beispiele"
-#: help2man:355
+#: help2man:397
msgid "This +is +free +software"
msgstr "Dies +ist +freie +Software"
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr "OPTIONEN"
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr "BEISPIELE"
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr "FEHLERBERICHTE"
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr "AUTOR"
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -229,18 +264,151 @@ msgstr ""
".PP\n"
"Zugriff auf das komplette Handbuch geben.\n"
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: Fehler beim Schreiben nach %s (%s)"
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: Es wurde keine »%s«-Information von %s erhalten"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: Es wurde keine »%s«-Information von %s erhalten%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Include-Datei für die help2man-Handbuchseite"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- generiert eine einfache Handbuchseite"
-#: help2man:609
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "DATEIEN ZUM EINFÃœGEN"
+
+#: help2man.h2m.PL:85
msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
+"\n"
+" [section]\n"
+" text\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+" /pattern/\n"
+" text\n"
msgstr ""
+"Zusätzliches Material kann in die generierte Ausgabe mit den\n"
+".B \\-\\-include\n"
+"und\n"
+".B \\-\\-opt\\-include\n"
+"Optionen eingefügt werden. Das Format ist einfach:\n"
+"\n"
+" [Abschnitt]\n"
+" Text\n"
+"\n"
+" /Muster/\n"
+" Text\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Blöcke aus wörtlichem *roff-Text werden entweder beim Start durch\n"
+"Angabe von\n"
+".BI [ Abschnitt ]\n"
+"(unabhängig von Groß-/Kleinschreibung) in die Ausgabe eingefügt oder\n"
+"nach einen passenden Absatz\n"
+".BI / Muster /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Muster benutzen die Syntax von regulären Perl-Ausdrücken und können\n"
+"von\n"
+".IR i ,\n"
+".I s\n"
+"oder\n"
+".I m\n"
+"Bestimmungswörtern gefolgt sein (siehe\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Zeilen vor dem ersten Abschnitt oder Muster, die mit »\\-« beginnen,\n"
+"werden als Optionen behandelt. Alles andere wird stillschweigend\n"
+"ignoriert und könnte für Kommentare, RCS-Schlüsselwörter oder was\n"
+"Sie wollen benutzt werden.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Die Reiehnfolge in der die Abschnitte ausgegeben werden, ist:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "andere"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Jeder\n"
+".B [NAME]\n"
+"oder\n"
+".B [ÃœBERSICHT]\n"
+"-Abschnitt, der in der eingefügten Datei erscheint, wird das\n"
+"ersetzen, was automatisch generiert würde (obwohl Sie das\n"
+"weitere immer noch, wenn nötigt, mit\n"
+".B --name\n"
+"überschreiben können.\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Andere Abschnitte werden der automatisch erzeugten Ausgabe für die\n"
+"oben angegebenen Standardabschnitte vorangestellt oder unter\n"
+".I andere\n"
+"(oben) in der Reihenfolge, in der sie in der eingefügten Datei\n"
+"vorgefunden werden, eingefügt.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "VERFÃœGBARKEIT"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Die neuste Version dieser Distribution ist Online erhältlich von:"
diff --git a/po/fi.gmo b/po/fi.gmo
index 2fc1665..61d1fb2 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index fed25f0..a58b466 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: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+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"
@@ -12,12 +12,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -26,7 +27,8 @@ msgid ""
msgstr ""
"GNU %s %s\n"
"\n"
-"Copyright © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"Tämä on vapaa ohjelmist; katsokaa kopiointiehdot lähdekoodista. Takuuta EI "
"OLE;\n"
@@ -35,7 +37,7 @@ msgstr ""
"\n"
"Kirjoittanut Brendan O'Dea <bod@debian.org>\n"
-#: help2man:59
+#: help2man:80
#, fuzzy, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -93,109 +95,142 @@ msgstr ""
"Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen\n"
"<bug-help2man@gnu.org>.\n"
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: ei voitu avata tiedostoa \"%s\" (%s)"
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: kelvollista tietoa ei löytynyt ohjelmasta \"%s\""
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: ei voi unlinkata/poistaa tiedostoa %s (%s)"
-#: help2man:226
+#: help2man:249
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: ei voitu luoda tiedostoa %s (%s)"
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr "NIMI"
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- manuaalisivu %s %s"
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr "Järjestelmähallinnan sovellukset"
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr "Pelit"
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr "Käyttäjän sovellukset"
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
msgid "Usage"
msgstr "Käyttö"
-#: help2man:299
+#: help2man:331
msgid "or"
msgstr "tai"
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr "YLEISKATSAUS"
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr "KUVAUS"
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
#, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr "Ilmoita +(ohjelmisto)?vioista|Lähetä +raportit +(ohjelmisto)?vioista"
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr "Kirjoittan(ut|eet)"
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr "Valitsimet"
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
msgid "Examples"
msgstr "Esimerkit"
-#: help2man:355
+#: help2man:397
msgid "This +is +free +software"
msgstr "Tämä +on +vapaa +ohjelmisto"
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr "VALITSIMET"
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr "ESIMERKKEJÄ"
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr "TEKIJÄNOIKEUDET"
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr "VIRHEISTÄ ILMOITTAMINEN"
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr "TEKIJÄ"
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr "KATSO MYÖS"
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -222,18 +257,148 @@ msgstr ""
".PP\n"
"pitäisi antaa täydellinen manuaali luettavaksi.\n"
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: virhe kirjoitettaessa tiedostoon %s (%s)"
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: ei saatu \"%s\"-tietoa ohjelmalta %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: ei saatu \"%s\"-tietoa ohjelmalta %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Suomennos help2man-ohjelman man-sivusta"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- luo yksinkertainen man-sivu"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "SISÄLLYTÄ TIEDOSTOJA"
+
+#: help2man.h2m.PL:85
+msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
+"\n"
+" [section]\n"
+" text\n"
+"\n"
+" /pattern/\n"
+" text\n"
+msgstr ""
+"Lisämateriaalia voi sisällyttää luotavaan tulosteeseen valitsimilla\n"
+".B \\-\\-include\n"
+"ja\n"
+".BR \\-\\-opt\\-include .\n"
+"Muoto on yksinkertainen:\n"
+"\n"
+" [kappale]\n"
+" teksti\n"
+"\n"
+" /hakuehto/\n"
+" teksti\n"
-#: help2man:609
+#: help2man.h2m.PL:100
msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Kappaleita puhdasta *roff-tekstiä lisätään tulosteeseen joko kun alkaa\n"
+".BI [ kappale ]\n"
+"(kirjainkoko merkitsevä) tai sellaisen kappaleen jälkeen, joka täsmää\n"
+"säännölliseen lausekkeeseen\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+".BI / hakuehto /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Hakuehdoissa käytetään Perlin säännöllisten lausekkeiden syntaksia, ja\n"
+"niiden perässä voi olla\n"
+".IR i ,\n"
+".I s\n"
+"tai\n"
+".I m\n"
+"muuntimet (katso\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
msgstr ""
+"Rivit ennen ensimmäistä kappaletta tai hakuehtoa, jotka alkavat \"\\-\",\n"
+"käsitellään valitsimina. Kaikki muu ohitetaan, joten ne voivat olla\n"
+"käyttäjän kommentteja, RCS-avainsanoja ja muuta sellaista.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Kappaleiden tulostusjärjestys on:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "muut"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Kappale\n"
+".B [NIMI]\n"
+"tai\n"
+".BR [YLEISKATSAUS] ,\n"
+"joka löytyy sisällytystiedostosta, korvaa muutoin automaattisesti\n"
+"tuotettavan osan (vaikka tämänkin voi korvata\n"
+".B --name\n"
+"-valitsimella tarvittaessa).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Muut kappaleet aloittavat automaattisesti tuotetun tulosteen aiemmin\n"
+"mainituille vakiokappaleille, tai ne sisällytetään kohtaan\n"
+".I muut\n"
+"samassa järjestyksessä kuin ne esiintyvät sisällytystiedostossa.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "SAATAVUUS"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:"
diff --git a/po/fr.gmo b/po/fr.gmo
index 0a12806..24d3044 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index d93327c..957f3d7 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: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+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"
@@ -14,12 +14,13 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -28,7 +29,8 @@ msgid ""
msgstr ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"Ce logiciel est libre ; voir les sources pour les conditions de\n"
"reproduction. AUCUNE garantie n'est donnée, pas même la garantie\n"
@@ -36,7 +38,7 @@ msgstr ""
"\n"
"Écrit par Brendan O'Dea <bod@debian.org>\n"
-#: help2man:59
+#: help2man:80
#, fuzzy, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -98,49 +100,52 @@ msgstr ""
"\n"
"Signaler les bogues à <bug-help2man@gnu.org>.\n"
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: impossible d'ouvrir « %s » (%s)"
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: aucune information valable trouvée dans « %s »"
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: impossible d'effacer %s (%s)"
-#: help2man:226
+#: help2man:249
#, 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:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr "NOM"
# Manual page title
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- page de manuel de %s %s"
# Name of a common manual section
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr "Utilitaires d'administration système"
# Name of a common manual section
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr "Jeux"
# Name of a common manual section
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr "Commandes"
@@ -151,93 +156,123 @@ msgstr "Commandes"
# 2. All French manual pages contain "Usage" when displaying their
# synopsis
# For these reasons, "Usage" has been kept.
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
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:299
+#: help2man:331
msgid "or"
msgstr "\\s*ou"
# Title of the SYNOPSIS section in generated localized manual pages
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
# Title of the DESCRIPTION section in generated localized manual pages
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
# When a string matches this regular expression, it is put into a
# BUGS section.
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
#, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr ""
"Signaler +les +bogues|Rapporter +les +bogues|Rapporter +toutes +anomalies|"
"Envoyer +les +rapports +de +bogue +à"
# When a string matches this regular expression, it is put into an
# AUTHOR section.
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr "Écrit +par"
# When a string matches this regular expression, it is put into an
# OPTIONS section.
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr "Options"
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
# When a string matches this regular expression, it is put into an
# EXAMPLE section.
-#: help2man:354
+#: help2man:396
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:355
+#: help2man:397
msgid "This +is +free +software"
msgstr "Ce +logiciel +est +libre"
# Title of the OPTIONS section in generated localized manual pages
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr "OPTIONS"
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
# Title of the EXAMPLES section in generated localized manual pages
-#: help2man:376 help2man:561
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr "EXEMPLES"
# Title of the COPYRIGHT section in generated localized manual pages
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
# Title of the BUGS section in generated localized manual pages
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr "SIGNALER DES BOGUES"
# Title of the AUTHOR section in generated localized manual pages
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr "AUTEUR"
# Title of the SEE ALSO section in generated localized manual pages
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
# Paragraph added into localized manual pages to point to info
# documentation.
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -265,18 +300,156 @@ msgstr ""
".PP\n"
"devrait vous donner accès au manuel complet (en anglais).\n"
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: erreur d'écriture sur %s (%s)"
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: impossible de récupérer l'information « %s » de %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: impossible de récupérer l'information « %s » de %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr ""
+"Traduction française du fichier inclus pour générer la page\n"
+"de manuel de help2man"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- génère une page de manuel sommaire"
-#: help2man:609
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "FICHIERS INCLUS"
+
+#: help2man.h2m.PL:85
msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
+"\n"
+" [section]\n"
+" text\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+" /pattern/\n"
+" text\n"
+msgstr ""
+"On peut ajouter un supplément de texte aux indications fournies par le\n"
+"programme grâce aux options\n"
+".B \\-\\-include\n"
+"et\n"
+".BR \\-\\-opt\\-include .\n"
+"Le format est simple\\ :\n"
+"\n"
+" [section]\n"
+" texte\n"
+"\n"
+" /motif/\n"
+" texte\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Les blocs de texte (au format *roff) sont insérés tels quels dans la\n"
+"sortie, soit au début de la zone désignée par\n"
+".BI [ section ]\n"
+"(balise insensible à la casse), soit après un paragraphe correspondant à\n"
+".BI / motif /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Les motifs obéissent à la syntaxe des expressions rationnelles de Perl\n"
+"et peuvent être suivis des modificateurs\n"
+".IR i ,\n"
+".I s\n"
+"ou\n"
+".I m\n"
+"(voir\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Les lignes précédant la première section (ou le premier motif) et\n"
+"commençant par «\\ \\-\\ » sont traitées comme des options. Tout le\n"
+"reste est ignoré sans aucun avertissement, et peut être utilisé pour\n"
+"des commentaires, des mots clés RCS ou d'autres éléments.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "L'ordre des sections produites est\\ :"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "autres"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Toute section\n"
+".B [NOM]\n"
+"ou\n"
+".B [SYNOPSIS]\n"
+"apparaissant dans le fichier inclus va remplacer celle qui aurait êté\n"
+"générée automatiquement (mais vous pouvez encore remplacer la première\n"
+"avec\n"
+".B --name\n"
+"si nécessaire).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Le texte supplémentaire aux autres sections usuelles (celles\n"
+"apparaissant dans cette liste) est inséré avant la sortie générée\n"
+"automatiquement pour elles.\n"
+"Les sections non usuelles sont insérées à la place marquée\n"
+".I autres\n"
+"dans la liste ci-dessus, dans l'ordre dans lequel ces sections\n"
+"apparaissent dans le fichier inclus.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "DISPONIBILITÉ"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
msgstr ""
+"La dernière version de cette distribution est disponible en ligne sur\\ :"
diff --git a/po/help2man.pot b/po/help2man.pot
index 3fb6662..2a48c35 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: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+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"
@@ -16,12 +16,13 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,7 @@ msgid ""
"Written by Brendan O'Dea <bod@debian.org>\n"
msgstr ""
-#: help2man:59
+#: help2man:80
#, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -61,108 +62,141 @@ msgid ""
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr ""
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr ""
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr ""
-#: help2man:226
+#: help2man:249
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr ""
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr ""
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr ""
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr ""
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr ""
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr ""
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
msgid "Usage"
msgstr ""
-#: help2man:299
+#: help2man:331
msgid "or"
msgstr ""
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr ""
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr ""
-#: help2man:351
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr ""
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr ""
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr ""
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
msgid "Examples"
msgstr ""
-#: help2man:355
+#: help2man:397
msgid "This +is +free +software"
msgstr ""
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr ""
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr ""
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr ""
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr ""
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr ""
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr ""
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -178,18 +212,108 @@ msgid ""
"should give you access to the complete manual.\n"
msgstr ""
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr ""
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
+msgid "%s: can't get `%s' info from %s%s"
msgstr ""
-#: help2man:609
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr ""
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr ""
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr ""
+
+#: help2man.h2m.PL:85
msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+" [section]\n"
+" text\n"
+"\n"
+" /pattern/\n"
+" text\n"
+msgstr ""
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr ""
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr ""
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr ""
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index 28ec213..00668c5 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 97e527d..87e5e18 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,26 +1,27 @@
# Polish translation for help2man.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation
+# Copyright (C) 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the help2man package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2005.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: help2man 1.36.1\n"
+"Project-Id-Version: help2man 1.38.1-pre1\n"
"Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
-"PO-Revision-Date: 2005-10-19 19:40+0200\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
+"PO-Revision-Date: 2010-04-13 22:06+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,8 @@ msgid ""
msgstr ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.\n"
"Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji PRZYDATNO¦CI\n"
@@ -37,8 +39,8 @@ msgstr ""
"\n"
"Program napisa³ Brendan O'Dea <bod@debian.org>\n"
-#: help2man:59
-#, fuzzy, perl-format
+#: help2man:80
+#, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
"\n"
@@ -91,113 +93,147 @@ msgstr ""
"\n"
" -h, --help-option=£AÑCUCH ³añcuch opcji pomocy\n"
" -v, --version-option=£AÑCUCH ³añcuch opcji wersji\n"
+" --version-string=£AÑCUCH ³añcuch wersji\n"
+" --no-discard-stderr do³±czenie stderr przy analizie wyj¶cia\n"
"\n"
-"B³êdy proszê zg³aszaæ na adres <bug-help2man@gnu.org>.\n"
+"B³êdy prosimy zg³aszaæ na adres <bug-help2man@gnu.org>.\n"
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: nie mo¿na otworzyæ `%s' (%s)"
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: nie znaleziono poprawnej informacji w `%s'"
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: nie mo¿na usun±æ %s (%s)"
-#: help2man:226
+#: help2man:249
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: nie mo¿na utworzyæ %s (%s)"
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr "NAZWA"
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- strona podrêcznika dla %s %s"
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr "Narzêdzia administracyjne"
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr "Gry"
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr "Polecenia u¿ytkownika"
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
msgid "Usage"
msgstr "Sk³adnia|U¿ycie"
-#: help2man:299
+#: help2man:331
msgid "or"
msgstr "lub|albo"
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr "SK£ADNIA"
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr "OPIS"
-#: help2man:351
-#, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr ""
"B³êdy +(proszê|prosimy) +zg³aszaæ +na +adres|Raporty +o +b³êdach +wysy³aj +do"
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr "Napisany +przez|Program +napisa(³a?|li)"
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr "Opcje"
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr "¦rodowisko"
+
+#: help2man:395
+msgid "Files"
+msgstr "Pliki"
+
+#: help2man:396
msgid "Examples"
msgstr "Przyk³ady"
-#: help2man:355
+#: help2man:397
msgid "This +is +free +software"
msgstr "Ten +program +jest +darmowy"
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr "OPCJE"
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr "¦RODOWISKO"
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr "PLIKI"
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr "PRZYK£ADY"
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr "ZG£ASZANIE B£ÊDÓW"
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr "AUTOR"
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr "ZOBACZ TAK¯E"
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -224,18 +260,150 @@ msgstr ""
".PP\n"
"powinno udostêpniæ kompletny podrêcznik.\n"
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: b³±d zapisu do %s (%s)"
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: nie mo¿na uzyskaæ informacji `%s' z %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: nie mo¿na uzyskaæ informacji `%s' z %s%s"
-#: help2man:609
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+"Opcja `--no-discard-stderr' pomo¿e, je¶li program wypisuje opis na stderr"
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Plik do³±czany do strony podrêcznika help2man"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- generowanie prostej strony podrêcznika"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "DO£¡CZANE PLIKI"
+
+#: help2man.h2m.PL:85
msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+" [section]\n"
+" text\n"
+"\n"
+" /pattern/\n"
+" text\n"
msgstr ""
+"Do generowanego pliku mo¿na do³±czyæ dodatkowy materia³ przy pomocy\n"
+"opcji\n"
+".B \\-\\-include\n"
+"i\n"
+".BR \\-\\-opt\\-include .\n"
+"Format jest prosty:\n"
+"\n"
+" [sekcja]\n"
+" tekst\n"
+"\n"
+" /wzorzec/\n"
+" tekst\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Bloki sformatowanego tekstu *roff s± wstawiane do wyj¶cia na pocz±tku\n"
+"podanej\n"
+".BI [ sekcji ]\n"
+"(bez rozró¿niania wielko¶ci liter) lub po akapicie pasuj±cym do\n"
+".BI / wzorca /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Wzorce zapisuje siê przy u¿yciu sk³adni perlowych wyra¿eñ regularnych\n"
+"i mo¿na je zakoñczyæ modyfikatorami\n"
+".IR i ,\n"
+".I s\n"
+"lub\n"
+".I m\n"
+"(patrz\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Linie przed pierwsz± sekcj± lub wzorzec zaczynaj±cy siê od `\\-' s±\n"
+"przetwarzane jako opcje. Ca³a reszta jest po cichu ignorowana i mo¿e\n"
+"byæ u¿ywana jako komentarze, s³owa kluczowe RCS itp.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Kolejno¶æ sekcji na wyj¶ciu to:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "inne"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Ka¿da sekcja\n"
+".B [nazwa]\n"
+"lib\n"
+".B [sk³adnia]\n"
+"wystêpuj±ca w pliku do³±czanym zastêpuje to, co zosta³oby automatycznie\n"
+"wyprodukowane (aczkolwiek mo¿na w razie potrzeby obej¶æ to zachowanie przez\n"
+".B --name\n"
+").\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Inne sekcje s± do³±czane do automatycznie generowanego wyj¶cia\n"
+"w przypadku standardowych, wy¿ej wymienionych sekcji lub w³±czane\n"
+"w miejscu\n"
+".I inne\n"
+"(jak wy¿ej) w kolejno¶ci, w jakiej wyst±pi³y w do³±czanym pliku.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "DOSTÊPNO¦Æ"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Najnowsza wersja tego oprogramowania jest dostêpna pod:"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 38b98a3..aef3d9c 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index edff41b..63d30fc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: help2man 1.36.4\n"
"Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
"PO-Revision-Date: 2009-08-31 14:13-0300\n"
"Last-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>\n"
"Language-Team: Brazilian Portugues <ldp-br@bazar2.conectiva.com.br>\n"
@@ -16,12 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,7 @@ msgid ""
"Written by Brendan O'Dea <bod@debian.org>\n"
msgstr ""
-#: help2man:59
+#: help2man:80
#, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -61,111 +62,144 @@ msgid ""
"Report bugs to <bug-help2man@gnu.org>.\n"
msgstr ""
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: não é possÃvel abrir \"%s\" (%s)"
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: não foi encontrada uma informação válida em \"%s\""
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: não é possÃvel excluir %s (%s)"
-#: help2man:226
+#: help2man:249
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: não é possÃvel criar %s (%s)"
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr "NOME"
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- página de manual para %s %s"
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr "Utilitários administrativos do sistema"
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr "Jogos"
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr "Comandos de usuário"
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
msgid "Usage"
msgstr "Uso"
-#: help2man:299
+#: help2man:331
msgid "or"
msgstr "ou"
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr "SINOPSE"
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr "DESCRIÇÃO"
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
#, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr ""
"Relate +problemas|Relate +bugs|Relate +defeitos|Envie +relatório +problemas|"
"Envie +relatório +bugs|Envie +relatório +defeitos"
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr "Escrito +por"
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr "Opções"
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
msgid "Examples"
msgstr "Exemplos"
-#: help2man:355
+#: help2man:397
msgid "This +is +free +software"
msgstr ""
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr "OPÇÕES"
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr "EXEMPLOS"
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr "DIREITOS AUTORAIS"
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr "RELATANDO PROBLEMAS"
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr "AUTOR"
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr "VEJA TAMBÉM"
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -181,18 +215,149 @@ msgid ""
"should give you access to the complete manual.\n"
msgstr ""
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: erro ao escrever em %s (%s)"
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: não é possÃvel obter informações \"%s\" do programa %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: não é possÃvel obter informações \"%s\" do programa %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Arquivo de inclusão para a página de manual do help2man"
-#: help2man:609
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- gera uma página de manual simples"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "ARQUIVOS INCLUSOS"
+
+#: help2man.h2m.PL:85
msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
+"\n"
+" [section]\n"
+" text\n"
+"\n"
+" /pattern/\n"
+" text\n"
+msgstr ""
+"Materiais adicionais podem ser incluÃdos na saÃda gerada com as opções\n"
+".B \\-\\-include\n"
+"e\n"
+".B \\-\\-opt\\-include\n"
+". O formato é simples:\n"
+"\n"
+" [seção]\n"
+" texto\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+" /padrão/\n"
+" texto\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Blocos de texto *roff literais são inseridos na saÃda ou no inÃcio de\n"
+"uma dada\n"
+".BI [ seção ]\n"
+"(indiferente à maiusculização), ou após um parágrafo que coincida com o\n"
+".BI / padrão /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Os padrões usam a sintaxe Perl de expressão regular e podem ser seguidos\n"
+"pelos modificadores\n"
+".IR i ,\n"
+".I s\n"
+"ou\n"
+".I m\n"
+"(veja\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
msgstr ""
+"As linhas antes da primeira seção ou de um padrão que comece com\n"
+"\"\\-\" são processados como opções. Qualquer outra coisa é ignorada\n"
+"silenciosamente e pode ser usada para comentários, palavras-chaves\n"
+"RCS e coisas do tipo.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "A ordem da saÃda das seções é:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "outra"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Quaisquer seções\n"
+".B [nome]\n"
+"ou\n"
+".B [sinopse]\n"
+"que apareçam no arquivo de inclusão substituirá o que seria\n"
+"produzido automaticamente (embora você ainda possa sobrepor\n"
+"o primeiro com\n"
+".B --name\n"
+"se necessário).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Outras seções são acrescentadas antes da saÃda produzida automaticamente\n"
+"para as seções padrões citadas acima ou inclusas na posição\n"
+".I outra\n"
+"(acima) na ordem em que elas forem encontradas no arquivo de inclusão.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "DISPONIBILIDADE"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "A última versão desta distribuição está disponÃvel on-line em:"
diff --git a/po/sv.gmo b/po/sv.gmo
index 409d79d..cd68bc0 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 7931e4c..c7536e4 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: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2009-12-19 20:29+1100\n"
+"POT-Creation-Date: 2010-04-26 15:18+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"
@@ -15,12 +15,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: help2man:48
+#: help2man:69
#, perl-format
msgid ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -29,7 +30,8 @@ msgid ""
msgstr ""
"GNU %s %s\n"
"\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
"Free Software Foundation, Inc.\n"
"Det här är fri programvara; se källkoden för kopieringsvillkor. Det finns "
"INGEN\n"
@@ -37,7 +39,7 @@ msgstr ""
"\n"
"Skrivet av Brendan O'Dea <bod@debian.org>\n"
-#: help2man:59
+#: help2man:80
#, fuzzy, perl-format
msgid ""
"`%s' generates a man page out of `--help' and `--version' output.\n"
@@ -94,109 +96,142 @@ msgstr ""
"Rapportera fel till <bug-help2man@gnu.org>.\n"
"Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
-#: help2man:138
+#: help2man:161
#, perl-format
msgid "%s: can't open `%s' (%s)"
msgstr "%s: kan inte öppna \"%s\" (%s)"
-#: help2man:199
+#: help2man:222
#, perl-format
msgid "%s: no valid information found in `%s'"
msgstr "%s: ingen giltig information funnen i \"%s\""
-#: help2man:222
+#: help2man:245
#, perl-format
msgid "%s: can't unlink %s (%s)"
msgstr "%s: kan inte avlänka %s (%s)"
-#: help2man:226
+#: help2man:249
#, perl-format
msgid "%s: can't create %s (%s)"
msgstr "%s: kan inte skapa %s (%s)"
-#: help2man:265 help2man:560
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
msgid "NAME"
msgstr "NAMN"
-#: help2man:277
+#: help2man:303
#, perl-format
msgid "%s \\- manual page for %s %s"
msgstr "%s \\- manualsida för %s %s"
-#: help2man:291
+#: help2man:317
msgid "System Administration Utilities"
msgstr "Systemadministrationsverktyg"
-#: help2man:292
+#: help2man:318
msgid "Games"
msgstr "Spel"
-#: help2man:293
+#: help2man:319
msgid "User Commands"
msgstr "Användarkommandon"
-#: help2man:298
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
msgid "Usage"
msgstr "Användning"
-#: help2man:299
+#: help2man:331
msgid "or"
msgstr "eller"
-#: help2man:330 help2man:560
+#: help2man:362 help2man:612 help2man.h2m.PL:130
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
-#: help2man:334 help2man:560
+#: help2man:366 help2man:612 help2man.h2m.PL:131
msgid "DESCRIPTION"
msgstr "BESKRIVNING"
-#: help2man:351
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
#, fuzzy
-msgid "Report +(?:[\\w-]* +)?bugs|Email +bug +reports +to"
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
msgstr "Rapportera +fel|E-post +fel +rapport +till"
-#: help2man:352
+#: help2man:392
msgid "Written +by"
msgstr "Skrivet +av"
-#: help2man:353
+#: help2man:393
msgid "Options"
msgstr "Alternativ"
-#: help2man:354
+#: help2man:394
+msgid "Environment"
+msgstr ""
+
+#: help2man:395
+msgid "Files"
+msgstr ""
+
+#: help2man:396
msgid "Examples"
msgstr "Exempel"
-#: help2man:355
+#: help2man:397
msgid "This +is +free +software"
msgstr "Det +här +är +fri +programvara"
-#: help2man:371 help2man:560
+#: help2man:413 help2man:612 help2man.h2m.PL:132
msgid "OPTIONS"
msgstr "FLAGGOR"
-#: help2man:376 help2man:561
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr ""
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr ""
+
+#: help2man:428 help2man:613 help2man.h2m.PL:135
msgid "EXAMPLES"
msgstr "EXEMPEL"
-#: help2man:383 help2man:563
+#: help2man:435 help2man:615 help2man.h2m.PL:139
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
-#: help2man:389 help2man:563
+#: help2man:441 help2man:615 help2man.h2m.PL:138
msgid "REPORTING BUGS"
msgstr "RAPPORTERA FEL"
-#: help2man:395 help2man:563
+#: help2man:447 help2man:615 help2man.h2m.PL:137
msgid "AUTHOR"
msgstr "UPPHOVSMAN"
-#: help2man:535 help2man:563
+#: help2man:587 help2man:615 help2man.h2m.PL:140
msgid "SEE ALSO"
msgstr "SE OCKSÃ…"
-#: help2man:539
+#: help2man:591
#, perl-format
msgid ""
"The full documentation for\n"
@@ -224,18 +259,150 @@ msgstr ""
".PP\n"
"bör ge dig tillgång till den kompletta manualen.\n"
-#: help2man:591
+#: help2man:643
#, perl-format
msgid "%s: error writing to %s (%s)"
msgstr "%s: fel vid skrivning till %s (%s)"
-#: help2man:608
+#: help2man:660
#, perl-format
-msgid "%s: can't get `%s' info from %s"
-msgstr "%s: kan inte få \"%s\" info från %s"
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: kan inte få \"%s\" info från %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr ""
-#: help2man:609
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- generera en enkel manualsida"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "INKLUDERA FILER"
+
+#: help2man.h2m.PL:85
msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
+"\n"
+" [section]\n"
+" text\n"
+"\n"
+" /pattern/\n"
+" text\n"
+msgstr ""
+"Ytterligare material kan inkluderas i den genererade utskriften med "
+"flaggorna\n"
+".B \\-\\-include\n"
+"och\n"
+".B \\-\\-opt\\-include\n"
+"Formatet är enkelt:\n"
+"\n"
+" [sektion]\n"
+" text\n"
"\n"
-"Try `--no-discard-stderr' if option outputs to stderr"
+" /mönster/\n"
+" text\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Block av *roff-text infogas ord för ord i utskriften antingen vid\n"
+"början av angiven\n"
+".BI [ section ]\n"
+"(okänslig för skiftläge), eller efter en paragraf som matchar\n"
+".BI / mönster /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Mönster använder Perls syntax för reguljära uttryck och kan efterföljas av "
+"modifierarna\n"
+".IR i ,\n"
+".I s\n"
+"eller\n"
+".I m\n"
+"(se\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
msgstr ""
+"Rader före den första sektionen eller mönstret som börjar med \"\\-\"\n"
+"behandlas som flaggor. Allt annat ignoreras tyst och kan användas\n"
+"för kommentarer, RCS-nyckelord och liknande.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Ordning på sektionsutskriften är:"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "övrigt"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Alla sektioner\n"
+".B [namn]\n"
+"eller\n"
+".B [synopsis]\n"
+"som visas i inkluderingsfilen kommer att ersätta vad som skulle\n"
+"automatiskt bli producerat (även om du fortfarande kan åsidosätta\n"
+"de senare med\n"
+".B --name\n"
+"om det krävs).\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Andra sektioner läggs till i början av den automatiskt producerade "
+"utskriften\n"
+"för standardsektionerna angivna ovan, eller inkluderas vid\n"
+".I övrigt\n"
+"(ovan) i den ordning de påträffades i inkluderingsfilen.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "TILLGÄNGLIGHET"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Senaste versionen av den här utgåvan finns tillgänglig online från:"
diff --git a/po/vi.gmo b/po/vi.gmo
new file mode 100644
index 0000000..65b3b99
Binary files /dev/null and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 0000000..36822d5
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,418 @@
+# Vietnamese translation for Help2Man.
+# Copyright © 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the help2man package.
+# Clytie Siddall <clytie@riverland.net.au>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: help2man 1.38.1-pre1\n"
+"Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
+"POT-Creation-Date: 2010-04-26 15:18+1000\n"
+"PO-Revision-Date: 2010-04-13 20:28+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#: help2man:69
+#, perl-format
+msgid ""
+"GNU %s %s\n"
+"\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
+"Free Software Foundation, Inc.\n"
+"This is free software; see the source for copying conditions. There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+"\n"
+"Written by Brendan O'Dea <bod@debian.org>\n"
+msgstr ""
+"GNU %s %s\n"
+"\n"
+"Tác quyá»n © năm 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010\n"
+"của Tổ chức Phần má»m Tá»± do.\n"
+"Äây là phần má»m tá»± do; hãy xem mã nguồn để biết vá» Ä‘iá»u kiện sao chép.\n"
+"KHÔNG có sá»± đảm bảo nà o; THẬM CHà KHÔNG CÓ KHẢ NÄ‚NG THÆ¯Æ NG MẠI\n"
+"HAY CHO MỘT MỤC ÄÃCH RIÊNG NÀO ÄÓ.\n"
+"\n"
+"Viết bởi Brendan O'Dea <bod@debian.org>\n"
+
+#: help2man:80
+#, perl-format
+msgid ""
+"`%s' generates a man page out of `--help' and `--version' output.\n"
+"\n"
+"Usage: %s [OPTION]... EXECUTABLE\n"
+"\n"
+" -n, --name=STRING description for the NAME paragraph\n"
+" -s, --section=SECTION section number for manual page (1, 6, 8)\n"
+" -m, --manual=TEXT name of manual (User Commands, ...)\n"
+" -S, --source=TEXT source of program (FSF, Debian, ...)\n"
+" -L, --locale=STRING select locale (default \"C\")\n"
+" -i, --include=FILE include material from `FILE'\n"
+" -I, --opt-include=FILE include material from `FILE' if it exists\n"
+" -o, --output=FILE send output to `FILE'\n"
+" -p, --info-page=TEXT name of Texinfo manual\n"
+" -N, --no-info suppress pointer to Texinfo manual\n"
+" --help print this help, then exit\n"
+" --version print version number, then exit\n"
+"\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 ""
+"« %s » tạo má»™t trang hÆ°á»›ng dẫn dá»±a và o kết xuất của tuỳ chá»n\n"
+"`--help' (trợ giúp) và `--version' (phiên bản).\n"
+"\n"
+"Sá» dụng: %s [TÙY_CHỌN]... BẢN_THá»°C_HIỆN_ÄƯỢC\n"
+"\n"
+" -n, --name=CHUỖI mô tả cho đoạn văn TÊN (NAME)\n"
+" -s, --section=PHẦN số thứ tự phần cho trang hướng dẫn (1, 6, 8)\n"
+" -m, --manual=TÊN tên của trang hướng dẫn (User Commands, ...)\n"
+" -S, --source=TEXT nguồn của chương trình (FSF, Debian, ...)\n"
+" -L, --locale=CHUá»–I chá»n miá»n địa phÆ°Æ¡ng (mặc định \"C\";\n"
+" đối với tiếng Việt thì là « vi_VN.UTF-8 »)\n"
+" -i, --include=TỆP bao gồm dữ liệu từ táºp tin nà y\n"
+" -I, --opt-include=TỆP bao gồm dữ liệu từ táºp tin nà y nếu có\n"
+" -o, --output=TỆP gá»i kết xuất cho táºp tin nà y\n"
+" -p, --info-page=TÊN tên của trang hướng dẫn loại Texinfo\n"
+" -N, --no-info thu hồi cái chỉ tới trang hướng dẫn Texinfo\n"
+" --help hiển thị trợ giúp nà y, sau đó thoát\n"
+" --version hiển thị số thứ tự phiên bản, sau đó thoát\n"
+"\n"
+"BẢN_THá»°C_HIỆN_ÄƯỢC nên chấp nháºn hai tuỳ chá»n `--help' và `--version'\n"
+"thì xuất qua đầu ra tiêu chuẩn (stdout) dù cũng có thể ghi rõ thêm tuỳ "
+"chá»n:\n"
+"\n"
+" -h, --help-option=CHUá»–I chuá»—i là tuỳ chá»n trợ giúp\n"
+" -v, --version-option=CHUá»–I chuá»—i là tuỳ chá»n phiên bản\n"
+" --version-string=CHUỖI chuỗi phiên bản\n"
+" --no-discard-stderr bao gồm đầu lỗi tiêu chuẩn\n"
+" khi phân tÃch cú pháp của kết xuất tuỳ chá»n\n"
+"\n"
+"Thông báo lỗi nà o cho <bug-help2man@gnu.org>.\n"
+
+#: help2man:161
+#, perl-format
+msgid "%s: can't open `%s' (%s)"
+msgstr "%s: không thể mở « %s » (%s)"
+
+#: help2man:222
+#, perl-format
+msgid "%s: no valid information found in `%s'"
+msgstr "%s: không tìm thấy thông tin hợp lệ trong « %s »"
+
+#: help2man:245
+#, perl-format
+msgid "%s: can't unlink %s (%s)"
+msgstr "%s: không thể bỠliên kết %s (%s)"
+
+#: help2man:249
+#, perl-format
+msgid "%s: can't create %s (%s)"
+msgstr "%s: không thể tạo %s (%s)"
+
+#. Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
+#. upper case are manual page section headings. The man(1) manual page in your
+#. language, if available should provide the conventional translations.
+#: help2man:291 help2man:612 help2man.h2m.PL:79 help2man.h2m.PL:129
+msgid "NAME"
+msgstr "TÊN"
+
+#: help2man:303
+#, perl-format
+msgid "%s \\- manual page for %s %s"
+msgstr "%s \\- trang hướng dẫn cho %s %s"
+
+#: help2man:317
+msgid "System Administration Utilities"
+msgstr "Tiện Ãch quản lý hệ thống"
+
+#: help2man:318
+msgid "Games"
+msgstr "Trò chơi"
+
+#: help2man:319
+msgid "User Commands"
+msgstr "Lệnh ngÆ°á»i dùng"
+
+#. Translators: "Usage" and "or" here are patterns (regular expressions) which
+#. are used to match the usage synopsis in program output. An example from cp
+#. (GNU coreutils) which contains both strings:
+#. Usage: cp [OPTION]... [-T] SOURCE DEST
+#. or: cp [OPTION]... SOURCE... DIRECTORY
+#. or: cp [OPTION]... -t DIRECTORY SOURCE...
+#: help2man:330
+msgid "Usage"
+msgstr "SỠdụng"
+
+#: help2man:331
+msgid "or"
+msgstr "hoặc"
+
+#: help2man:362 help2man:612 help2man.h2m.PL:130
+msgid "SYNOPSIS"
+msgstr "TÓM TẮT"
+
+#: help2man:366 help2man:612 help2man.h2m.PL:131
+msgid "DESCRIPTION"
+msgstr "MÔ TẢ"
+
+#. Translators: patterns are used to match common program output. In the source
+#. these strings are all of the form of "my $PAT_something = _('...');" and are
+#. regular expressions. If there is more than one commonly used string, you
+#. may separate alternatives with "|". Spaces in these expressions are written
+#. as " +" to indicate that more than one space may be matched. The string
+#. "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
+#. optional word, so that either "Report bugs" or "Report _program_ bugs" will
+#. be matched.
+#: help2man:391
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
+msgstr "Thông +báo +lá»—i|Gá»i thÆ° +thông +báo +lá»—i +cho"
+
+#: help2man:392
+msgid "Written +by"
+msgstr "Viết +bởi"
+
+#: help2man:393
+msgid "Options"
+msgstr "Tuỳ +chá»n"
+
+#: help2man:394
+msgid "Environment"
+msgstr "Môi +trÆ°á»ng"
+
+#: help2man:395
+msgid "Files"
+msgstr "Táºp +tin"
+
+#: help2man:396
+msgid "Examples"
+msgstr "Và +dụ"
+
+#: help2man:397
+msgid "This +is +free +software"
+msgstr "Äây +là +phần +má»m +tá»± +do"
+
+#: help2man:413 help2man:612 help2man.h2m.PL:132
+msgid "OPTIONS"
+msgstr "TÙY CHỌN"
+
+#: help2man:418 help2man:613 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr "MÔI TRƯỜNG"
+
+#: help2man:423 help2man:613 help2man.h2m.PL:134
+msgid "FILES"
+msgstr "TỆP"
+
+# type: =head1
+#: help2man:428 help2man:613 help2man.h2m.PL:135
+msgid "EXAMPLES"
+msgstr "Và DỤ"
+
+#: help2man:435 help2man:615 help2man.h2m.PL:139
+msgid "COPYRIGHT"
+msgstr "BẢN QUYỀN"
+
+#: help2man:441 help2man:615 help2man.h2m.PL:138
+msgid "REPORTING BUGS"
+msgstr "THÔNG BÃO Lá»–I"
+
+#: help2man:447 help2man:615 help2man.h2m.PL:137
+msgid "AUTHOR"
+msgstr "TÃC GIẢ"
+
+#: help2man:587 help2man:615 help2man.h2m.PL:140
+msgid "SEE ALSO"
+msgstr "XEM THÊM"
+
+#: help2man:591
+#, perl-format
+msgid ""
+"The full documentation for\n"
+".B %s\n"
+"is maintained as a Texinfo manual. If the\n"
+".B info\n"
+"and\n"
+".B %s\n"
+"programs are properly installed at your site, the command\n"
+".IP\n"
+".B info %s\n"
+".PP\n"
+"should give you access to the complete manual.\n"
+msgstr ""
+"Tà i liệu hÆ°á»›ng dẫn đầy đủ vá»\n"
+".B %s\n"
+"được bảo tồn dưới dạng một sổ tay Texinfo.\n"
+"Nếu chương trình\n"
+".B info\n"
+"và \n"
+".B %s\n"
+"được cà i đặt đúng ở địa chỉ của bạn thì câu lệnh\n"
+".IP\n"
+".B info %s\n"
+".PP\n"
+"nên cho phép bạn truy cáºp đến sổ tay hoà n toà n.\n"
+
+#: help2man:643
+#, perl-format
+msgid "%s: error writing to %s (%s)"
+msgstr "%s: lỗi ghi nhớ và o %s (%s)"
+
+#: help2man:660
+#, perl-format
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: không thể lấy thông tin « %s » từ %s%s"
+
+#: help2man:662
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+"Nếu tuỳ chá»n xuất qua đầu lá»—i tiêu chuẩn thì thá» láºp cỠ« --no-discard-stderr "
+"»"
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "Bao gồm táºp tin cho trang hÆ°á»›ng dẫn vá» help2man"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- tạo một trang hướng dẫn đơn giản"
+
+#: help2man.h2m.PL:83
+msgid "INCLUDE FILES"
+msgstr "TỆP BAO GỒM"
+
+#: help2man.h2m.PL:85
+msgid ""
+"Additional material may be included in the generated output with the\n"
+".B \\-\\-include\n"
+"and\n"
+".B \\-\\-opt\\-include\n"
+"options. The format is simple:\n"
+"\n"
+" [section]\n"
+" text\n"
+"\n"
+" /pattern/\n"
+" text\n"
+msgstr ""
+"CÅ©ng có thể bao gồm dữ liệu bổ sung trong kết xuất, dùng tuỳ chá»n\n"
+".B \\-\\-include\n"
+"và \n"
+".B \\-\\-opt\\-include\n"
+"Có một định dạng đơn giản:\n"
+"\n"
+" [phần]\n"
+" chuá»—i\n"
+"\n"
+" /mẫu/\n"
+" chuá»—i\n"
+
+#: help2man.h2m.PL:100
+msgid ""
+"Blocks of verbatim *roff text are inserted into the output either at\n"
+"the start of the given\n"
+".BI [ section ]\n"
+"(case insensitive), or after a paragraph matching\n"
+".BI / pattern /\\fR.\n"
+msgstr ""
+"Khối văn bản định dạng *roff đúng nguyên văn được chèn và o kết xuất\n"
+"hoặc ở đầu của phần\n"
+".BI [ phần ]\n"
+"(không phân biệt chữ hoa/thÆ°á»ng),\n"
+"hoặc đẳng sau một đoạn văn tương ứng với mẫu\n"
+".BI / mẫu /\\fR.\n"
+
+#: help2man.h2m.PL:109
+msgid ""
+"Patterns use the Perl regular expression syntax and may be followed by\n"
+"the\n"
+".IR i ,\n"
+".I s\n"
+"or\n"
+".I m\n"
+"modifiers (see\n"
+".BR perlre (1)).\n"
+msgstr ""
+"Mẫu chấp nháºn cú pháp của biểu thức chÃnh quy Perl,\n"
+"và cÅ©ng cho phép dấu sá»a đổi\n"
+".IR i ,\n"
+".I s\n"
+"hay\n"
+".I m\n"
+"(xem\n"
+".BR perlre (1)).\n"
+
+#: help2man.h2m.PL:121
+msgid ""
+"Lines before the first section or pattern which begin with `\\-' are\n"
+"processed as options. Anything else is silently ignored and may be\n"
+"used for comments, RCS keywords and the like.\n"
+msgstr ""
+"Dòng nà o đẳng trÆ°á»›c phần đầu tiên hoặc mẫu bắt đầu vá»›i « \\- » thì được xá»\n"
+"lý dÆ°á»›i dạng tuỳ chá»n. Dữ liệu khác (nếu có) bị bá» qua mà không xuất chi\n"
+"tiết, và có thể được sỠdụng là m ghi chú, từ khoá RCS v.v.\n"
+
+#: help2man.h2m.PL:127
+msgid "The section output order (for those included) is:"
+msgstr "Thứ tự xuất phần (đã bao gồm):"
+
+#: help2man.h2m.PL:136
+msgid "other"
+msgstr "khác"
+
+#: help2man.h2m.PL:144
+msgid ""
+"Any\n"
+".B [NAME]\n"
+"or\n"
+".B [SYNOPSIS]\n"
+"sections appearing in the include file will replace what would have\n"
+"automatically been produced (although you can still override the\n"
+"former with\n"
+".B --name\n"
+"if required).\n"
+msgstr ""
+"Bắt cứ phần\n"
+".B [NAME]\n"
+"hoặc\n"
+".B [SYNOPSIS]\n"
+"nà o xuất hiện trong táºp tin bao gồm thì thay thế kết xuất tá»± Ä‘á»™ng tạo\n"
+"(dù bạn vẫn còn có dịp ghi đè lên phần [NAME] bằng:\n"
+".B --name\n"
+"nếu cần).\n"
+"\n"
+"NAME: TÊN\n"
+"SYNOPSIS: TÓM TẮT\n"
+
+#: help2man.h2m.PL:157
+msgid ""
+"Other sections are prepended to the automatically produced output for\n"
+"the standard sections given above, or included at\n"
+".I other\n"
+"(above) in the order they were encountered in the include file.\n"
+msgstr ""
+"Các phần khác được thêm và o đầu của kết xuất tự động tạo\n"
+"cho những phần tiêu chuẩn đưa ra trên, hoặc được bao gồm tại\n"
+".I other\n"
+"(bên trên) theo thứ tá»± gặp trong táºp tin bao gồm.\n"
+
+#: help2man.h2m.PL:164
+msgid "AVAILABILITY"
+msgstr "TÃNH SẴN SÀNG"
+
+#: help2man.h2m.PL:165
+msgid "The latest version of this distribution is available on-line from:"
+msgstr "Phiên bản mới nhất của bản phân phối nà y có sẵn sà ng trực tuyến từ :"