texinfo ChangeLog po/POTFILES.in tp/init/latex2...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/30 00:41:42

Modified files:
        .              : ChangeLog 
        po             : POTFILES.in 
        tp/init        : latex2html.pm 

Log message:
                * po/POTFILES.in, tp/init/latex2html.pm: mark translations
                for error messages in latex2html.pm, and add file to 
                po/POTFILES.in.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1533&r2=1.1534
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/POTFILES.in?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/latex2html.pm?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1533
retrieving revision 1.1534
diff -u -b -r1.1533 -r1.1534
--- ChangeLog   28 Jan 2013 18:36:40 -0000      1.1533
+++ ChangeLog   30 Jan 2013 00:41:42 -0000      1.1534
@@ -1,3 +1,9 @@
+2013-01-29  Patrice Dumas  <address@hidden>
+
+       * po/POTFILES.in, tp/init/latex2html.pm: mark translations
+       for error messages in latex2html.pm, and add file to 
+       po/POTFILES.in.
+
 2013-01-28  Karl Berry  <address@hidden>
 
        * pretest 4.13.95.

Index: po/POTFILES.in
===================================================================
RCS file: /sources/texinfo/texinfo/po/POTFILES.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/POTFILES.in      28 Jan 2013 18:36:41 -0000      1.21
+++ po/POTFILES.in      30 Jan 2013 00:41:42 -0000      1.22
@@ -42,6 +42,7 @@
 tp/Texinfo/Report.pm
 tp/Texinfo/Structuring.pm
 tp/init/chm.pm
+tp/init/latex2html.pm
 tp/init/tex4ht.pm
 tp/texi2any.pl
 util/texindex.c

Index: tp/init/latex2html.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/latex2html.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tp/init/latex2html.pm       12 Sep 2012 00:40:24 -0000      1.4
+++ tp/init/latex2html.pm       30 Jan 2013 00:41:42 -0000      1.5
@@ -196,7 +196,9 @@
 
   unless ($self->get_conf('L2H_SKIP')) {
     unless (open(L2H_LATEX, ">$l2h_latex_file")) {
-      $self->document_error("l2h: Can't open latex file '$l2h_latex_file' for 
writing: $!");
+      $self->document_error(sprintf($self->__(
+              "l2h: could not open latex file %s for writing: %s"),
+                                    $l2h_latex_file, $!));
       $status = 0;
       return;
     }
@@ -336,12 +338,12 @@
   # Check for dot in directory where dvips will work
   if ($self->get_conf('L2H_TMP')) {
     if ($self->get_conf('L2H_TMP') =~ /\./) {
-      $self->document_warn ("l2h: l2h_tmp dir contains a dot.");
+      $self->document_warn($self->__("l2h: L2H_TMP directory contains a dot"));
       $dotbug = 1;
     }
   } else {
     if (cwd() =~ /\./) {
-      $self->document_warn ("l2h: current dir contains a dot.");
+      $self->document_warn($self->__("l2h: current directory contains a dot"));
       $dotbug = 1;
     }
   }
@@ -369,7 +371,8 @@
 
   warn "# l2h: executing '$call'\n" if ($verbose);
   if (system($call)) {
-    $self->document_error ("l2h: '${call}' did not succeed");
+    $self->document_error(sprintf($self->__("l2h: command did not succeed: 
%s"), 
+                                  $call));
     return 0;
   } else  {
      warn "# l2h: latex2html finished successfully\n" if ($verbose);
@@ -415,7 +418,8 @@
         # document extension. copying the file could result in 
         # overwriting an output file (almost surely if the default 
         # texi2html file names are used).
-        $self->document_warn ("L2h image $src has invalid extension");
+        $self->document_warn(sprintf($self->__(
+                            "l2h: image has invalid extension: %s"), $src));
         next;
       }
       while (-e File::Spec->catpath($docu_volume, $docu_directories,
@@ -430,8 +434,9 @@
       if ($debug) {
         copy($file_src, $file_dest);
       } else {
-        if (!rename ($file_src, $file_dest)) {
-          $self->document_warn ("Error renaming $file_src as $file_dest: $!");
+        if (!rename($file_src, $file_dest)) {
+          $self->document_warn(sprintf($self->__("l2h: rename %s as %s failed: 
%s"), 
+                                       $file_src, $file_dest, $!));
         }
       }
       $l2h_img{$src} = $dest;
@@ -452,7 +457,8 @@
   }
 
   if (! open(L2H_HTML, "<$l2h_html_file")) {
-    $self->document_warn ("l2h: Can't open $l2h_html_file for reading");
+    $self->document_warn(sprintf($self->__("l2h: could not open %s: %s"),
+                                 $l2h_html_file, $!));
     return 0;
   }
   warn "# l2h: use $l2h_html_file as html file\n" if ($verbose);
@@ -605,7 +611,8 @@
   my $self = shift;
   if (-r $l2h_cache_file) {
     my $rdo = do "$l2h_cache_file";
-    $self->document_error ("l2h: could not load $l2h_cache_file: $@")
+    $self->document_error(sprintf($self->__("l2h: could not load %s: %s"),
+                                  $l2h_cache_file, $@))
       unless ($rdo);
   }
 }
@@ -617,7 +624,8 @@
   return unless $latex_count;
   my ($key, $value);
   unless (open(FH, ">$l2h_cache_file")) { 
-    $self->document_error ("l2h: could not open $l2h_cache_file for writing: 
$!");
+    $self->document_error(sprintf($self->__("l2h: could not open %s for 
writing: %s"),
+                                  $l2h_cache_file, $!));
     return;
   }
   while (($key, $value) = each %l2h_cache) {