gnu/help2man

diff --git a/Makefile.in b/Makefile.in
index a97948b..155594d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for help2man
-# $Id: Makefile.in,v 1.20 2003/07/17 15:32:17 bod Exp $
+# $Id: Makefile.in,v 1.27 2005/10/16 16:15:54 bod Exp $
 
 SHELL = @SHELL@
 VPATH = @srcdir@
@@ -16,7 +16,7 @@ infodir = @infodir@
 localedir = $(datadir)/locale
 
 DESTDIR =
-LINGUAS = fr pl
+LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
 
 CC = @CC@
 PERL = @PERL@
@@ -67,10 +67,8 @@ uninstall:
 	rm -f $(DESTDIR)$(bindir)/$(target) \
 	    $(DESTDIR)$(libdir)/$(preload).so \
 	    $(DESTDIR)$(mandir)/man1/$(target).1 \
-	    $(DESTDIR)$(mandir)/fr/man1/$(target).1 \
-	    $(DESTDIR)$(mandir)/pl/man1/$(target).1 \
-	    $(DESTDIR)$(localedir)/fr/LC_MESSAGES/$(target).mo \
-	    $(DESTDIR)$(localedir)/pl/LC_MESSAGES/$(target).mo \
+	    $(DESTDIR)$(mandir)/*/man1/$(target).1 \
+	    $(DESTDIR)$(localedir)/*/LC_MESSAGES/$(target).mo \
 	    $(DESTDIR)$(infodir)/$(target).info
 
 	if test -f $(DESTDIR)$(infodir)/dir; \
@@ -85,14 +83,13 @@ clean:
 mostlyclean: clean
 	rm -f $(target).dvi $(target).aux $(target).cp $(target).cps \
 	    $(target).fn $(target).ky $(target).log $(target).pg \
-	    $(target).toc $(target).tp $(target).vr
+	    $(target).toc $(target).tp $(target).vr $(srcdir)/po/*.po~
 
 distclean: mostlyclean
 	-rm -rf config.cache config.log config.status Makefile autom4te.cache
 
 realclean: distclean
-	-rm -f $(target).info $(target).1 $(target).fr.1 $(target).pl.1 \
-	    po/*.gmo
+	-rm -f $(target).info $(target).1 $(target).*.1 po/*.gmo
 
 maintainer-clean: realclean
 	rm -f configure
@@ -105,35 +102,21 @@ $(preload).so: $(srcdir)/$(preload).c
 	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
 
 man: $(target).1
-man_l10n:
-	for lang in $(LINGUAS); \
-	do \
-	    $(MAKE) po/$$lang.gmo $(target).$$lang.1; \
-	done
-
-$(target).1: $(target) $(srcdir)/$(target).h2m
+$(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
+	$(MAKE) $(target)
 	./$(target) --include=$(srcdir)/$(target).h2m \
 	    --output=$@ ./$(target)
 
-$(target).fr.1: po/fr.gmo $(target) $(srcdir)/$(target).fr.h2m
-	$(MAKE) preload
+man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))
+$(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).%.h2m $(srcdir)/po/%.po
+	lang=$(patsubst $(target).%.1,%,$@); \
+	$(MAKE) $(target) $(preload).so po/$$lang.gmo && \
 	LD_PRELOAD="./$(preload).so preloadable_libintl.so" \
 	TEXTDOMAIN=help2man \
-	./$(target) --include=$(srcdir)/$(target).fr.h2m \
-	    --output=$@ --locale=fr_FR@euro ./$(target)
+	    ./$(target) --include=$(srcdir)/$(target).$$lang.h2m \
+		--output=$@ --locale=$$lang ./$(target)
 
-$(target).pl.1: po/pl.gmo $(target) $(srcdir)/$(target).pl.h2m
-	$(MAKE) preload
-	LD_PRELOAD="./$(preload).so preloadable_libintl.so" \
-	TEXTDOMAIN=help2man \
-	./$(target) --include=$(srcdir)/$(target).pl.h2m \
-	    --output=$@ --locale=pl_PL ./$(target)
-
-po/fr.gmo: $(srcdir)/po/fr.po
-	test -d po || mkdir po
-	$(MSGFMT) -o $@ $?
-
-po/pl.gmo: $(srcdir)/po/pl.po
+po/%.gmo: $(srcdir)/po/%.po
 	test -d po || mkdir po
 	$(MSGFMT) -o $@ $?
 
@@ -148,6 +131,16 @@ $(target).dvi: $(srcdir)/$(target).texi
 Makefile: $(srcdir)/Makefile.in
 	./config.status
 
+update-po: $(srcdir)/po/$(target).pot
+	for lang in $(LINGUAS); \
+	do \
+	    echo -n "Updating $$lang "; \
+	    msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \
+	done
+
+$(srcdir)/po/$(target).pot: $(target)
+	xgettext -L Perl -k_ -kN_ -o $@ $?
+
 .PHONY: all clean distclean preload man man_l10n info dvi install \
     install_base install_preload install_l10n mostlyclean realclean \
     uninstall
diff --git a/NEWS b/NEWS
index eba53bc..af9249a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 1.36		October 17, 2005
+
+  * Add default territory to --locale option.
+  * Add Finnish translations.
+
 Version 1.35		November 25, 2004
 
   * Set program name to the first word of NAME paragraph in --include
diff --git a/README b/README
index 4f136d7..fcc62f0 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-		README for GNU help2man version 1.35
+		README for GNU help2man version 1.36
 
 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.35.2.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.1.tar.gz
 
 Since most GNU documentation is now in info format, this provides a
 way to generate a placeholder man page pointing to that resource while
diff --git a/THANKS b/THANKS
index 1bf7e40..af0143a 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Mo DeJong			<mdejong@cygnus.com>
 Akim Demaille			<demaille@inf.enst.fr>
 Paul Eggert			<eggert@twinsun.com>
 Roland Huebner			<rh@pelikan.cologne.de>
+Thomas Huriaux			<thomas.huriaux@kti.ae.poznan.pl>
 Matt Kraai			<kraai@alumni.carnegiemellon.edu>
 Jim Meyering			<jim@meyering.net>
 Dave Morrison			<dave@bnl.gov>
diff --git a/debian/changelog b/debian/changelog
index a9cfac2..0d5cffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+help2man (1.36.1) unstable; urgency=low
+
+  * Add default territory to --locale option.
+  * Add Finnish translations (thanks to Tommi Vainikainen,
+    closes #332444).
+  * Correctly update .pot and .po files (thanks to Thomas Huriaux,
+    closes: #331678).
+
+ -- Brendan O'Dea <bod@debian.org>  Mon, 17 Oct 2005 01:38:59 +1000
+
 help2man (1.35.2) unstable; urgency=low
 
   * help2man.texi: spelling corrections (closes: #328671).
diff --git a/debian/rules b/debian/rules
index 7e6714f..8dbfc0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ maint-prep:
 	ln -sf debian/changelog ChangeLog
 	autoconf
 	configure
-	$(MAKE) all distclean
+	$(MAKE) update-po all distclean
 
 maint-clean: maint-prep
 	configure
diff --git a/help2man.1 b/help2man.1
index 08726d5..b706cd3 100644
--- a/help2man.1
+++ b/help2man.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH HELP2MAN "1" "October 2005" "help2man 1.35" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH HELP2MAN "1" "October 2005" "help2man 1.36" "User Commands"
 .SH NAME
 help2man \- generate a simple manual page
 .SH SYNOPSIS
@@ -120,8 +120,8 @@ 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 Free Software
-Foundation, Inc.
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+Software Foundation, Inc.
 .br
 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.PL b/help2man.PL
index 2eeefc6..3295033 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use Config;
 use Getopt::Long;
 
 my ($program, $version)
-    = (qw$Id: help2man.PL,v 1.35 2004/11/25 10:19:54 bod Exp $)[1..2];
+    = (qw$Id: help2man.PL,v 1.36 2005/10/16 15:38:47 bod Exp $)[1..2];
 
 $program =~ s/\.PL(,v)?$//;
 
@@ -60,7 +60,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
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -132,8 +132,8 @@ textdomain $this_program;
 my $version_info = sprintf _(<<'EOT'), $this_program, $this_version;
 GNU %s %s
 
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-Foundation, Inc.
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 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.
 
@@ -202,6 +202,9 @@ die $help_info unless @ARGV == 1;
 die "$this_program: no locale support (Locale::gettext required)\n"
     unless $locale eq 'C' or $have_gettext;
 
+# Add default territory to locale.
+$locale .= "_\U$locale" if $locale =~ /^[a-z]{2}$/;
+
 # Set localisation of date and executable's ouput.
 delete @ENV{qw(LANGUAGE LC_MESSAGES LANG)};
 setlocale LC_ALL, $ENV{LC_ALL} = $locale;
diff --git a/help2man.fi.1 b/help2man.fi.1
new file mode 100644
index 0000000..6417c15
--- /dev/null
+++ b/help2man.fi.1
@@ -0,0 +1,141 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH HELP2MAN "1" "lokakuu 2005" "help2man 1.36" "Käyttäjän sovellukset"
+.SH NIMI
+help2man \- luo yksinkertainen man-sivu
+.SH YLEISKATSAUS
+.B help2man
+[\fIVALITSIMET\fR]... \fIOHJELMA\fR
+.SH KUVAUS
+"help2man" luo man\-sivun "\-\-help"\- ja "\-\-version"\-tulosteista.
+.TP
+\fB\-n\fR, \fB\-\-name\fR=\fIMERKKIJONO\fR
+kuvaus kappaleeseen NIMI
+.TP
+\fB\-s\fR, \fB\-\-section\fR=\fILUOKKA\fR
+manuaalisivun luokan numero (1, 6, 8)
+.TP
+\fB\-m\fR, \fB\-\-manual\fR=\fITEKSTI\fR
+manuaalin nimi (Käyttäjän sovellukset, ...)
+.TP
+\fB\-S\fR, \fB\-\-source\fR=\fITEKSTI\fR
+ohjelman lähde (FSF, Debian, ...)
+.TP
+\fB\-L\fR, \fB\-\-locale\fR=\fIMERKKIJONO\fR
+valitse maa\-asetusto (oletus on "C")
+.TP
+\fB\-i\fR, \fB\-\-include\fR=\fITIEDOSTO\fR
+sisällytä materiaali TIEDOSTOsta
+.TP
+\fB\-I\fR, \fB\-\-opt\-include\fR=\fITIEDOSTO\fR
+sisällytä materiaali TIEDOSTOsta mikäli
+se on olemassa
+.TP
+\fB\-o\fR, \fB\-\-output\fR=\fITIEDOSTO\fR
+kirjoita tuloste TIEDOSTOon
+.TP
+\fB\-p\fR, \fB\-\-info\-page\fR=\fIMERKKIJONO\fR
+Texinfo\-manuaalin nimi
+.TP
+\fB\-N\fR, \fB\-\-no\-info\fR
+jätä pois viittaus Texinfo\-manuaaliin
+.TP
+\fB\-\-help\fR
+näytä tämä ohje ja poistu
+.TP
+\fB\-\-version\fR
+tulosta versiotiedot ja poistu
+.PP
+OHJELMAn tulee hyväksyä sekä "\-\-help"\- että "\-\-version"\-valitsimet,
+mutta vaihtoehtoiset valitsimet voi määrittää valitsimilla:
+.TP
+\fB\-h\fR, \fB\-\-help\-option\fR=\fIMERKKIJONO\fR
+ohjevalitsin
+.TP
+\fB\-v\fR, \fB\-\-version\-option\fR=\fIMERKKIJONO\fR
+versiotietovalitsin
+.SH "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.
+.SH SAATAVUUS
+Tuorein versio tästä sovelluksesta on saatavilla verkossa osoitteesta:
+
+    ftp://ftp.gnu.org/gnu/help2man/
+.SH "VIRHEISTÄ ILMOITTAMINEN"
+Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen
+<bug\-help2man@gnu.org>.
+.SH TEKIJÄNOIKEUDET
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 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.
+.PP
+Written by Brendan O'Dea <bod@debian.org>
+.SH "KATSO MYÖS"
+Ohjelman
+.B help2man
+täydellinen dokumentaatio ylläpidetään Texinfo-manuaalissa. Mikäli
+ohjelmat
+.B info
+ja
+.B help2man
+on täysin asennettu, komennon
+.B info help2man
+.PP
+pitäisi antaa täydellinen manuaali luettavaksi.
diff --git a/help2man.fi.h2m b/help2man.fi.h2m
new file mode 100644
index 0000000..f754bd9
--- /dev/null
+++ b/help2man.fi.h2m
@@ -0,0 +1,75 @@
+Encoding charset: ISO-8859-15
+Language: Finnish
+Locale: fi_FI@euro (and also fi_FI)
+Translator : Tommi Vainikainen
+
+Suomennos help2man-ohjelman man-sivusta.
+
+[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 46f8158..cd4541a 100644
--- a/help2man.fr.1
+++ b/help2man.fr.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH HELP2MAN "1" "octobre 2005" "help2man 1.35" "Commandes"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH HELP2MAN "1" "octobre 2005" "help2man 1.36" "Commandes"
 .SH NOM
 help2man \- génère une page de manuel sommaire
 .SH SYNOPSIS
@@ -126,8 +126,8 @@ La derni
 .SH "SIGNALER DES BOGUES"
 Signaler les bogues à <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-Foundation, Inc.
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 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.
 .PP
diff --git a/help2man.info b/help2man.info
index 680bff4..69c3772 100644
--- a/help2man.info
+++ b/help2man.info
@@ -1,4 +1,4 @@
-This is help2man.info, produced by makeinfo version 4.7 from
+This is help2man.info, produced by makeinfo version 4.8 from
 help2man.texi.
 
 INFO-DIR-SECTION GNU programming support
diff --git a/help2man.pl.1 b/help2man.pl.1
index 3313fb0..7c20ccb 100644
--- a/help2man.pl.1
+++ b/help2man.pl.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH HELP2MAN "1" "pa¼dziernik 2005" "help2man 1.35" "Polecenia u¿ytkownika"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH HELP2MAN "1" "pa¼dziernik 2005" "help2man 1.36" "Polecenia u¿ytkownika"
 .SH NAZWA
 help2man \- generowanie prostej strony podrêcznika
 .SH SK£ADNIA
@@ -116,17 +116,15 @@ w miejscu
 Najnowsza wersja tego oprogramowania jest dostêpna pod:
 
     ftp://ftp.gnu.org/gnu/help2man/
-.SH AUTOR
-Program napisa³ Brendan O'Dea <bod@debian.org>
 .SH "ZG£ASZANIE B£ÊDÓW"
 B³êdy proszê zg³aszaæ na adres <bug\-help2man@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-Foundation, Inc.
-.br
-Ten program jest darmowy; warunki kopiowania s± opisane w ¼ród³ach.
-Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji PRZYDATNO¦CI
-DO SPRZEDA¯Y LUB DO KONKRETNYCH CELÓW.
+Copyright \(co 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 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.
+.PP
+Written by Brendan O'Dea <bod@debian.org>
 .SH "ZOBACZ TAK¯E"
 Pe³na dokumentacja dla programu
 .B help2man
diff --git a/mkpot b/mkpot
deleted file mode 100755
index dd6ade9..0000000
--- a/mkpot
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-# extract translation strings
-
-use POSIX 'strftime';
-
-my $date = strftime '%F %T%z', localtime;
-my $prog = shift or die "Usage: $0 PROG\n";
-my ($package, $version) = `perl $prog --version 2>/dev/null`
-    =~ /^(?:(?:GNU|Free)\s+)?(?:(\w\S+)\s+)?(\d\S+)\n/;
-
-($package = $prog) =~ s!.*/!! unless $package;
-$version ||= 'unknown';
-
-open PARSER, "perl -MO=Deparse,-l $prog 2>/dev/null |"
-    or die "can't fork: $!";
-
-print <<EOT;
-# Translation template for $package
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: $package $version\\n"
-"POT-Creation-Date: $date\\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"
-"MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=CHARSET\\n"
-"Content-Transfer-Encoding: ENCODING\\n"
-EOT
-
-my $line = 1;
-my $file = $prog;
-my %close = (
-    '(' => ')',
-    '[' => ']',
-    '<' => '>',
-    '{' => '}',
-);
-
-my %seen;
-
-while (<PARSER>)
-{
-    chomp;
-    ($line, $file) = ($1, $2) if /^#\s*line\s+(\d+)\s+"([^"]+)"/;
-    while (s/.*?\bN?_\(//)
-    {
-	my $single;
-	my $o = '';
-	my $c;
-	if (s/^q(q?)(.)//)
-	{
-	    $single = !length $1;
-	    if ($c = $close{$2})
-	    {
-		$o = $2;
-	    }
-	    else
-	    {
-		$c = $2;
-	    }
-	}
-	elsif (s/^(["'])//)
-	{
-	    $single = $1 eq "'";
-	    $c = $1;
-	}
-	else
-	{
-	    die "$file:$line: can't determine quote style\n";
-	}
-
-	my $nest = $o ? "|\Q$o\E[^\Q$c\E]*\Q$c\E" : '';
-	my $text = s/^((?:\\.|[^\Q$o$c\E\\]+$nest)*)// ? $1 :
-	    die "$file:$line: can't find closing quote $c\n";
-
-	for ($text)
-	{
-	    unless ($single)
-	    {
-		1 while s/(^|[^\\])\\n/$1\n/g;
-		s/\\([\$\@])/$1/g;
-	    }
-
-	    s/"/\\"/g;
-	    if (s/\n/\\n"\n"/g)
-	    {
-		s/^/"\n"/;
-		s/"\n"$//;
-	    }
-	}
-
-	print <<EOT unless $seen{$text}++;
-
-#: $file:$line
-msgid "$text"
-msgstr ""
-EOT
-    }
-}
diff --git a/po/fi.gmo b/po/fi.gmo
new file mode 100644
index 0000000..1140cb7
Binary files /dev/null and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 0000000..c706ace
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,229 @@
+# Translation template for help2man
+msgid ""
+msgstr ""
+"Project-Id-Version: help2man-1.35.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-17 01:08+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: help2man:66
+#, fuzzy, perl-format
+msgid ""
+"GNU %s %s\n"
+"\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free\n"
+"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 © 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software\n"
+"Foundation, Inc.\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"
+"Kirjoittanut Brendan O'Dea <bod@debian.org>\n"
+
+#: help2man:77
+#, 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 although\n"
+"alternatives may be specified using:\n"
+"\n"
+" -h, --help-option=STRING     help option string\n"
+" -v, --version-option=STRING  version option string\n"
+"\n"
+"Report bugs to <bug-help2man@gnu.org>.\n"
+msgstr ""
+"\"%s\" luo man-sivun \"--help\"- ja \"--version\"-tulosteista.\n"
+"\n"
+"Käyttö: %s [VALITSIMET]... OHJELMA\n"
+"\n"
+" -n, --name=MERKKIJONO       kuvaus kappaleeseen NIMI\n"
+" -s, --section=LUOKKA        manuaalisivun luokan numero (1, 6, 8)\n"
+" -m, --manual=TEKSTI         manuaalin nimi (Käyttäjän sovellukset, ...)\n"
+" -S, --source=TEKSTI         ohjelman lähde (FSF, Debian, ...)\n"
+" -L, --locale=MERKKIJONO     valitse maa-asetusto (oletus on \"C\")\n"
+" -i, --include=TIEDOSTO      sisällytä materiaali TIEDOSTOsta\n"
+" -I, --opt-include=TIEDOSTO  sisällytä materiaali TIEDOSTOsta mikäli\n"
+"                             se on olemassa\n"
+" -o, --output=TIEDOSTO       kirjoita tuloste TIEDOSTOon\n"
+" -p, --info-page=MERKKIJONO  Texinfo-manuaalin nimi\n"
+" -N, --no-info               jätä pois viittaus Texinfo-manuaaliin\n"
+"     --help                  näytä tämä ohje ja poistu\n"
+"     --version               tulosta versiotiedot ja poistu\n"
+"\n"
+"OHJELMAn tulee hyväksyä sekä \"--help\"- että \"--version\"-valitsimet,\n"
+"mutta vaihtoehtoiset valitsimet voi määrittää valitsimilla:\n"
+"\n"
+" -h, --help-option=MERKKIJONO     ohjevalitsin\n"
+" -v, --version-option=MERKKIJONO  versiotietovalitsin\n"
+"\n"
+"Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen\n"
+"<bug-help2man@gnu.org>.\n"
+
+#: help2man:165
+#, perl-format
+msgid "%s: can't open `%s' (%s)"
+msgstr "%s: ei voitu avata tiedostoa \"%s\" (%s)"
+
+#: help2man:222
+#, perl-format
+msgid "%s: no valid information found in `%s'"
+msgstr "%s: kelvollista tietoa ei löytynyt ohjelmasta \"%s\""
+
+#: help2man:235
+#, perl-format
+msgid "%s: can't get `%s' info from %s"
+msgstr "%s: ei saatu \"%s\"-tietoa ohjelmalta %s"
+
+#: help2man:246
+#, perl-format
+msgid "%s: can't unlink %s (%s)"
+msgstr "%s: ei voi unlinkata/poistaa tiedostoa %s (%s)"
+
+#: help2man:250
+#, perl-format
+msgid "%s: can't create %s (%s)"
+msgstr "%s: ei voitu luoda tiedostoa %s (%s)"
+
+#: help2man:289 help2man:587
+msgid "NAME"
+msgstr "NIMI"
+
+#: help2man:301
+#, perl-format
+msgid "%s \\- manual page for %s %s"
+msgstr "%s \\- manuaalisivu %s %s"
+
+#: help2man:315
+msgid "System Administration Utilities"
+msgstr "Järjestelmähallinnan sovellukset"
+
+#: help2man:316
+msgid "Games"
+msgstr "Pelit"
+
+#: help2man:317
+msgid "User Commands"
+msgstr "Käyttäjän sovellukset"
+
+#: help2man:322
+msgid "Usage"
+msgstr "Käyttö"
+
+#: help2man:323
+msgid "or"
+msgstr "tai"
+
+#: help2man:354 help2man:587
+msgid "SYNOPSIS"
+msgstr "YLEISKATSAUS"
+
+#: help2man:358 help2man:587
+msgid "DESCRIPTION"
+msgstr "KUVAUS"
+
+#: help2man:375
+msgid "Report +bugs|Email +bug +reports +to"
+msgstr "Ilmoita +(ohjelmisto)?vioista|Lähetä +raportit +(ohjelmisto)?vioista"
+
+#: help2man:376
+msgid "Written +by"
+msgstr "Kirjoittan(ut|eet)"
+
+#: help2man:377
+msgid "Options"
+msgstr "Valitsimet"
+
+#: help2man:378
+msgid "Examples"
+msgstr "Esimerkit"
+
+#: help2man:379
+msgid "This +is +free +software"
+msgstr "Tämä +on +vapaa +ohjelmisto"
+
+#: help2man:391 help2man:587
+msgid "OPTIONS"
+msgstr "VALITSIMET"
+
+#: help2man:396 help2man:588
+msgid "EXAMPLES"
+msgstr "ESIMERKKEJÄ"
+
+#: help2man:403 help2man:590
+msgid "COPYRIGHT"
+msgstr "TEKIJÄNOIKEUDET"
+
+#: help2man:432 help2man:590
+msgid "REPORTING BUGS"
+msgstr "VIRHEISTÄ ILMOITTAMINEN"
+
+#: help2man:438 help2man:590
+msgid "AUTHOR"
+msgstr "TEKIJÄ"
+
+#: help2man:562 help2man:590
+msgid "SEE ALSO"
+msgstr "KATSO MYÖS"
+
+#: help2man:566
+#, 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 ""
+"Ohjelman\n"
+".B %s\n"
+"täydellinen dokumentaatio ylläpidetään Texinfo-manuaalissa. Mikäli\n"
+"ohjelmat\n"
+".B info\n"
+"ja\n"
+".B %s\n"
+"on täysin asennettu, komennon\n"
+".B info %s\n"
+".PP\n"
+"pitäisi antaa täydellinen manuaali luettavaksi.\n"
+
+#: help2man:619
+#, perl-format
+msgid "%s: error writing to %s (%s)"
+msgstr "%s: virhe kirjoitettaessa tiedostoon %s (%s)"
diff --git a/po/fr.gmo b/po/fr.gmo
index 2efc363..e65e75f 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index d69020e..66c55dd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.31\n"
-"POT-Creation-Date: 2003-07-09 20:33:36+1000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-17 01:08+1000\n"
 "PO-Revision-Date: 2003-07-09 20:34:44+1000\n"
 "Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -15,12 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:65
+#: help2man:66
+#, fuzzy, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software\n"
-"Foundation, Inc.\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free\n"
+"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"
@@ -36,7 +38,8 @@ msgstr ""
 "\n"
 "Écrit par Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:76
+#: help2man:77
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
@@ -94,97 +97,116 @@ msgstr ""
 "\n"
 "Signaler les bogues à <bug-help2man@gnu.org>.\n"
 
-#: help2man:162
+#: help2man:165
+#, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: impossible d'ouvrir « %s » (%s)"
 
-#: help2man:219
+#: help2man:222
+#, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: aucune information valable trouvée dans « %s »"
 
-#: help2man:231
+#: help2man:235
+#, perl-format
 msgid "%s: can't get `%s' info from %s"
 msgstr "%s: impossible de récupérer l'information « %s » de %s"
 
-#: help2man:243
+#: help2man:246
+#, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: impossible d'effacer %s (%s)"
 
-#: help2man:246
+#: help2man:250
+#, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: impossible de créer « %s » (%s)"
 
-#: help2man:290
+#: help2man:289 help2man:587
+msgid "NAME"
+msgstr "NOM"
+
+#: help2man:301
+#, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- page de manuel de %s %s"
 
-#: help2man:302
+#: help2man:315
 msgid "System Administration Utilities"
 msgstr "Commandes d'administration système"
 
-#: help2man:302
+#: help2man:316
 msgid "Games"
 msgstr "Jeux"
 
-#: help2man:304
+#: help2man:317
 msgid "User Commands"
 msgstr "Commandes"
 
-#: help2man:308
+#: help2man:322
+msgid "Usage"
+msgstr ""
+
+#: help2man:323
 msgid "or"
 msgstr "ou"
 
-#: help2man:345
+#: help2man:354 help2man:587
+msgid "SYNOPSIS"
+msgstr "SYNOPSIS"
+
+#: help2man:358 help2man:587
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: help2man:359
+#: help2man:375
 msgid "Report +bugs|Email +bug +reports +to"
 msgstr ""
 "Signaler +les +bogues|Rapporter +les +bogues|Rapporter +toutes +anomalies|"
 "Envoyer +les +rapports +de +bogue +à"
 
-#: help2man:360
+#: help2man:376
 msgid "Written +by"
 msgstr "Écrit +par"
 
-#: help2man:361
+#: help2man:377
 msgid "Options"
 msgstr "Options"
 
-#: help2man:362
+#: help2man:378
 msgid "Examples"
 msgstr "Exemples"
 
-#: help2man:363
+#: help2man:379
 msgid "This +is +free +software"
 msgstr "Ce +logiciel +est +libre"
 
-#: help2man:375
+#: help2man:391 help2man:587
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
-#: help2man:380
+#: help2man:396 help2man:588
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
-#: help2man:387
+#: help2man:403 help2man:590
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
-#: help2man:417
+#: help2man:432 help2man:590
 msgid "REPORTING BUGS"
 msgstr "SIGNALER DES BOGUES"
 
-#: help2man:417
+#: help2man:438 help2man:590
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
-#: help2man:546
+#: help2man:562 help2man:590
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
-#: help2man:549
+#: help2man:566
+#, perl-format
 msgid ""
 "The full documentation for\n"
 ".B %s\n"
@@ -211,15 +233,7 @@ msgstr ""
 ".PP\n"
 "devrait vous donner accès au manuel complet (en anglais).\n"
 
-#: help2man:571
-msgid "NAME"
-msgstr "NOM"
-
-#: help2man:571
-msgid "SYNOPSIS"
-msgstr "SYNOPSIS"
-
-#: help2man:601
+#: help2man:619
+#, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: erreur d'écriture sur %s (%s)"
-
diff --git a/po/help2man.pot b/po/help2man.pot
index 0b2aceb..0346c64 100644
--- a/po/help2man.pot
+++ b/po/help2man.pot
@@ -1,29 +1,36 @@
-# Translation template for help2man
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: help2man 1.34\n"
-"POT-Creation-Date: 2004-11-20 10:10:31+1100\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-17 02:18+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL>\n"
-"Language-Team: LANGUAGE <LL.org>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:65
+#: help2man:66
+#, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software\n"
-"Foundation, Inc.\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free\n"
+"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 ""
 
-#: help2man:76
+#: help2man:77
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
@@ -51,99 +58,114 @@ msgid ""
 "Report bugs to <bug-help2man@gnu.org>.\n"
 msgstr ""
 
-#: help2man:162
+#: help2man:165
+#, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr ""
 
-#: help2man:219
+#: help2man:222
+#, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr ""
 
-#: help2man:231
+#: help2man:235
+#, perl-format
 msgid "%s: can't get `%s' info from %s"
 msgstr ""
 
-#: help2man:243
+#: help2man:246
+#, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr ""
 
-#: help2man:246
+#: help2man:250
+#, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr ""
 
-#: help2man:290
+#: help2man:289 help2man:587
+msgid "NAME"
+msgstr ""
+
+#: help2man:301
+#, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr ""
 
-#: help2man:302
+#: help2man:315
 msgid "System Administration Utilities"
 msgstr ""
 
-#: help2man:302
+#: help2man:316
 msgid "Games"
 msgstr ""
 
-#: help2man:304
+#: help2man:317
 msgid "User Commands"
 msgstr ""
 
-#: help2man:309
+#: help2man:322
 msgid "Usage"
 msgstr ""
 
-#: help2man:310
+#: help2man:323
 msgid "or"
 msgstr ""
 
-#: help2man:345
+#: help2man:354 help2man:587
+msgid "SYNOPSIS"
+msgstr ""
+
+#: help2man:358 help2man:587
 msgid "DESCRIPTION"
 msgstr ""
 
-#: help2man:362
+#: help2man:375
 msgid "Report +bugs|Email +bug +reports +to"
 msgstr ""
 
-#: help2man:363
+#: help2man:376
 msgid "Written +by"
 msgstr ""
 
-#: help2man:364
+#: help2man:377
 msgid "Options"
 msgstr ""
 
-#: help2man:365
+#: help2man:378
 msgid "Examples"
 msgstr ""
 
-#: help2man:366
+#: help2man:379
 msgid "This +is +free +software"
 msgstr ""
 
-#: help2man:378
+#: help2man:391 help2man:587
 msgid "OPTIONS"
 msgstr ""
 
-#: help2man:383
+#: help2man:396 help2man:588
 msgid "EXAMPLES"
 msgstr ""
 
-#: help2man:390
+#: help2man:403 help2man:590
 msgid "COPYRIGHT"
 msgstr ""
 
-#: help2man:417
+#: help2man:432 help2man:590
 msgid "REPORTING BUGS"
 msgstr ""
 
-#: help2man:417
+#: help2man:438 help2man:590
 msgid "AUTHOR"
 msgstr ""
 
-#: help2man:549
+#: help2man:562 help2man:590
 msgid "SEE ALSO"
 msgstr ""
 
-#: help2man:552
+#: help2man:566
+#, perl-format
 msgid ""
 "The full documentation for\n"
 ".B %s\n"
@@ -158,14 +180,7 @@ msgid ""
 "should give you access to the complete manual.\n"
 msgstr ""
 
-#: help2man:574
-msgid "NAME"
-msgstr ""
-
-#: help2man:574
-msgid "SYNOPSIS"
-msgstr ""
-
-#: help2man:606
+#: help2man:619
+#, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index 2b0ab01..5d2c015 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 06d4ef3..9c6171e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: help2man 1.34.1\n"
-"POT-Creation-Date: 2004-11-20 10:10:31+1100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-17 01:08+1000\n"
 "PO-Revision-Date: 2004-11-21 21:51+1000\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -14,12 +15,13 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help2man:65
+#: help2man:66
+#, fuzzy, perl-format
 msgid ""
 "GNU %s %s\n"
 "\n"
-"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software\n"
-"Foundation, Inc.\n"
+"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free\n"
+"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"
@@ -35,7 +37,8 @@ msgstr ""
 "\n"
 "Program napisa³ Brendan O'Dea <bod@debian.org>\n"
 
-#: help2man:76
+#: help2man:77
+#, perl-format
 msgid ""
 "`%s' generates a man page out of `--help' and `--version' output.\n"
 "\n"
@@ -72,7 +75,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"
@@ -87,99 +91,115 @@ msgstr ""
 "\n"
 "B³êdy proszê zg³aszaæ na adres <bug-help2man@gnu.org>.\n"
 
-#: help2man:162
+#: help2man:165
+#, perl-format
 msgid "%s: can't open `%s' (%s)"
 msgstr "%s: nie mo¿na otworzyæ `%s' (%s)"
 
-#: help2man:219
+#: help2man:222
+#, perl-format
 msgid "%s: no valid information found in `%s'"
 msgstr "%s: nie znaleziono poprawnej informacji w `%s'"
 
-#: help2man:231
+#: help2man:235
+#, perl-format
 msgid "%s: can't get `%s' info from %s"
 msgstr "%s: nie mo¿na uzyskaæ informacji `%s' z %s"
 
-#: help2man:243
+#: help2man:246
+#, perl-format
 msgid "%s: can't unlink %s (%s)"
 msgstr "%s: nie mo¿na usun±æ %s (%s)"
 
-#: help2man:246
+#: help2man:250
+#, perl-format
 msgid "%s: can't create %s (%s)"
 msgstr "%s: nie mo¿na utworzyæ %s (%s)"
 
-#: help2man:290
+#: help2man:289 help2man:587
+msgid "NAME"
+msgstr "NAZWA"
+
+#: help2man:301
+#, perl-format
 msgid "%s \\- manual page for %s %s"
 msgstr "%s \\- strona podrêcznika dla %s %s"
 
-#: help2man:302
+#: help2man:315
 msgid "System Administration Utilities"
 msgstr "Narzêdzia administracyjne"
 
-#: help2man:302
+#: help2man:316
 msgid "Games"
 msgstr "Gry"
 
-#: help2man:304
+#: help2man:317
 msgid "User Commands"
 msgstr "Polecenia u¿ytkownika"
 
-#: help2man:309
+#: help2man:322
 msgid "Usage"
 msgstr "Sk³adnia|U¿ycie"
 
-#: help2man:310
+#: help2man:323
 msgid "or"
 msgstr "lub|albo"
 
-#: help2man:345
+#: help2man:354 help2man:587
+msgid "SYNOPSIS"
+msgstr "SK£ADNIA"
+
+#: help2man:358 help2man:587
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: help2man:362
+#: help2man:375
 msgid "Report +bugs|Email +bug +reports +to"
-msgstr "B³êdy +(proszê|prosimy) +zg³aszaæ +na +adres|Raporty +o +b³êdach +wysy³aj +do"
+msgstr ""
+"B³êdy +(proszê|prosimy) +zg³aszaæ +na +adres|Raporty +o +b³êdach +wysy³aj +do"
 
-#: help2man:363
+#: help2man:376
 msgid "Written +by"
 msgstr "Napisany +przez|Program +napisa(³a?|li)"
 
-#: help2man:364
+#: help2man:377
 msgid "Options"
 msgstr "Opcje"
 
-#: help2man:365
+#: help2man:378
 msgid "Examples"
 msgstr "Przyk³ady"
 
-#: help2man:366
+#: help2man:379
 msgid "This +is +free +software"
 msgstr "Ten +program +jest +darmowy"
 
-#: help2man:378
+#: help2man:391 help2man:587
 msgid "OPTIONS"
 msgstr "OPCJE"
 
-#: help2man:383
+#: help2man:396 help2man:588
 msgid "EXAMPLES"
 msgstr "PRZYK£ADY"
 
-#: help2man:390
+#: help2man:403 help2man:590
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
-#: help2man:417
+#: help2man:432 help2man:590
 msgid "REPORTING BUGS"
 msgstr "ZG£ASZANIE B£ÊDÓW"
 
-#: help2man:417
+#: help2man:438 help2man:590
 msgid "AUTHOR"
 msgstr "AUTOR"
 
-#: help2man:549
+#: help2man:562 help2man:590
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAK¯E"
 
-#: help2man:552
+#: help2man:566
+#, perl-format
 msgid ""
 "The full documentation for\n"
 ".B %s\n"
@@ -205,14 +225,7 @@ msgstr ""
 ".PP\n"
 "powinno udostêpniæ kompletny podrêcznik.\n"
 
-#: help2man:574
-msgid "NAME"
-msgstr "NAZWA"
-
-#: help2man:574
-msgid "SYNOPSIS"
-msgstr "SK£ADNIA"
-
-#: help2man:606
+#: help2man:619
+#, perl-format
 msgid "%s: error writing to %s (%s)"
 msgstr "%s: b³±d zapisu do %s (%s)"