From ceb4f51c2b37c1f27f1aa67778b2ae412fb81600 Mon Sep 17 00:00:00 2001 From: Nicolas FRANCOIS Date: Sat, 29 Jul 2006 07:52:25 +0000 Subject: [PATCH] Apply suggestions by Helge Kreutzman and regenerate the POT and POs. --- man/C/dpkg-name.1 | 13 +++++--- man/ChangeLog | 7 +++++ man/po4a/dpkg-name.1/po/dpkg-name.1.pot | 32 +++++++++---------- man/po4a/dpkg-name.1/po/es.po | 39 ++++++++++++----------- man/po4a/dpkg-name.1/po/fr.po | 42 ++++++++++++++----------- man/po4a/dpkg-name.1/po/ja.po | 39 ++++++++++++----------- 6 files changed, 94 insertions(+), 78 deletions(-) diff --git a/man/C/dpkg-name.1 b/man/C/dpkg-name.1 index 9f806d82..8006d1d7 100644 --- a/man/C/dpkg-name.1 +++ b/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 __.deb as specified in the control file of the package. The 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\-/
'. 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 `
/binary\-'. 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 __.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), diff --git a/man/ChangeLog b/man/ChangeLog index 63ad0586..b83a5a67 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,10 @@ +2006-07-29 Nicolas Francois + + * 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 * po4a/cleanup-info.8/po/de.po: Updated translation. diff --git a/man/po4a/dpkg-name.1/po/dpkg-name.1.pot b/man/po4a/dpkg-name.1/po/dpkg-name.1.pot index d02b73c2..7ff589dd 100644 --- a/man/po4a/dpkg-name.1/po/dpkg-name.1.pot +++ b/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 \n" "Language-Team: LANGUAGE \n" @@ -78,8 +78,8 @@ msgid "" "package name consists of " "EpackageE_EversionE_EarchitectureE.deb as specified " "in the control file of the package. The EversionE 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-EarchitectureE/EsectionE'. 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 " "`EsectionE/binary-EarchitectureE'. 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 " "EpackageE_EversionE_EarchitectureE.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(1)/ B(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(5), B(5), B(1), B(1), B(1), " "B(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 is free software; see " "the GNU General Public Licence version 2 or later for copying " diff --git a/man/po4a/dpkg-name.1/po/es.po b/man/po4a/dpkg-name.1/po/es.po index 96af4eb1..3f7b2d00 100644 --- a/man/po4a/dpkg-name.1/po/es.po +++ b/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 \n" @@ -82,8 +82,8 @@ msgid "" "package name consists of " "EpackageE_EversionE_EarchitectureE.deb as specified " "in the control file of the package. The EversionE 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 , un programa hecho en sh que " "ofrece una manera fácil de renombrar paquetes B 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-" -"EarchitectureE/EsectionE'. If the section is `non-free', " -"`contrib' or no section information is found in the control file the target " -"directory is `EsectionE/binary-EarchitectureE'. 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-" +"EarchitectureE/EsectionE'. 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 `EsectionE/" +"binary-EarchitectureE'. 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 " "EpackageE_EversionE_EarchitectureE.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(1)/ B(1), but other " +"installation tools might depend on this naming structure." msgstr "" "Algunos paquetes no siguen la misma estructura de " "EpaqueteE_EversiónE_EarquitecturaE.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(5), B(5), B(1), B(1), B(1), " @@ -335,13 +336,13 @@ msgstr "" "B(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 is free software; see " diff --git a/man/po4a/dpkg-name.1/po/fr.po b/man/po4a/dpkg-name.1/po/fr.po index e17ebda2..4aa33749 100644 --- a/man/po4a/dpkg-name.1/po/fr.po +++ b/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 \n" "Language-Team: French \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 sh script which provides an easy " "way to rename B packages into their full package names. A full " "package name consists of " "EpackageE_EversionE_EarchitectureE.deb as specified " "in the control file of the package. The EversionE 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. Celui-ci fournit " "une façon simple de redonner aux paquets B leur nom complet. Ce nom " @@ -142,16 +143,18 @@ msgstr "B<-s, --subdir> [I]" # 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-" -"EarchitectureE/EsectionE'. If the section is `non-free', " -"`contrib' or no section information is found in the control file the target " -"directory is `EsectionE/binary-EarchitectureE'. 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-" +"EarchitectureE/EsectionE'. 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 `EsectionE/" +"binary-EarchitectureE'. 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 " "EpackageE_EversionE_EarchitectureE.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(1)/ B(1), but other " +"installation tools might depend on this naming structure." msgstr "" "Certains paquets ne respectent pas l'organisation " "EpaquetE_EversionE_EarchitectureE.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(5), B(5), B(1), B(1), B(1), " "B(1)." @@ -322,13 +326,13 @@ msgstr "" "B(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 is free software; see " "the GNU General Public Licence version 2 or later for copying conditions. " diff --git a/man/po4a/dpkg-name.1/po/ja.po b/man/po4a/dpkg-name.1/po/ja.po index 41fa1c10..61e496fe 100644 --- a/man/po4a/dpkg-name.1/po/ja.po +++ b/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 \n" @@ -82,8 +82,8 @@ msgid "" "package name consists of " "EpackageE_EversionE_EarchitectureE.deb as specified " "in the control file of the package. The EversionE 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 ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤¹¤ë¡£ " "B ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ï¡¢ B ¥Ñ¥Ã¥±¡¼¥¸¤ò´°Á´¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾" @@ -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-" -"EarchitectureE/EsectionE'. If the section is `non-free', " -"`contrib' or no section information is found in the control file the target " -"directory is `EsectionE/binary-EarchitectureE'. 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-" +"EarchitectureE/EsectionE'. 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 `EsectionE/" +"binary-EarchitectureE'. 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 " "EpackageE_EversionE_EarchitectureE.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(1)/ B(1), but other " +"installation tools might depend on this naming structure." msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¤Ï E¥Ñ¥Ã¥±¡¼¥¸E_E¥Ð¡¼¥¸¥ç¥óE_E¥¢¡¼¥­¥Æ" "¥¯¥Á¥ãE.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(5), B(5), B(1), B(1), B(1), " @@ -328,13 +329,13 @@ msgstr "" "B(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 is free software; see " -- 2.39.5