gnu/help2man

diff --git a/NEWS b/NEWS
index 0a3124c..7ab13c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 1.40		May 28, 2011
+
+  * Update texinfo docs.
+  * Document --libtool option.
+  * Allow date format to be localised.
+  * Add Japanese translation.
+
 Version 1.39		March 8, 2011
 
   * Add --libtool option to remove `lt-' prefix for libtool programs.
diff --git a/README b/README
index dca6263..44d75da 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-		README for GNU help2man version 1.39.4
+		README for GNU help2man version 1.40.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.39.4.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.40.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 3215fa2..5c8de2e 100644
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ A list of people who have contributed to the development of `help2man'
 by reporting problems, suggesting various improvements and submitting
 code or translations follows.
 
+Yasumichi AKAHOSHI		<yasumichi@vinelinux.org>
 Ben Asselstine			<benasselstine@hushmail.com>
 Denis Barbier			<barbier@debian.org>
 Karl Berry			<karl@freefriends.org>
@@ -27,20 +28,20 @@ Lionel Elie Mamane		<lionel@mamane.lu>
 Jim Meyering			<jim@meyering.net>
 Dave Morrison			<dave@bnl.gov>
 Peter Moulder			<reiter@netspace.net.au>
+NIIBE Yutaka			<gniibe@fsij.org>
 Daniel Nylander			<yeager@lidkoping.net>
+OKUJI Yoshinori			<okuji@kuicr.kyoto-u.ac.jp>
 François Pinard			<pinard@iro.umontreal.ca>
 Richard Pixley			<rpixley@zhone.com>
 David Prévot			<david@tilapin.org>
 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>
+SUZUKI Shoji			<suzukis@cmpt.phys.tohoku.ac.jp>
 Reuben Thomas			<rrt@sc3d.org>
 Patrick Tullmann		<tullmann@cs.utah.edu>
 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>
-NIIBE Yutaka			<gniibe@fsij.org>
 Stefano Zacchiroli		<zack@debian.org>
 Sergio Zanchetta		<primes2h@ubuntu.com>
diff --git a/debian/changelog b/debian/changelog
index f6e332a..7bcb6c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+help2man (1.40.1) unstable; urgency=low
+
+  * Update texinfo docs with recommendations kindly provided by Karl
+    Berry.
+  * Document --libtool option.
+  * Fixup references to GNU Standards.
+  * Allow date format to be localised (thanks to Yasumichi Akahoshi).
+  * Add Japanese translation (thanks to Yasumichi Akahoshi).
+
+ -- Brendan O'Dea <bod@debian.org>  Sun, 29 May 2011 11:31:14 +1000
+
 help2man (1.39.4) unstable; urgency=low
 
   * Update Italian translation (thanks to Sergio Zanchetta).
diff --git a/help2man.1 b/help2man.1
index 416c690..1e166af 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "May 2011" "help2man 1.39.4" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "May 2011" "help2man 1.40.1" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS
diff --git a/help2man.PL b/help2man.PL
index 39a3fb1..532c0b9 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,11 +16,12 @@ use 5.008;
 use Config;
 use Getopt::Long;
 
-my ($program, $version) = ('help2man', '1.39.4');
+my ($program, $version) = ('help2man', '1.40.1');
 
 my %opts;
 die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"
-    unless GetOptions \%opts, qw(quiet stdout with-gettext name version) and !@ARGV;
+    unless GetOptions \%opts, qw(quiet stdout with-gettext name version)
+      and !@ARGV;
 
 print "$program\n" if $opts{name};
 print "$version\n" if $opts{version};
@@ -331,7 +332,7 @@ sub get_option_value;
 my $help_text   = get_option_value $ARGV[0], $help_option;
 $version_text ||= get_option_value $ARGV[0], $version_option;
 
-my $date = strftime "%B %Y", localtime;
+my $date = enc strftime _("%B %Y"), localtime;
 (my $program = $ARGV[0]) =~ s!.*/!!;
 my $package = $program;
 my $version;
diff --git a/help2man.de.1 b/help2man.de.1
index 1f8e5e3..ba40e1f 100644
--- a/help2man.de.1
+++ b/help2man.de.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "Mai 2011" "help2man 1.39.4" "Benutzerkommandos"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "Mai 2011" "help2man 1.40.1" "Benutzerkommandos"
 .SH NAME
 help2man \- generiert eine einfache Handbuchseite
 .SH ÜBERSICHT
diff --git a/help2man.el.1 b/help2man.el.1
index 90e9768..b078c65 100644
--- a/help2man.el.1
+++ b/help2man.el.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "Μάιος 2011" "help2man 1.39.4" "Εντολές χρήστη"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "Μάιος 2011" "help2man 1.40.1" "Εντολές χρήστη"
 .SH NAME
 help2man \- δημιουργία απλής σελίδας εγχειριδίου
 .SH DESCRIPTION
diff --git a/help2man.eo.1 b/help2man.eo.1
index 6260484..b3164b5 100644
--- a/help2man.eo.1
+++ b/help2man.eo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "Majo 2011" "help2man 1.39.4" "Uzant-Komandoj"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "Majo 2011" "help2man 1.40.1" "Uzant-Komandoj"
 .SH NOMO
 help2man \- generas simplan man-paĝon
 .SH RESUMO
diff --git a/help2man.fi.1 b/help2man.fi.1
index 5a025fb..00bee1b 100644
--- a/help2man.fi.1
+++ b/help2man.fi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "toukokuu 2011" "help2man 1.39.4" "Käyttäjän sovellukset"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "toukokuu 2011" "help2man 1.40.1" "Käyttäjän sovellukset"
 .SH NIMI
 help2man \- luo yksinkertainen man-sivu
 .SH YLEISKATSAUS
diff --git a/help2man.fr.1 b/help2man.fr.1
index 657635c..cd18e9b 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "mai 2011" "help2man 1.39.4" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "mai 2011" "help2man 1.40.1" "Commandes"
 .SH NOM
 help2man \- crée une page de manuel sommaire
 .SH SYNOPSIS
diff --git a/help2man.html.PL b/help2man.html.PL
new file mode 100755
index 0000000..e030296
--- /dev/null
+++ b/help2man.html.PL
@@ -0,0 +1,85 @@
+#!/usr/bin/perl
+
+#
+# Combine generated html page with GNU boilerplate.
+#
+
+use strict;
+use warnings;
+use File::Temp;
+use Getopt::Long;
+
+my %opts;
+die "Usage: $0 [--quiet] [--stdout]\n"
+    unless GetOptions \%opts, qw(quiet stdout) and !@ARGV;
+
+undef $/;
+
+# Fetch GNU boilerplate
+my $boilerplate;
+my $url = 'http://www.gnu.org/server/standards/boilerplate-source.html';
+do {
+    open my $b, '-|', 'curl', '-sL', $url or die "curl: $!";
+    $boilerplate = <$b>;
+    ($url) = $boilerplate =~ /<meta\s+http-equiv=["']?refresh["']?\s+
+	                      content=["']\d+;\s+url=["']?(http[^"'>]*)/xi;
+} while $url;
+
+for ($boilerplate)
+{
+    s#\$Revision:\s+(\S+)\s+\$#$1#;
+    s#<!-- This is the template document.*?-->\s+##s;
+    s#<!-- Instructions for adapting.*?-->\s*(<!-- \d+\. .*?-->\s*)*##s;
+    s#<title>Baz\s+(- GNU Project)#<title>help2man $1#s;
+    s#<h2>GNU\sBaz</h2>.*(</div><!--\s+for\s+id="content")#%body%$1#s;
+}
+
+my ($header, $footer) = split /%body%/, $boilerplate;
+die "can't parse boilerplate" unless $footer;
+
+# Generate manual from texinfo
+my $texi_tmp = File::Temp->new();
+system 'makeinfo', '--html', '--no-number-sections', '--no-headers',
+    '--no-split', '--output=' . $texi_tmp->filename, 'help2man.texi';
+
+my $gnu_standards = "http://www.gnu.org/prep/standards/standards.html";
+my $body = <$texi_tmp>;
+for ($body)
+{
+    s#^.*<body>##s;
+    s#</body>.*##s;
+
+    # Fixup references
+    s#<a\s+href="standards\.html#<a href="$gnu_standards#g;
+    s#<a\s+href="\*manpages\*\.html\#perlre"
+        #<a href="http://perldoc.perl.org/perlre.html"#xg;
+}
+
+# Write output
+my $target = $0;
+my $out;
+if ($opts{stdout})
+{
+    $out = \*STDOUT;
+    $opts{quiet} = 1;
+}
+else
+{
+    $target =~ s!.*/!!;
+    $target =~ s/\.PL$//  or die "$0: can't determine target name\n";
+    unlink $target        or die "$0: can't unlink $target ($!)\n"
+	if -e $target;
+    open $out, ">$target" or die "$0: can't create $target ($!)\n";
+}
+
+print "Extracting $target (with GNU boilerplate)\n"
+    unless $opts{quiet};
+
+print $out $header, $body, $footer;
+
+# Fix output file permissions
+unless ($opts{stdout})
+{
+    close $out;
+    chmod 0444, $target or warn "$0: can't change mode of $target ($!)\n";
+}
diff --git a/help2man.info b/help2man.info
index 8643583..5a88262 100644
--- a/help2man.info
+++ b/help2man.info
@@ -1,7 +1,7 @@
 This is help2man.info, produced by makeinfo version 4.13 from
 help2man.texi.
 
-INFO-DIR-SECTION GNU programming support
+INFO-DIR-SECTION Software development
 START-INFO-DIR-ENTRY
 * help2man: (help2man).      Automatic manual page generation.
 END-INFO-DIR-ENTRY
@@ -39,8 +39,8 @@ File: help2man.info,  Node: Top,  Next: Overview,  Up: (dir)
 
 * Overview::                    Overview of `help2man'.
 * Invoking help2man::           How to run `help2man'.
-* Including text::              Including additional text in the output.
 * --help recommendations::      Recommended formatting for --help output.
+* Including text::              Including additional text in the output.
 * Makefile usage::              Using `help2man' with `make'.
 * Localised man pages::         Producing native language manual pages.
 * Example::                     Example `help2man' output.
@@ -68,7 +68,7 @@ maintain that document.
 something which resembles a manual page.
 
 
-File: help2man.info,  Node: Invoking help2man,  Next: Including text,  Prev: Overview,  Up: Top
+File: help2man.info,  Node: Invoking help2man,  Next: --help recommendations,  Prev: Overview,  Up: Top
 
 2 How to Run `help2man'
 ***********************
@@ -136,6 +136,12 @@ The format for running the `help2man' program is:
      Suppress inclusion of a `SEE ALSO' paragraph directing the reader
      to the Texinfo documentation.
 
+`-l'
+`--libtool'
+     Drop `lt-' prefix from instances of the program name in the
+     synopsis (`libtool' creates wrapper scripts in the build directory
+     which invoke `foo' as `.libs/lt-foo').
+
 `--help'
 `--version'
      Show help or version information.
@@ -158,7 +164,7 @@ options to the executable although alternatives may be specified using:
      Include stderr when parsing option output.
 
 
-File: help2man.info,  Node: --help recommendations,  Next: Makefile usage,  Prev: Including text,  Up: Top
+File: help2man.info,  Node: --help recommendations,  Next: Including text,  Prev: Invoking help2man,  Up: Top
 
 3 `--help' Recommendations
 **************************
@@ -167,9 +173,9 @@ Here are some recommendations for what to include in your `--help'
 output.  Including these gives `help2man' the best chance at generating
 a respectable man page, as well as benefitting users directly.
 
-   *Note Command-Line Interfaces: (GNU Coding Standards)Command-Line
-Interfaces, and *note Man Pages: (GNU Coding Standards)Man Pages, for
-the official GNU standards relating to `--help' and man pages.
+   *Note Command-Line Interfaces: (standards)Command-Line Interfaces,
+and *note Man Pages: (standards)Man Pages, for the official GNU
+standards relating to `--help' and man pages.
 
    * A synopsis of how to invoke the program.  If different usages of
      the program have different invocations, then list them all.  For
@@ -233,7 +239,7 @@ option definition; you may wish to consider using these routines for
 option parsing instead of `getopt'.
 
 
-File: help2man.info,  Node: Including text,  Next: --help recommendations,  Prev: Invoking help2man,  Up: Top
+File: help2man.info,  Node: Including text,  Next: Makefile usage,  Prev: --help recommendations,  Up: Top
 
 4 Including Additional Text in the Output
 *****************************************
@@ -286,7 +292,7 @@ the standard sections given above, or included at _other_ (above) in
 the order they were encountered in the include file.
 
 
-File: help2man.info,  Node: Makefile usage,  Next: Localised man pages,  Prev: --help recommendations,  Up: Top
+File: help2man.info,  Node: Makefile usage,  Next: Localised man pages,  Prev: Including text,  Up: Top
 
 5 Using `help2man' With `make'
 ******************************
@@ -479,23 +485,31 @@ File: help2man.info,  Node: Availability,  Prev: Reports,  Up: Top
 9 Obtaining `help2man'
 **********************
 
-The latest version of this distribution is available on-line from:
+The latest version of this distribution is available online from GNU
+mirrors:
+
+     `http://ftpmirror.gnu.org/help2man/'
+
+   If automatic redirection fails, the list of mirrors is at:
+
+     `http://www.gnu.org/order/ftp.html'
 
-     `ftp://ftp.gnu.org/gnu/help2man/'
+   Or if need be you can use the main GNU ftp server:
+     `http://ftp.gnu.org/gnu/help2man/'
 
 
 
 Tag Table:
-Node: Top1137
-Node: Overview1903
-Node: Invoking help2man2610
-Node: --help recommendations4961
-Node: Including text8379
-Node: Makefile usage10090
-Node: Localised man pages11029
-Ref: Localised man pages-Footnote-112734
-Node: Example12910
-Node: Reports15515
-Node: Availability15969
+Node: Top1134
+Node: Overview1900
+Node: Invoking help2man2607
+Node: --help recommendations5165
+Node: Including text8564
+Node: Makefile usage10272
+Node: Localised man pages11203
+Ref: Localised man pages-Footnote-112908
+Node: Example13084
+Node: Reports15689
+Node: Availability16143
 
 End Tag Table
diff --git a/help2man.it.1 b/help2man.it.1
index c540eeb..71255c0 100644
--- a/help2man.it.1
+++ b/help2man.it.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "maggio 2011" "help2man 1.39.4" "Comandi utente"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "maggio 2011" "help2man 1.40.1" "Comandi utente"
 .SH NOME
 help2man \- genera una semplice pagina di manuale
 .SH SINTASSI
diff --git a/help2man.ja.1 b/help2man.ja.1
new file mode 100644
index 0000000..52fc742
--- /dev/null
+++ b/help2man.ja.1
@@ -0,0 +1,149 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "5月 2011" "help2man 1.40.1" "ユーザーコマンド"
+.SH 名前
+help2man \- 簡易マニュアルページの生成
+.SH 書式
+.B help2man
+[\fIOPTION\fR]... \fIEXECUTABLE\fR
+.SH 説明
+`help2man' は `\-\-help' および `\-\-version' の出力を元にマニュアルページを生成する。
+.PP
+引数 EXECUTABLE には、マニュアル作成の対象とするコマンドを指定する。
+.TP
+\fB\-n\fR, \fB\-\-name\fR=\fISTRING\fR
+「名前」セクションで使うコマンドの短い説明
+.TP
+\fB\-s\fR, \fB\-\-section\fR=\fISECTION\fR
+マニュアルページが所属するセクションの番号 (1, 6, 8)
+.TP
+\fB\-m\fR, \fB\-\-manual\fR=\fITEXT\fR
+マニュアルの種類 (ユーザコマンド, ...)
+.TP
+\fB\-S\fR, \fB\-\-source\fR=\fITEXT\fR
+プログラムの出自 (FSF, Debian, ...)
+.TP
+\fB\-L\fR, \fB\-\-locale\fR=\fISTRING\fR
+ロケールを選択する (デフォルトは "C")
+.TP
+\fB\-i\fR, \fB\-\-include\fR=\fIFILE\fR
+`FILE' から原稿を取り込む
+.TP
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fIFILE\fR
+`FILE' が存在した場合 `FILE' から原稿を取り込む
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
+`FILE' へ出力を送る
+.TP
+\fB\-p\fR, \fB\-\-info\-page\fR=\fITEXT\fR
+Texinfo マニュアルの名前
+.TP
+\fB\-N\fR, \fB\-\-no\-info\fR
+Texinfo マニュアルの紹介を省略する
+.TP
+\fB\-l\fR, \fB\-\-libtool\fR
+プログラム名から `lt\-' を取り除く
+.TP
+\fB\-\-help\fR
+簡単な使い方を表示し終了する
+.TP
+\fB\-\-version\fR
+バージョン番号を表示し終了する
+.PP
+マニュアル作成の対象になるコマンドは、\-\-help や \fB\-\-version\fR というオプションを受け入れて、
+標準出力にメッセージを表示するようになっているべきである。
+もっとも、以下のオプションを使えば、\-\-help や \fB\-\-version\fR に相当する別のオプションを指定することが可能だ。
+.TP
+\fB\-h\fR, \fB\-\-help\-option\fR=\fISTRING\fR
+ヘルプ表示オプションの文字列
+.TP
+\fB\-v\fR, \fB\-\-version\-option\fR=\fISTRING\fR
+バージョン表示オプションの文字列
+.TP
+\fB\-\-version\-string\fR=\fISTRING\fR
+バージョンとして表示する文字列
+.TP
+\fB\-\-no\-discard\-stderr\fR
+オプションの出力を解析するときに標準エラー出力を含める
+.SH インクルードファイル
+.B \-\-include
+や
+.B \-\-opt\-include
+オプションを使用すると、生成する出力に追加の原稿を取り込むことができる。ファイルの書式は単純である。
+
+    [セクション]
+    本文
+
+    /パターン/
+    本文
+
+本文は *roff のテキストであり、出力中の、指定された
+.BI [ セクション ]
+(大文字・小文字は区別されない) の先頭部分や
+.BI / パターン /\fR.
+にマッチするパラグラフの直後に、そのままの形で挿入される。
+
+パターンには Perl の正規表現の文法を使用する。修飾子の
+.IR i
+,
+.I s
+,
+.I m
+を後に付けることもできる (
+.BR perlre (1) を参照)。
+
+最初のセクションやパターンより前にある行で、'\-' で始まっている行は、
+オプションとして処理される。それ以外は、何もせずに無視されるのでコメントや
+RCS のキーワードなどに使用することができる。
+
+セクションの出力順序:
+
+    名前
+    書式
+    説明
+    オプション
+    環境変数
+    ファイル
+    例
+    \fIその他\fR
+    作者
+    バグの報告
+    著作権
+    関連項目
+
+インクルードファイルに
+.B [名前]
+や
+.B [書式]
+というセクションがあれば、そこに記述した内容が、自動的に生成される内容のかわりに出力される。
+ (もっとも、どうしても必要ならば、前者については、
+.B --name
+オプションを使って、さらに置き換えることができるが。)
+
+それ以外のセクションについては、上記の標準的なセクションのために
+自動的に生成される出力の前に挿入されるか、あるいは、(上記の) 
+.I その他
+の位置に、インクルードファイル中で見つかった順番で取り込まれる。
+.SH 入手先
+この配布物の最新バージョンは次の場所から入手可能である。
+
+    ftp://ftp.gnu.org/gnu/help2man/
+.SH 作者
+作者は Brendan O'Dea <bod@debian.org> である。
+.SH バグの報告
+バグを発見した場合は <bug\-help2man@gnu.org> に報告されたい。
+.SH 著作権
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
+2011 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.
+.SH 関連項目
+.B help2man
+の完全なマニュアルは Texinfo マニュアルとして整備されている。もし、
+.B info
+および
+.B help2man
+のプログラムが正しくインストールされているならば、コマンド
+.IP
+.B info help2man
+.PP
+を使用すると完全なマニュアルを読むことができるはずだ。
diff --git a/help2man.pl.1 b/help2man.pl.1
index b51c819..f58c7bf 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "maj 2011" "help2man 1.39.4" "Polecenia użytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "maj 2011" "help2man 1.40.1" "Polecenia użytkownika"
 .SH NAZWA
 help2man \- generowanie prostej strony podręcznika
 .SH SKŁADNIA
diff --git a/help2man.pt_BR.1 b/help2man.pt_BR.1
index 336217c..75235c2 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.39.4.
-.TH HELP2MAN "1" "maio 2011" "help2man 1.39.4" "Comandos de usuário"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "maio 2011" "help2man 1.40.1" "Comandos de usuário"
 .SH NOME
 help2man \- gera uma página de manual simples
 .SH DESCRIÇÃO
diff --git a/help2man.ru.1 b/help2man.ru.1
index 8ee9921..d9c906f 100644
--- a/help2man.ru.1
+++ b/help2man.ru.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "Май 2011" "help2man 1.39.4" "Пользовательские команды"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "Май 2011" "help2man 1.40.1" "Пользовательские команды"
 .SH ИМЯ
 help2man \- генерирует простую справочную страницу
 .SH ОБЗОР
diff --git a/help2man.sv.1 b/help2man.sv.1
index 4d4c4d3..87c7b15 100644
--- a/help2man.sv.1
+++ b/help2man.sv.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "maj 2011" "help2man 1.39.4" "Användarkommandon"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "maj 2011" "help2man 1.40.1" "Användarkommandon"
 .SH NAMN
 help2man \- generera en enkel manualsida
 .SH BESKRIVNING
diff --git a/help2man.texi b/help2man.texi
index 540fdc8..379733a 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -1,15 +1,14 @@
 \input texinfo @c -*-texinfo-*-
 @setfilename help2man.info
 @settitle @command{help2man} Reference Manual
-@setchapternewpage on
 @finalout
 
-@dircategory GNU programming support
+@dircategory Software development
 @direntry
 * help2man: (help2man).      Automatic manual page generation.
 @end direntry
 
-@ifinfo
+@copying
 This file documents the GNU @command{help2man} command which produces
 simple manual pages from the @samp{--help} and @samp{--version} output
 of other commands.
@@ -37,7 +36,7 @@ Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Foundation.
-@end ifinfo
+@end copying
 
 @titlepage
 @title help2man
@@ -64,7 +63,7 @@ except that this permission notice may be stated in a translation approved
 by the Foundation.
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top
 @top @command{help2man}
 
@@ -74,15 +73,15 @@ and @samp{--version} output of other commands.
 @menu
 * Overview::                    Overview of @command{help2man}.
 * Invoking help2man::           How to run @command{help2man}.
-* Including text::              Including additional text in the output.
 * --help recommendations::      Recommended formatting for --help output.
+* Including text::              Including additional text in the output.
 * Makefile usage::              Using @command{help2man} with @command{make}.
 * Localised man pages::         Producing native language manual pages.
 * Example::                     Example @command{help2man} output.
 * Reports::                     Reporting bugs or suggestions.
 * Availability::                Obtaining @command{help2man}.
 @end menu
-@end ifinfo
+@end ifnottex
 
 @node Overview
 @chapter Overview of @command{help2man}
@@ -91,7 +90,7 @@ and @samp{--version} output of other commands.
 manual pages from program output.
 
 Although manual pages are optional for GNU programs other projects,
-such as Debian require them (@pxref{Man Pages, , , standards, The GNU
+such as Debian require them (@pxref{Man Pages, , , standards, GNU
 Coding Standards})
 
 This program is intended to provide an easy way for software authors
@@ -171,6 +170,12 @@ Name of Texinfo manual.
 Suppress inclusion of a @samp{SEE ALSO} paragraph directing the reader
 to the Texinfo documentation.
 
+@item -l
+@itemx --libtool
+Drop @file{lt-} prefix from instances of the program name in the
+synopsis (@command{libtool} creates wrapper scripts in the build
+directory which invoke @command{foo} as @command{.libs/lt-foo}).
+
 @item --help
 @itemx --version
 Show help or version information.
@@ -204,9 +209,9 @@ Here are some recommendations for what to include in your
 best chance at generating a respectable man page, as well as
 benefitting users directly.
 
-@xref{Command-Line Interfaces,,,GNU Coding Standards,standards}, and
-@ref{Man Pages,,,GNU Coding Standards,standards}, for the official GNU
-standards relating to @option{--help} and man pages.
+@xref{Command-Line Interfaces, , , standards, GNU Coding Standards},
+and @ref{Man Pages, , , standards, GNU Coding Standards}, for the
+official GNU standards relating to @option{--help} and man pages.
 
 @itemize @bullet
 @item
@@ -436,7 +441,7 @@ does (or doesn't) work for you (@pxref{Reports}).
 Given a hypothetical program @command{foo} which produces the following output:
 
 @c Default values strong/em to be used in Examples, these are
-@c overridden for info, which doeesn't have real bold/italic.
+@c overridden for info, which doesn't have real bold/italic.
 @macro exstrong{text}
 @strong{\text\}
 @end macro
@@ -559,10 +564,22 @@ Note to translators: Translations are handled though the
 @node Availability
 @chapter Obtaining @command{help2man}
 
-The latest version of this distribution is available on-line from:
+The latest version of this distribution is available online from GNU
+mirrors:
+
+@example
+@url{http://ftpmirror.gnu.org/help2man/}
+@end example
+
+If automatic redirection fails, the list of mirrors is at:
+
+@example
+@url{http://www.gnu.org/order/ftp.html}
+@end example
 
+Or if need be you can use the main GNU ftp server:
 @example
-@url{ftp://ftp.gnu.org/gnu/help2man/}
+@url{http://ftp.gnu.org/gnu/help2man/}
 @end example
 
 @contents
diff --git a/help2man.uk.1 b/help2man.uk.1
index b6079e8..b2f23ca 100644
--- a/help2man.uk.1
+++ b/help2man.uk.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "травень 2011" "help2man 1.39.4" "Команди користувача"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "травень 2011" "help2man 1.40.1" "Команди користувача"
 .SH НАЗВА
 help2man \— програма для створення простих сторінок довідника
 .SH "КОРОТКИЙ ОПИС"
diff --git a/help2man.vi.1 b/help2man.vi.1
index 1c9c763..a701466 100644
--- a/help2man.vi.1
+++ b/help2man.vi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH HELP2MAN "1" "Tháng năm 2011" "help2man 1.39.4" "Lệnh người dùng"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.1.
+.TH HELP2MAN "1" "Tháng năm 2011" "help2man 1.40.1" "Lệnh người dùng"
 .SH TÊN
 help2man \- tạo một trang hướng dẫn đơn giản
 .SH "MÔ TẢ"
diff --git a/locales b/locales
index e5bf867..e6a94a4 100644
--- a/locales
+++ b/locales
@@ -1,9 +1,10 @@
 de	de_DE.UTF-8
 el	el_GR.UTF-8
+eo	eo.UTF-8
 fi	fi_FI.UTF-8
 fr	fr_FR.UTF-8
-eo	eo.UTF-8
 it	it_IT.UTF-8
+ja	ja_JP.UTF-8
 pl	pl_PL.UTF-8
 pt_BR	pt_BR.UTF-8
 ru	ru_RU.UTF-8
diff --git a/po/de.gmo b/po/de.gmo
index 1eb29b3..86b8dd4 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index f6c307e..60dd34c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.2\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-05-01 10:25+1000\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -114,6 +114,14 @@ msgstr "%s: »%s« kann nicht geöffnet werden (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: Keine gültigen Informationen in »%s« gefunden"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
diff --git a/po/el.gmo b/po/el.gmo
index 4986489..5b43d02 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 5fbda0d..889488c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.38.2 \n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2010-10-23 00:48+0200\n"
 "Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
@@ -116,6 +116,14 @@ msgstr "%s: αδυναμία ανοίγματος `%s' (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: δεν βρέθηκαν έγκυρες πληροφορίες σε `%s'"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
diff --git a/po/eo.gmo b/po/eo.gmo
index 75d7a1f..f08f970 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index ece434b..0da1eeb 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-03-04 20:31-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -21,7 +21,8 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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,9 +31,11 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Kopirajto (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Kopirajto (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 Free Software Foundation, Inc.\n"
-"Tio ĉi estas libera programaro; rigardu la fontkodon por kopi-kondiĉoj. Estas NENIU\n"
+"Tio ĉi estas libera programaro; rigardu la fontkodon por kopi-kondiĉoj. "
+"Estas NENIU\n"
 "garantio; eĉ ne por MERKATIGEBLO aŭ TAŬGECO POR SPECIFA CELO.\n"
 "\n"
 "Verkite de Brendan O'Dea <bod@debian.org>\n"
@@ -58,7 +61,8 @@ msgid ""
 "     --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"
+"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"
@@ -78,7 +82,8 @@ msgstr ""
 " -S, --source=TEKSTO       fonto de la programo (FSF, Debian, ...)\n"
 " -L, --locale=ĈENO         elekti lokaĵaron (apriore \"C\")\n"
 " -i, --include=DOSIERO     inkluzivigi materialon el 'DOSIERO'\n"
-" -I, --opt-include=DOSIERO inkluzivigi materialon el 'DOSIERO' se ĝi ekzistas\n"
+" -I, --opt-include=DOSIERO inkluzivigi materialon el 'DOSIERO' se ĝi "
+"ekzistas\n"
 " -o, --output=DOSIERO      sendi eligon al 'DOSIERO'\n"
 " -p, --info-page=TEKSTO    nomo de manlibro Texinfo\n"
 " -N, --no-info             formeti referencon al manlibro Texinfo\n"
@@ -92,7 +97,8 @@ msgstr ""
 " -h, --help-option=ĈENO    help-elektila ĉeno\n"
 " -v, --version-option=ĈENO versi-elektila ĉeno\n"
 " --version-string=ĈENO     versia ĉeno\n"
-" --no-discard-stderr       inkluzivigi stderr dum analizado de elektil-eligo\n"
+" --no-discard-stderr       inkluzivigi stderr dum analizado de elektil-"
+"eligo\n"
 "\n"
 "Raportu misojn al <bug-help2man@gnu.org>.\n"
 
@@ -106,6 +112,14 @@ msgstr "%s: ne povas malfermi '%s' (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: neniu valida informo trovite en '%s'"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
@@ -172,7 +186,9 @@ msgstr "PRISKRIBO"
 #. be matched.
 #: help2man:395
 msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
-msgstr "Raportu +(?:[\\w-]+ +)?misojn|Raportu +(?:[\\w-]+ +)?cimojn|Sendu +cim?raportojn +al"
+msgstr ""
+"Raportu +(?:[\\w-]+ +)?misojn|Raportu +(?:[\\w-]+ +)?cimojn|Sendu +cim?"
+"raportojn +al"
 
 #: help2man:396
 msgid "Written +by"
@@ -334,7 +350,8 @@ msgid ""
 "modifiers (see\n"
 ".BR perlre (1)).\n"
 msgstr ""
-"Ŝablonoj uzas la sintakson de regul-esprimoj Perl kaj povas esti sekvataj de\n"
+"Ŝablonoj uzas la sintakson de regul-esprimoj Perl kaj povas esti sekvataj "
+"de\n"
 "la modifiloj\n"
 ".IR i ,\n"
 ".I s\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index c522324..223f392 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index a8ddbf6..d8c6958 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-03-03 10:08+0200\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -21,7 +21,8 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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,9 +31,11 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 Free Software Foundation, Inc.\n"
-"Tämä on vapaa ohjelmist; katsokaa kopiointiehdot lähdekoodista. Takuuta EI OLE;\n"
+"Tämä on vapaa ohjelmist; katsokaa kopiointiehdot lähdekoodista. Takuuta EI "
+"OLE;\n"
 "ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA tai SOPIVUUDESTA TIETTYYN\n"
 "TARKOITUKSEEN.\n"
 "\n"
@@ -59,7 +62,8 @@ msgid ""
 "     --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"
+"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"
@@ -94,7 +98,8 @@ msgstr ""
 " -h, --help-option=MERKKIJONO     ohjevalitsin\n"
 " -v, --version-option=MERKKIJONO  versiotietovalitsin\n"
 " --version-string=MERKKIJONO      versiotieto\n"
-" --no-discard-stderr              sisällytä vakiovirhetuloste jäsennettäessä\n"
+" --no-discard-stderr              sisällytä vakiovirhetuloste "
+"jäsennettäessä\n"
 "                                  tulostetta\n"
 "\n"
 "Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen\n"
@@ -110,6 +115,14 @@ msgstr "%s: ei voitu avata tiedostoa \"%s\" (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: kelvollista tietoa ei löytynyt ohjelmasta \"%s\""
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
diff --git a/po/fr.gmo b/po/fr.gmo
index 856141c..441137a 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index b86f0de..6734da9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-03-24 11:46-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -24,7 +24,8 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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"
@@ -33,7 +34,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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"
@@ -62,7 +64,8 @@ msgid ""
 "     --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"
+"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"
@@ -100,7 +103,8 @@ msgstr ""
 "précisées en utilisant :\n"
 "\n"
 " -h, --help-option=CHAÎNE     chaîne pour l'option équivalente à « --help »\n"
-" -v, --version-option=CHAÎNE  chaîne pour l'option équivalente à « --version »\n"
+" -v, --version-option=CHAÎNE  chaîne pour l'option équivalente à « --"
+"version »\n"
 " --version-string=CHAÎNE      chaîne de version\n"
 " --no-discard-stderr          inclure la sortie d'erreur standard lors\n"
 "                              de l'analyse de la sortie d'option\n"
@@ -117,6 +121,14 @@ msgstr "%s: impossible d'ouvrir « %s » (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: aucune information valable trouvée dans « %s »"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
@@ -202,7 +214,9 @@ msgstr "DESCRIPTION"
 #. be matched.
 #: help2man:395
 msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
-msgstr "([Ss]ignaler|[Rr]apporter|[Ee]nvoyer) +(?:[\\w-]+ +)?(bogue|anomalie|problème)s?"
+msgstr ""
+"([Ss]ignaler|[Rr]apporter|[Ee]nvoyer) +(?:[\\w-]+ +)?(bogue|anomalie|"
+"problème)s?"
 
 #  When a string matches this regular expression, it is put into an
 #  AUTHOR section.
@@ -455,4 +469,5 @@ 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\\ :"
+msgstr ""
+"La dernière version de cette distribution est disponible en ligne sur\\ :"
diff --git a/po/help2man.pot b/po/help2man.pot
index 3079445..284054c 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: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+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"
@@ -74,6 +74,14 @@ msgstr ""
 msgid "%s: no valid information found in `%s'"
 msgstr ""
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
diff --git a/po/it.gmo b/po/it.gmo
index 19ace93..82d4c19 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 57ca0f9..70ae20e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man-1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-05-05 00:15+0200\n"
 "Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -22,7 +22,8 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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"
@@ -31,7 +32,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 Free Software Foundation, Inc.\n"
 "Questo è software libero; si vedano i sorgenti per le condizioni di copia.\n"
 "NON c'è alcuna garanzia; neppure di COMMERCIABILITÀ o di IDONEITÀ A UNO\n"
@@ -60,7 +62,8 @@ msgid ""
 "     --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"
+"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"
@@ -75,12 +78,14 @@ msgstr ""
 "Uso: %s [OPZIONE]... ESEGUIBILE\n"
 "\n"
 " -n, --name=STRINGA      Descrizione per il paragrafo NOME\n"
-" -s, --section=SEZIONE   Numero di sezione per la pagina di manuale (1, 6, 8)\n"
+" -s, --section=SEZIONE   Numero di sezione per la pagina di manuale (1, 6, "
+"8)\n"
 " -m, --manual=TESTO      Nome del manuale (Comandi utente, ...)\n"
 " -S, --source=TESTO      Provenienza del programma (FSF, Debian, ...)\n"
 " -L, --locale=STRINGA    Seleziona la localizzazione (predefinita \"C\")\n"
 " -i, --include=FILE      Include il materiale proveniente dal \"FILE\"\n"
-" -I, --opt-include=FILE  Include il materiale proveniente dal \"FILE\" se esiste\n"
+" -I, --opt-include=FILE  Include il materiale proveniente dal \"FILE\" se "
+"esiste\n"
 " -o, --output=FILE       Invia l'output su \"FILE\"\n"
 " -p, --info-page=TESTO   Nome del manuale Texinfo\n"
 " -N, --no-info           Elimina il riferimento al manuale Texinfo\n"
@@ -88,13 +93,16 @@ msgstr ""
 "     --help              Stampa questo aiuto ed esce\n"
 "     --version           Stampa il numero di versione ed esce\n"
 "\n"
-"L'ESEGUIBILE dovrebbe accettare le opzioni \"--help\" e \"--version\" e produrre output su\n"
+"L'ESEGUIBILE dovrebbe accettare le opzioni \"--help\" e \"--version\" e "
+"produrre output su\n"
 "stdout sebbene le alternative possano essere specificate usando:\n"
 "\n"
 " -h, --help-option=STRINGA     Stringa con opzione alternativa per l'aiuto\n"
-" -v, --version-option=STRINGA  Stringa con opzione alternativa per la versione\n"
+" -v, --version-option=STRINGA  Stringa con opzione alternativa per la "
+"versione\n"
 " --version-string=STRINGA      Stringa della versione\n"
-" --no-discard-stderr           Include lo stderr nell'analisi dell'output dell'opzione\n"
+" --no-discard-stderr           Include lo stderr nell'analisi dell'output "
+"dell'opzione\n"
 "\n"
 "Segnalare i bug a <bug-help2man@gnu.org>.\n"
 
@@ -108,6 +116,14 @@ msgstr "%s: impossibile aprire \"%s\" (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: nessuna informazione valida trovata in \"%s\""
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
@@ -299,7 +315,8 @@ msgid ""
 "    /pattern/\n"
 "    text\n"
 msgstr ""
-"Nell'output generato possono essere inclusi materiali aggiuntivi con le opzioni\n"
+"Nell'output generato possono essere inclusi materiali aggiuntivi con le "
+"opzioni\n"
 ".B \\-\\-include\n"
 "e\n"
 ".B \\-\\-opt\\-include\n"
@@ -337,7 +354,8 @@ msgid ""
 "modifiers (see\n"
 ".BR perlre (1)).\n"
 msgstr ""
-"I modelli usano la sintassi delle espressioni regolari Perl e possono essere seguiti dai\n"
+"I modelli usano la sintassi delle espressioni regolari Perl e possono essere "
+"seguiti dai\n"
 "modificatori\n"
 ".IR i ,\n"
 ".I s\n"
@@ -352,8 +370,10 @@ msgid ""
 "processed as options.  Anything else is silently ignored and may be\n"
 "used for comments, RCS keywords and the like.\n"
 msgstr ""
-"Le righe precedenti la prima sezione o i modelli che iniziano con \"\\-\" sono\n"
-"elaborati come opzioni.  Qualsiasi altra cosa è ignorata in silenzio e può essere\n"
+"Le righe precedenti la prima sezione o i modelli che iniziano con \"\\-\" "
+"sono\n"
+"elaborati come opzioni.  Qualsiasi altra cosa è ignorata in silenzio e può "
+"essere\n"
 "usata per commenti, parole chiave RCS e simili.\n"
 
 #: help2man.h2m.PL:127
@@ -393,7 +413,8 @@ msgid ""
 ".I other\n"
 "(above) in the order they were encountered in the include file.\n"
 msgstr ""
-"Altre sezioni sono inserite prima di quelle automaticamente prodotte in output\n"
+"Altre sezioni sono inserite prima di quelle automaticamente prodotte in "
+"output\n"
 "per le sezioni standard fornite precedentemente, oppure sono incluse in\n"
 ".I altre\n"
 "(come sopra) nell'ordine riscontrato nel file di inclusione.\n"
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 0000000..7fe20dd
Binary files /dev/null and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..06a8e67
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,425 @@
+# Japanese translation for help2man.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the help2man package.
+# Yasumichi Akahoshi <yasumichi@vinelinux.org>;, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: help2man 1.39.1\n"
+"Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
+"PO-Revision-Date: 2011-05-28 03:21+0900\n"
+"Last-Translator: Yasumichi Akahoshi <yasumichi@vinelinux.org>\n"
+"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\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"
+
+#: help2man:69
+#, perl-format
+msgid ""
+"GNU %s %s\n"
+"\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
+"2011 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"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
+"2011 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"
+"作者は 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"
+" -l, --libtool           exclude the `lt-' from the program name\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' は `--help' および `--version' の出力を元にマニュアルページを生成す"
+"る。\n"
+"\n"
+"使用法: %s [OPTION]... EXECUTABLE\n"
+"\n"
+"引数 EXECUTABLE には、マニュアル作成の対象とするコマンドを指定する。\n"
+"\n"
+" -n, --name=STRING       「名前」セクションで使うコマンドの短い説明\n"
+" -s, --section=SECTION   マニュアルページが所属するセクションの番号 (1, 6, "
+"8)\n"
+" -m, --manual=TEXT       マニュアルの種類 (ユーザコマンド, ...)\n"
+" -S, --source=TEXT       プログラムの出自 (FSF, Debian, ...)\n"
+" -L, --locale=STRING     ロケールを選択する (デフォルトは \"C\")\n"
+" -i, --include=FILE      `FILE' から原稿を取り込む\n"
+" -I, --opt-include=FILE  `FILE' が存在した場合 `FILE' から原稿を取り込む\n"
+" -o, --output=FILE       `FILE' へ出力を送る\n"
+" -p, --info-page=TEXT    Texinfo マニュアルの名前\n"
+" -N, --no-info           Texinfo マニュアルの紹介を省略する\n"
+" -l, --libtool           プログラム名から `lt-' を取り除く\n"
+"     --help              簡単な使い方を表示し終了する\n"
+"     --version           バージョン番号を表示し終了する\n"
+"\n"
+"マニュアル作成の対象になるコマンドは、--help や --version というオプションを"
+"受け入れて、\n"
+"標準出力にメッセージを表示するようになっているべきである。\n"
+"もっとも、以下のオプションを使えば、--help や --version に相当する別のオプ"
+"ションを指定することが可能だ。\n"
+"\n"
+" -h, --help-option=STRING     ヘルプ表示オプションの文字列\n"
+" -v, --version-option=STRING  バージョン表示オプションの文字列\n"
+" --version-string=STRING      バージョンとして表示する文字列\n"
+" --no-discard-stderr          オプションの出力を解析するときに標準エラー出力"
+"を含める\n"
+"\n"
+"バグを発見した場合は <bug-help2man@gnu.org> に報告されたい。\n"
+
+#: help2man:164
+#, perl-format
+msgid "%s: can't open `%s' (%s)"
+msgstr "%s: `%s' を開けません (%s)"
+
+#: help2man:225
+#, perl-format
+msgid "%s: no valid information found in `%s'"
+msgstr "%s: `%s' に有効な情報が見つかりません"
+
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
+#: help2man:248
+#, perl-format
+msgid "%s: can't unlink %s (%s)"
+msgstr "%s: %s を削除できません (%s)"
+
+#: help2man:252
+#, perl-format
+msgid "%s: can't create %s (%s)"
+msgstr "%s: %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:294 help2man:616 help2man.h2m.PL:79 help2man.h2m.PL:129
+msgid "NAME"
+msgstr "名前"
+
+#: help2man:306
+#, perl-format
+msgid "%s \\- manual page for %s %s"
+msgstr "%s \\- %s %s のマニュアルページ"
+
+#: help2man:320
+msgid "System Administration Utilities"
+msgstr "システム管理ユーティリティ"
+
+#: help2man:321
+msgid "Games"
+msgstr "ゲーム"
+
+#: help2man:322
+msgid "User Commands"
+msgstr "ユーザーコマンド"
+
+#. 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:333
+msgid "Usage"
+msgstr "使用法"
+
+#: help2man:334
+msgid "or"
+msgstr "または"
+
+#: help2man:366 help2man:616 help2man.h2m.PL:130
+msgid "SYNOPSIS"
+msgstr "書式"
+
+#: help2man:370 help2man:616 help2man.h2m.PL:131
+msgid "DESCRIPTION"
+msgstr "説明"
+
+#. 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:395
+msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
+msgstr ".*バグを発見した場合は"
+
+#: help2man:396
+msgid "Written +by"
+msgstr "^作者"
+
+#: help2man:397
+msgid "Options"
+msgstr "オプション"
+
+#: help2man:398
+msgid "Environment"
+msgstr "環境変数"
+
+#: help2man:399
+msgid "Files"
+msgstr "ファイル"
+
+#: help2man:400
+msgid "Examples"
+msgstr "例"
+
+#: help2man:401
+msgid "This +is +free +software"
+msgstr ""
+
+#: help2man:417 help2man:616 help2man.h2m.PL:132
+msgid "OPTIONS"
+msgstr "オプション"
+
+#: help2man:422 help2man:617 help2man.h2m.PL:133
+msgid "ENVIRONMENT"
+msgstr "環境変数"
+
+#: help2man:427 help2man:617 help2man.h2m.PL:134
+msgid "FILES"
+msgstr "ファイル"
+
+#: help2man:432 help2man:617 help2man.h2m.PL:135
+msgid "EXAMPLES"
+msgstr "例"
+
+#: help2man:439 help2man:619 help2man.h2m.PL:139
+msgid "COPYRIGHT"
+msgstr "著作権"
+
+#: help2man:445 help2man:619 help2man.h2m.PL:138
+msgid "REPORTING BUGS"
+msgstr "バグの報告"
+
+#: help2man:451 help2man:619 help2man.h2m.PL:137
+msgid "AUTHOR"
+msgstr "作者"
+
+#: help2man:591 help2man:619 help2man.h2m.PL:140
+msgid "SEE ALSO"
+msgstr "関連項目"
+
+#: help2man:595
+#, 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 ""
+".B %s\n"
+"の完全なマニュアルは Texinfo マニュアルとして整備されている。もし、\n"
+".B info\n"
+"および\n"
+".B %s\n"
+"のプログラムが正しくインストールされているならば、コマンド\n"
+".IP\n"
+".B info %s\n"
+".PP\n"
+"を使用すると完全なマニュアルを読むことができるはずだ。\n"
+
+#: help2man:647
+#, perl-format
+msgid "%s: error writing to %s (%s)"
+msgstr "%s: %s への書込エラー (%s)"
+
+#: help2man:664
+#, perl-format
+msgid "%s: can't get `%s' info from %s%s"
+msgstr "%s: `%s' の情報を %s%s から取得できません"
+
+#: help2man:666
+msgid "Try `--no-discard-stderr' if option outputs to stderr"
+msgstr ""
+"もしオプションが標準エラー出力に出力しているならば、`--no-discard-stderr'　を"
+"試してください"
+
+#: help2man.h2m.PL:74
+msgid "Include file for help2man man page"
+msgstr "help2man マニュアルページのインクルードファイル"
+
+#: help2man.h2m.PL:80
+msgid "help2man \\- generate a simple manual page"
+msgstr "help2man \\- 簡易マニュアルページの生成"
+
+#: 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"
+"    [section]\n"
+"    text\n"
+"\n"
+"    /pattern/\n"
+"    text\n"
+msgstr ""
+".B \\-\\-include\n"
+"や\n"
+".B \\-\\-opt\\-include\n"
+"オプションを使用すると、生成する出力に追加の原稿を取り込むことができる。ファ"
+"イルの書式は単純である。\n"
+"\n"
+"    [セクション]\n"
+"    本文\n"
+"\n"
+"    /パターン/\n"
+"    本文\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 ""
+"本文は *roff のテキストであり、出力中の、指定された\n"
+".BI [ セクション ]\n"
+"(大文字・小文字は区別されない) の先頭部分や\n"
+".BI / パターン /\\fR.\n"
+"にマッチするパラグラフの直後に、そのままの形で挿入される。\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 ""
+"パターンには Perl の正規表現の文法を使用する。修飾子の\n"
+".IR i\n"
+",\n"
+".I s\n"
+",\n"
+".I m\n"
+"を後に付けることもできる (\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 ""
+"最初のセクションやパターンより前にある行で、'\\-' で始まっている行は、\n"
+"オプションとして処理される。それ以外は、何もせずに無視されるのでコメントや\n"
+"RCS のキーワードなどに使用することができる。\n"
+
+#: 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 ""
+"インクルードファイルに\n"
+".B [名前]\n"
+"や\n"
+".B [書式]\n"
+"というセクションがあれば、そこに記述した内容が、自動的に生成される内容のかわ"
+"りに出力される。\n"
+" (もっとも、どうしても必要ならば、前者については、\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 ""
+"それ以外のセクションについては、上記の標準的なセクションのために\n"
+"自動的に生成される出力の前に挿入されるか、あるいは、(上記の) \n"
+".I その他\n"
+"の位置に、インクルードファイル中で見つかった順番で取り込まれる。\n"
+
+#: 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 1bb1970..7f13656 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 0f355d0..74079ea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-03-02 19:25+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -21,7 +21,8 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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"
@@ -59,7 +61,8 @@ msgid ""
 "     --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"
+"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"
@@ -79,7 +82,8 @@ msgstr ""
 " -S, --source=TEKST      pochodzenie programu (FSF, Debian, ...)\n"
 " -L, --locale=�A�CUCH    ustawienie lokalizacji (domy�lnie \"C\")\n"
 " -i, --include=PLIK      do��czenie materia�u z `PLIKU'\n"
-" -I, --opt-include=PLIK  do��czenie materia�u z `PLIKU', je�li takowy istnieje\n"
+" -I, --opt-include=PLIK  do��czenie materia�u z `PLIKU', je�li takowy "
+"istnieje\n"
 " -o, --output=PLIK       zapisanie wyj�cia do `PLIKU'\n"
 " -p, --info-page=TEKST   nazwa podr�cznika Texinfo\n"
 " -N, --no-info           pomini�cie wskazania do podr�cznika Texinfo\n"
@@ -108,6 +112,14 @@ msgstr "%s: nie mo
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: nie znaleziono poprawnej informacji w `%s'"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
@@ -174,7 +186,9 @@ msgstr "OPIS"
 #. be matched.
 #: help2man:395
 msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to"
-msgstr "B��dy +(w +[\\w-]+ +)?+(prosz�|prosimy) +zg�asza� +na +adres|Raporty +o +b��dach +wysy�aj +do"
+msgstr ""
+"B��dy +(w +[\\w-]+ +)?+(prosz�|prosimy) +zg�asza� +na +adres|Raporty +o "
+"+b��dach +wysy�aj +do"
 
 #: help2man:396
 msgid "Written +by"
@@ -271,7 +285,8 @@ msgstr "%s: nie mo
 
 #: help2man:666
 msgid "Try `--no-discard-stderr' if option outputs to stderr"
-msgstr "Opcja `--no-discard-stderr' pomo�e, je�li program wypisuje opis na 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"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index ed9e883..02fa6c9 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 470d407..1489ca0 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: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+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"
@@ -74,6 +74,14 @@ msgstr "%s: não é possível abrir \"%s\" (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: não foi encontrada uma informação válida em \"%s\""
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
diff --git a/po/ru.gmo b/po/ru.gmo
index 10feb7c..2f7ebd7 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 7933791..cbd536f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-03-01 20:11+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -16,14 +16,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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"
@@ -32,7 +34,8 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 Free Software Foundation, Inc.\n"
 "Это свободное ПО; условия копирования см. в исходном коде.\n"
 "Нет НИКАКИХ ГАРАНТИЙ; даже подразумеваемыми гарантиями\n"
@@ -61,7 +64,8 @@ msgid ""
 "     --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"
+"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"
@@ -110,6 +114,14 @@ msgstr "%s: не удалось открыть %s (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: не найдено допустимой информации в %s"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
@@ -273,7 +285,8 @@ msgstr "%s: не удалось получить информацию %s из %s
 
 #: help2man:666
 msgid "Try `--no-discard-stderr' if option outputs to stderr"
-msgstr "Попробуйте --no-discard-stderr, если параметр выводит результат в stderr"
+msgstr ""
+"Попробуйте --no-discard-stderr, если параметр выводит результат в stderr"
 
 #: help2man.h2m.PL:74
 msgid "Include file for help2man man page"
diff --git a/po/sv.gmo b/po/sv.gmo
index 82243cb..4687ab1 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 7d7dd35..12ad976 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: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+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"
@@ -108,6 +108,14 @@ msgstr "%s: kan inte öppna \"%s\" (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: ingen giltig information funnen i \"%s\""
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
diff --git a/po/uk.gmo b/po/uk.gmo
index 930a350..5b8b3b3 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index fb0f2bc..fb151ae 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.39.1\n"
 "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man@gnu.org>\n"
-"POT-Creation-Date: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+1000\n"
 "PO-Revision-Date: 2011-03-02 16:18+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -23,7 +23,8 @@ msgstr ""
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, "
+"2010,\n"
 "2011 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"
@@ -32,8 +33,11 @@ msgid ""
 msgstr ""
 "GNU %s %s\n"
 "\n"
-"© Free Software Foundation, Inc., 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011\n"
-"Це програмне забезпечення є вільним, умови копіювання викладено у його початкових кодах. Умовами ліцензування програми НЕ передбачено жодних гарантій, зокрема гарантій працездатності або придатності для певної мети.\n"
+"© Free Software Foundation, Inc., 1997, 1998, 1999, 2000, 2001, 2002, 2003, "
+"2004, 2005, 2009, 2010, 2011\n"
+"Це програмне забезпечення є вільним, умови копіювання викладено у його "
+"початкових кодах. Умовами ліцензування програми НЕ передбачено жодних "
+"гарантій, зокрема гарантій працездатності або придатності для певної мети.\n"
 "\n"
 "Автором програми є Brendan O'Dea <bod@debian.org>\n"
 
@@ -58,7 +62,8 @@ msgid ""
 "     --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"
+"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"
@@ -68,7 +73,8 @@ msgid ""
 "\n"
 "Report bugs to <bug-help2man@gnu.org>.\n"
 msgstr ""
-"%s створює сторінку довідника (man) на основі даних виконання програми з параметрами --help та --version.\n"
+"%s створює сторінку довідника (man) на основі даних виконання програми з "
+"параметрами --help та --version.\n"
 "\n"
 "Використання: %s [ПАРАМЕТР]... ВИКОНУВАНИЙ_ФАЙЛ\n"
 "\n"
@@ -86,13 +92,16 @@ msgstr ""
 "     --help              показати ці довідкові дані, потім завершити роботу\n"
 "     --version           показати дані щодо версії, потім завершити роботу\n"
 "\n"
-"У ВИКОНУВАНОМУ_ФАЙЛІ має бути передбачено використання параметрів «--help» та «--version» з виведенням\n"
-"даних до stdout. Ви можете внести зміни до цих типових вимог за допомогою таких параметрів:\n"
+"У ВИКОНУВАНОМУ_ФАЙЛІ має бути передбачено використання параметрів «--help» "
+"та «--version» з виведенням\n"
+"даних до stdout. Ви можете внести зміни до цих типових вимог за допомогою "
+"таких параметрів:\n"
 "\n"
 " -h, --help-option=РЯДОК      рядок параметра виведення довідкових даних\n"
 " -v, --version-option=РЯДОК   рядок параметра виведення даних щодо версії\n"
 " --version-string=РЯДОК       рядок версії\n"
-" --no-discard-stderr          використовувати дані зі stderr під час обробки виведених даних\n"
+" --no-discard-stderr          використовувати дані зі stderr під час обробки "
+"виведених даних\n"
 "\n"
 "Про вади повідомляйте на адресу <bug-help2man@gnu.org>.\n"
 
@@ -106,6 +115,14 @@ msgstr "%s: не вдалося відкрити «%s» (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: у `%s' не виявлено належних даних"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"
@@ -269,7 +286,9 @@ msgstr "%s: не вдалося отримати дані «%s» з %s%s"
 
 #: help2man:666
 msgid "Try `--no-discard-stderr' if option outputs to stderr"
-msgstr "Спробуйте додати параметр «--no-discard-stderr», якщо параметри виводить дані до stderr"
+msgstr ""
+"Спробуйте додати параметр «--no-discard-stderr», якщо параметри виводить "
+"дані до stderr"
 
 #: help2man.h2m.PL:74
 msgid "Include file for help2man man page"
@@ -297,7 +316,8 @@ msgid ""
 "    /pattern/\n"
 "    text\n"
 msgstr ""
-"Включити додаткові матеріали до створеної сторінки можна за допомогою параметрів\n"
+"Включити додаткові матеріали до створеної сторінки можна за допомогою "
+"параметрів\n"
 ".B \\-\\-include\n"
 "та\n"
 ".B \\-\\-opt\\-include\n"
@@ -348,7 +368,8 @@ msgid ""
 "processed as options.  Anything else is silently ignored and may be\n"
 "used for comments, RCS keywords and the like.\n"
 msgstr ""
-"Рядки перед першим розділом або шаблоном, які починаються з набору символів «\\-»,\n"
+"Рядки перед першим розділом або шаблоном, які починаються з набору символів "
+"«\\-»,\n"
 "вважаються визначеннями параметрів. Всі інші такі рядки буде проігноровано,\n"
 "ними можна скористатися для коментування, ключових слів RCS тощо.\n"
 
diff --git a/po/vi.gmo b/po/vi.gmo
index 0752fca..53bb0f0 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index c90ef34..d7f5fd3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ 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: 2011-02-28 11:20+1100\n"
+"POT-Creation-Date: 2011-05-29 11:32+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"
@@ -115,6 +115,14 @@ msgstr "%s: không thể mở « %s » (%s)"
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: không tìm thấy thông tin hợp lệ trong « %s »"
 
+#. Translators: the following message is a strftime(3) format string, which in
+#. the English version expands to the month as a word and the full year.  It
+#. is used on the footer of the generated manual pages.  If in doubt, you may
+#. just use %x as the value (which should be the full locale-specific date).
+#: help2man:241
+msgid "%B %Y"
+msgstr ""
+
 #: help2man:248
 #, perl-format
 msgid "%s: can't unlink %s (%s)"