Apply suggestions by Helge Kreutzman and regenerate the POT and POs.

man/C/dpkg-name.1

@@ -28,7 +28,7 @@ sh script which provides an easy way to rename
 packages into their full package names. A full package name consists
 of <package>_<version>_<architecture>.deb as specified in the control
 file of the package. The <version> part of the filename consists of
-the mainstream version information optionally followed by a hyphen and
+the upstream version information optionally followed by a hyphen and
 the revision information.
 .SH OPTIONS
 .TP
@@ -43,13 +43,13 @@ Existing files will be overwritten if they have the same name as the
 destination filename.
 .TP
 .BR "\-s, \-\-subdir" " [\fIdir\fP]"
-Files will be moved into subdir. If directory given as argument exists
+Files will be moved into a subdirectory. If the directory given as argument exists
 the files will be moved into that directory otherwise the name of
 the target directory is extracted from the section field in the
 control part of the package. The target directory will be
 `unstable/binary\-<architecture>/<section>'. If the section is
-`non-free', `contrib' or no section information is found in the
-control file the target directory is
+not found in the control, then `no-section' is assumed, and in this case,
+as well as for sections `non-free' and `contrib' the target directory is
 `<section>/binary\-<architecture>'. The section field isn't required so
 a lot of packages will find their way to the `no\-section' area. Use
 this option with care, it's messy.
@@ -92,7 +92,10 @@ This can be used when building new packages.
 Some packages don't follow the name structure
 <package>_<version>_<architecture>.deb. Packages renamed by dpkg\-name
 will follow this structure. Generally this will have no impact on how
-packages are installed by dselect/dpkg, but other installation tools
+packages are installed by
+.BR dselect (1)/
+.BR dpkg (1),
+but other installation tools
 might depend on this naming structure.
 .SH SEE ALSO
 .BR deb (5),

man/ChangeLog

@@ -1,3 +1,10 @@
+2006-07-29  Nicolas Francois  <nicolas.francois@centraliens.net>
+
+	* C/dpkg-name.1: Typo fix.
+	* po4a/dpkg-name.1/po/dpkg-name.1.pot: Regenerated.
+	* po4a/dpkg-name.1/po/*.po: Merge with pot file.
+	Former completed translations become 39t3f.
+
 2006-07-28  Helge Kreutzmann  <debian@helgefjell.de>
 
 	* po4a/cleanup-info.8/po/de.po: Updated translation.

man/po4a/dpkg-name.1/po/dpkg-name.1.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-07-28 21:10+0200\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"
@@ -78,8 +78,8 @@ msgid ""
 "package name consists of "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
 "in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the mainstream version information optionally followed "
-"by a hyphen and the revision information."
+"filename consists of the upstream version information optionally followed by "
+"a hyphen and the revision information."
 msgstr ""
 
 # type: SH
@@ -132,13 +132,13 @@ msgstr ""
 # type: Plain text
 #: ../../../man/po4a/../C/dpkg-name.1:56
 msgid ""
-"Files will be moved into subdir. If directory given as argument exists the "
-"files will be moved into that directory otherwise the name of the target "
-"directory is extracted from the section field in the control part of the "
-"package. The target directory will be "
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be "
 "`unstable/binary-E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section "
-"is `non-free', `contrib' or no section information is found in the control "
-"file the target directory is "
+"is not found in the control, then `no-section' is assumed, and in this case, "
+"as well as for sections `non-free' and `contrib' the target directory is "
 "`E<lt>sectionE<gt>/binary-E<lt>architectureE<gt>'. The section field isn't "
 "required so a lot of packages will find their way to the `no-section' "
 "area. Use this option with care, it's messy."
@@ -257,36 +257,36 @@ msgid "BUGS"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 msgid ""
 "Some packages don't follow the name structure "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
 "renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by dselect/dpkg, but other installation "
-"tools might depend on this naming structure."
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
 msgstr ""
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:110
+#: ../../../man/po4a/../C/dpkg-name.1:113
 msgid ""
 "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
 "the GNU General Public Licence version 2 or later for copying "

man/po4a/dpkg-name.1/po/es.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-07-28 21:10+0200\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -82,8 +82,8 @@ msgid ""
 "package name consists of "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
 "in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the mainstream version information optionally followed "
-"by a hyphen and the revision information."
+"filename consists of the upstream version information optionally followed by "
+"a hyphen and the revision information."
 msgstr ""
 "Esta pagina de manual trata sobre B<dpkg-name> , un programa hecho en sh que "
 "ofrece una manera fácil de renombrar paquetes B<Debian> a nombres de "
@@ -149,15 +149,16 @@ msgstr "B<-s, --subdir [directorio]>"
 #: ../../../man/po4a/../C/dpkg-name.1:56
 #, fuzzy
 msgid ""
-"Files will be moved into subdir. If directory given as argument exists the "
-"files will be moved into that directory otherwise the name of the target "
-"directory is extracted from the section field in the control part of the "
-"package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is `non-free', "
-"`contrib' or no section information is found in the control file the target "
-"directory is `E<lt>sectionE<gt>/binary-E<lt>architectureE<gt>'. The section "
-"field isn't required so a lot of packages will find their way to the `no-"
-"section' area. Use this option with care, it's messy."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 "Se moverán los archivos dentro del subdirectorio especificado. Si existe el "
 "directorio dado como argumento, los archivos se moverán dentro del "
@@ -303,14 +304,14 @@ msgid "BUGS"
 msgstr "ERRATAS"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 #, fuzzy
 msgid ""
 "Some packages don't follow the name structure "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
 "renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by dselect/dpkg, but other installation "
-"tools might depend on this naming structure."
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 "Algunos paquetes no siguen la misma estructura de "
 "E<lt>paqueteE<gt>_E<lt>versiónE<gt>_E<lt>arquitecturaE<gt>.deb. Los paquetes "
@@ -319,13 +320,13 @@ msgstr ""
 "otras herramientas de instalación podrían depender de esta estructura."
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr "VÉASE TAMBIÉN"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
@@ -335,13 +336,13 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 #, fuzzy, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:110
+#: ../../../man/po4a/../C/dpkg-name.1:113
 #, fuzzy
 msgid ""
 "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "

man/po4a/dpkg-name.1/po/fr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-07-28 21:10+0200\n"
 "PO-Revision-Date: 2006-05-14 10:21+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -73,14 +73,15 @@ msgstr "DESCRIPTION"
 
 # type: Plain text
 #: ../../../man/po4a/../C/dpkg-name.1:33
+#, fuzzy
 msgid ""
 "This manual page documents the B<dpkg-name> sh script which provides an easy "
 "way to rename B<Debian> packages into their full package names. A full "
 "package name consists of "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
 "in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the mainstream version information optionally followed "
-"by a hyphen and the revision information."
+"filename consists of the upstream version information optionally followed by "
+"a hyphen and the revision information."
 msgstr ""
 "Cette page de manuel documente le script sh B<dpkg-name>. Celui-ci fournit "
 "une façon simple de redonner aux paquets B<Debian> leur nom complet. Ce nom "
@@ -142,16 +143,18 @@ msgstr "B<-s, --subdir> [I<rep>]"
 
 # type: Plain text
 #: ../../../man/po4a/../C/dpkg-name.1:56
+#, fuzzy
 msgid ""
-"Files will be moved into subdir. If directory given as argument exists the "
-"files will be moved into that directory otherwise the name of the target "
-"directory is extracted from the section field in the control part of the "
-"package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is `non-free', "
-"`contrib' or no section information is found in the control file the target "
-"directory is `E<lt>sectionE<gt>/binary-E<lt>architectureE<gt>'. The section "
-"field isn't required so a lot of packages will find their way to the `no-"
-"section' area. Use this option with care, it's messy."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 "Met les fichiers dans rep. Si le répertoire donné en argument existe, les "
 "fichiers sont déplacés dans ce répertoire\\ ; sinon le répertoire cible, "
@@ -292,13 +295,14 @@ msgid "BUGS"
 msgstr "BOGUES"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
+#, fuzzy
 msgid ""
 "Some packages don't follow the name structure "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
 "renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by dselect/dpkg, but other installation "
-"tools might depend on this naming structure."
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 "Certains paquets ne respectent pas l'organisation "
 "E<lt>paquetE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Les paquets "
@@ -307,13 +311,13 @@ msgstr ""
 "systèmes d'installation aient besoin de cette organisation."
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
 "B<xargs>(1)."
@@ -322,13 +326,13 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:110
+#: ../../../man/po4a/../C/dpkg-name.1:113
 msgid ""
 "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "
 "the GNU General Public Licence version 2 or later for copying conditions. "

man/po4a/dpkg-name.1/po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2006-06-20 21:07+0200\n"
+"POT-Creation-Date: 2006-07-28 21:10+0200\n"
 "PO-Revision-Date: 2005-07-03 15:04+0200\n"
 "Last-Translator: Unknown translator\n"
 "Language-Team: Japanese <debian-l10n-japanese@lists.debian.org>\n"
@@ -82,8 +82,8 @@ msgid ""
 "package name consists of "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb as specified "
 "in the control file of the package. The E<lt>versionE<gt> part of the "
-"filename consists of the mainstream version information optionally followed "
-"by a hyphen and the revision information."
+"filename consists of the upstream version information optionally followed by "
+"a hyphen and the revision information."
 msgstr ""
 "このマニュアルページでは、 B<dpkg-name> シェルスクリプトについて説明する。 "
 "B<dpkg-name> シェルスクリプトは、 B<Debian> パッケージを完全なパッケージ名"
@@ -147,15 +147,16 @@ msgstr "B<-s, --subdir [dir]>"
 #: ../../../man/po4a/../C/dpkg-name.1:56
 #, fuzzy
 msgid ""
-"Files will be moved into subdir. If directory given as argument exists the "
-"files will be moved into that directory otherwise the name of the target "
-"directory is extracted from the section field in the control part of the "
-"package. The target directory will be `unstable/binary-"
-"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is `non-free', "
-"`contrib' or no section information is found in the control file the target "
-"directory is `E<lt>sectionE<gt>/binary-E<lt>architectureE<gt>'. The section "
-"field isn't required so a lot of packages will find their way to the `no-"
-"section' area. Use this option with care, it's messy."
+"Files will be moved into a subdirectory. If the directory given as argument "
+"exists the files will be moved into that directory otherwise the name of the "
+"target directory is extracted from the section field in the control part of "
+"the package. The target directory will be `unstable/binary-"
+"E<lt>architectureE<gt>/E<lt>sectionE<gt>'. If the section is not found in "
+"the control, then `no-section' is assumed, and in this case, as well as for "
+"sections `non-free' and `contrib' the target directory is `E<lt>sectionE<gt>/"
+"binary-E<lt>architectureE<gt>'. The section field isn't required so a lot of "
+"packages will find their way to the `no-section' area. Use this option with "
+"care, it's messy."
 msgstr ""
 "ファイルを subdir で指定したディレクトリに移動する。もし引数で指定した ディレ"
 "クトリが存在すれば、パッケージの control のセクションフィールド から得られた"
@@ -296,14 +297,14 @@ msgid "BUGS"
 msgstr "バグ"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 #, fuzzy
 msgid ""
 "Some packages don't follow the name structure "
 "E<lt>packageE<gt>_E<lt>versionE<gt>_E<lt>architectureE<gt>.deb. Packages "
 "renamed by dpkg-name will follow this structure. Generally this will have no "
-"impact on how packages are installed by dselect/dpkg, but other installation "
-"tools might depend on this naming structure."
+"impact on how packages are installed by B<dselect>(1)/ B<dpkg>(1), but other "
+"installation tools might depend on this naming structure."
 msgstr ""
 "パッケージによっては E<lt>パッケージE<gt>_E<lt>バージョンE<gt>_E<lt>アーキテ"
 "クチャE<gt>.deb という名前ではない。 dpkg-name によって改名されたパッケージは"
@@ -312,13 +313,13 @@ msgstr ""
 "トールツールに よっては影響があるかもしれない。"
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:97
+#: ../../../man/po4a/../C/dpkg-name.1:100
 #, fuzzy, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 #, fuzzy
 msgid ""
 "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dpkg-deb>(1), B<find>(1), "
@@ -328,13 +329,13 @@ msgstr ""
 "B<xargs>(1)."
 
 # type: SH
-#: ../../../man/po4a/../C/dpkg-name.1:104
+#: ../../../man/po4a/../C/dpkg-name.1:107
 #, fuzzy, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
-#: ../../../man/po4a/../C/dpkg-name.1:110
+#: ../../../man/po4a/../C/dpkg-name.1:113
 #, fuzzy
 msgid ""
 "Copyright 1995,1996 Erick Branderhorst.  B<dpkg-name> is free software; see "