 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a Build.PL,1.5,1.6
                                
                                
                                
                                    
                                        by Jordi Vilalta
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a
In directory haydn:/tmp/cvs-serv12156
Modified Files:
	Build.PL 
Log Message:
Sort the lists of files before updating the pot's.
Without this, we were sending lots of unnecesary diff with each po/pot update
depending on how the files were ordered in everyone's hard disk (same messages
in different order).
Things should stabilize with the next po/pot commits.
Index: Build.PL
===================================================================
RCS file: /cvsroot/po4a/po4a/Build.PL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Build.PL	17 Jul 2004 07:36:00 -0000	1.5
+++ Build.PL	18 Jul 2004 09:58:32 -0000	1.6
@@ -27,7 +27,7 @@
 	sub ACTION_binpo {
 	    my $self = shift;
 	    
-	    my @files = (keys(%{$self->script_files()}), @{$self->rscan_dir('lib',qr{\.pm$})});
+	    my @files = sort((keys(%{$self->script_files()}), @{$self->rscan_dir('lib',qr{\.pm$})}));
 	    
 	    unless ($self->up_to_date(\@files, "po/bin/po4a.pot")) {
 		print "XX Update po/bin/po4a.pot\n";
@@ -85,7 +85,7 @@
 	    my $self = shift;
 	    
 	    # update pot
-	    my @files = (keys(%{$self->script_files()}), @{$self->rscan_dir('lib',qr{\.pm$})}, @{$self->rscan_dir('doc',qr{\.pod$})});
+	    my @files = sort((keys(%{$self->script_files()}), @{$self->rscan_dir('lib',qr{\.pm$})}, @{$self->rscan_dir('doc',qr{\.pod$})}));
 	    unless ($self->up_to_date(\@files, "po/pod/po4a-pod.pot")) {
 		my $podfiles = join ("", map {" -m ../../".$_ } @files);
 		print "XX Update documentation pot files: ";
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/po/bin po4a.pot,1.21,1.22
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/po/bin
In directory haydn:/tmp/cvs-serv12256/po/bin
Modified Files:
	po4a.pot 
Log Message:
Sync to the code after Xml.pm checkout
Index: po4a.pot
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/po4a.pot,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- po4a.pot	18 Jul 2004 08:49:05 -0000	1.21
+++ po4a.pot	18 Jul 2004 09:57:54 -0000	1.22
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-18 01:47-0700\n"
+"POT-Creation-Date: 2004-07-18 02:53-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -551,4 +551,18 @@
 #: ../../lib/Locale/Po4a/Sgml.pm:739
 #, perl-format
 msgid "%s:%d: Unknown SGML event type: %s"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:176
+#, perl-format
+msgid "po4a::xml: Unknown option: %s"
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:354
+#, perl-format
+msgid "po4a::xml: Bad document type. '%s' expected."
+msgstr ""
+
+#: ../../lib/Locale/Po4a/Xml.pm:405
+msgid "po4a::xml: Unexpected closing tag. The main document may be wrong."
 msgstr ""
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/po/bin fr.po,1.22,1.23
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/po/bin
In directory haydn:/tmp/cvs-serv12240
Modified Files:
	fr.po 
Log Message:
Translate the new strings from Xml. This time, I was not the one who caused the
fuzzies ;)
Index: fr.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/fr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- fr.po	18 Jul 2004 08:55:32 -0000	1.22
+++ fr.po	18 Jul 2004 09:57:12 -0000	1.23
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: po4a 0.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-18 01:47-0700\n"
-"PO-Revision-Date: 2004-07-18 01:55-0700\n"
+"POT-Creation-Date: 2004-07-18 02:53-0700\n"
+"PO-Revision-Date: 2004-07-18 02:56-0700\n"
 "Last-Translator: Martin Quinson <Martin.Quinson(a)tuxfamily.org>\n"
 "Language-Team: french <debian-l10n-french(a)lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,9 @@
 #: ../../po4a-translate:240
 #, perl-format
 msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
-msgstr "Rejet de la traduction de %s (seulement %s%% sont traduits, %s%% sont nécessaires)."
+msgstr ""
+"Rejet de la traduction de %s (seulement %s%% sont traduits, %s%% sont "
+"nécessaires)."
 
 #: ../../po4a-translate:247
 #, perl-format
@@ -654,3 +656,17 @@
 #, perl-format
 msgid "%s:%d: Unknown SGML event type: %s"
 msgstr "%s:%d: événement SGML inconnu : %s"
+
+#: ../../lib/Locale/Po4a/Xml.pm:176
+#, perl-format
+msgid "po4a::xml: Unknown option: %s"
+msgstr "po4a::xml: option '%s' inconnue"
+
+#: ../../lib/Locale/Po4a/Xml.pm:354
+#, perl-format
+msgid "po4a::xml: Bad document type. '%s' expected."
+msgstr "po4a::xml: Mauvais type de document (« %s » était attendu)."
+
+#: ../../lib/Locale/Po4a/Xml.pm:405
+msgid "po4a::xml: Unexpected closing tag. The main document may be wrong."
+msgstr "Bad document type. '%s' expected.<"
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/po/bin ca.po,1.5,1.6 es.po,1.7,1.8
                                
                                
                                
                                    
                                        by Jordi Vilalta
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/po/bin
In directory haydn:/tmp/cvs-serv26880
Modified Files:
	ca.po es.po 
Log Message:
Sync to EN
Index: ca.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/ca.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ca.po	18 Jul 2004 08:49:05 -0000	1.5
+++ ca.po	18 Jul 2004 09:40:53 -0000	1.6
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-18 01:47-0700\n"
-"PO-Revision-Date: 2004-07-17 09:05+0100\n"
+"POT-Creation-Date: 2004-07-18 11:35+0200\n"
+"PO-Revision-Date: 2004-07-18 11:17+0100\n"
 "Last-Translator: Jordi Vilalta <jvprat(a)wanadoo.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -48,9 +48,9 @@
 msgstr "No s'ha pogut obrir %s: %s"
 
 #: ../../po4a:235
-#, fuzzy, perl-format
+#, perl-format
 msgid "Syntax error: %s"
-msgstr "Error de sintaxi"
+msgstr "Error de sintaxi: %s"
 
 #: ../../po4a:242
 #, perl-format
@@ -63,29 +63,29 @@
 msgstr "'po4a_path' redeclarat"
 
 #: ../../po4a:255
-#, fuzzy, perl-format
+#, perl-format
 msgid "Unparsable argument '%s'."
-msgstr "No s'ha pogut analitzar el paràmetre '%s'"
+msgstr "No s'ha pogut analitzar el paràmetre '%s'."
 
 #: ../../po4a:266
-#, fuzzy, perl-format
+#, perl-format
 msgid "Unparsable argument '%s' (%s)."
-msgstr "No s'ha pogut analitzar el paràmetre '%s'"
+msgstr "No s'ha pogut analitzar el paràmetre '%s' (%s)."
 
 #: ../../po4a:272
 #, perl-format
 msgid "The translated and master file are the same."
-msgstr ""
+msgstr "El fitxer traduït i l'original són el mateix."
 
 #: ../../po4a:280
-#, fuzzy, perl-format
+#, perl-format
 msgid "Translation of %s in %s redefined"
-msgstr "S'ha descartat la traducció de %s: tan sols hi ha un %s%% traduït."
+msgstr "S'ha redefinit la traducció de %s a %s"
 
 #: ../../po4a:289
-#, fuzzy, perl-format
+#, perl-format
 msgid "Unparsable command '%s'."
-msgstr "No s'ha pogut analitzar la comanda '%s'"
+msgstr "No s'ha pogut analitzar la comanda '%s'."
 
 #: ../../po4a:296
 msgid "po4a_paths not declared. Dunno where to find the pot and po files"
@@ -102,9 +102,9 @@
 msgstr "Creant %s:"
 
 #: ../../po4a:324
-#, fuzzy, perl-format
+#, perl-format
 msgid "Updating %s: "
-msgstr "Actualitzant %s:"
+msgstr "Actualitzant %s: "
 
 #: ../../po4a:327 ../../po4a-updatepo:208
 #, perl-format
@@ -117,11 +117,9 @@
 msgstr "Error mentre es copiava l'arxiu po: %s"
 
 #: ../../po4a:357
-#, fuzzy, perl-format
+#, perl-format
 msgid "Discard %s (only %s%% translated; need %s%%)."
-msgstr ""
-"S'ha descartat la traducció de %s (tan sols hi ha un %s%% traduït; es "
-"necessita un %s%%)."
+msgstr "%s descartat (només hi ha un %s%% traduït; es necessita un %s%%)."
 
 #: ../../po4a:366
 #, perl-format
@@ -129,14 +127,14 @@
 msgstr "L'annex %s s'aplica a %s (traducció descartada)."
 
 #: ../../po4a:375
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is %s%% translated (%s strings)."
-msgstr "%s està traduït en un %s%% (%s de %s cadenes)"
+msgstr "%s està traduït en un %s%% (%s cadenes)"
 
 #: ../../po4a:378 ../../po4a-translate:234
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is %s%% translated (%s of %s strings)."
-msgstr "%s està traduït en un %s%% (%s de %s cadenes)"
+msgstr "%s està traduït en un %s%% (%s de %s cadenes)."
 
 #: ../../po4a-updatepo:181
 msgid "po4a-update can't take the input po from the file '-'."
@@ -172,156 +170,104 @@
 msgid "Discard the translation of %s (addendum %s does not apply)."
 msgstr "S'ha descartat la traducció de %s (no s'ha pogut aplicar l'annex %s)."
 
-#: ../../lib/Locale/Po4a/KernelHelp.pm:106
-#, perl-format
-msgid "%s: Syntax error"
-msgstr "%s: Error de sintaxi"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:29
-msgid "Need to provide a module name to the Chooser"
-msgstr "Es necessita indicar un nom de mòdul per al Chooser"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:41
-#, perl-format
-msgid "Unknown format type: %s."
-msgstr "Tipus de format desconegut: %s."
-
-#: ../../lib/Locale/Po4a/Chooser.pm:42
-#, perl-format
-msgid "Module loading error: %s"
-msgstr "Error al carregar el mòdul: %s"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:50
-msgid ""
-"List of valid formats:\n"
-"  - kernelhelp: Help messages of each kernel compilation option.\n"
-"  - man: Good old manual page format.\n"
-"  - pod: Perl Online Documentation format.\n"
-"  - sgml: either debiandoc or docbook DTD.\n"
-"  - dia: uncompressed Dia diagrams."
-msgstr ""
-"Llista de formats vàlids:\n"
-"  - kernelhelp: L'ajuda de les opcions de compilació del kernel.\n"
-"  - man: El clàssic format de les pàgines de manual.\n"
-"  - pod: Format de la Documentació Online de Perl.\n"
-"  - sgml: ja sigui el DTD de debiandoc o el de docbook.\n"
-"  - dia: diagrames de Dia descomprimits."
-
 #: ../../lib/Locale/Po4a/Dia.pm:144
 msgid "po4a::dia: Couldn't find file encoding. Assuming UTF-8."
 msgstr ""
 "po4a::dia: No s'ha pogut trobar la codificació de l'arxiu. Assumint UTF-8."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:338
-msgid "Can't read from file without having a filename"
-msgstr "No es pot llegir d'un arxiu sense nom"
+#: ../../lib/Locale/Po4a/Po.pm:143
+msgid "po4a::po: Please provide a non-nul filename"
+msgstr "po4a::po: Si us plau, proveïu un nom d'arxiu no nul"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:342
-#: ../../lib/Locale/Po4a/TransTractor.pm:455 ../../lib/Locale/Po4a/Po.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:146 ../../lib/Locale/Po4a/TransTractor.pm:342
+#: ../../lib/Locale/Po4a/TransTractor.pm:455
 #, perl-format
 msgid "Can't read from %s: %s"
 msgstr "No s'ha pogut llegir de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:350 ../../lib/Locale/Po4a/Po.pm:154
+#: ../../lib/Locale/Po4a/Po.pm:154 ../../lib/Locale/Po4a/TransTractor.pm:350
 #, perl-format
 msgid "Can't close %s after reading: %s"
 msgstr "No s'ha pogut tancar %s després de llegir: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:363 ../../lib/Locale/Po4a/Po.pm:209
-msgid "Can't write to a file without filename"
-msgstr "No es pot escriure a unn arxiu sense nom"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:370
-#, perl-format
-msgid "can't write to %s: %s"
-msgstr "no s'ha pogut escriure a %s: %s"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:377
-#, perl-format
-msgid "Can't close %s after writing: %s"
-msgstr "No s'ha pogut tancar %s després d'escriure: %s"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:460
-#, perl-format
-msgid "Can't read Po4a header from %s."
-msgstr "No s'ha pogut llegir una capçalera Po4a de %s."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:466
-#, perl-format
-msgid "First line of %s does not look like a Po4a header."
-msgstr "La primera línia de %s no sembla ser una capçalera Po4a."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:472
+#: ../../lib/Locale/Po4a/Po.pm:184
 #, perl-format
-msgid "Syntax error in Po4a header of %s, near \"%s\""
-msgstr "Error de sintaxi a la capçalera Po4a de %s, prop de \"%s\""
+msgid "Strange line at line %s: -->%s<--"
+msgstr "Línia estranya a la línia %s: -->%s<--"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:488
-#, perl-format
-msgid "Invalid argument in the Po4a header of %s: %s"
-msgstr "Paràmetre invàlid en la capçalera Po4a de %s: %s"
+#: ../../lib/Locale/Po4a/Po.pm:209 ../../lib/Locale/Po4a/TransTractor.pm:363
+msgid "Can't write to a file without filename"
+msgstr "No es pot escriure a unn arxiu sense nom"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:495
+#: ../../lib/Locale/Po4a/Po.pm:216
 #, perl-format
-msgid "The Po4a header of %s does not define the mode."
-msgstr "La capçalera Po4a de %s no defineix el mode."
+msgid "Can't write to %s: %s"
+msgstr "No s'ha pogut escriure a %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:500
+#: ../../lib/Locale/Po4a/Po.pm:276
 #, perl-format
 msgid ""
-"Mode invalid in the Po4a header of %s: should be 'before' or 'after' not %s."
+"po4a gettextize: Original have more strings that the translation (%d>%d).\n"
+"po4a gettextize: Please fix it by editing the translated version to add a "
+"dummy entry."
 msgstr ""
-"Mode invàlid a la capçalera Po4a de %s: hauria de ser 'before' o 'after', no "
-"%s."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:506
-#, perl-format
-msgid "The Po4a header of %s does not define the position."
-msgstr "La capçalera Po4a de %s no defineix la posició."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:511
-msgid "No ending boundary given in the Po4a header, but mode=after."
-msgstr "No es dóna límit al final en la capçalera Po4a, però mode=after."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:536
-#, fuzzy
-msgid "Can't apply addendum when not given the filename"
-msgstr "No es pot afegir l'annex si no s'especifica el nom de l'arxiu"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:539
-#, fuzzy, perl-format
-msgid "Addendum %s does not exist."
-msgstr "L'arxiu %s no existeix."
+"po4a gettextize: L'original té més cadenes que la traducció (%d>%d).\n"
+"po4a gettextize: Arregleu-ho editant la versió traduïda afegint entrades "
+"buides."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:549
+#: ../../lib/Locale/Po4a/Po.pm:281
 #, perl-format
-msgid "No candidate position for the addendum %s."
-msgstr "No s'ha trobat cap posició candidata per l'annex %s."
+msgid ""
+"po4a gettextize: Original have less strings that the translation (%d<%d).\n"
+"po4a gettextize: Please fix it by removing the extra entry from the\n"
+"po4a gettextize: translated file. You may need an addendum, cf po4a(7)."
+msgstr ""
+"po4a gettextize: L'original té menys cadenes que la traducció (%d<%d).\n"
+"po4a gettextize: Si us plau, arregleu-ho treient les entrades extra de "
+"l'arxiu\n"
+"po4a gettextize: traduït. Probablement necessiteu un annex, consulteu po4a"
+"(7)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:315
 #, perl-format
-msgid "More than one cadidate position found for the addendum %s."
-msgstr "S'ha trobat més d'una posició candidata per l'annex %s."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:562
-#: ../../lib/Locale/Po4a/TransTractor.pm:583
-#, fuzzy, perl-format
-msgid "Addendum '%s' applied before this line: %s"
+msgid ""
+"po4a gettextization: Structure disparity between original and translated "
+"files:\n"
+"msgid (at %s) is of type '%s' while\n"
+"msgstr (at %s) is of type '%s'.\n"
+"Original text: %s\n"
+"Translated text: %s"
 msgstr ""
-"Afegint l'annex %s abans de la línia:\n"
-"%s"
+"po4a gettextization: L'estructura de l'arxiu original i del traduït "
+"difereixen:\n"
+"msgid (a %s) és del tipus '%s' mentre que\n"
+"msgstr (a %s) és del tipus '%s'.\n"
+"Text original: %s\n"
+"Text traduït: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:590
-#, fuzzy, perl-format
-msgid "Addendum '%s' applied after the line: %s."
-msgstr ""
-"Afegint l'annex %s abans de la línia:\n"
-"%s"
+#: ../../lib/Locale/Po4a/Po.pm:581
+#, perl-format
+msgid "msgid defined twice: %s"
+msgstr "msgid definit més d'una vegada: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:597
+#: ../../lib/Locale/Po4a/Po.pm:593
 #, perl-format
-msgid "Addendum '%s' applied at the end of the file."
+msgid ""
+"Translations don't match for:\n"
+"%s\n"
+"-->First translation:\n"
+"%s\n"
+" Second translation:\n"
+"%s\n"
+" Old translation discarded."
 msgstr ""
+"Les traduccions no encaixen per:\n"
+"%s\n"
+"-->Primera traducció:\n"
+"%s\n"
+" Segona traducció:\n"
+"%s\n"
+" S'ha descartat la traducció vella."
 
 #: ../../lib/Locale/Po4a/Man.pm:290
 #, perl-format
@@ -449,13 +395,13 @@
 "po4a::man: Això no està suportat (encara)."
 
 #: ../../lib/Locale/Po4a/Man.pm:667
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "po4a::man: Unknown macro '%s' (at %s).\n"
 "po4a::man: Remove it from the document, or provide a patch to the po4a team."
 msgstr ""
-"po4a::man: Macro '%s' desconeguda. Elimíni-la del document, o\n"
-"po4a::man: enviï un pegat a <po4a-devel(a)lists.alioth.debian.org>."
+"po4a::man: Macro '%s' desconeguda (a %s).\n"
+"po4a::man: Elimini-la del document, o enviï un pegat a l'equip de po4a."
 
 #: ../../lib/Locale/Po4a/Man.pm:888
 msgid ""
@@ -474,84 +420,131 @@
 "po4a::man: Aquesta pàgina utilitza condicionals amb '%s'. Com po4a no és\n"
 "po4a::man: un analitzador de groff, això no està suportat."
 
-#: ../../lib/Locale/Po4a/Po.pm:143
-msgid "po4a::po: Please provide a non-nul filename"
-msgstr "po4a::po: Si us plau, proveïu un nom d'arxiu no nul"
+#: ../../lib/Locale/Po4a/TransTractor.pm:338
+msgid "Can't read from file without having a filename"
+msgstr "No es pot llegir d'un arxiu sense nom"
 
-#: ../../lib/Locale/Po4a/Po.pm:184
+#: ../../lib/Locale/Po4a/TransTractor.pm:370
 #, perl-format
-msgid "Strange line at line %s: -->%s<--"
-msgstr "Línia estranya a la línia %s: -->%s<--"
+msgid "can't write to %s: %s"
+msgstr "no s'ha pogut escriure a %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:216
+#: ../../lib/Locale/Po4a/TransTractor.pm:377
 #, perl-format
-msgid "Can't write to %s: %s"
-msgstr "No s'ha pogut escriure a %s: %s"
+msgid "Can't close %s after writing: %s"
+msgstr "No s'ha pogut tancar %s després d'escriure: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:276
+#: ../../lib/Locale/Po4a/TransTractor.pm:460
 #, perl-format
-msgid ""
-"po4a gettextize: Original have more strings that the translation (%d>%d).\n"
-"po4a gettextize: Please fix it by editing the translated version to add a "
-"dummy entry."
-msgstr ""
-"po4a gettextize: L'original té més cadenes que la traducció (%d>%d).\n"
-"po4a gettextize: Arregleu-ho editant la versió traduïda afegint entrades "
-"buides."
+msgid "Can't read Po4a header from %s."
+msgstr "No s'ha pogut llegir una capçalera Po4a de %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:281
+#: ../../lib/Locale/Po4a/TransTractor.pm:466
 #, perl-format
-msgid ""
-"po4a gettextize: Original have less strings that the translation (%d<%d).\n"
-"po4a gettextize: Please fix it by removing the extra entry from the\n"
-"po4a gettextize: translated file. You may need an addendum, cf po4a(7)."
-msgstr ""
-"po4a gettextize: L'original té menys cadenes que la traducció (%d<%d).\n"
-"po4a gettextize: Si us plau, arregleu-ho treient les entrades extra de "
-"l'arxiu\n"
-"po4a gettextize: traduït. Probablement necessiteu un annex, consulteu po4a"
-"(7)."
+msgid "First line of %s does not look like a Po4a header."
+msgstr "La primera línia de %s no sembla ser una capçalera Po4a."
 
-#: ../../lib/Locale/Po4a/Po.pm:315
+#: ../../lib/Locale/Po4a/TransTractor.pm:472
+#, perl-format
+msgid "Syntax error in Po4a header of %s, near \"%s\""
+msgstr "Error de sintaxi a la capçalera Po4a de %s, prop de \"%s\""
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:488
+#, perl-format
+msgid "Invalid argument in the Po4a header of %s: %s"
+msgstr "Paràmetre invàlid en la capçalera Po4a de %s: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:495
+#, perl-format
+msgid "The Po4a header of %s does not define the mode."
+msgstr "La capçalera Po4a de %s no defineix el mode."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:500
 #, perl-format
 msgid ""
-"po4a gettextization: Structure disparity between original and translated "
-"files:\n"
-"msgid (at %s) is of type '%s' while\n"
-"msgstr (at %s) is of type '%s'.\n"
-"Original text: %s\n"
-"Translated text: %s"
+"Mode invalid in the Po4a header of %s: should be 'before' or 'after' not %s."
 msgstr ""
-"po4a gettextization: L'estructura de l'arxiu original i del traduït "
-"difereixen:\n"
-"msgid (a %s) és del tipus '%s' mentre que\n"
-"msgstr (a %s) és del tipus '%s'.\n"
-"Text original: %s\n"
-"Text traduït: %s"
+"Mode invàlid a la capçalera Po4a de %s: hauria de ser 'before' o 'after', no "
+"%s."
 
-#: ../../lib/Locale/Po4a/Po.pm:581
+#: ../../lib/Locale/Po4a/TransTractor.pm:506
 #, perl-format
-msgid "msgid defined twice: %s"
-msgstr "msgid definit més d'una vegada: %s"
+msgid "The Po4a header of %s does not define the position."
+msgstr "La capçalera Po4a de %s no defineix la posició."
 
-#: ../../lib/Locale/Po4a/Po.pm:593
+#: ../../lib/Locale/Po4a/TransTractor.pm:511
+msgid "No ending boundary given in the Po4a header, but mode=after."
+msgstr "No es dóna límit al final en la capçalera Po4a, però mode=after."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:536
+msgid "Can't apply addendum when not given the filename"
+msgstr "No es pot aplicar l'annex si no s'especifica el nom de l'arxiu"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:539
 #, perl-format
+msgid "Addendum %s does not exist."
+msgstr "L'annex %s no existeix."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:549
+#, perl-format
+msgid "No candidate position for the addendum %s."
+msgstr "No s'ha trobat cap posició candidata per l'annex %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:555
+#, perl-format
+msgid "More than one cadidate position found for the addendum %s."
+msgstr "S'ha trobat més d'una posició candidata per l'annex %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:562
+#: ../../lib/Locale/Po4a/TransTractor.pm:583
+#, perl-format
+msgid "Addendum '%s' applied before this line: %s"
+msgstr "S'ha aplicat l'annex '%s' abans d'aquesta la línia: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:590
+#, perl-format
+msgid "Addendum '%s' applied after the line: %s."
+msgstr "S'ha aplicat l'annex '%s' després de la línia: %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:597
+#, perl-format
+msgid "Addendum '%s' applied at the end of the file."
+msgstr "S'ha aplicat l'annex '%s' al final del fitxer."
+
+#: ../../lib/Locale/Po4a/KernelHelp.pm:106
+#, perl-format
+msgid "%s: Syntax error"
+msgstr "%s: Error de sintaxi"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:29
+msgid "Need to provide a module name to the Chooser"
+msgstr "Es necessita indicar un nom de mòdul per al Chooser"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:41
+#, perl-format
+msgid "Unknown format type: %s."
+msgstr "Tipus de format desconegut: %s."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:42
+#, perl-format
+msgid "Module loading error: %s"
+msgstr "Error al carregar el mòdul: %s"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:50
 msgid ""
-"Translations don't match for:\n"
-"%s\n"
-"-->First translation:\n"
-"%s\n"
-" Second translation:\n"
-"%s\n"
-" Old translation discarded."
+"List of valid formats:\n"
+"  - kernelhelp: Help messages of each kernel compilation option.\n"
+"  - man: Good old manual page format.\n"
+"  - pod: Perl Online Documentation format.\n"
+"  - sgml: either debiandoc or docbook DTD.\n"
+"  - dia: uncompressed Dia diagrams."
 msgstr ""
-"Les traduccions no encaixen per:\n"
-"%s\n"
-"-->Primera traducció:\n"
-"%s\n"
-" Segona traducció:\n"
-"%s\n"
-" S'ha descartat la traducció vella."
+"Llista de formats vàlids:\n"
+"  - kernelhelp: L'ajuda de les opcions de compilació del kernel.\n"
+"  - man: El clàssic format de les pàgines de manual.\n"
+"  - pod: Format de la Documentació Online de Perl.\n"
+"  - sgml: ja sigui el DTD de debiandoc o el de docbook.\n"
+"  - dia: diagrames de Dia descomprimits."
 
 #: ../../lib/Locale/Po4a/Sgml.pm:170
 msgid ""
@@ -657,34 +650,6 @@
 msgid "%s:%d: Unknown SGML event type: %s"
 msgstr "%s:%d: Tipus d'event SGML desconegut: %s"
 
-#~ msgid ""
-#~ "Adding the addendum %s after the section begining with the line:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Afegint l'annex %s després de la secció que comença amb la línia:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Next section begins with:\n"
-#~ "%s\n"
-#~ "Addendum added before this line."
-#~ msgstr ""
-#~ "La propera secció comença amb:\n"
-#~ "%s\n"
-#~ "L'annex s'ha afegit abans d'aquesta línia."
-
-#~ msgid ""
-#~ "This section ends with:\n"
-#~ "%s\n"
-#~ "Addendum added after this line."
-#~ msgstr ""
-#~ "La secció acaba amb:\n"
-#~ "%s\n"
-#~ "L'annex s'ha afegit després d'aquesta línia."
-
-#~ msgid ""
-#~ "Can't find the end of the section in the file. Addendum added at the end "
-#~ "of the file."
-#~ msgstr ""
-#~ "No s'ha pogut trobar el final de la secció a l'arxiu. S'ha afegit l'annex "
-#~ "al final de l'arxiu."
+#, fuzzy
+#~ msgid "po4a::xml: Unknown option: %s"
+#~ msgstr "po4a::sgml: Opció desconeguda: %s"
Index: es.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/es.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- es.po	18 Jul 2004 08:49:05 -0000	1.7
+++ es.po	18 Jul 2004 09:40:53 -0000	1.8
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-18 01:47-0700\n"
-"PO-Revision-Date: 2004-07-17 09:07+0100\n"
+"POT-Creation-Date: 2004-07-18 11:35+0200\n"
+"PO-Revision-Date: 2004-07-18 11:24+0100\n"
 "Last-Translator: Jordi Vilalta <jvprat(a)wanadoo.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -48,9 +48,9 @@
 msgstr "No se ha podido abrir %s: %s"
 
 #: ../../po4a:235
-#, fuzzy, perl-format
+#, perl-format
 msgid "Syntax error: %s"
-msgstr "Error de sintaxis"
+msgstr "Error de sintaxis: %s"
 
 #: ../../po4a:242
 #, perl-format
@@ -63,29 +63,29 @@
 msgstr "'po4a_path' redeclarado"
 
 #: ../../po4a:255
-#, fuzzy, perl-format
+#, perl-format
 msgid "Unparsable argument '%s'."
-msgstr "No se ha podido analizar el parámetro '%s'"
+msgstr "No se ha podido analizar el parámetro '%s'."
 
 #: ../../po4a:266
-#, fuzzy, perl-format
+#, perl-format
 msgid "Unparsable argument '%s' (%s)."
-msgstr "No se ha podido analizar el parámetro '%s'"
+msgstr "No se ha podido analizar el parámetro '%s' (%s)."
 
 #: ../../po4a:272
 #, perl-format
 msgid "The translated and master file are the same."
-msgstr ""
+msgstr "El fichero traducido y el original son el mismo."
 
 #: ../../po4a:280
-#, fuzzy, perl-format
+#, perl-format
 msgid "Translation of %s in %s redefined"
-msgstr "Se ha descartado la traducción de %s: sólo se ha traducido un %s%%."
+msgstr "Se ha redefinido la traducción de %s en %s"
 
 #: ../../po4a:289
-#, fuzzy, perl-format
+#, perl-format
 msgid "Unparsable command '%s'."
-msgstr "No se ha podido analizar el comando '%s'"
+msgstr "No se ha podido analizar el comando '%s'."
 
 #: ../../po4a:296
 msgid "po4a_paths not declared. Dunno where to find the pot and po files"
@@ -103,9 +103,9 @@
 msgstr "Creando %s:"
 
 #: ../../po4a:324
-#, fuzzy, perl-format
+#, perl-format
 msgid "Updating %s: "
-msgstr "Actualizando %s:"
+msgstr "Actualizando %s: "
 
 #: ../../po4a:327 ../../po4a-updatepo:208
 #, perl-format
@@ -118,11 +118,9 @@
 msgstr "Error durante la copia del archivo po: %s"
 
 #: ../../po4a:357
-#, fuzzy, perl-format
+#, perl-format
 msgid "Discard %s (only %s%% translated; need %s%%)."
-msgstr ""
-"Se ha descartado la traducción de %s (sólo se ha traducido un %s%%; se "
-"necesita un %s%%)."
+msgstr "%s descartado (sólo se ha traducido un %s%%; se necesita un %s%%)."
 
 #: ../../po4a:366
 #, perl-format
@@ -130,14 +128,14 @@
 msgstr "El apéndice %s se aplica a %s (traducción descartada)."
 
 #: ../../po4a:375
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is %s%% translated (%s strings)."
-msgstr "%s está traducido en un %s%% (%s de %s cadenas)"
+msgstr "%s está traducido en un %s%% (%s cadenas)"
 
 #: ../../po4a:378 ../../po4a-translate:234
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is %s%% translated (%s of %s strings)."
-msgstr "%s está traducido en un %s%% (%s de %s cadenas)"
+msgstr "%s está traducido en un %s%% (%s de %s cadenas)."
 
 #: ../../po4a-updatepo:181
 msgid "po4a-update can't take the input po from the file '-'."
@@ -175,156 +173,103 @@
 "Se ha descartado la traducción de %s (no se ha podido aplicar el apéndice %"
 "s)."
 
-#: ../../lib/Locale/Po4a/KernelHelp.pm:106
-#, perl-format
-msgid "%s: Syntax error"
-msgstr "%s: Error de sintaxis"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:29
-msgid "Need to provide a module name to the Chooser"
-msgstr "Se debe proporcionar un nombre de módulo para Chooser"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:41
-#, perl-format
-msgid "Unknown format type: %s."
-msgstr "Tipo de formato desconocido: %s."
-
-#: ../../lib/Locale/Po4a/Chooser.pm:42
-#, perl-format
-msgid "Module loading error: %s"
-msgstr "Error al cargar el módulo: %s"
-
-#: ../../lib/Locale/Po4a/Chooser.pm:50
-msgid ""
-"List of valid formats:\n"
-"  - kernelhelp: Help messages of each kernel compilation option.\n"
-"  - man: Good old manual page format.\n"
-"  - pod: Perl Online Documentation format.\n"
-"  - sgml: either debiandoc or docbook DTD.\n"
-"  - dia: uncompressed Dia diagrams."
-msgstr ""
-"Lista de formatos válidos:\n"
-"  - kernelhelp: La ayuda de las opciones de compilación del kernel.\n"
-"  - man: El clásico formato de las páginas de manual.\n"
-"  - pod: Formato de Documentación Online de Perl.\n"
-"  - sgml: ya sea el DTD de debiandoc o el de docbook.\n"
-"  - dia: diagramas de Dia descomprimidos."
-
 #: ../../lib/Locale/Po4a/Dia.pm:144
 msgid "po4a::dia: Couldn't find file encoding. Assuming UTF-8."
 msgstr ""
 "po4a::dia: No se ha encontrado la codificación del fichero. Asumiendo UTF-8."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:338
-msgid "Can't read from file without having a filename"
-msgstr "No se puede leer de un archivo sin nombre"
+#: ../../lib/Locale/Po4a/Po.pm:143
+msgid "po4a::po: Please provide a non-nul filename"
+msgstr "po4a::po: Por favor, proporcione un nombre de fichero no nulo"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:342
-#: ../../lib/Locale/Po4a/TransTractor.pm:455 ../../lib/Locale/Po4a/Po.pm:146
+#: ../../lib/Locale/Po4a/Po.pm:146 ../../lib/Locale/Po4a/TransTractor.pm:342
+#: ../../lib/Locale/Po4a/TransTractor.pm:455
 #, perl-format
 msgid "Can't read from %s: %s"
 msgstr "No se ha podido leer de %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:350 ../../lib/Locale/Po4a/Po.pm:154
+#: ../../lib/Locale/Po4a/Po.pm:154 ../../lib/Locale/Po4a/TransTractor.pm:350
 #, perl-format
 msgid "Can't close %s after reading: %s"
 msgstr "No se ha podido cerrar %s después de leer: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:363 ../../lib/Locale/Po4a/Po.pm:209
-msgid "Can't write to a file without filename"
-msgstr "No se puede escribir en un archivo sin nombre"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:370
-#, perl-format
-msgid "can't write to %s: %s"
-msgstr "no se ha podido escribir en %s: %s"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:377
-#, perl-format
-msgid "Can't close %s after writing: %s"
-msgstr "No se ha podido cerrar %s después de escribir: %s"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:460
-#, perl-format
-msgid "Can't read Po4a header from %s."
-msgstr "No se ha podido leer una cabecera Po4a de %s."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:466
-#, perl-format
-msgid "First line of %s does not look like a Po4a header."
-msgstr "La primera línea de %s no parece ser una cabecera de Po4a."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:472
+#: ../../lib/Locale/Po4a/Po.pm:184
 #, perl-format
-msgid "Syntax error in Po4a header of %s, near \"%s\""
-msgstr "Error de sintaxis en la cabecera Po4a de %s, cerca de \"%s\""
+msgid "Strange line at line %s: -->%s<--"
+msgstr "Línea extraña en la línea %s: -->%s<--"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:488
-#, perl-format
-msgid "Invalid argument in the Po4a header of %s: %s"
-msgstr "Parámetro no válido en la cabecera Po4a de %s: %s"
+#: ../../lib/Locale/Po4a/Po.pm:209 ../../lib/Locale/Po4a/TransTractor.pm:363
+msgid "Can't write to a file without filename"
+msgstr "No se puede escribir en un archivo sin nombre"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:495
+#: ../../lib/Locale/Po4a/Po.pm:216
 #, perl-format
-msgid "The Po4a header of %s does not define the mode."
-msgstr "La cabecera Po4a de %s no define el modo."
+msgid "Can't write to %s: %s"
+msgstr "No se ha podido escribir en %s: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:500
+#: ../../lib/Locale/Po4a/Po.pm:276
 #, perl-format
 msgid ""
-"Mode invalid in the Po4a header of %s: should be 'before' or 'after' not %s."
+"po4a gettextize: Original have more strings that the translation (%d>%d).\n"
+"po4a gettextize: Please fix it by editing the translated version to add a "
+"dummy entry."
 msgstr ""
-"Modo inválido en la cabecera Po4a de %s: debería ser 'before' o 'after', no %"
-"s."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:506
-#, perl-format
-msgid "The Po4a header of %s does not define the position."
-msgstr "La cabecera Po4a de %s no define la posición."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:511
-msgid "No ending boundary given in the Po4a header, but mode=after."
-msgstr "No se dá límite para el final en la cabecera Po4a, pero el modo=after."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:536
-#, fuzzy
-msgid "Can't apply addendum when not given the filename"
-msgstr "No se puede insertar el apéndice si no se dá el nombre de archivo"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:539
-#, fuzzy, perl-format
-msgid "Addendum %s does not exist."
-msgstr "El archivo %s no existe."
+"po4a gettextize: El original tiene más cadenas que la traducción (%d>%d).\n"
+"po4a gettextize: Por favor, arréglelo editando la versión traducida "
+"añadiendo entradas vacías."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:549
+#: ../../lib/Locale/Po4a/Po.pm:281
 #, perl-format
-msgid "No candidate position for the addendum %s."
-msgstr "No hay posición candidata para el apéndice %s."
+msgid ""
+"po4a gettextize: Original have less strings that the translation (%d<%d).\n"
+"po4a gettextize: Please fix it by removing the extra entry from the\n"
+"po4a gettextize: translated file. You may need an addendum, cf po4a(7)."
+msgstr ""
+"po4a gettextize: El original tiene menos cadenas que la traducción (%d<%d).\n"
+"po4a gettextize: Por favor, arréglelo quitando las entradas extra del "
+"archivo\n"
+"po4a gettextize: traducido. Puede que necesite un apéndice, consulte po4a(7)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:555
+#: ../../lib/Locale/Po4a/Po.pm:315
 #, perl-format
-msgid "More than one cadidate position found for the addendum %s."
-msgstr "Se ha encontrado más de una posición candidata para el apéndice %s."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:562
-#: ../../lib/Locale/Po4a/TransTractor.pm:583
-#, fuzzy, perl-format
-msgid "Addendum '%s' applied before this line: %s"
+msgid ""
+"po4a gettextization: Structure disparity between original and translated "
+"files:\n"
+"msgid (at %s) is of type '%s' while\n"
+"msgstr (at %s) is of type '%s'.\n"
+"Original text: %s\n"
+"Translated text: %s"
 msgstr ""
-"Añadiendo el apéndice %s antes de la línea:\n"
-"%s"
+"po4a gettextization: Difiere la estructura del archivo original y del "
+"traducido:\n"
+"msgid (en %s) es del tipo '%s' mientras que\n"
+"msgstr (en %s) es del tipo '%s'.\n"
+"Texto original: %s\n"
+"Texto traducido:%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:590
-#, fuzzy, perl-format
-msgid "Addendum '%s' applied after the line: %s."
-msgstr ""
-"Añadiendo el apéndice %s antes de la línea:\n"
-"%s"
+#: ../../lib/Locale/Po4a/Po.pm:581
+#, perl-format
+msgid "msgid defined twice: %s"
+msgstr "msgid definido más de una vez: %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:597
+#: ../../lib/Locale/Po4a/Po.pm:593
 #, perl-format
-msgid "Addendum '%s' applied at the end of the file."
+msgid ""
+"Translations don't match for:\n"
+"%s\n"
+"-->First translation:\n"
+"%s\n"
+" Second translation:\n"
+"%s\n"
+" Old translation discarded."
 msgstr ""
+"Las traducciones no encajan para:\n"
+"%s\n"
+"-->Primera traducción:\n"
+"%s\n"
+" Segunda traducción:\n"
+"%s\n"
+" Se ha descartado la traducción vieja."
 
 #: ../../lib/Locale/Po4a/Man.pm:290
 #, perl-format
@@ -453,13 +398,13 @@
 "po4a::man: Esto no está soportado (aún)."
 
 #: ../../lib/Locale/Po4a/Man.pm:667
-#, fuzzy, perl-format
+#, perl-format
 msgid ""
 "po4a::man: Unknown macro '%s' (at %s).\n"
 "po4a::man: Remove it from the document, or provide a patch to the po4a team."
 msgstr ""
-"po4a::man: Macro '%s' desconocida. Elimínela del documento, o\n"
-"po4a::man: envíe un parche a <po4a-devel(a)lists.alioth.debian.org>."
+"po4a::man: Macro '%s' desconocida (en %s).\n"
+"po4a::man: Elimínela del documento, o envíe un parche al equipo de po4a."
 
 #: ../../lib/Locale/Po4a/Man.pm:888
 msgid ""
@@ -478,83 +423,131 @@
 "po4a::man: Esta página utiliza condicionales con '%s'. Como po4a no es\n"
 "po4a::man: un analizador de groff real, esto no está soportado."
 
-#: ../../lib/Locale/Po4a/Po.pm:143
-msgid "po4a::po: Please provide a non-nul filename"
-msgstr "po4a::po: Por favor, proporcione un nombre de fichero no nulo"
+#: ../../lib/Locale/Po4a/TransTractor.pm:338
+msgid "Can't read from file without having a filename"
+msgstr "No se puede leer de un archivo sin nombre"
 
-#: ../../lib/Locale/Po4a/Po.pm:184
+#: ../../lib/Locale/Po4a/TransTractor.pm:370
 #, perl-format
-msgid "Strange line at line %s: -->%s<--"
-msgstr "Línea extraña en la línea %s: -->%s<--"
+msgid "can't write to %s: %s"
+msgstr "no se ha podido escribir en %s: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:216
+#: ../../lib/Locale/Po4a/TransTractor.pm:377
 #, perl-format
-msgid "Can't write to %s: %s"
-msgstr "No se ha podido escribir en %s: %s"
+msgid "Can't close %s after writing: %s"
+msgstr "No se ha podido cerrar %s después de escribir: %s"
 
-#: ../../lib/Locale/Po4a/Po.pm:276
+#: ../../lib/Locale/Po4a/TransTractor.pm:460
 #, perl-format
-msgid ""
-"po4a gettextize: Original have more strings that the translation (%d>%d).\n"
-"po4a gettextize: Please fix it by editing the translated version to add a "
-"dummy entry."
-msgstr ""
-"po4a gettextize: El original tiene más cadenas que la traducción (%d>%d).\n"
-"po4a gettextize: Por favor, arréglelo editando la versión traducida "
-"añadiendo entradas vacías."
+msgid "Can't read Po4a header from %s."
+msgstr "No se ha podido leer una cabecera Po4a de %s."
 
-#: ../../lib/Locale/Po4a/Po.pm:281
+#: ../../lib/Locale/Po4a/TransTractor.pm:466
 #, perl-format
-msgid ""
-"po4a gettextize: Original have less strings that the translation (%d<%d).\n"
-"po4a gettextize: Please fix it by removing the extra entry from the\n"
-"po4a gettextize: translated file. You may need an addendum, cf po4a(7)."
-msgstr ""
-"po4a gettextize: El original tiene menos cadenas que la traducción (%d<%d).\n"
-"po4a gettextize: Por favor, arréglelo quitando las entradas extra del "
-"archivo\n"
-"po4a gettextize: traducido. Puede que necesite un apéndice, consulte po4a(7)."
+msgid "First line of %s does not look like a Po4a header."
+msgstr "La primera línea de %s no parece ser una cabecera de Po4a."
 
-#: ../../lib/Locale/Po4a/Po.pm:315
+#: ../../lib/Locale/Po4a/TransTractor.pm:472
+#, perl-format
+msgid "Syntax error in Po4a header of %s, near \"%s\""
+msgstr "Error de sintaxis en la cabecera Po4a de %s, cerca de \"%s\""
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:488
+#, perl-format
+msgid "Invalid argument in the Po4a header of %s: %s"
+msgstr "Parámetro no válido en la cabecera Po4a de %s: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:495
+#, perl-format
+msgid "The Po4a header of %s does not define the mode."
+msgstr "La cabecera Po4a de %s no define el modo."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:500
 #, perl-format
 msgid ""
-"po4a gettextization: Structure disparity between original and translated "
-"files:\n"
-"msgid (at %s) is of type '%s' while\n"
-"msgstr (at %s) is of type '%s'.\n"
-"Original text: %s\n"
-"Translated text: %s"
+"Mode invalid in the Po4a header of %s: should be 'before' or 'after' not %s."
 msgstr ""
-"po4a gettextization: Difiere la estructura del archivo original y del "
-"traducido:\n"
-"msgid (en %s) es del tipo '%s' mientras que\n"
-"msgstr (en %s) es del tipo '%s'.\n"
-"Texto original: %s\n"
-"Texto traducido:%s"
+"Modo inválido en la cabecera Po4a de %s: debería ser 'before' o 'after', no %"
+"s."
 
-#: ../../lib/Locale/Po4a/Po.pm:581
+#: ../../lib/Locale/Po4a/TransTractor.pm:506
 #, perl-format
-msgid "msgid defined twice: %s"
-msgstr "msgid definido más de una vez: %s"
+msgid "The Po4a header of %s does not define the position."
+msgstr "La cabecera Po4a de %s no define la posición."
 
-#: ../../lib/Locale/Po4a/Po.pm:593
+#: ../../lib/Locale/Po4a/TransTractor.pm:511
+msgid "No ending boundary given in the Po4a header, but mode=after."
+msgstr "No se dá límite para el final en la cabecera Po4a, pero el modo=after."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:536
+msgid "Can't apply addendum when not given the filename"
+msgstr "No se puede aplicar el apéndice si no se da el nombre del fichero"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:539
+#, perl-format
+msgid "Addendum %s does not exist."
+msgstr "El apéndice %s no existe."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:549
+#, perl-format
+msgid "No candidate position for the addendum %s."
+msgstr "No hay posición candidata para el apéndice %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:555
+#, perl-format
+msgid "More than one cadidate position found for the addendum %s."
+msgstr "Se ha encontrado más de una posición candidata para el apéndice %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:562
+#: ../../lib/Locale/Po4a/TransTractor.pm:583
+#, perl-format
+msgid "Addendum '%s' applied before this line: %s"
+msgstr "Se ha aplicado el apéndice '%s' antes de ésta línea línea: %s"
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:590
+#, perl-format
+msgid "Addendum '%s' applied after the line: %s."
+msgstr "Se ha aplicado el apéndice '%s' después de la línea: %s."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:597
 #, perl-format
+msgid "Addendum '%s' applied at the end of the file."
+msgstr "Se ha aplicado el apéndice '%s' al final del fichero."
+
+#: ../../lib/Locale/Po4a/KernelHelp.pm:106
+#, perl-format
+msgid "%s: Syntax error"
+msgstr "%s: Error de sintaxis"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:29
+msgid "Need to provide a module name to the Chooser"
+msgstr "Se debe proporcionar un nombre de módulo para Chooser"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:41
+#, perl-format
+msgid "Unknown format type: %s."
+msgstr "Tipo de formato desconocido: %s."
+
+#: ../../lib/Locale/Po4a/Chooser.pm:42
+#, perl-format
+msgid "Module loading error: %s"
+msgstr "Error al cargar el módulo: %s"
+
+#: ../../lib/Locale/Po4a/Chooser.pm:50
 msgid ""
-"Translations don't match for:\n"
-"%s\n"
-"-->First translation:\n"
-"%s\n"
-" Second translation:\n"
-"%s\n"
-" Old translation discarded."
+"List of valid formats:\n"
+"  - kernelhelp: Help messages of each kernel compilation option.\n"
+"  - man: Good old manual page format.\n"
+"  - pod: Perl Online Documentation format.\n"
+"  - sgml: either debiandoc or docbook DTD.\n"
+"  - dia: uncompressed Dia diagrams."
 msgstr ""
-"Las traducciones no encajan para:\n"
-"%s\n"
-"-->Primera traducción:\n"
-"%s\n"
-" Segunda traducción:\n"
-"%s\n"
-" Se ha descartado la traducción vieja."
+"Lista de formatos válidos:\n"
+"  - kernelhelp: La ayuda de las opciones de compilación del kernel.\n"
+"  - man: El clásico formato de las páginas de manual.\n"
+"  - pod: Formato de Documentación Online de Perl.\n"
+"  - sgml: ya sea el DTD de debiandoc o el de docbook.\n"
+"  - dia: diagramas de Dia descomprimidos."
 
 #: ../../lib/Locale/Po4a/Sgml.pm:170
 msgid ""
@@ -660,35 +653,6 @@
 msgid "%s:%d: Unknown SGML event type: %s"
 msgstr "%s:%d: Tipo de evento SGML desconocido: %s"
 
-#~ msgid ""
-#~ "Adding the addendum %s after the section begining with the line:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Añadiendo el apéndice %s después de la sección que comienza con la "
-#~ "línea:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Next section begins with:\n"
-#~ "%s\n"
-#~ "Addendum added before this line."
-#~ msgstr ""
-#~ "La siguiente sección comienza con:\n"
-#~ "%s\n"
-#~ "El apéndice se ha añadido antes de ésta línea."
-
-#~ msgid ""
-#~ "This section ends with:\n"
-#~ "%s\n"
-#~ "Addendum added after this line."
-#~ msgstr ""
-#~ "Esta sección termina con:\n"
-#~ "%s\n"
-#~ "El apéndice se ha añadido después de ésta línea."
-
-#~ msgid ""
-#~ "Can't find the end of the section in the file. Addendum added at the end "
-#~ "of the file."
-#~ msgstr ""
-#~ "No se ha podido encontrar el final de la sección en el archivo. Apéndice "
-#~ "añadido al final del archivo."
+#, fuzzy
+#~ msgid "po4a::xml: Unknown option: %s"
+#~ msgstr "po4a::sgml: Opción desconocida: %s"
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel]Recent changes
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Ok, guys,
I am sorry for bombing you of cvs commit that way, but I had a bug repport
from a user (Philippe). It turned out to be a misuse of the scripts. I was
very happy, since it shows that the new po4a(1) is very useful. So, I
redacted an answer saying "You just have to write a tiny little config file
like that, and ..." and when I tryied, I found some bugs in the script.
I fixed it, commited, and retryied.
And this cycle went more that I would have hoped. If I knew from the
begining that it would be so painful, I would have refrained myself from
commiting each time. 
But there was an existing spanish translation in the module Philippe was
trying to translate. I tryied to convert it to po4a, but it naturally added
a "translator" section at the end of the man page. I thus had to create an
addendum (and then debug the handling of addendum by po4a(1)).
The nice point is that it now had a real testing, and I hope that Philippe
will manage to convince the original author (Manoj) to switch to po4a. It
would be cool, and it would be a great example of how to do stuff.
Now, I need to get the version 0.17.1 out of the door. Jordi, would you mind
updating the translations after the recent buchery, please? I'm sorry about
that, but using the stuff, I found a whole bunch of messages which would be
better said another way.
For example, I changed all constructs like "adding addendum" to "applying
addendum". Indeed, it makes more sense to consider addendum like patches.
Strange patches (with only one line of context; but this line is a regular
expression), but patches anyway.
Let me put this sentence in the po4a(7) man page...
Thanks for your patience, Mt.
-- 
Le capitalisme, c'est l'exploitation de l'homme par l'homme.
Le communisme, c'est le contraire.
               -- Coluche
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/doc po4a.7.pod,1.20,1.21
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/doc
In directory haydn:/tmp/cvs-serv25830/doc
Modified Files:
	po4a.7.pod 
Log Message:
Update to better explain addendums (I hope)
Index: po4a.7.pod
===================================================================
RCS file: /cvsroot/po4a/po4a/doc/po4a.7.pod,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- po4a.7.pod	28 Apr 2004 08:48:31 -0000	1.20
+++ po4a.7.pod	18 Jul 2004 09:23:49 -0000	1.21
@@ -205,11 +205,15 @@
 This one of the major headache for po-based documentation translation
 systems. In po4a, the solution is called addendum.
 
-Addendum can be seen as post-processing patches to the produced
-document. They allow the translator to add original content to the document
-which is not translated from the original document. This way, they can add
-a section giving the name of the contributors to this translation, or
-explain how to report bug against the translation.
+Addendum can be seen as patches to the localized document. Somehow strange
+patches since they have only one line of context, which line can be a
+regular expression, and since they can only add stuff, not remove. Anyhow,
+it helps a lot the comprension to consider them as patch. 
+
+Their goal is to allow the translator to add original content to the
+document which is not translated from the original document. This way, they
+can add a section giving the name of the contributors to this translation,
+or explain how to report bug against the translation.
 
 Addendum must be provided to the system as a file, with the first line
 indicating where in the produced document they should be placed in a so
@@ -272,7 +276,7 @@
 you should put a C<position> matching this line, and an C<endboundary>
 matching the end of a section (ie C<E<lt>/sect1E<gt>>). The addendum will
 then be added B<after> the I<position point> and immediatly B<after> the
-first line matching the C<endboundary>.
+first line matching the C<endboundary> (see below for some use example).
 
 If you want to add something after the following nroff section:
 
@@ -304,16 +308,12 @@
 
 don't use C<.fi> as endboundary, because it will match with "the[ fi]le",
 which is obviously not what you expect. The correct endboundary in that case
-is: C<^\.fi$>
+is: C<^\.fi$>.
 
-If the addenda don't go where you expected, try to pass the -v argument to
-po4a-translate, so that it explains you what it does while placing the
+If the addenda don't go where you expected, try to pass the -vv argument to
+the tools, so that it explains you what it does while placing the
 addendum.
 
-=item lang
-
-language code for which we have to use this insert (NOT USED SO FAR).
-
 =back
 
 Here are some example of headers. The first one present the mode=before,
@@ -344,7 +344,7 @@
 
 and a file named C<extra-content> contains this:
 
- |PO4A-HEADER:mode=after;position=AUTEUR;lang=fr;beginboundary=^head
+ |PO4A-HEADER:mode=after;position=AUTEUR;beginboundary=^head
  |
  |=head1 TRADUCTEUR
  |
@@ -359,7 +359,7 @@
 
 To put the addendum before the AUTHORS, you could use the following header:
 
- PO4A-HEADER:mode=after;section=NOM;lang=fr;beginboundary=^head1
+ PO4A-HEADER:mode=after;section=NOM;beginboundary=^head1
 
 because after the section "NAME" (translated to "NOM" in French), the next
 line matching the beginboundary /^head1/ is the one declaring the authors. So,
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/debian changelog,1.57,1.58
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/debian
In directory haydn:/tmp/cvs-serv17835/debian
Modified Files:
	changelog 
Log Message:
Document last changes
Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/debian/changelog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- changelog	16 Jul 2004 23:25:32 -0000	1.57
+++ changelog	18 Jul 2004 08:57:00 -0000	1.58
@@ -1,4 +1,4 @@
-po4a (0.17.1-1) unstable; urgency=low
+po4a (0.17.1-0.1) unstable; urgency=low
 
   NOT YET RELEASED
 
@@ -10,7 +10,11 @@
    - sync to en po/bin/fr.po
    - turn back my email address to tuxfamily instead of my professional one
    - Cleanups of the building mecanism
-   - Rephrase some error messages in po4a-translate
+   - Rephrase some error messages here and there (sorry for keeping fuzzing
+     the translation ;)
+   - fix several brain dead errors in po4a (I swear I tested version 0.17 !)
+   - add a threshold option to po4a(1). If we cannot fix it from the config
+     file, at least we can fix it from the command file.
    
  -- Martin Quinson <martin.quinson(a)tuxfamily.org>  Thu, 15 Jul 2004 21:14:13 -0700
 
@@ -55,7 +59,7 @@
     Put myself as maintainer (not changing the uploaders)
     Fix my email address for consistancy with my other packages
     
- -- Martin Quinson <martin.quinson(a)ens-lyon.fr>  Thu, 15 Jul 2004 16:57:48 -0700
+ -- Martin Quinson <martin.quinson(a)tuxfamily.org>  Thu, 15 Jul 2004 16:57:48 -0700
 
 po4a (0.16.3-1) unstable; urgency=low
 
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/po/bin fr.po,1.21,1.22
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/po/bin
In directory haydn:/tmp/cvs-serv17784
Modified Files:
	fr.po 
Log Message:
Sync to EN
Index: fr.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/fr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- fr.po	18 Jul 2004 05:29:43 -0000	1.21
+++ fr.po	18 Jul 2004 08:55:32 -0000	1.22
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: po4a 0.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-17 22:24-0700\n"
-"PO-Revision-Date: 2004-07-17 22:29-0700\n"
+"POT-Creation-Date: 2004-07-18 01:47-0700\n"
+"PO-Revision-Date: 2004-07-18 01:55-0700\n"
 "Last-Translator: Martin Quinson <Martin.Quinson(a)tuxfamily.org>\n"
 "Language-Team: french <debian-l10n-french(a)lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../po4a-normalize:102 ../../po4a-gettextize:149 ../../po4a:165
+#: ../../po4a-normalize:102 ../../po4a-gettextize:149 ../../po4a:171
 #: ../../po4a-updatepo:130 ../../po4a-translate:165
 #, perl-format
 msgid ""
@@ -37,78 +37,108 @@
 "RÉPONDRE À UN BESOIN PARTICULIER."
 
 #: ../../po4a-normalize:144 ../../po4a-gettextize:196
-#: ../../po4a-gettextize:198 ../../po4a:206 ../../po4a-updatepo:180
+#: ../../po4a-gettextize:198 ../../po4a:215 ../../po4a-updatepo:180
 #, perl-format
 msgid "File %s does not exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: ../../po4a:212 ../../lib/Locale/Po4a/Sgml.pm:289
+#: ../../po4a:221 ../../lib/Locale/Po4a/Sgml.pm:289
 #: ../../lib/Locale/Po4a/Sgml.pm:444
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "Impossible d'ouvrir %s : %s"
 
-#: ../../po4a:224
+#: ../../po4a:235
 #, perl-format
-msgid "Syntax error."
-msgstr "Erreur de syntaxe"
+msgid "Syntax error: %s"
+msgstr "Erreur de syntaxe: %s"
 
-#: ../../po4a:231
+#: ../../po4a:242
 #, perl-format
 msgid "The first argument (%s) must not contain any colon (':')"
 msgstr ""
 "Le premier argument (%s) ne doit pas contenir de caractère deux points (':')"
 
-#: ../../po4a:237
+#: ../../po4a:248
 #, perl-format
 msgid "'po4a_path' redeclared"
 msgstr "'po4a_path' redéclaré"
 
-#: ../../po4a:244 ../../po4a:255
+#: ../../po4a:255
 #, perl-format
-msgid "Unparsable argument '%s'"
-msgstr "Impossible de traiter l'argument «%s»"
+msgid "Unparsable argument '%s'."
+msgstr "Impossible de traiter l'argument «%s»."
 
-#: ../../po4a:264
+#: ../../po4a:266
 #, perl-format
-msgid "Unparsable command '%s'"
-msgstr "Impossible de traiter la commande «%s»"
+msgid "Unparsable argument '%s' (%s)."
+msgstr "Impossible de traiter l'argument «%s» (%s)."
 
-#: ../../po4a:271
+#: ../../po4a:272
+#, perl-format
+msgid "The translated and master file are the same."
+msgstr "Le document traduit et l'original sont le même fichier."
+
+#: ../../po4a:280
+#, perl-format
+msgid "Translation of %s in %s redefined"
+msgstr "La tranduction de %s en %s redéfinie."
+
+#: ../../po4a:289
+#, perl-format
+msgid "Unparsable command '%s'."
+msgstr "Impossible de traiter la commande «%s»."
+
+#: ../../po4a:296
 msgid "po4a_paths not declared. Dunno where to find the pot and po files"
 msgstr ""
 "po4a_paths n'est pas déclaré. Localisation des fichiers pot et po inconnue."
 
-#: ../../po4a:276 ../../po4a:299 ../../po4a-updatepo:205
+#: ../../po4a:301 ../../po4a-updatepo:205
 #, perl-format
 msgid "Updating %s:"
 msgstr "Mise à jour de %s :"
 
-#: ../../po4a:279 ../../po4a:306 ../../po4a-updatepo:212
+#: ../../po4a:304 ../../po4a:331 ../../po4a-updatepo:212
 #, perl-format
 msgid "Creating %s:"
 msgstr "Création de %s :"
 
-#: ../../po4a:302 ../../po4a-updatepo:208
+#: ../../po4a:324
+#, perl-format
+msgid "Updating %s: "
+msgstr "Mise à jour de %s : "
+
+#: ../../po4a:327 ../../po4a-updatepo:208
 #, perl-format
 msgid "Error while running msgmerge: %s"
 msgstr "Erreur lors de l'exécution de msgmerge : %s"
 
-#: ../../po4a:309 ../../po4a-updatepo:215
+#: ../../po4a:334 ../../po4a-updatepo:215
 #, perl-format
 msgid "Error while copying the po file: %s"
 msgstr "Erreur lors de la copie du fichier po : %s"
 
-#: ../../po4a:332
+#: ../../po4a:357
 #, perl-format
-msgid "Translation of %s discarded: only %s%% are translated."
-msgstr "Traduction de %s n'a pas été retenue : seulement %s%% sont traduits."
+msgid "Discard %s (only %s%% translated; need %s%%)."
+msgstr "Rejet de %s (seulement %s%% sont traduits, %s%% sont nécessaires)."
 
-#: ../../po4a:340
+#: ../../po4a:366
 #, perl-format
 msgid "Addendum %s does apply to %s (translation discarded)."
 msgstr "L'addendum %s ne s'applique pas à %s (la traduction est ignorée)."
 
+#: ../../po4a:375
+#, perl-format
+msgid "%s is %s%% translated (%s strings)."
+msgstr "%s est traduit à %s%% (%s chaînes)"
+
+#: ../../po4a:378 ../../po4a-translate:234
+#, perl-format
+msgid "%s is %s%% translated (%s of %s strings)."
+msgstr "%s est traduit à %s%% (%s chaînes sur %s)."
+
 #: ../../po4a-updatepo:181
 msgid "po4a-update can't take the input po from the file '-'."
 msgstr "po4a-update ne peut utiliser le fichier '-' comme fichier po."
@@ -131,23 +161,15 @@
 msgid "%s: file %s does not exist."
 msgstr "%s: le fichier %s n'existe pas."
 
-#: ../../po4a-translate:234
-#, perl-format
-msgid "%s is %s%% translated (%s of %s strings)"
-msgstr "%s est traduit à %s%% (%s chaînes sur %s)"
-
 #: ../../po4a-translate:240
 #, perl-format
 msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
-msgstr ""
-"La traduction de %s n'a pas été retenue (seulement %s%% sont traduits, %s%% "
-"sont nécessaires)."
+msgstr "Rejet de la traduction de %s (seulement %s%% sont traduits, %s%% sont nécessaires)."
 
 #: ../../po4a-translate:247
 #, perl-format
 msgid "Discard the translation of %s (addendum %s does not apply)."
-msgstr ""
-"La traduction de %s n'a pas été retenue (l'addendum %s ne s'applique pas)."
+msgstr "Rejet de la traduction de %s (l'addendum %s ne s'applique pas)."
 
 #: ../../lib/Locale/Po4a/KernelHelp.pm:106
 #, perl-format
@@ -261,67 +283,40 @@
 msgid "No ending boundary given in the Po4a header, but mode=after."
 msgstr "Pas de frontière de fin dans l'entête Po4a, mais mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:535
-msgid "Can't insert addendum when not given the filename"
-msgstr "Impossible d'ajouter un addendum dont le nom n'est pas donné"
+#: ../../lib/Locale/Po4a/TransTractor.pm:536
+msgid "Can't apply addendum when not given the filename"
+msgstr "Impossible d'appliquer un addendum dont le nom n'est pas donné"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:545
+#: ../../lib/Locale/Po4a/TransTractor.pm:539
+#, perl-format
+msgid "Addendum %s does not exist."
+msgstr "L'addendum %s n'existe pas."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:549
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "L'addendum %s n'a pas de position candidate."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:555
 #, perl-format
 msgid "More than one cadidate position found for the addendum %s."
 msgstr "L'addendum %s a plus d'une position candidate."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:558
-#, perl-format
-msgid ""
-"Adding the addendum %s before the line:\n"
-"%s"
-msgstr ""
-"Ajout de l'addendum %s avant la ligne:\n"
-"%s"
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:570
+#: ../../lib/Locale/Po4a/TransTractor.pm:562
+#: ../../lib/Locale/Po4a/TransTractor.pm:583
 #, perl-format
-msgid ""
-"Adding the addendum %s after the section begining with the line:\n"
-"%s"
-msgstr ""
-"Ajout de l'addendum %s après la section commençant par :\n"
-"%s"
+msgid "Addendum '%s' applied before this line: %s"
+msgstr "Ajout de l'addendum « %s » avant la ligne : %s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:579
+#: ../../lib/Locale/Po4a/TransTractor.pm:590
 #, perl-format
-msgid ""
-"Next section begins with:\n"
-"%s\n"
-"Addendum added before this line."
-msgstr ""
-"La section suivante commence par :\n"
-"%s\n"
-"L'addendum est ajouté avant cette ligne."
+msgid "Addendum '%s' applied after the line: %s."
+msgstr "Ajout de l'addendum « %s » avant la ligne: %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:587
+#: ../../lib/Locale/Po4a/TransTractor.pm:597
 #, perl-format
-msgid ""
-"This section ends with:\n"
-"%s\n"
-"Addendum added after this line."
-msgstr ""
-"Cette section se termine par :\n"
-"%s\n"
-"L'addendum est ajouté après cette ligne."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:595
-msgid ""
-"Can't find the end of the section in the file. Addendum added at the end of "
-"the file."
-msgstr ""
-"Impossible de trouver la fin de la section dans ce fichier. L'addendum est "
-"ajouté à la fin du fichier."
+msgid "Addendum '%s' applied at the end of the file."
+msgstr "Application de l'addendum « %s » à la fin du fichier."
 
 #: ../../lib/Locale/Po4a/Man.pm:290
 #, perl-format
@@ -459,7 +454,8 @@
 "po4a::man: Remove it from the document, or provide a patch to the po4a team."
 msgstr ""
 "po4a::man: Macro '%s' inconnue (en %s).\n"
-"po4a::man:  Retirez-la du document, ou fournissez un correctif à l'équipe de po4a."
+"po4a::man:  Retirez-la du document, ou fournissez un correctif à l'équipe de "
+"po4a."
 
 #: ../../lib/Locale/Po4a/Man.pm:888
 msgid ""
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/po/pod fr.po,1.26,1.27 po4a-pod.pot,1.24,1.25
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/po/pod
In directory haydn:/tmp/cvs-serv17387/po/pod
Modified Files:
	fr.po po4a-pod.pot 
Log Message:
Sync to the code; should be last time tonight :-/
Index: po4a-pod.pot
===================================================================
RCS file: /cvsroot/po4a/po4a/po/pod/po4a-pod.pot,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- po4a-pod.pot	16 Jul 2004 23:20:00 -0000	1.24
+++ po4a-pod.pot	18 Jul 2004 08:49:05 -0000	1.25
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-07-16 15:15-0700\n"
+"POT-Creation-Date: 2004-07-18  1:47-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -42,12 +42,12 @@
 
 # type: textblock
 #: ../../po4a-normalize:21
-msgid "po4a-normalize -f E<lt>formatE<gt> E<lt>original.docE<gt>"
+msgid "po4a-normalize -f E<lt>fmtE<gt> E<lt>master.docE<gt>"
 msgstr ""
 
 # type: =head1
-#: ../../po4a-normalize:23 ../../po4a-gettextize:23 ../../po4a:23
-#: ../../po4a-updatepo:23 ../../po4a-translate:23
+#: ../../po4a-normalize:23 ../../po4a-gettextize:25 ../../po4a:23
+#: ../../po4a-updatepo:25 ../../po4a-translate:25
 #: ../../lib/Locale/Po4a/KernelHelp.pm:144 ../../lib/Locale/Po4a/Chooser.pm:70
 #: ../../lib/Locale/Po4a/Dia.pm:32 ../../lib/Locale/Po4a/Html.pm:32
 #: ../../lib/Locale/Po4a/TransTractor.pm:28 ../../lib/Locale/Po4a/Man.pm:7
@@ -57,8 +57,8 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:25 ../../po4a-gettextize:25 ../../po4a:25
-#: ../../po4a-updatepo:25 ../../po4a-translate:25
+#: ../../po4a-normalize:25 ../../po4a-gettextize:27 ../../po4a:25
+#: ../../po4a-updatepo:27 ../../po4a-translate:27
 msgid ""
 "The po4a (po for anything) project goal is to ease translations (and more "
 "interstingly, the maintenance of translation) using gettext tools on areas "
@@ -82,78 +82,78 @@
 msgstr ""
 
 # type: =head1
-#: ../../po4a-normalize:37 ../../po4a-gettextize:52 ../../po4a:81
-#: ../../po4a-updatepo:38 ../../po4a-translate:34
+#: ../../po4a-normalize:37 ../../po4a-gettextize:54 ../../po4a:81
+#: ../../po4a-updatepo:40 ../../po4a-translate:36
 msgid "OPTIONS"
 msgstr ""
 
 # type: =item
-#: ../../po4a-normalize:41 ../../po4a-gettextize:82 ../../po4a-updatepo:61
-#: ../../po4a-translate:70
+#: ../../po4a-normalize:41 ../../po4a-gettextize:84 ../../po4a-updatepo:63
+#: ../../po4a-translate:72
 msgid "-o, --option"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:43 ../../po4a-gettextize:84 ../../po4a-updatepo:63
-#: ../../po4a-translate:72
+#: ../../po4a-normalize:43 ../../po4a-gettextize:86 ../../po4a-updatepo:65
+#: ../../po4a-translate:74
 msgid ""
 "Pass an extra option to the format plugin. See the documentation of each "
 "plugin for more information about the valid options and their meaning."
 msgstr ""
 
 # type: =item
-#: ../../po4a-normalize:46 ../../po4a-gettextize:87 ../../po4a:85
-#: ../../po4a-updatepo:66 ../../po4a-translate:85
+#: ../../po4a-normalize:46 ../../po4a-gettextize:89 ../../po4a:91
+#: ../../po4a-updatepo:68 ../../po4a-translate:87
 msgid "-h, --help"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:48 ../../po4a-gettextize:89 ../../po4a:87
-#: ../../po4a-updatepo:68 ../../po4a-translate:87
+#: ../../po4a-normalize:48 ../../po4a-gettextize:91 ../../po4a:93
+#: ../../po4a-updatepo:70 ../../po4a-translate:89
 msgid "Show a short help message."
 msgstr ""
 
 # type: =item
-#: ../../po4a-normalize:50 ../../po4a-gettextize:91 ../../po4a-updatepo:70
-#: ../../po4a-translate:89
+#: ../../po4a-normalize:50 ../../po4a-gettextize:93 ../../po4a-updatepo:72
+#: ../../po4a-translate:91
 msgid "--help-format"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:52 ../../po4a-gettextize:93 ../../po4a-updatepo:72
-#: ../../po4a-translate:91
+#: ../../po4a-normalize:52 ../../po4a-gettextize:95 ../../po4a-updatepo:74
+#: ../../po4a-translate:93
 msgid "List the documentation format understood by po4a."
 msgstr ""
 
 # type: =item
-#: ../../po4a-normalize:54 ../../po4a-gettextize:56 ../../po4a-updatepo:42
-#: ../../po4a-translate:38
+#: ../../po4a-normalize:54 ../../po4a-gettextize:58 ../../po4a-updatepo:44
+#: ../../po4a-translate:40
 msgid "-f, --format"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:56 ../../po4a-gettextize:58 ../../po4a-updatepo:44
-#: ../../po4a-translate:40
+#: ../../po4a-normalize:56 ../../po4a-gettextize:60 ../../po4a-updatepo:46
+#: ../../po4a-translate:42
 msgid ""
 "Format type of the documentation you want to handle. Use the --help-format "
 "option to see the list of available formats."
 msgstr ""
 
 # type: =item
-#: ../../po4a-normalize:59 ../../po4a-gettextize:95 ../../po4a:89
-#: ../../po4a-updatepo:74 ../../po4a-translate:93
+#: ../../po4a-normalize:59 ../../po4a-gettextize:97 ../../po4a:95
+#: ../../po4a-updatepo:76 ../../po4a-translate:95
 msgid "-V, --version"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:61 ../../po4a-gettextize:97 ../../po4a:91
-#: ../../po4a-updatepo:76 ../../po4a-translate:95
+#: ../../po4a-normalize:61 ../../po4a-gettextize:99 ../../po4a:97
+#: ../../po4a-updatepo:78 ../../po4a-translate:97
 msgid "Displays the version of the script and exits."
 msgstr ""
 
 # type: =head1
-#: ../../po4a-normalize:65 ../../po4a-gettextize:109 ../../po4a:127
-#: ../../po4a-updatepo:88 ../../po4a-translate:126
+#: ../../po4a-normalize:65 ../../po4a-gettextize:111 ../../po4a:133
+#: ../../po4a-updatepo:90 ../../po4a-translate:128
 #: ../../lib/Locale/Po4a/KernelHelp.pm:157 ../../lib/Locale/Po4a/Chooser.pm:83
 #: ../../lib/Locale/Po4a/Dia.pm:77 ../../lib/Locale/Po4a/Man.pm:220
 #: ../../lib/Locale/Po4a/Pod.pm:264
@@ -167,8 +167,8 @@
 msgstr ""
 
 # type: =head1
-#: ../../po4a-normalize:69 ../../po4a-gettextize:113 ../../po4a:131
-#: ../../po4a-updatepo:92 ../../po4a-translate:131
+#: ../../po4a-normalize:69 ../../po4a-gettextize:115 ../../po4a:137
+#: ../../po4a-updatepo:94 ../../po4a-translate:133
 #: ../../lib/Locale/Po4a/KernelHelp.pm:163
 #: ../../lib/Locale/Po4a/Chooser.pm:102 ../../lib/Locale/Po4a/Dia.pm:81
 #: ../../lib/Locale/Po4a/Html.pm:165 ../../lib/Locale/Po4a/Man.pm:225
@@ -178,8 +178,8 @@
 msgstr ""
 
 # type: verbatim
-#: ../../po4a-normalize:71 ../../po4a-gettextize:115 ../../po4a:133
-#: ../../po4a-updatepo:94 ../../po4a-translate:133
+#: ../../po4a-normalize:71 ../../po4a-gettextize:117 ../../po4a:139
+#: ../../po4a-updatepo:96 ../../po4a-translate:135
 #: ../../lib/Locale/Po4a/KernelHelp.pm:165
 #: ../../lib/Locale/Po4a/Chooser.pm:104 ../../lib/Locale/Po4a/Man.pm:227
 #: ../../lib/Locale/Po4a/Po.pm:803 ../../lib/Locale/Po4a/Pod.pm:271
@@ -192,8 +192,8 @@
 msgstr ""
 
 # type: =head1
-#: ../../po4a-normalize:74 ../../po4a-gettextize:118 ../../po4a:136
-#: ../../po4a-updatepo:97 ../../po4a-translate:136
+#: ../../po4a-normalize:74 ../../po4a-gettextize:120 ../../po4a:142
+#: ../../po4a-updatepo:99 ../../po4a-translate:138
 #: ../../lib/Locale/Po4a/KernelHelp.pm:168
 #: ../../lib/Locale/Po4a/Chooser.pm:107 ../../lib/Locale/Po4a/Dia.pm:85
 #: ../../lib/Locale/Po4a/Html.pm:169 ../../lib/Locale/Po4a/Man.pm:230
@@ -202,14 +202,14 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:76 ../../po4a-gettextize:120 ../../po4a:138
-#: ../../po4a-updatepo:99 ../../po4a-translate:138
+#: ../../po4a-normalize:76 ../../po4a-gettextize:122 ../../po4a:144
+#: ../../po4a-updatepo:101 ../../po4a-translate:140
 msgid "Copyright 2002, 2003, 2004 by SPI, inc."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-normalize:78 ../../po4a-gettextize:122 ../../po4a:140
-#: ../../po4a-updatepo:101 ../../po4a-translate:140
+#: ../../po4a-normalize:78 ../../po4a-gettextize:124 ../../po4a:146
+#: ../../po4a-updatepo:103 ../../po4a-translate:142
 #: ../../lib/Locale/Po4a/KernelHelp.pm:172
 #: ../../lib/Locale/Po4a/Chooser.pm:111 ../../lib/Locale/Po4a/Dia.pm:89
 #: ../../lib/Locale/Po4a/Html.pm:173 ../../lib/Locale/Po4a/Man.pm:234
@@ -228,12 +228,17 @@
 # type: textblock
 #: ../../po4a-gettextize:21
 msgid ""
-"po4a-gettextize -f E<lt>formatE<gt> -m E<lt>master.docE<gt> [-l "
-"E<lt>localized.docE<gt>] -p E<lt>translation.poE<gt>"
+"po4a-gettextize -f E<lt>fmtE<gt> -m E<lt>master.docE<gt> [-l E<lt>XX."
+"docE<gt>] -p E<lt>XX.poE<gt>"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:29
+#: ../../po4a-gettextize:23
+msgid "(XX.po is the output, all others are input)"
+msgstr ""
+
+# type: textblock
+#: ../../po4a-gettextize:31
 msgid ""
 "The C<po4a-gettextize> script is in charge of converting documentation files "
 "to po files.  If you start a new translation, C<po4a-gettextize> will "
@@ -242,7 +247,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:34
+#: ../../po4a-gettextize:36
 msgid ""
 "If you already have a translated file, C<po4a-gettextize> will try to "
 "extract the translations it contains and put them in place in the written po "
@@ -253,7 +258,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:41
+#: ../../po4a-gettextize:43
 msgid ""
 "However, C<po4a-gettextize> will diagnose your death by detecting any "
 "desyncronisation between files, and reporting where they occur. In that "
@@ -264,7 +269,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:48
+#: ../../po4a-gettextize:50
 msgid ""
 "Even if the script manage to do its job without apparent problems, it still "
 "mark all extracted translation as fuzzy, to make sure that the translator "
@@ -272,83 +277,83 @@
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:61 ../../po4a-updatepo:47 ../../po4a-translate:54
+#: ../../po4a-gettextize:63 ../../po4a-updatepo:49 ../../po4a-translate:56
 msgid "-m, --master"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:63 ../../po4a-translate:56
+#: ../../po4a-gettextize:65 ../../po4a-translate:58
 msgid "File containing the master document to translate."
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:65 ../../po4a-updatepo:51 ../../po4a-translate:58
+#: ../../po4a-gettextize:67 ../../po4a-updatepo:53 ../../po4a-translate:60
 msgid "-M, --master-charset"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:67 ../../po4a-translate:60
+#: ../../po4a-gettextize:69 ../../po4a-translate:62
 msgid "Charset of the file containing the document to translate."
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:69 ../../po4a-translate:62
+#: ../../po4a-gettextize:71 ../../po4a-translate:64
 msgid "-l, --localized"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:71
+#: ../../po4a-gettextize:73
 msgid "File containing the localized (translated) document."
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:73
+#: ../../po4a-gettextize:75
 msgid "-L, --localized-charset"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:75
+#: ../../po4a-gettextize:77
 msgid "Charset of the file containing the localized document."
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:77 ../../po4a-updatepo:56 ../../po4a-translate:66
+#: ../../po4a-gettextize:79 ../../po4a-updatepo:58 ../../po4a-translate:68
 msgid "-p, --po"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:79
+#: ../../po4a-gettextize:81
 msgid ""
 "File where the message catalog should be written. If not given, the message "
 "catalog will be written to the standard output."
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:99 ../../po4a:93 ../../po4a-updatepo:78
-#: ../../po4a-translate:97
+#: ../../po4a-gettextize:101 ../../po4a:99 ../../po4a-updatepo:80
+#: ../../po4a-translate:99
 msgid "-v, --verbose"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:101 ../../po4a:95 ../../po4a-updatepo:80
-#: ../../po4a-translate:99
+#: ../../po4a-gettextize:103 ../../po4a:101 ../../po4a-updatepo:82
+#: ../../po4a-translate:101
 msgid "Increase the verbosity of the program."
 msgstr ""
 
 # type: =item
-#: ../../po4a-gettextize:103 ../../po4a:101 ../../po4a-updatepo:82
-#: ../../po4a-translate:101
+#: ../../po4a-gettextize:105 ../../po4a:107 ../../po4a-updatepo:84
+#: ../../po4a-translate:103
 msgid "-d, --debug"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:105 ../../po4a:103 ../../po4a-updatepo:84
-#: ../../po4a-translate:103
+#: ../../po4a-gettextize:107 ../../po4a:109 ../../po4a-updatepo:86
+#: ../../po4a-translate:105
 msgid "Outputs some debugging informations."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-gettextize:111
+#: ../../po4a-gettextize:113
 msgid ""
 "L<po4a(7)>, L<po4a-updatepo(1)>, L<po4a-translate(1)>, L<po4a-normalize(1)>."
 msgstr ""
@@ -447,7 +452,7 @@
 
 # type: =head2
 #: ../../po4a:64
-msgid "Specifying the documents to translates"
+msgid "Specifying the documents to translate"
 msgstr ""
 
 # type: textblock
@@ -490,44 +495,57 @@
 msgstr ""
 
 # type: =item
-#: ../../po4a:97
+#: ../../po4a:85 ../../po4a-translate:77
+msgid "-k, --keep"
+msgstr ""
+
+# type: textblock
+#: ../../po4a:87 ../../po4a-translate:79
+msgid ""
+"Minimal threshold for translation percentage to keep (ie, write) the "
+"resulting file (default: 80). Ie, by default, files have to be translated at "
+"at least 80% to get written."
+msgstr ""
+
+# type: =item
+#: ../../po4a:103
 msgid "-q, --quiet"
 msgstr ""
 
 # type: textblock
-#: ../../po4a:99
+#: ../../po4a:105
 msgid "Decrease the verbosity of the program."
 msgstr ""
 
 # type: =head1
-#: ../../po4a:107
+#: ../../po4a:113
 msgid "SHORTCOMMING"
 msgstr ""
 
 # type: textblock
-#: ../../po4a:113
+#: ../../po4a:119
 msgid "Does not allow to pass any options to the modules."
 msgstr ""
 
 # type: textblock
-#: ../../po4a:117
+#: ../../po4a:123
 msgid ""
 "Does not allow to specify the threshold under which the translations are "
 "discarded."
 msgstr ""
 
 # type: textblock
-#: ../../po4a:121
+#: ../../po4a:127
 msgid "Dupplicates some code with the po4a-* programs."
 msgstr ""
 
 # type: textblock
-#: ../../po4a:125
+#: ../../po4a:131
 msgid "Patch welcome ;)"
 msgstr ""
 
 # type: textblock
-#: ../../po4a:129
+#: ../../po4a:135
 msgid ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-updatepo(1)>, L<po4a-translate(1)"
 ">, L<po4a-normalize(1)>."
@@ -541,12 +559,17 @@
 # type: textblock
 #: ../../po4a-updatepo:21
 msgid ""
-"po4a-updatepo -f E<lt>formatE<gt> (--master|-m E<lt>master.docE<gt>)+ (--po|-"
-"p E<lt>translation.poE<gt>)+"
+"po4a-updatepo -f E<lt>fmtE<gt> (-m E<lt>master.docE<gt>)+ (-p E<lt>XX."
+"poE<gt>)+"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-updatepo:29
+#: ../../po4a-updatepo:23
+msgid "(XX.po are the output, all others are input)"
+msgstr ""
+
+# type: textblock
+#: ../../po4a-updatepo:31
 msgid ""
 "The C<po4a-updatepo> script is in charge of updating po files to make them "
 "reflect the changes made to the original documentation file. For that, it "
@@ -555,7 +578,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-updatepo:34
+#: ../../po4a-updatepo:36
 msgid ""
 "It is possible to give more than one po file (if you want to update several "
 "languages at once), and several documentation file (if you want to store the "
@@ -563,26 +586,26 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-updatepo:49
+#: ../../po4a-updatepo:51
 msgid "File(s) containing the master document to translate."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-updatepo:53
+#: ../../po4a-updatepo:55
 msgid ""
 "Charset of the files containing the document to translate. Note that all "
 "files must have the same charset."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-updatepo:58
+#: ../../po4a-updatepo:60
 msgid ""
 "Po file(s) to update. If these files do not exist, they are created by "
 "C<po4a-updatepo>."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-updatepo:90
+#: ../../po4a-updatepo:92
 msgid ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-translate(1)>, L<po4a-normalize(1)"
 ">."
@@ -596,12 +619,17 @@
 # type: textblock
 #: ../../po4a-translate:21
 msgid ""
-"po4a-translate -f E<lt>formatE<gt> [E<lt>other optionsE<gt>] -m E<lt>master."
-"docE<gt> -p E<lt>translation.poE<gt>"
+"po4a-translate -f E<lt>fmtE<gt> -m E<lt>master.docE<gt> -p E<lt>XX.poE<gt> -"
+"l E<lt>XX.docE<gt>"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:29
+#: ../../po4a-translate:23
+msgid "(XX.doc is the output, all others are input)"
+msgstr ""
+
+# type: textblock
+#: ../../po4a-translate:31
 msgid ""
 "The C<po4a-translate> script is in charge of converting the translation "
 "(which were done in a po file) under the documentation format back. The "
@@ -610,12 +638,12 @@
 msgstr ""
 
 # type: =item
-#: ../../po4a-translate:43
+#: ../../po4a-translate:45
 msgid "-a, --addendum"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:45
+#: ../../po4a-translate:47
 msgid ""
 "Add a file to the resulting file (to put translator's name or a section "
 "\"About this translation, for example). The first line of the file to insert "
@@ -624,56 +652,43 @@
 msgstr ""
 
 # type: =item
-#: ../../po4a-translate:50
+#: ../../po4a-translate:52
 msgid "-A, --addendum-charset"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:52
+#: ../../po4a-translate:54
 msgid ""
 "Charset of the addenda. Note that all addenda should be in the same charset."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:64
+#: ../../po4a-translate:66
 msgid "File where the localized (translated) document should be written."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:68
+#: ../../po4a-translate:70
 msgid "File from which the message catalog should be read."
 msgstr ""
 
 # type: =item
-#: ../../po4a-translate:75
-msgid "-k, --keep"
-msgstr ""
-
-# type: textblock
-#: ../../po4a-translate:77
-msgid ""
-"Minimal threshold for translation percentage to keep (ie, write) the "
-"resulting file (default: 80). Ie, by default, files have to be translated at "
-"at least 80% to get written."
-msgstr ""
-
-# type: =item
-#: ../../po4a-translate:81
+#: ../../po4a-translate:83
 msgid "-w, --width"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:83
+#: ../../po4a-translate:85
 msgid "Column to which we should wrap the resulting file."
 msgstr ""
 
 # type: =head1
-#: ../../po4a-translate:107
+#: ../../po4a-translate:109
 msgid "Adding content (beside translations) to generated files"
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:109
+#: ../../po4a-translate:111
 msgid ""
 "To add some extra content to the generated document beside what you "
 "translated (like the name of the translator, or a \"about this translation\" "
@@ -681,7 +696,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:113
+#: ../../po4a-translate:115
 msgid ""
 "The first line of the addendum must be a header indicating where to put it "
 "in the document (it can be before or after a given part of the document).  "
@@ -690,7 +705,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:118
+#: ../../po4a-translate:120
 msgid ""
 "Note that if po4a-translate fail to add one of the given file, it discards "
 "the whole translation (because the missing file could be the one indicating "
@@ -699,20 +714,20 @@
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:123
+#: ../../po4a-translate:125
 msgid ""
 "The header have a pretty rigid syntax. For more information on how to use "
 "this feature and how it works, please refer to the po4a(7) man page."
 msgstr ""
 
 # type: textblock
-#: ../../po4a-translate:128
+#: ../../po4a-translate:130
 msgid ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-updatepo(1)>, L<po4a-normalize(1)>."
 msgstr ""
 
 # type: verbatim
-#: ../../po4a-translate:130 ../../lib/Locale/Po4a/Po.pm:51
+#: ../../po4a-translate:132 ../../lib/Locale/Po4a/Po.pm:51
 #: ../../lib/Locale/Po4a/Pod.pm:180 ../../lib/Locale/Po4a/Pod.pm:181
 #: ../../lib/Locale/Po4a/Sgml.pm:72 ../../lib/Locale/Po4a/Sgml.pm:73
 #: ../../doc/po4a.7.pod:132 ../../doc/po4a.7.pod:239 ../../doc/po4a.7.pod:299
@@ -976,14 +991,14 @@
 #: ../../lib/Locale/Po4a/TransTractor.pm:46
 #: ../../lib/Locale/Po4a/TransTractor.pm:56
 #: ../../lib/Locale/Po4a/TransTractor.pm:61
-#: ../../lib/Locale/Po4a/TransTractor.pm:662
-#: ../../lib/Locale/Po4a/TransTractor.pm:666
-#: ../../lib/Locale/Po4a/TransTractor.pm:670
-#: ../../lib/Locale/Po4a/TransTractor.pm:702
-#: ../../lib/Locale/Po4a/TransTractor.pm:706
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
-#: ../../lib/Locale/Po4a/TransTractor.pm:792
-#: ../../lib/Locale/Po4a/TransTractor.pm:796 ../../doc/po4a.7.pod:69
+#: ../../lib/Locale/Po4a/TransTractor.pm:665
+#: ../../lib/Locale/Po4a/TransTractor.pm:669
+#: ../../lib/Locale/Po4a/TransTractor.pm:673
+#: ../../lib/Locale/Po4a/TransTractor.pm:705
+#: ../../lib/Locale/Po4a/TransTractor.pm:709
+#: ../../lib/Locale/Po4a/TransTractor.pm:791
+#: ../../lib/Locale/Po4a/TransTractor.pm:795
+#: ../../lib/Locale/Po4a/TransTractor.pm:799 ../../doc/po4a.7.pod:69
 #: ../../doc/po4a.7.pod:79 ../../doc/po4a.7.pod:151 ../../doc/po4a.7.pod:161
 #: ../../doc/po4a.7.pod:170
 msgid "-"
@@ -1432,17 +1447,17 @@
 msgstr ""
 
 # type: =head1
-#: ../../lib/Locale/Po4a/TransTractor.pm:607
+#: ../../lib/Locale/Po4a/TransTractor.pm:610
 msgid "INTERNAL FUNCTIONS used to write derivated parsers"
 msgstr ""
 
 # type: =head2
-#: ../../lib/Locale/Po4a/TransTractor.pm:609
+#: ../../lib/Locale/Po4a/TransTractor.pm:612
 msgid "Getting input, providing output"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:611
+#: ../../lib/Locale/Po4a/TransTractor.pm:614
 msgid ""
 "Four functions are provided to get input and return output. They are very "
 "similar to shift/unshift and push/pop. The first pair is about input, while "
@@ -1452,80 +1467,80 @@
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:619
+#: ../../lib/Locale/Po4a/TransTractor.pm:622
 msgid "shiftline()"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:621
+#: ../../lib/Locale/Po4a/TransTractor.pm:624
 msgid ""
 "This function returns the next line of the doc_in to be parsed and its "
 "reference (packed as an array)."
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:624
+#: ../../lib/Locale/Po4a/TransTractor.pm:627
 msgid "unshiftline($$)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:626
+#: ../../lib/Locale/Po4a/TransTractor.pm:629
 msgid "Unshifts a line of the input document and its reference."
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:628
+#: ../../lib/Locale/Po4a/TransTractor.pm:631
 msgid "pushline($)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:630
+#: ../../lib/Locale/Po4a/TransTractor.pm:633
 msgid "Push a new line to the doc_out."
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:632
+#: ../../lib/Locale/Po4a/TransTractor.pm:635
 msgid "popline()"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:634
+#: ../../lib/Locale/Po4a/TransTractor.pm:637
 msgid "Pop the last pushed line from the doc_out."
 msgstr ""
 
 # type: =head2
-#: ../../lib/Locale/Po4a/TransTractor.pm:650
+#: ../../lib/Locale/Po4a/TransTractor.pm:653
 msgid "Marking strings as translatable"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:652
+#: ../../lib/Locale/Po4a/TransTractor.pm:655
 msgid ""
 "Two functions are provided to handle the text which should be translated."
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:659
 msgid "translate($$$)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:658
+#: ../../lib/Locale/Po4a/TransTractor.pm:661
 msgid "Mandatory arguments:"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:664
+#: ../../lib/Locale/Po4a/TransTractor.pm:667
 msgid "A string to translate"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:668
+#: ../../lib/Locale/Po4a/TransTractor.pm:671
 msgid "The reference of this string (ie, position in inputfile)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:672
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
 msgid ""
 "The type of this string (ie, the textual description of its structural "
 "role ; used in Locale::Po4a::Po::gettextization() ; see also po4a(7), "
@@ -1533,14 +1548,14 @@
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:678
+#: ../../lib/Locale/Po4a/TransTractor.pm:681
 msgid ""
 "This function can also take some extra arguments. They must be organized as "
 "a hash. For example:"
 msgstr ""
 
 # type: verbatim
-#: ../../lib/Locale/Po4a/TransTractor.pm:681
+#: ../../lib/Locale/Po4a/TransTractor.pm:684
 #, no-wrap
 msgid ""
 "  $self->translate(\"string\",\"ref\",\"type\",\n"
@@ -1549,13 +1564,13 @@
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:686 ../../lib/Locale/Po4a/Po.pm:349
+#: ../../lib/Locale/Po4a/TransTractor.pm:689 ../../lib/Locale/Po4a/Po.pm:349
 #: ../../lib/Locale/Po4a/Po.pm:504
 msgid "wrap"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:688
+#: ../../lib/Locale/Po4a/TransTractor.pm:691
 msgid ""
 "boolean indicating wheather we can consider that whitespaces in string are "
 "not important. If yes, the function canonize the string before looking for a "
@@ -1563,70 +1578,70 @@
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:692 ../../lib/Locale/Po4a/Po.pm:355
+#: ../../lib/Locale/Po4a/TransTractor.pm:695 ../../lib/Locale/Po4a/Po.pm:355
 #: ../../lib/Locale/Po4a/Po.pm:511
 msgid "wrapcol"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:694 ../../lib/Locale/Po4a/Po.pm:357
+#: ../../lib/Locale/Po4a/TransTractor.pm:697 ../../lib/Locale/Po4a/Po.pm:357
 #: ../../lib/Locale/Po4a/Po.pm:513
 msgid "The column at which we should wrap (default: 76)."
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:698
+#: ../../lib/Locale/Po4a/TransTractor.pm:701
 msgid "Actions:"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:704
+#: ../../lib/Locale/Po4a/TransTractor.pm:707
 msgid "Pushes the string, reference and type to po_out."
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:708
+#: ../../lib/Locale/Po4a/TransTractor.pm:711
 msgid ""
 "Returns the translation of the string (as found in po_in) so that the parser "
 "can build the doc_out."
 msgstr ""
 
 # type: =head2
-#: ../../lib/Locale/Po4a/TransTractor.pm:744
+#: ../../lib/Locale/Po4a/TransTractor.pm:747
 msgid "Misc functions"
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:751
 msgid "verbose()"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:750
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 msgid ""
 "Returns if the verbose option was passed during the creation of the "
 "TransTractor."
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:765
+#: ../../lib/Locale/Po4a/TransTractor.pm:768
 msgid "debug()"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:767
+#: ../../lib/Locale/Po4a/TransTractor.pm:770
 msgid ""
 "Returns if the debug option was passed during the creation of the "
 "TransTractor."
 msgstr ""
 
 # type: =head1
-#: ../../lib/Locale/Po4a/TransTractor.pm:778
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 msgid "FUTURE DIRECTIONS"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:780
+#: ../../lib/Locale/Po4a/TransTractor.pm:783
 msgid ""
 "One shortcoming of the current TransTractor is that it can't handle "
 "translated document containing all languages, like debconf templates, or ."
@@ -1634,29 +1649,29 @@
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:787
 msgid "To address this problem, the only interface changes needed are:"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:790
+#: ../../lib/Locale/Po4a/TransTractor.pm:793
 msgid "take an hash as po_in_name (a list per language)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:794
+#: ../../lib/Locale/Po4a/TransTractor.pm:797
 msgid "add an argument to translate to indicate the target language"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:798
+#: ../../lib/Locale/Po4a/TransTractor.pm:801
 msgid ""
 "make a pushline_all function, which would make pushline of its content for "
 "all language, using a map-like syntax:"
 msgstr ""
 
 # type: verbatim
-#: ../../lib/Locale/Po4a/TransTractor.pm:801
+#: ../../lib/Locale/Po4a/TransTractor.pm:804
 #, no-wrap
 msgid ""
 "    $self->pushline_all({ \"Description[\".$langcode.\"]=\".\n"
@@ -1666,7 +1681,7 @@
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:807
+#: ../../lib/Locale/Po4a/TransTractor.pm:810
 msgid "Will see if it's enough ;)"
 msgstr ""
 
Index: fr.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/pod/fr.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- fr.po	16 Jul 2004 23:20:00 -0000	1.26
+++ fr.po	18 Jul 2004 08:49:05 -0000	1.27
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po-pod 0.16\n"
-"POT-Creation-Date: 2004-07-16 15:15-0700\n"
+"POT-Creation-Date: 2004-07-18  1:47-0700\n"
 "PO-Revision-Date: 2004-04-28 08:14+0200\n"
 "Last-Translator: Martin Quinson <Martin.Quinson(a)tuxfamily.org>\n"
 "Language-Team: french <debian-l10n-french(a)lists.debian.org>\n"
@@ -40,11 +40,12 @@
 msgstr "SYNOPSIS"
 
 #: ../../po4a-normalize:21
-msgid "po4a-normalize -f E<lt>formatE<gt> E<lt>original.docE<gt>"
+#, fuzzy
+msgid "po4a-normalize -f E<lt>fmtE<gt> E<lt>master.docE<gt>"
 msgstr "po4a-normalize -f E<lt>formatE<gt> E<lt>original.docE<gt>"
 
-#: ../../po4a-normalize:23 ../../po4a-gettextize:23 ../../po4a:23
-#: ../../po4a-updatepo:23 ../../po4a-translate:23
+#: ../../po4a-normalize:23 ../../po4a-gettextize:25 ../../po4a:23
+#: ../../po4a-updatepo:25 ../../po4a-translate:25
 #: ../../lib/Locale/Po4a/KernelHelp.pm:144 ../../lib/Locale/Po4a/Chooser.pm:70
 #: ../../lib/Locale/Po4a/Dia.pm:32 ../../lib/Locale/Po4a/Html.pm:32
 #: ../../lib/Locale/Po4a/TransTractor.pm:28 ../../lib/Locale/Po4a/Man.pm:7
@@ -53,8 +54,8 @@
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: ../../po4a-normalize:25 ../../po4a-gettextize:25 ../../po4a:25
-#: ../../po4a-updatepo:25 ../../po4a-translate:25
+#: ../../po4a-normalize:25 ../../po4a-gettextize:27 ../../po4a:25
+#: ../../po4a-updatepo:27 ../../po4a-translate:27
 msgid ""
 "The po4a (po for anything) project goal is to ease translations (and more "
 "interstingly, the maintenance of translation) using gettext tools on areas "
@@ -85,19 +86,19 @@
 "fichier po généré est écrit dans po4a-normalize.po. Impossible de changer "
 "ça ;)"
 
-#: ../../po4a-normalize:37 ../../po4a-gettextize:52 ../../po4a:81
-#: ../../po4a-updatepo:38 ../../po4a-translate:34
+#: ../../po4a-normalize:37 ../../po4a-gettextize:54 ../../po4a:81
+#: ../../po4a-updatepo:40 ../../po4a-translate:36
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
-#: ../../po4a-normalize:41 ../../po4a-gettextize:82 ../../po4a-updatepo:61
-#: ../../po4a-translate:70
+#: ../../po4a-normalize:41 ../../po4a-gettextize:84 ../../po4a-updatepo:63
+#: ../../po4a-translate:72
 msgid "-o, --option"
 msgstr "-o, --option"
 
 # type: textblock
-#: ../../po4a-normalize:43 ../../po4a-gettextize:84 ../../po4a-updatepo:63
-#: ../../po4a-translate:72
+#: ../../po4a-normalize:43 ../../po4a-gettextize:86 ../../po4a-updatepo:65
+#: ../../po4a-translate:74
 msgid ""
 "Pass an extra option to the format plugin. See the documentation of each "
 "plugin for more information about the valid options and their meaning."
@@ -106,35 +107,35 @@
 "la documentation de chaque plugin pour la liste des options valides et leur "
 "signification."
 
-#: ../../po4a-normalize:46 ../../po4a-gettextize:87 ../../po4a:85
-#: ../../po4a-updatepo:66 ../../po4a-translate:85
+#: ../../po4a-normalize:46 ../../po4a-gettextize:89 ../../po4a:91
+#: ../../po4a-updatepo:68 ../../po4a-translate:87
 msgid "-h, --help"
 msgstr "-h, --help"
 
 # type: textblock
-#: ../../po4a-normalize:48 ../../po4a-gettextize:89 ../../po4a:87
-#: ../../po4a-updatepo:68 ../../po4a-translate:87
+#: ../../po4a-normalize:48 ../../po4a-gettextize:91 ../../po4a:93
+#: ../../po4a-updatepo:70 ../../po4a-translate:89
 msgid "Show a short help message."
 msgstr "Affiche un message d'aide."
 
 # type: =item
-#: ../../po4a-normalize:50 ../../po4a-gettextize:91 ../../po4a-updatepo:70
-#: ../../po4a-translate:89
+#: ../../po4a-normalize:50 ../../po4a-gettextize:93 ../../po4a-updatepo:72
+#: ../../po4a-translate:91
 msgid "--help-format"
 msgstr "--help-format"
 
-#: ../../po4a-normalize:52 ../../po4a-gettextize:93 ../../po4a-updatepo:72
-#: ../../po4a-translate:91
+#: ../../po4a-normalize:52 ../../po4a-gettextize:95 ../../po4a-updatepo:74
+#: ../../po4a-translate:93
 msgid "List the documentation format understood by po4a."
 msgstr "Liste les formats de documentation connus de po4a."
 
-#: ../../po4a-normalize:54 ../../po4a-gettextize:56 ../../po4a-updatepo:42
-#: ../../po4a-translate:38
+#: ../../po4a-normalize:54 ../../po4a-gettextize:58 ../../po4a-updatepo:44
+#: ../../po4a-translate:40
 msgid "-f, --format"
 msgstr "-f, --format"
 
-#: ../../po4a-normalize:56 ../../po4a-gettextize:58 ../../po4a-updatepo:44
-#: ../../po4a-translate:40
+#: ../../po4a-normalize:56 ../../po4a-gettextize:60 ../../po4a-updatepo:46
+#: ../../po4a-translate:42
 msgid ""
 "Format type of the documentation you want to handle. Use the --help-format "
 "option to see the list of available formats."
@@ -142,18 +143,18 @@
 "Type de format de la documentation que vous souhaitez traiter. Utilisez "
 "l'option --help-format pour afficher la liste des formats disponibles."
 
-#: ../../po4a-normalize:59 ../../po4a-gettextize:95 ../../po4a:89
-#: ../../po4a-updatepo:74 ../../po4a-translate:93
+#: ../../po4a-normalize:59 ../../po4a-gettextize:97 ../../po4a:95
+#: ../../po4a-updatepo:76 ../../po4a-translate:95
 msgid "-V, --version"
 msgstr "-V, --version"
 
-#: ../../po4a-normalize:61 ../../po4a-gettextize:97 ../../po4a:91
-#: ../../po4a-updatepo:76 ../../po4a-translate:95
+#: ../../po4a-normalize:61 ../../po4a-gettextize:99 ../../po4a:97
+#: ../../po4a-updatepo:78 ../../po4a-translate:97
 msgid "Displays the version of the script and exits."
 msgstr "Affiche la version du script et quitte."
 
-#: ../../po4a-normalize:65 ../../po4a-gettextize:109 ../../po4a:127
-#: ../../po4a-updatepo:88 ../../po4a-translate:126
+#: ../../po4a-normalize:65 ../../po4a-gettextize:111 ../../po4a:133
+#: ../../po4a-updatepo:90 ../../po4a-translate:128
 #: ../../lib/Locale/Po4a/KernelHelp.pm:157 ../../lib/Locale/Po4a/Chooser.pm:83
 #: ../../lib/Locale/Po4a/Dia.pm:77 ../../lib/Locale/Po4a/Man.pm:220
 #: ../../lib/Locale/Po4a/Pod.pm:264
@@ -166,8 +167,8 @@
 msgstr ""
 "L<po4a(7)>, L<po4a-updatepo(1)>, L<po4a-translate(1)>, L<po4a-gettextize(1)>."
 
-#: ../../po4a-normalize:69 ../../po4a-gettextize:113 ../../po4a:131
-#: ../../po4a-updatepo:92 ../../po4a-translate:131
+#: ../../po4a-normalize:69 ../../po4a-gettextize:115 ../../po4a:137
+#: ../../po4a-updatepo:94 ../../po4a-translate:133
 #: ../../lib/Locale/Po4a/KernelHelp.pm:163
 #: ../../lib/Locale/Po4a/Chooser.pm:102 ../../lib/Locale/Po4a/Dia.pm:81
 #: ../../lib/Locale/Po4a/Html.pm:165 ../../lib/Locale/Po4a/Man.pm:225
@@ -176,8 +177,8 @@
 msgid "AUTHORS"
 msgstr "AUTEURS"
 
-#: ../../po4a-normalize:71 ../../po4a-gettextize:115 ../../po4a:133
-#: ../../po4a-updatepo:94 ../../po4a-translate:133
+#: ../../po4a-normalize:71 ../../po4a-gettextize:117 ../../po4a:139
+#: ../../po4a-updatepo:96 ../../po4a-translate:135
 #: ../../lib/Locale/Po4a/KernelHelp.pm:165
 #: ../../lib/Locale/Po4a/Chooser.pm:104 ../../lib/Locale/Po4a/Man.pm:227
 #: ../../lib/Locale/Po4a/Po.pm:803 ../../lib/Locale/Po4a/Pod.pm:271
@@ -192,8 +193,8 @@
 " Martin Quinson <martin.quinson(a)tuxfamily.org>\n"
 "\n"
 
-#: ../../po4a-normalize:74 ../../po4a-gettextize:118 ../../po4a:136
-#: ../../po4a-updatepo:97 ../../po4a-translate:136
+#: ../../po4a-normalize:74 ../../po4a-gettextize:120 ../../po4a:142
+#: ../../po4a-updatepo:99 ../../po4a-translate:138
 #: ../../lib/Locale/Po4a/KernelHelp.pm:168
 #: ../../lib/Locale/Po4a/Chooser.pm:107 ../../lib/Locale/Po4a/Dia.pm:85
 #: ../../lib/Locale/Po4a/Html.pm:169 ../../lib/Locale/Po4a/Man.pm:230
@@ -201,13 +202,13 @@
 msgid "COPYRIGHT AND LICENSE"
 msgstr "COPYRIGHT ET LICENCE"
 
-#: ../../po4a-normalize:76 ../../po4a-gettextize:120 ../../po4a:138
-#: ../../po4a-updatepo:99 ../../po4a-translate:138
+#: ../../po4a-normalize:76 ../../po4a-gettextize:122 ../../po4a:144
+#: ../../po4a-updatepo:101 ../../po4a-translate:140
 msgid "Copyright 2002, 2003, 2004 by SPI, inc."
 msgstr "Copyright 2002, 2003, 2004 by SPI, inc."
 
-#: ../../po4a-normalize:78 ../../po4a-gettextize:122 ../../po4a:140
-#: ../../po4a-updatepo:101 ../../po4a-translate:140
+#: ../../po4a-normalize:78 ../../po4a-gettextize:124 ../../po4a:146
+#: ../../po4a-updatepo:103 ../../po4a-translate:142
 #: ../../lib/Locale/Po4a/KernelHelp.pm:172
 #: ../../lib/Locale/Po4a/Chooser.pm:111 ../../lib/Locale/Po4a/Dia.pm:89
 #: ../../lib/Locale/Po4a/Html.pm:173 ../../lib/Locale/Po4a/Man.pm:234
@@ -227,14 +228,20 @@
 "fichier po"
 
 #: ../../po4a-gettextize:21
+#, fuzzy
 msgid ""
-"po4a-gettextize -f E<lt>formatE<gt> -m E<lt>master.docE<gt> [-l "
-"E<lt>localized.docE<gt>] -p E<lt>translation.poE<gt>"
+"po4a-gettextize -f E<lt>fmtE<gt> -m E<lt>master.docE<gt> [-l E<lt>XX."
+"docE<gt>] -p E<lt>XX.poE<gt>"
 msgstr ""
 "po4a-gettextize -f E<lt>formatE<gt> -m E<lt>maitre.docE<gt> [-l "
 "E<lt>traduction.docE<gt>] -p E<lt>fichier.poE<gt>"
 
-#: ../../po4a-gettextize:29
+# type: textblock
+#: ../../po4a-gettextize:23
+msgid "(XX.po is the output, all others are input)"
+msgstr ""
+
+#: ../../po4a-gettextize:31
 msgid ""
 "The C<po4a-gettextize> script is in charge of converting documentation files "
 "to po files.  If you start a new translation, C<po4a-gettextize> will "
@@ -246,7 +253,7 @@
 "traduction, C<po4a-gettextize> extraira du fichier de documentation les "
 "chaînes devant être traduites et les écrira dans un fichier pot."
 
-#: ../../po4a-gettextize:34
+#: ../../po4a-gettextize:36
 msgid ""
 "If you already have a translated file, C<po4a-gettextize> will try to "
 "extract the translations it contains and put them in place in the written po "
@@ -263,7 +270,7 @@
 "Si ce n'est pas le cas, vous êtes mort. C'est pourquoi il est très important "
 "que les deux fichiers aient exactement la même structure."
 
-#: ../../po4a-gettextize:41
+#: ../../po4a-gettextize:43
 msgid ""
 "However, C<po4a-gettextize> will diagnose your death by detecting any "
 "desyncronisation between files, and reporting where they occur. In that "
@@ -279,7 +286,7 @@
 "valide (c'est-à-dire que chaque msgstr est bien la traduction du msgid "
 "auquel il est associé, et non du précédent ou du suivant)."
 
-#: ../../po4a-gettextize:48
+#: ../../po4a-gettextize:50
 msgid ""
 "Even if the script manage to do its job without apparent problems, it still "
 "mark all extracted translation as fuzzy, to make sure that the translator "
@@ -290,46 +297,46 @@
 "« fuzzy » (approximatives), pour s'assurer que le traducteur les vérifiera "
 "et détectera les éventuels problèmes restants."
 
-#: ../../po4a-gettextize:61 ../../po4a-updatepo:47 ../../po4a-translate:54
+#: ../../po4a-gettextize:63 ../../po4a-updatepo:49 ../../po4a-translate:56
 msgid "-m, --master"
 msgstr "-m, --master"
 
-#: ../../po4a-gettextize:63 ../../po4a-translate:56
+#: ../../po4a-gettextize:65 ../../po4a-translate:58
 msgid "File containing the master document to translate."
 msgstr "Fichier contenant les documents maîtres à traduire."
 
-#: ../../po4a-gettextize:65 ../../po4a-updatepo:51 ../../po4a-translate:58
+#: ../../po4a-gettextize:67 ../../po4a-updatepo:53 ../../po4a-translate:60
 msgid "-M, --master-charset"
 msgstr "-M, --master-charset"
 
-#: ../../po4a-gettextize:67 ../../po4a-translate:60
+#: ../../po4a-gettextize:69 ../../po4a-translate:62
 msgid "Charset of the file containing the document to translate."
 msgstr "Jeu de caractères du fichier contenant les documents à traduire."
 
 # type: =item
-#: ../../po4a-gettextize:69 ../../po4a-translate:62
+#: ../../po4a-gettextize:71 ../../po4a-translate:64
 msgid "-l, --localized"
 msgstr "-l, --localized"
 
-#: ../../po4a-gettextize:71
+#: ../../po4a-gettextize:73
 msgid "File containing the localized (translated) document."
 msgstr "Fichier contenant le document traduit."
 
 # type: =item
-#: ../../po4a-gettextize:73
+#: ../../po4a-gettextize:75
 msgid "-L, --localized-charset"
 msgstr "-L, --localized-charset"
 
-#: ../../po4a-gettextize:75
+#: ../../po4a-gettextize:77
 msgid "Charset of the file containing the localized document."
 msgstr "Jeu de caractères du fichier contenant le document traduit."
 
-#: ../../po4a-gettextize:77 ../../po4a-updatepo:56 ../../po4a-translate:66
+#: ../../po4a-gettextize:79 ../../po4a-updatepo:58 ../../po4a-translate:68
 msgid "-p, --po"
 msgstr "-p, --po"
 
 # type: textblock
-#: ../../po4a-gettextize:79
+#: ../../po4a-gettextize:81
 msgid ""
 "File where the message catalog should be written. If not given, the message "
 "catalog will be written to the standard output."
@@ -337,27 +344,27 @@
 "Fichier où le catalogue de messages sera écrit. S'il n'est pas spécifié, le "
 "catalogue de messages sera écrit sur la sortie standard."
 
-#: ../../po4a-gettextize:99 ../../po4a:93 ../../po4a-updatepo:78
-#: ../../po4a-translate:97
+#: ../../po4a-gettextize:101 ../../po4a:99 ../../po4a-updatepo:80
+#: ../../po4a-translate:99
 msgid "-v, --verbose"
 msgstr "-v, --verbose"
 
-#: ../../po4a-gettextize:101 ../../po4a:95 ../../po4a-updatepo:80
-#: ../../po4a-translate:99
+#: ../../po4a-gettextize:103 ../../po4a:101 ../../po4a-updatepo:82
+#: ../../po4a-translate:101
 msgid "Increase the verbosity of the program."
 msgstr "Rend le programme plus bavard."
 
-#: ../../po4a-gettextize:103 ../../po4a:101 ../../po4a-updatepo:82
-#: ../../po4a-translate:101
+#: ../../po4a-gettextize:105 ../../po4a:107 ../../po4a-updatepo:84
+#: ../../po4a-translate:103
 msgid "-d, --debug"
 msgstr "-d, --debug"
 
-#: ../../po4a-gettextize:105 ../../po4a:103 ../../po4a-updatepo:84
-#: ../../po4a-translate:103
+#: ../../po4a-gettextize:107 ../../po4a:109 ../../po4a-updatepo:86
+#: ../../po4a-translate:105
 msgid "Outputs some debugging informations."
 msgstr "Affiche quelques informations de debogage."
 
-#: ../../po4a-gettextize:111
+#: ../../po4a-gettextize:113
 msgid ""
 "L<po4a(7)>, L<po4a-updatepo(1)>, L<po4a-translate(1)>, L<po4a-normalize(1)>."
 msgstr ""
@@ -459,7 +466,7 @@
 
 #: ../../po4a:64
 #, fuzzy
-msgid "Specifying the documents to translates"
+msgid "Specifying the documents to translate"
 msgstr "Fichier contenant les documents maîtres à traduire."
 
 # type: textblock
@@ -501,44 +508,58 @@
 "\n"
 msgstr ""
 
-#: ../../po4a:97
+#: ../../po4a:85 ../../po4a-translate:77
+msgid "-k, --keep"
+msgstr "-k, --keep"
+
+#: ../../po4a:87 ../../po4a-translate:79
+msgid ""
+"Minimal threshold for translation percentage to keep (ie, write) the "
+"resulting file (default: 80). Ie, by default, files have to be translated at "
+"at least 80% to get written."
+msgstr ""
+"Seuil à dépasser afin que le fichier généré soit conservé et écrit sur "
+"disque (80 par défaut). C'est-à-dire que par défaut, les fichiers générés "
+"doivent être traduits à plus de 80% pour être écrits."
+
+#: ../../po4a:103
 #, fuzzy
 msgid "-q, --quiet"
 msgstr "-w, --width"
 
-#: ../../po4a:99
+#: ../../po4a:105
 #, fuzzy
 msgid "Decrease the verbosity of the program."
 msgstr "Rend le programme plus bavard."
 
 # type: =head1
-#: ../../po4a:107
+#: ../../po4a:113
 msgid "SHORTCOMMING"
 msgstr ""
 
 # type: textblock
-#: ../../po4a:113
+#: ../../po4a:119
 msgid "Does not allow to pass any options to the modules."
 msgstr ""
 
 # type: textblock
-#: ../../po4a:117
+#: ../../po4a:123
 msgid ""
 "Does not allow to specify the threshold under which the translations are "
 "discarded."
 msgstr ""
 
 # type: textblock
-#: ../../po4a:121
+#: ../../po4a:127
 msgid "Dupplicates some code with the po4a-* programs."
 msgstr ""
 
 # type: textblock
-#: ../../po4a:125
+#: ../../po4a:131
 msgid "Patch welcome ;)"
 msgstr ""
 
-#: ../../po4a:129
+#: ../../po4a:135
 #, fuzzy
 msgid ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-updatepo(1)>, L<po4a-translate(1)"
@@ -553,14 +574,20 @@
 "po4a-updatepo - Met la traduction (au format po) de documentation à jour."
 
 #: ../../po4a-updatepo:21
+#, fuzzy
 msgid ""
-"po4a-updatepo -f E<lt>formatE<gt> (--master|-m E<lt>master.docE<gt>)+ (--po|-"
-"p E<lt>translation.poE<gt>)+"
+"po4a-updatepo -f E<lt>fmtE<gt> (-m E<lt>master.docE<gt>)+ (-p E<lt>XX."
+"poE<gt>)+"
 msgstr ""
 "po4a-updatepo -f E<lt>formatE<gt> (--master|-m E<lt>maitre.docE<gt>)+ (--po|-"
 "p E<lt>traduction.poE<gt>)+"
 
-#: ../../po4a-updatepo:29
+# type: textblock
+#: ../../po4a-updatepo:23
+msgid "(XX.po are the output, all others are input)"
+msgstr ""
+
+#: ../../po4a-updatepo:31
 msgid ""
 "The C<po4a-updatepo> script is in charge of updating po files to make them "
 "reflect the changes made to the original documentation file. For that, it "
@@ -572,7 +599,7 @@
 "pod en fichier pot, puis invoque L<msgmerge(1)> sur ce nouveau pot et sur "
 "les fichiers po fournis."
 
-#: ../../po4a-updatepo:34
+#: ../../po4a-updatepo:36
 msgid ""
 "It is possible to give more than one po file (if you want to update several "
 "languages at once), and several documentation file (if you want to store the "
@@ -583,11 +610,11 @@
 "documentation (si vous voulez stocker la traduction de plusieurs documents "
 "dans le même fichier po)"
 
-#: ../../po4a-updatepo:49
+#: ../../po4a-updatepo:51
 msgid "File(s) containing the master document to translate."
 msgstr "Fichier(s) contenant les documents maîtres à traduire."
 
-#: ../../po4a-updatepo:53
+#: ../../po4a-updatepo:55
 msgid ""
 "Charset of the files containing the document to translate. Note that all "
 "files must have the same charset."
@@ -596,7 +623,7 @@
 "tous les fichiers doivent partager le même jeu de caractères."
 
 # type: textblock
-#: ../../po4a-updatepo:58
+#: ../../po4a-updatepo:60
 msgid ""
 "Po file(s) to update. If these files do not exist, they are created by "
 "C<po4a-updatepo>."
@@ -604,7 +631,7 @@
 "Fichier(s) po à mettre à jour. Si ces fichiers n'existent pas, ils sont "
 "créés par C<po4a-updatepo>."
 
-#: ../../po4a-updatepo:90
+#: ../../po4a-updatepo:92
 msgid ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-translate(1)>, L<po4a-normalize(1)"
 ">."
@@ -618,14 +645,20 @@
 "po4a-translate - reconvertit un fichier po en fichier de documentation."
 
 #: ../../po4a-translate:21
+#, fuzzy
 msgid ""
-"po4a-translate -f E<lt>formatE<gt> [E<lt>other optionsE<gt>] -m E<lt>master."
-"docE<gt> -p E<lt>translation.poE<gt>"
+"po4a-translate -f E<lt>fmtE<gt> -m E<lt>master.docE<gt> -p E<lt>XX.poE<gt> -"
+"l E<lt>XX.docE<gt>"
 msgstr ""
-"po4a-translate -f E<lt>formatE<gt> [E<lt>autres optionsE<gt>] -m E<lt>maitre."
-"docE<gt> -p E<lt>traduction.poE<gt>"
+"po4a-gettextize -f E<lt>formatE<gt> -m E<lt>maitre.docE<gt> [-l "
+"E<lt>traduction.docE<gt>] -p E<lt>fichier.poE<gt>"
 
-#: ../../po4a-translate:29
+# type: textblock
+#: ../../po4a-translate:23
+msgid "(XX.doc is the output, all others are input)"
+msgstr ""
+
+#: ../../po4a-translate:31
 msgid ""
 "The C<po4a-translate> script is in charge of converting the translation "
 "(which were done in a po file) under the documentation format back. The "
@@ -636,12 +669,12 @@
 "fichier po) dans le format d'origine. Le fichier C<po> fourni devrait être "
 "la traduction du fichier C<pot> produit par po4a-gettextize(1)."
 
-#: ../../po4a-translate:43
+#: ../../po4a-translate:45
 msgid "-a, --addendum"
 msgstr "-a, --addendum"
 
 # type: textblock
-#: ../../po4a-translate:45
+#: ../../po4a-translate:47
 msgid ""
 "Add a file to the resulting file (to put translator's name or a section "
 "\"About this translation, for example). The first line of the file to insert "
@@ -654,55 +687,41 @@
 "être un entête valide indiquant où l'ajout doit avoir lieu (voir la section "
 "I<Comment ajouter des choses n'étant pas des traduction> dans po4a(7))."
 
-#: ../../po4a-translate:50
+#: ../../po4a-translate:52
 msgid "-A, --addendum-charset"
 msgstr "-A, --addendum-charset"
 
 # type: textblock
-#: ../../po4a-translate:52
+#: ../../po4a-translate:54
 msgid ""
 "Charset of the addenda. Note that all addenda should be in the same charset."
 msgstr ""
 "Jeu de caractères des addendums. Notez que tous les ajouts doivent partager "
 "le même jeu de caractères."
 
-#: ../../po4a-translate:64
+#: ../../po4a-translate:66
 msgid "File where the localized (translated) document should be written."
 msgstr "Fichier où sera écrit le document traduit."
 
 # type: textblock
-#: ../../po4a-translate:68
+#: ../../po4a-translate:70
 msgid "File from which the message catalog should be read."
 msgstr "Fichier contenant le catalogue de messages à lire."
 
-#: ../../po4a-translate:75
-msgid "-k, --keep"
-msgstr "-k, --keep"
-
-#: ../../po4a-translate:77
-msgid ""
-"Minimal threshold for translation percentage to keep (ie, write) the "
-"resulting file (default: 80). Ie, by default, files have to be translated at "
-"at least 80% to get written."
-msgstr ""
-"Seuil à dépasser afin que le fichier généré soit conservé et écrit sur "
-"disque (80 par défaut). C'est-à-dire que par défaut, les fichiers générés "
-"doivent être traduits à plus de 80% pour être écrits."
-
-#: ../../po4a-translate:81
+#: ../../po4a-translate:83
 msgid "-w, --width"
 msgstr "-w, --width"
 
-#: ../../po4a-translate:83
+#: ../../po4a-translate:85
 msgid "Column to which we should wrap the resulting file."
 msgstr "Nombre de colonnes dans le fichier de sortie."
 
-#: ../../po4a-translate:107
+#: ../../po4a-translate:109
 msgid "Adding content (beside translations) to generated files"
 msgstr "Ajouter du contenu (en plus de la traduction) aux fichiers générés"
 
 # type: textblock
-#: ../../po4a-translate:109
+#: ../../po4a-translate:111
 msgid ""
 "To add some extra content to the generated document beside what you "
 "translated (like the name of the translator, or a \"about this translation\" "
@@ -712,7 +731,7 @@
 "le nom du traducteur ou une section à propos de la traduction), voue devez "
 "utiliser l'option C<--addendum>."
 
-#: ../../po4a-translate:113
+#: ../../po4a-translate:115
 msgid ""
 "The first line of the addendum must be a header indicating where to put it "
 "in the document (it can be before or after a given part of the document).  "
@@ -724,7 +743,7 @@
 "partie donnée du document). Le reste du fichier sera ajouté sans "
 "modification dans le fichier généré."
 
-#: ../../po4a-translate:118
+#: ../../po4a-translate:120
 msgid ""
 "Note that if po4a-translate fail to add one of the given file, it discards "
 "the whole translation (because the missing file could be the one indicating "
@@ -737,7 +756,7 @@
 "signaler des erreurs de traduction)"
 
 # type: textblock
-#: ../../po4a-translate:123
+#: ../../po4a-translate:125
 msgid ""
 "The header have a pretty rigid syntax. For more information on how to use "
 "this feature and how it works, please refer to the po4a(7) man page."
@@ -745,13 +764,13 @@
 "Les entêtes ont une syntaxe relativement rigide. Pour plus d'informations à "
 "ce sujet, veuillez vous reporter à la page de manuel po4a(7)."
 
-#: ../../po4a-translate:128
+#: ../../po4a-translate:130
 msgid ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-updatepo(1)>, L<po4a-normalize(1)>."
 msgstr ""
 "L<po4a(7)>, L<po4a-gettextize(1)>, L<po4a-updatepo(1)>, L<po4a-normalize(1)>."
 
-#: ../../po4a-translate:130 ../../lib/Locale/Po4a/Po.pm:51
+#: ../../po4a-translate:132 ../../lib/Locale/Po4a/Po.pm:51
 #: ../../lib/Locale/Po4a/Pod.pm:180 ../../lib/Locale/Po4a/Pod.pm:181
 #: ../../lib/Locale/Po4a/Sgml.pm:72 ../../lib/Locale/Po4a/Sgml.pm:73
 #: ../../doc/po4a.7.pod:132 ../../doc/po4a.7.pod:239 ../../doc/po4a.7.pod:299
@@ -1037,14 +1056,14 @@
 #: ../../lib/Locale/Po4a/TransTractor.pm:46
 #: ../../lib/Locale/Po4a/TransTractor.pm:56
 #: ../../lib/Locale/Po4a/TransTractor.pm:61
-#: ../../lib/Locale/Po4a/TransTractor.pm:662
-#: ../../lib/Locale/Po4a/TransTractor.pm:666
-#: ../../lib/Locale/Po4a/TransTractor.pm:670
-#: ../../lib/Locale/Po4a/TransTractor.pm:702
-#: ../../lib/Locale/Po4a/TransTractor.pm:706
-#: ../../lib/Locale/Po4a/TransTractor.pm:788
-#: ../../lib/Locale/Po4a/TransTractor.pm:792
-#: ../../lib/Locale/Po4a/TransTractor.pm:796 ../../doc/po4a.7.pod:69
+#: ../../lib/Locale/Po4a/TransTractor.pm:665
+#: ../../lib/Locale/Po4a/TransTractor.pm:669
+#: ../../lib/Locale/Po4a/TransTractor.pm:673
+#: ../../lib/Locale/Po4a/TransTractor.pm:705
+#: ../../lib/Locale/Po4a/TransTractor.pm:709
+#: ../../lib/Locale/Po4a/TransTractor.pm:791
+#: ../../lib/Locale/Po4a/TransTractor.pm:795
+#: ../../lib/Locale/Po4a/TransTractor.pm:799 ../../doc/po4a.7.pod:69
 #: ../../doc/po4a.7.pod:79 ../../doc/po4a.7.pod:151 ../../doc/po4a.7.pod:161
 #: ../../doc/po4a.7.pod:170
 msgid "-"
@@ -1452,15 +1471,15 @@
 msgid "This function returns a non-nul integer on error."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:607
+#: ../../lib/Locale/Po4a/TransTractor.pm:610
 msgid "INTERNAL FUNCTIONS used to write derivated parsers"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:609
+#: ../../lib/Locale/Po4a/TransTractor.pm:612
 msgid "Getting input, providing output"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:611
+#: ../../lib/Locale/Po4a/TransTractor.pm:614
 msgid ""
 "Four functions are provided to get input and return output. They are very "
 "similar to shift/unshift and push/pop. The first pair is about input, while "
@@ -1469,68 +1488,68 @@
 "the end, like pop does."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:619
+#: ../../lib/Locale/Po4a/TransTractor.pm:622
 msgid "shiftline()"
 msgstr "shiftline()"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:621
+#: ../../lib/Locale/Po4a/TransTractor.pm:624
 msgid ""
 "This function returns the next line of the doc_in to be parsed and its "
 "reference (packed as an array)."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:624
+#: ../../lib/Locale/Po4a/TransTractor.pm:627
 msgid "unshiftline($$)"
 msgstr "unshiftline($$)"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:626
+#: ../../lib/Locale/Po4a/TransTractor.pm:629
 msgid "Unshifts a line of the input document and its reference."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:628
+#: ../../lib/Locale/Po4a/TransTractor.pm:631
 msgid "pushline($)"
 msgstr "pushline($)"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:630
+#: ../../lib/Locale/Po4a/TransTractor.pm:633
 msgid "Push a new line to the doc_out."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:632
+#: ../../lib/Locale/Po4a/TransTractor.pm:635
 msgid "popline()"
 msgstr "popline()"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:634
+#: ../../lib/Locale/Po4a/TransTractor.pm:637
 msgid "Pop the last pushed line from the doc_out."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:650
+#: ../../lib/Locale/Po4a/TransTractor.pm:653
 msgid "Marking strings as translatable"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:652
+#: ../../lib/Locale/Po4a/TransTractor.pm:655
 msgid ""
 "Two functions are provided to handle the text which should be translated."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:656
+#: ../../lib/Locale/Po4a/TransTractor.pm:659
 msgid "translate($$$)"
 msgstr "translate($$$)"
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:658
+#: ../../lib/Locale/Po4a/TransTractor.pm:661
 msgid "Mandatory arguments:"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:664
+#: ../../lib/Locale/Po4a/TransTractor.pm:667
 msgid "A string to translate"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:668
+#: ../../lib/Locale/Po4a/TransTractor.pm:671
 msgid "The reference of this string (ie, position in inputfile)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:672
+#: ../../lib/Locale/Po4a/TransTractor.pm:675
 msgid ""
 "The type of this string (ie, the textual description of its structural "
 "role ; used in Locale::Po4a::Po::gettextization() ; see also po4a(7), "
@@ -1538,14 +1557,14 @@
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:678
+#: ../../lib/Locale/Po4a/TransTractor.pm:681
 msgid ""
 "This function can also take some extra arguments. They must be organized as "
 "a hash. For example:"
 msgstr ""
 
 # type: verbatim
-#: ../../lib/Locale/Po4a/TransTractor.pm:681
+#: ../../lib/Locale/Po4a/TransTractor.pm:684
 #, no-wrap
 msgid ""
 "  $self->translate(\"string\",\"ref\",\"type\",\n"
@@ -1554,13 +1573,13 @@
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:686 ../../lib/Locale/Po4a/Po.pm:349
+#: ../../lib/Locale/Po4a/TransTractor.pm:689 ../../lib/Locale/Po4a/Po.pm:349
 #: ../../lib/Locale/Po4a/Po.pm:504
 msgid "wrap"
 msgstr "wrap"
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:688
+#: ../../lib/Locale/Po4a/TransTractor.pm:691
 msgid ""
 "boolean indicating wheather we can consider that whitespaces in string are "
 "not important. If yes, the function canonize the string before looking for a "
@@ -1568,87 +1587,87 @@
 msgstr ""
 
 # type: =item
-#: ../../lib/Locale/Po4a/TransTractor.pm:692 ../../lib/Locale/Po4a/Po.pm:355
+#: ../../lib/Locale/Po4a/TransTractor.pm:695 ../../lib/Locale/Po4a/Po.pm:355
 #: ../../lib/Locale/Po4a/Po.pm:511
 msgid "wrapcol"
 msgstr "wrapcol"
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:694 ../../lib/Locale/Po4a/Po.pm:357
+#: ../../lib/Locale/Po4a/TransTractor.pm:697 ../../lib/Locale/Po4a/Po.pm:357
 #: ../../lib/Locale/Po4a/Po.pm:513
 msgid "The column at which we should wrap (default: 76)."
 msgstr ""
 "La colonne à laquelle la remise en forme doit avoir lieu (76 par défaut)."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:698
+#: ../../lib/Locale/Po4a/TransTractor.pm:701
 msgid "Actions:"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:704
+#: ../../lib/Locale/Po4a/TransTractor.pm:707
 msgid "Pushes the string, reference and type to po_out."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:708
+#: ../../lib/Locale/Po4a/TransTractor.pm:711
 msgid ""
 "Returns the translation of the string (as found in po_in) so that the parser "
 "can build the doc_out."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:744
+#: ../../lib/Locale/Po4a/TransTractor.pm:747
 msgid "Misc functions"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:748
+#: ../../lib/Locale/Po4a/TransTractor.pm:751
 msgid "verbose()"
 msgstr "verbose()"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:750
+#: ../../lib/Locale/Po4a/TransTractor.pm:753
 msgid ""
 "Returns if the verbose option was passed during the creation of the "
 "TransTractor."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:765
+#: ../../lib/Locale/Po4a/TransTractor.pm:768
 msgid "debug()"
 msgstr "debug()"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:767
+#: ../../lib/Locale/Po4a/TransTractor.pm:770
 msgid ""
 "Returns if the debug option was passed during the creation of the "
 "TransTractor."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:778
+#: ../../lib/Locale/Po4a/TransTractor.pm:781
 msgid "FUTURE DIRECTIONS"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:780
+#: ../../lib/Locale/Po4a/TransTractor.pm:783
 msgid ""
 "One shortcoming of the current TransTractor is that it can't handle "
 "translated document containing all languages, like debconf templates, or ."
 "desktop files."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:784
+#: ../../lib/Locale/Po4a/TransTractor.pm:787
 msgid "To address this problem, the only interface changes needed are:"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:790
+#: ../../lib/Locale/Po4a/TransTractor.pm:793
 msgid "take an hash as po_in_name (a list per language)"
 msgstr ""
 
 # type: textblock
-#: ../../lib/Locale/Po4a/TransTractor.pm:794
+#: ../../lib/Locale/Po4a/TransTractor.pm:797
 msgid "add an argument to translate to indicate the target language"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:798
+#: ../../lib/Locale/Po4a/TransTractor.pm:801
 msgid ""
 "make a pushline_all function, which would make pushline of its content for "
 "all language, using a map-like syntax:"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:801
+#: ../../lib/Locale/Po4a/TransTractor.pm:804
 #, no-wrap
 msgid ""
 "    $self->pushline_all({ \"Description[\".$langcode.\"]=\".\n"
@@ -1657,7 +1676,7 @@
 "\n"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:807
+#: ../../lib/Locale/Po4a/TransTractor.pm:810
 msgid "Will see if it's enough ;)"
 msgstr ""
 
@@ -4490,6 +4509,13 @@
 "To do the same, we should allow translators to put their addendum in the po "
 "file itself, as comment."
 msgstr ""
+
+#~ msgid ""
+#~ "po4a-translate -f E<lt>formatE<gt> [E<lt>other optionsE<gt>] -m "
+#~ "E<lt>master.docE<gt> -p E<lt>translation.poE<gt>"
+#~ msgstr ""
+#~ "po4a-translate -f E<lt>formatE<gt> [E<lt>autres optionsE<gt>] -m "
+#~ "E<lt>maitre.docE<gt> -p E<lt>traduction.poE<gt>"
 
 #~ msgid "-o, --options"
 #~ msgstr "-o, --options"
                                
                         
                        
                                
                                21 years, 3 months
                        
                        
                 
         
 
        
            
        
        
        
                
                        
                                
                                 
                                        
                                
                         
                        
                                
                                
                                        
                                                
                                        
                                        
                                        [Po4a-devel][CVS] po4a/po/bin ca.po,1.4,1.5 es.po,1.6,1.7 po4a.pot,1.20,1.21
                                
                                
                                
                                    
                                        by Martin Quinson
                                    
                                
                                
                                        Update of /cvsroot/po4a/po4a/po/bin
In directory haydn:/tmp/cvs-serv17387/po/bin
Modified Files:
	ca.po es.po po4a.pot 
Log Message:
Sync to the code; should be last time tonight :-/
Index: ca.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/ca.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ca.po	17 Jul 2004 07:16:44 -0000	1.4
+++ ca.po	18 Jul 2004 08:49:05 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 15:41-0700\n"
+"POT-Creation-Date: 2004-07-18 01:47-0700\n"
 "PO-Revision-Date: 2004-07-17 09:05+0100\n"
 "Last-Translator: Jordi Vilalta <jvprat(a)wanadoo.es>\n"
 "Language-Team: \n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../po4a-normalize:102 ../../po4a-gettextize:147 ../../po4a:165
-#: ../../po4a-updatepo:128 ../../po4a-translate:163
+#: ../../po4a-normalize:102 ../../po4a-gettextize:149 ../../po4a:171
+#: ../../po4a-updatepo:130 ../../po4a-translate:165
 #, perl-format
 msgid ""
 "%s version %s.\n"
@@ -35,112 +35,139 @@
 "de còpia. No es dóna CAP garantia; ni tan sols per finalitats\n"
 "COMERCIALS o ADAPTACIO A UN PROPOSIT PARTICULAR."
 
-#: ../../po4a-normalize:144 ../../po4a-gettextize:194
-#: ../../po4a-gettextize:196 ../../po4a:206 ../../po4a-updatepo:178
+#: ../../po4a-normalize:144 ../../po4a-gettextize:196
+#: ../../po4a-gettextize:198 ../../po4a:215 ../../po4a-updatepo:180
 #, perl-format
 msgid "File %s does not exist."
 msgstr "L'arxiu %s no existeix."
 
-#: ../../po4a:212 ../../lib/Locale/Po4a/Sgml.pm:289
+#: ../../po4a:221 ../../lib/Locale/Po4a/Sgml.pm:289
 #: ../../lib/Locale/Po4a/Sgml.pm:444
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "No s'ha pogut obrir %s: %s"
 
-#: ../../po4a:224
-#, perl-format
-msgid "Syntax error."
+#: ../../po4a:235
+#, fuzzy, perl-format
+msgid "Syntax error: %s"
 msgstr "Error de sintaxi"
 
-#: ../../po4a:231
+#: ../../po4a:242
 #, perl-format
 msgid "The first argument (%s) must not contain any colon (':')"
 msgstr "El primer paràmetre (%s) no pot contenir dos punts (':')"
 
-#: ../../po4a:237
+#: ../../po4a:248
 #, perl-format
 msgid "'po4a_path' redeclared"
 msgstr "'po4a_path' redeclarat"
 
-#: ../../po4a:244 ../../po4a:255
-#, perl-format
-msgid "Unparsable argument '%s'"
+#: ../../po4a:255
+#, fuzzy, perl-format
+msgid "Unparsable argument '%s'."
 msgstr "No s'ha pogut analitzar el paràmetre '%s'"
 
-#: ../../po4a:264
+#: ../../po4a:266
+#, fuzzy, perl-format
+msgid "Unparsable argument '%s' (%s)."
+msgstr "No s'ha pogut analitzar el paràmetre '%s'"
+
+#: ../../po4a:272
 #, perl-format
-msgid "Unparsable command '%s'"
+msgid "The translated and master file are the same."
+msgstr ""
+
+#: ../../po4a:280
+#, fuzzy, perl-format
+msgid "Translation of %s in %s redefined"
+msgstr "S'ha descartat la traducció de %s: tan sols hi ha un %s%% traduït."
+
+#: ../../po4a:289
+#, fuzzy, perl-format
+msgid "Unparsable command '%s'."
 msgstr "No s'ha pogut analitzar la comanda '%s'"
 
-#: ../../po4a:271
+#: ../../po4a:296
 msgid "po4a_paths not declared. Dunno where to find the pot and po files"
 msgstr "No s'ha declarat po4a_paths. No sé on trobar els arxius pot i po."
 
-#: ../../po4a:276 ../../po4a:299 ../../po4a-updatepo:203
+#: ../../po4a:301 ../../po4a-updatepo:205
 #, perl-format
 msgid "Updating %s:"
 msgstr "Actualitzant %s:"
 
-#: ../../po4a:279 ../../po4a:306 ../../po4a-updatepo:210
+#: ../../po4a:304 ../../po4a:331 ../../po4a-updatepo:212
 #, perl-format
 msgid "Creating %s:"
 msgstr "Creant %s:"
 
-#: ../../po4a:302 ../../po4a-updatepo:206
+#: ../../po4a:324
+#, fuzzy, perl-format
+msgid "Updating %s: "
+msgstr "Actualitzant %s:"
+
+#: ../../po4a:327 ../../po4a-updatepo:208
 #, perl-format
 msgid "Error while running msgmerge: %s"
 msgstr "Error durant l'execució de msgmerge: %s"
 
-#: ../../po4a:309 ../../po4a-updatepo:213
+#: ../../po4a:334 ../../po4a-updatepo:215
 #, perl-format
 msgid "Error while copying the po file: %s"
 msgstr "Error mentre es copiava l'arxiu po: %s"
 
-#: ../../po4a:332
-#, perl-format
-msgid "Translation of %s discarded: only %s%% are translated."
-msgstr "S'ha descartat la traducció de %s: tan sols hi ha un %s%% traduït."
+#: ../../po4a:357
+#, fuzzy, perl-format
+msgid "Discard %s (only %s%% translated; need %s%%)."
+msgstr ""
+"S'ha descartat la traducció de %s (tan sols hi ha un %s%% traduït; es "
+"necessita un %s%%)."
 
-#: ../../po4a:340
+#: ../../po4a:366
 #, perl-format
 msgid "Addendum %s does apply to %s (translation discarded)."
 msgstr "L'annex %s s'aplica a %s (traducció descartada)."
 
-#: ../../po4a-updatepo:179
+#: ../../po4a:375
+#, fuzzy, perl-format
+msgid "%s is %s%% translated (%s strings)."
+msgstr "%s està traduït en un %s%% (%s de %s cadenes)"
+
+#: ../../po4a:378 ../../po4a-translate:234
+#, fuzzy, perl-format
+msgid "%s is %s%% translated (%s of %s strings)."
+msgstr "%s està traduït en un %s%% (%s de %s cadenes)"
+
+#: ../../po4a-updatepo:181
 msgid "po4a-update can't take the input po from the file '-'."
 msgstr "po4a-update no pot agafar l'arxiu po d'entrada de l'arxiu '-'."
 
-#: ../../po4a-updatepo:188
+#: ../../po4a-updatepo:190
 #, perl-format
 msgid "Can't create a temporary pot file: %s"
 msgstr "No s'ha pogut crear l'arxiu pot temporal: %s"
 
-#: ../../po4a-updatepo:191
+#: ../../po4a-updatepo:193
 msgid "Parse input files... "
 msgstr "Analitzant els arxius d'entrada... "
 
-#: ../../po4a-updatepo:198
+#: ../../po4a-updatepo:200
 msgid "done."
 msgstr "fet."
 
-#: ../../po4a-translate:203 ../../po4a-translate:204
+#: ../../po4a-translate:205 ../../po4a-translate:206
 #, perl-format
 msgid "%s: file %s does not exist."
 msgstr "%s: l'arxiu %s no existeix."
 
-#: ../../po4a-translate:232
-#, perl-format
-msgid "%s is %s%% translated (%s of %s strings)"
-msgstr "%s està traduït en un %s%% (%s de %s cadenes)"
-
-#: ../../po4a-translate:238
+#: ../../po4a-translate:240
 #, perl-format
 msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
 msgstr ""
 "S'ha descartat la traducció de %s (tan sols hi ha un %s%% traduït; es "
 "necessita un %s%%)."
 
-#: ../../po4a-translate:245
+#: ../../po4a-translate:247
 #, perl-format
 msgid "Discard the translation of %s (addendum %s does not apply)."
 msgstr "S'ha descartat la traducció de %s (no s'ha pogut aplicar l'annex %s)."
@@ -256,67 +283,45 @@
 msgid "No ending boundary given in the Po4a header, but mode=after."
 msgstr "No es dóna límit al final en la capçalera Po4a, però mode=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:535
-msgid "Can't insert addendum when not given the filename"
+#: ../../lib/Locale/Po4a/TransTractor.pm:536
+#, fuzzy
+msgid "Can't apply addendum when not given the filename"
 msgstr "No es pot afegir l'annex si no s'especifica el nom de l'arxiu"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:545
+#: ../../lib/Locale/Po4a/TransTractor.pm:539
+#, fuzzy, perl-format
+msgid "Addendum %s does not exist."
+msgstr "L'arxiu %s no existeix."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:549
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "No s'ha trobat cap posició candidata per l'annex %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:555
 #, perl-format
 msgid "More than one cadidate position found for the addendum %s."
 msgstr "S'ha trobat més d'una posició candidata per l'annex %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:558
-#, perl-format
-msgid ""
-"Adding the addendum %s before the line:\n"
-"%s"
+#: ../../lib/Locale/Po4a/TransTractor.pm:562
+#: ../../lib/Locale/Po4a/TransTractor.pm:583
+#, fuzzy, perl-format
+msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 "Afegint l'annex %s abans de la línia:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:570
-#, perl-format
-msgid ""
-"Adding the addendum %s after the section begining with the line:\n"
-"%s"
+#: ../../lib/Locale/Po4a/TransTractor.pm:590
+#, fuzzy, perl-format
+msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
-"Afegint l'annex %s després de la secció que comença amb la línia:\n"
+"Afegint l'annex %s abans de la línia:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:579
-#, perl-format
-msgid ""
-"Next section begins with:\n"
-"%s\n"
-"Addendum added before this line."
-msgstr ""
-"La propera secció comença amb:\n"
-"%s\n"
-"L'annex s'ha afegit abans d'aquesta línia."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:587
+#: ../../lib/Locale/Po4a/TransTractor.pm:597
 #, perl-format
-msgid ""
-"This section ends with:\n"
-"%s\n"
-"Addendum added after this line."
-msgstr ""
-"La secció acaba amb:\n"
-"%s\n"
-"L'annex s'ha afegit després d'aquesta línia."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:595
-msgid ""
-"Can't find the end of the section in the file. Addendum added at the end of "
-"the file."
+msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
-"No s'ha pogut trobar el final de la secció a l'arxiu. S'ha afegit l'annex al "
-"final de l'arxiu."
 
 #: ../../lib/Locale/Po4a/Man.pm:290
 #, perl-format
@@ -444,10 +449,10 @@
 "po4a::man: Això no està suportat (encara)."
 
 #: ../../lib/Locale/Po4a/Man.pm:667
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
-"po4a::man: Unknown macro '%s'. Remove it from the document,\n"
-"po4a::man: or provide a patch to <po4a-devel(a)lists.alioth.debian.org>."
+"po4a::man: Unknown macro '%s' (at %s).\n"
+"po4a::man: Remove it from the document, or provide a patch to the po4a team."
 msgstr ""
 "po4a::man: Macro '%s' desconeguda. Elimíni-la del document, o\n"
 "po4a::man: enviï un pegat a <po4a-devel(a)lists.alioth.debian.org>."
@@ -651,3 +656,35 @@
 #, perl-format
 msgid "%s:%d: Unknown SGML event type: %s"
 msgstr "%s:%d: Tipus d'event SGML desconegut: %s"
+
+#~ msgid ""
+#~ "Adding the addendum %s after the section begining with the line:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Afegint l'annex %s després de la secció que comença amb la línia:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Next section begins with:\n"
+#~ "%s\n"
+#~ "Addendum added before this line."
+#~ msgstr ""
+#~ "La propera secció comença amb:\n"
+#~ "%s\n"
+#~ "L'annex s'ha afegit abans d'aquesta línia."
+
+#~ msgid ""
+#~ "This section ends with:\n"
+#~ "%s\n"
+#~ "Addendum added after this line."
+#~ msgstr ""
+#~ "La secció acaba amb:\n"
+#~ "%s\n"
+#~ "L'annex s'ha afegit després d'aquesta línia."
+
+#~ msgid ""
+#~ "Can't find the end of the section in the file. Addendum added at the end "
+#~ "of the file."
+#~ msgstr ""
+#~ "No s'ha pogut trobar el final de la secció a l'arxiu. S'ha afegit l'annex "
+#~ "al final de l'arxiu."
Index: po4a.pot
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/po4a.pot,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- po4a.pot	18 Jul 2004 05:30:05 -0000	1.20
+++ po4a.pot	18 Jul 2004 08:49:05 -0000	1.21
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-17 22:24-0700\n"
+"POT-Creation-Date: 2004-07-18 01:47-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../po4a-normalize:102 ../../po4a-gettextize:149 ../../po4a:165
+#: ../../po4a-normalize:102 ../../po4a-gettextize:149 ../../po4a:171
 #: ../../po4a-updatepo:130 ../../po4a-translate:165
 #, perl-format
 msgid ""
@@ -30,76 +30,106 @@
 msgstr ""
 
 #: ../../po4a-normalize:144 ../../po4a-gettextize:196
-#: ../../po4a-gettextize:198 ../../po4a:206 ../../po4a-updatepo:180
+#: ../../po4a-gettextize:198 ../../po4a:215 ../../po4a-updatepo:180
 #, perl-format
 msgid "File %s does not exist."
 msgstr ""
 
-#: ../../po4a:212 ../../lib/Locale/Po4a/Sgml.pm:289
+#: ../../po4a:221 ../../lib/Locale/Po4a/Sgml.pm:289
 #: ../../lib/Locale/Po4a/Sgml.pm:444
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr ""
 
-#: ../../po4a:224
+#: ../../po4a:235
 #, perl-format
-msgid "Syntax error."
+msgid "Syntax error: %s"
 msgstr ""
 
-#: ../../po4a:231
+#: ../../po4a:242
 #, perl-format
 msgid "The first argument (%s) must not contain any colon (':')"
 msgstr ""
 
-#: ../../po4a:237
+#: ../../po4a:248
 #, perl-format
 msgid "'po4a_path' redeclared"
 msgstr ""
 
-#: ../../po4a:244 ../../po4a:255
+#: ../../po4a:255
 #, perl-format
-msgid "Unparsable argument '%s'"
+msgid "Unparsable argument '%s'."
 msgstr ""
 
-#: ../../po4a:264
+#: ../../po4a:266
 #, perl-format
-msgid "Unparsable command '%s'"
+msgid "Unparsable argument '%s' (%s)."
 msgstr ""
 
-#: ../../po4a:271
+#: ../../po4a:272
+#, perl-format
+msgid "The translated and master file are the same."
+msgstr ""
+
+#: ../../po4a:280
+#, perl-format
+msgid "Translation of %s in %s redefined"
+msgstr ""
+
+#: ../../po4a:289
+#, perl-format
+msgid "Unparsable command '%s'."
+msgstr ""
+
+#: ../../po4a:296
 msgid "po4a_paths not declared. Dunno where to find the pot and po files"
 msgstr ""
 
-#: ../../po4a:276 ../../po4a:299 ../../po4a-updatepo:205
+#: ../../po4a:301 ../../po4a-updatepo:205
 #, perl-format
 msgid "Updating %s:"
 msgstr ""
 
-#: ../../po4a:279 ../../po4a:306 ../../po4a-updatepo:212
+#: ../../po4a:304 ../../po4a:331 ../../po4a-updatepo:212
 #, perl-format
 msgid "Creating %s:"
 msgstr ""
 
-#: ../../po4a:302 ../../po4a-updatepo:208
+#: ../../po4a:324
+#, perl-format
+msgid "Updating %s: "
+msgstr ""
+
+#: ../../po4a:327 ../../po4a-updatepo:208
 #, perl-format
 msgid "Error while running msgmerge: %s"
 msgstr ""
 
-#: ../../po4a:309 ../../po4a-updatepo:215
+#: ../../po4a:334 ../../po4a-updatepo:215
 #, perl-format
 msgid "Error while copying the po file: %s"
 msgstr ""
 
-#: ../../po4a:332
+#: ../../po4a:357
 #, perl-format
-msgid "Translation of %s discarded: only %s%% are translated."
+msgid "Discard %s (only %s%% translated; need %s%%)."
 msgstr ""
 
-#: ../../po4a:340
+#: ../../po4a:366
 #, perl-format
 msgid "Addendum %s does apply to %s (translation discarded)."
 msgstr ""
 
+#: ../../po4a:375
+#, perl-format
+msgid "%s is %s%% translated (%s strings)."
+msgstr ""
+
+#: ../../po4a:378 ../../po4a-translate:234
+#, perl-format
+msgid "%s is %s%% translated (%s of %s strings)."
+msgstr ""
+
 #: ../../po4a-updatepo:181
 msgid "po4a-update can't take the input po from the file '-'."
 msgstr ""
@@ -122,11 +152,6 @@
 msgid "%s: file %s does not exist."
 msgstr ""
 
-#: ../../po4a-translate:234
-#, perl-format
-msgid "%s is %s%% translated (%s of %s strings)"
-msgstr ""
-
 #: ../../po4a-translate:240
 #, perl-format
 msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
@@ -239,54 +264,39 @@
 msgid "No ending boundary given in the Po4a header, but mode=after."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:535
-msgid "Can't insert addendum when not given the filename"
+#: ../../lib/Locale/Po4a/TransTractor.pm:536
+msgid "Can't apply addendum when not given the filename"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:545
+#: ../../lib/Locale/Po4a/TransTractor.pm:539
 #, perl-format
-msgid "No candidate position for the addendum %s."
+msgid "Addendum %s does not exist."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:549
 #, perl-format
-msgid "More than one cadidate position found for the addendum %s."
+msgid "No candidate position for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:558
+#: ../../lib/Locale/Po4a/TransTractor.pm:555
 #, perl-format
-msgid ""
-"Adding the addendum %s before the line:\n"
-"%s"
+msgid "More than one cadidate position found for the addendum %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:570
+#: ../../lib/Locale/Po4a/TransTractor.pm:562
+#: ../../lib/Locale/Po4a/TransTractor.pm:583
 #, perl-format
-msgid ""
-"Adding the addendum %s after the section begining with the line:\n"
-"%s"
+msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:579
+#: ../../lib/Locale/Po4a/TransTractor.pm:590
 #, perl-format
-msgid ""
-"Next section begins with:\n"
-"%s\n"
-"Addendum added before this line."
+msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:587
+#: ../../lib/Locale/Po4a/TransTractor.pm:597
 #, perl-format
-msgid ""
-"This section ends with:\n"
-"%s\n"
-"Addendum added after this line."
-msgstr ""
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:595
-msgid ""
-"Can't find the end of the section in the file. Addendum added at the end of "
-"the file."
+msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
 
 #: ../../lib/Locale/Po4a/Man.pm:290
Index: es.po
===================================================================
RCS file: /cvsroot/po4a/po4a/po/bin/es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- es.po	17 Jul 2004 07:16:44 -0000	1.6
+++ es.po	18 Jul 2004 08:49:05 -0000	1.7
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: po4a bin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 15:41-0700\n"
+"POT-Creation-Date: 2004-07-18 01:47-0700\n"
 "PO-Revision-Date: 2004-07-17 09:07+0100\n"
 "Last-Translator: Jordi Vilalta <jvprat(a)wanadoo.es>\n"
 "Language-Team: \n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../po4a-normalize:102 ../../po4a-gettextize:147 ../../po4a:165
-#: ../../po4a-updatepo:128 ../../po4a-translate:163
+#: ../../po4a-normalize:102 ../../po4a-gettextize:149 ../../po4a:171
+#: ../../po4a-updatepo:130 ../../po4a-translate:165
 #, perl-format
 msgid ""
 "%s version %s.\n"
@@ -35,113 +35,140 @@
 "de copia. No se dá NINGUNA garantía; ni siquiera para fines\n"
 "COMERCIALES o ADAPTACION A UN PROPOSITO PARTICULAR."
 
-#: ../../po4a-normalize:144 ../../po4a-gettextize:194
-#: ../../po4a-gettextize:196 ../../po4a:206 ../../po4a-updatepo:178
+#: ../../po4a-normalize:144 ../../po4a-gettextize:196
+#: ../../po4a-gettextize:198 ../../po4a:215 ../../po4a-updatepo:180
 #, perl-format
 msgid "File %s does not exist."
 msgstr "El archivo %s no existe."
 
-#: ../../po4a:212 ../../lib/Locale/Po4a/Sgml.pm:289
+#: ../../po4a:221 ../../lib/Locale/Po4a/Sgml.pm:289
 #: ../../lib/Locale/Po4a/Sgml.pm:444
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "No se ha podido abrir %s: %s"
 
-#: ../../po4a:224
-#, perl-format
-msgid "Syntax error."
+#: ../../po4a:235
+#, fuzzy, perl-format
+msgid "Syntax error: %s"
 msgstr "Error de sintaxis"
 
-#: ../../po4a:231
+#: ../../po4a:242
 #, perl-format
 msgid "The first argument (%s) must not contain any colon (':')"
 msgstr "El primer parámetro (%s) no puede contener dos puntos (':')"
 
-#: ../../po4a:237
+#: ../../po4a:248
 #, perl-format
 msgid "'po4a_path' redeclared"
 msgstr "'po4a_path' redeclarado"
 
-#: ../../po4a:244 ../../po4a:255
-#, perl-format
-msgid "Unparsable argument '%s'"
+#: ../../po4a:255
+#, fuzzy, perl-format
+msgid "Unparsable argument '%s'."
 msgstr "No se ha podido analizar el parámetro '%s'"
 
-#: ../../po4a:264
+#: ../../po4a:266
+#, fuzzy, perl-format
+msgid "Unparsable argument '%s' (%s)."
+msgstr "No se ha podido analizar el parámetro '%s'"
+
+#: ../../po4a:272
 #, perl-format
-msgid "Unparsable command '%s'"
+msgid "The translated and master file are the same."
+msgstr ""
+
+#: ../../po4a:280
+#, fuzzy, perl-format
+msgid "Translation of %s in %s redefined"
+msgstr "Se ha descartado la traducción de %s: sólo se ha traducido un %s%%."
+
+#: ../../po4a:289
+#, fuzzy, perl-format
+msgid "Unparsable command '%s'."
 msgstr "No se ha podido analizar el comando '%s'"
 
-#: ../../po4a:271
+#: ../../po4a:296
 msgid "po4a_paths not declared. Dunno where to find the pot and po files"
 msgstr ""
 "No se ha declarado po4a_paths. No sé dónde encontrar los ficheros pot y po."
 
-#: ../../po4a:276 ../../po4a:299 ../../po4a-updatepo:203
+#: ../../po4a:301 ../../po4a-updatepo:205
 #, perl-format
 msgid "Updating %s:"
 msgstr "Actualizando %s:"
 
-#: ../../po4a:279 ../../po4a:306 ../../po4a-updatepo:210
+#: ../../po4a:304 ../../po4a:331 ../../po4a-updatepo:212
 #, perl-format
 msgid "Creating %s:"
 msgstr "Creando %s:"
 
-#: ../../po4a:302 ../../po4a-updatepo:206
+#: ../../po4a:324
+#, fuzzy, perl-format
+msgid "Updating %s: "
+msgstr "Actualizando %s:"
+
+#: ../../po4a:327 ../../po4a-updatepo:208
 #, perl-format
 msgid "Error while running msgmerge: %s"
 msgstr "Error durante la ejecución de msgmerge: %s"
 
-#: ../../po4a:309 ../../po4a-updatepo:213
+#: ../../po4a:334 ../../po4a-updatepo:215
 #, perl-format
 msgid "Error while copying the po file: %s"
 msgstr "Error durante la copia del archivo po: %s"
 
-#: ../../po4a:332
-#, perl-format
-msgid "Translation of %s discarded: only %s%% are translated."
-msgstr "Se ha descartado la traducción de %s: sólo se ha traducido un %s%%."
+#: ../../po4a:357
+#, fuzzy, perl-format
+msgid "Discard %s (only %s%% translated; need %s%%)."
+msgstr ""
+"Se ha descartado la traducción de %s (sólo se ha traducido un %s%%; se "
+"necesita un %s%%)."
 
-#: ../../po4a:340
+#: ../../po4a:366
 #, perl-format
 msgid "Addendum %s does apply to %s (translation discarded)."
 msgstr "El apéndice %s se aplica a %s (traducción descartada)."
 
-#: ../../po4a-updatepo:179
+#: ../../po4a:375
+#, fuzzy, perl-format
+msgid "%s is %s%% translated (%s strings)."
+msgstr "%s está traducido en un %s%% (%s de %s cadenas)"
+
+#: ../../po4a:378 ../../po4a-translate:234
+#, fuzzy, perl-format
+msgid "%s is %s%% translated (%s of %s strings)."
+msgstr "%s está traducido en un %s%% (%s de %s cadenas)"
+
+#: ../../po4a-updatepo:181
 msgid "po4a-update can't take the input po from the file '-'."
 msgstr "po4a-update no puede obtener el po de entrada del archivo '-'."
 
-#: ../../po4a-updatepo:188
+#: ../../po4a-updatepo:190
 #, perl-format
 msgid "Can't create a temporary pot file: %s"
 msgstr "No se ha podido crear el archivo pot temporal: %s"
 
-#: ../../po4a-updatepo:191
+#: ../../po4a-updatepo:193
 msgid "Parse input files... "
 msgstr "Analizando archivos de entrada... "
 
-#: ../../po4a-updatepo:198
+#: ../../po4a-updatepo:200
 msgid "done."
 msgstr "hecho."
 
-#: ../../po4a-translate:203 ../../po4a-translate:204
+#: ../../po4a-translate:205 ../../po4a-translate:206
 #, perl-format
 msgid "%s: file %s does not exist."
 msgstr "%s: el archivo %s no existe."
 
-#: ../../po4a-translate:232
-#, perl-format
-msgid "%s is %s%% translated (%s of %s strings)"
-msgstr "%s está traducido en un %s%% (%s de %s cadenas)"
-
-#: ../../po4a-translate:238
+#: ../../po4a-translate:240
 #, perl-format
 msgid "Discard the translation of %s (only %s%% translated; need %s%%)."
 msgstr ""
 "Se ha descartado la traducción de %s (sólo se ha traducido un %s%%; se "
 "necesita un %s%%)."
 
-#: ../../po4a-translate:245
+#: ../../po4a-translate:247
 #, perl-format
 msgid "Discard the translation of %s (addendum %s does not apply)."
 msgstr ""
@@ -259,67 +286,45 @@
 msgid "No ending boundary given in the Po4a header, but mode=after."
 msgstr "No se dá límite para el final en la cabecera Po4a, pero el modo=after."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:535
-msgid "Can't insert addendum when not given the filename"
+#: ../../lib/Locale/Po4a/TransTractor.pm:536
+#, fuzzy
+msgid "Can't apply addendum when not given the filename"
 msgstr "No se puede insertar el apéndice si no se dá el nombre de archivo"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:545
+#: ../../lib/Locale/Po4a/TransTractor.pm:539
+#, fuzzy, perl-format
+msgid "Addendum %s does not exist."
+msgstr "El archivo %s no existe."
+
+#: ../../lib/Locale/Po4a/TransTractor.pm:549
 #, perl-format
 msgid "No candidate position for the addendum %s."
 msgstr "No hay posición candidata para el apéndice %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:551
+#: ../../lib/Locale/Po4a/TransTractor.pm:555
 #, perl-format
 msgid "More than one cadidate position found for the addendum %s."
 msgstr "Se ha encontrado más de una posición candidata para el apéndice %s."
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:558
-#, perl-format
-msgid ""
-"Adding the addendum %s before the line:\n"
-"%s"
+#: ../../lib/Locale/Po4a/TransTractor.pm:562
+#: ../../lib/Locale/Po4a/TransTractor.pm:583
+#, fuzzy, perl-format
+msgid "Addendum '%s' applied before this line: %s"
 msgstr ""
 "Añadiendo el apéndice %s antes de la línea:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:570
-#, perl-format
-msgid ""
-"Adding the addendum %s after the section begining with the line:\n"
-"%s"
+#: ../../lib/Locale/Po4a/TransTractor.pm:590
+#, fuzzy, perl-format
+msgid "Addendum '%s' applied after the line: %s."
 msgstr ""
-"Añadiendo el apéndice %s después de la sección que comienza con la línea:\n"
+"Añadiendo el apéndice %s antes de la línea:\n"
 "%s"
 
-#: ../../lib/Locale/Po4a/TransTractor.pm:579
-#, perl-format
-msgid ""
-"Next section begins with:\n"
-"%s\n"
-"Addendum added before this line."
-msgstr ""
-"La siguiente sección comienza con:\n"
-"%s\n"
-"El apéndice se ha añadido antes de ésta línea."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:587
+#: ../../lib/Locale/Po4a/TransTractor.pm:597
 #, perl-format
-msgid ""
-"This section ends with:\n"
-"%s\n"
-"Addendum added after this line."
-msgstr ""
-"Esta sección termina con:\n"
-"%s\n"
-"El apéndice se ha añadido después de ésta línea."
-
-#: ../../lib/Locale/Po4a/TransTractor.pm:595
-msgid ""
-"Can't find the end of the section in the file. Addendum added at the end of "
-"the file."
+msgid "Addendum '%s' applied at the end of the file."
 msgstr ""
-"No se ha podido encontrar el final de la sección en el archivo. Apéndice "
-"añadido al final del archivo."
 
 #: ../../lib/Locale/Po4a/Man.pm:290
 #, perl-format
@@ -448,10 +453,10 @@
 "po4a::man: Esto no está soportado (aún)."
 
 #: ../../lib/Locale/Po4a/Man.pm:667
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
-"po4a::man: Unknown macro '%s'. Remove it from the document,\n"
-"po4a::man: or provide a patch to <po4a-devel(a)lists.alioth.debian.org>."
+"po4a::man: Unknown macro '%s' (at %s).\n"
+"po4a::man: Remove it from the document, or provide a patch to the po4a team."
 msgstr ""
 "po4a::man: Macro '%s' desconocida. Elimínela del documento, o\n"
 "po4a::man: envíe un parche a <po4a-devel(a)lists.alioth.debian.org>."
@@ -654,3 +659,36 @@
 #, perl-format
 msgid "%s:%d: Unknown SGML event type: %s"
 msgstr "%s:%d: Tipo de evento SGML desconocido: %s"
+
+#~ msgid ""
+#~ "Adding the addendum %s after the section begining with the line:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Añadiendo el apéndice %s después de la sección que comienza con la "
+#~ "línea:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Next section begins with:\n"
+#~ "%s\n"
+#~ "Addendum added before this line."
+#~ msgstr ""
+#~ "La siguiente sección comienza con:\n"
+#~ "%s\n"
+#~ "El apéndice se ha añadido antes de ésta línea."
+
+#~ msgid ""
+#~ "This section ends with:\n"
+#~ "%s\n"
+#~ "Addendum added after this line."
+#~ msgstr ""
+#~ "Esta sección termina con:\n"
+#~ "%s\n"
+#~ "El apéndice se ha añadido después de ésta línea."
+
+#~ msgid ""
+#~ "Can't find the end of the section in the file. Addendum added at the end "
+#~ "of the file."
+#~ msgstr ""
+#~ "No se ha podido encontrar el final de la sección en el archivo. Apéndice "
+#~ "añadido al final del archivo."
                                
                         
                        
                                
                                21 years, 3 months