[Po4a-devel][CVS] po4a po4a-translate,1.21,1.22

[Martin Quinson]

Update of /cvsroot/po4a/po4a
In directory haydn:/tmp/cvs-serv7709

Modified Files:
	po4a-translate 
Log Message:
Rephrase error messages; avoid displaying the same info twice

Index: po4a-translate
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a-translate,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- po4a-translate	25 May 2004 19:19:32 -0000	1.21
+++ po4a-translate	16 Jul 2004 23:14:12 -0000	1.22
@@ -231,19 +231,19 @@
 
 print STDERR sprintf(gettext("%s is %s%% translated (%s of %s strings)"),
 		     $master_filename,$percent,$hit,$queries)."\n" 
-    if $verbose;
+    if $verbose && ($percent>=$threshold);
 
 
 if ($percent<$threshold)  {
-    print STDERR sprintf(gettext("ERROR: translation of %s discarded: only %s%% are translated ; %s%% is needed to keep translations."),
+    print STDERR sprintf(gettext("Discard the translation of %s (only %s%% translated; need %s%%)."),
 			 $master_filename,$percent,$threshold)."\n";
     unlink($outfile) if (-e $outfile);
 } else {
     foreach (@addfiles) {
 	unless ($error) {
 	    $error ||= !$doc->addendum($_);
-	    die sprintf(gettext("ERROR: file %s couldn't be added to %s.\n  This translation is therefore discarded."),
-				 $_,$master_filename)."\n"
+	    die sprintf(gettext("Discard the translation of %s (addendum %s does not apply)."),
+				 $master_filename,$_)."\n"
 		if $error;
 	}
     }