Update of /cvsroot/po4a/po4a In directory haydn:/tmp/cvs-serv32095 Modified Files: po4a-gettextize po4a-normalize po4a-translate po4a-updatepo Log Message: Remove trailing newlines from gettext messages, they are error prone for translators. Index: po4a-normalize =================================================================== RCS file: /cvsroot/po4a/po4a/po4a-normalize,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- po4a-normalize 28 Apr 2004 09:01:10 -0000 1.13 +++ po4a-normalize 30 Apr 2004 23:05:43 -0000 1.14 @@ -101,7 +101,14 @@ textdomain('po4a'); sub show_version { - print sprintf(gettext("%s version %s.\nwritten by Martin Quinson and Denis Barbier.\n\nCopyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\nThis is free software; see source code for copying\nconditions. There is NO warranty; not even for \nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),"po4a-normalize",$VERSION); + print sprintf(gettext( + "%s version %s.\n". + "written by Martin Quinson and Denis Barbier.\n\n". + "Copyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\n". + "This is free software; see source code for copying\n". + "conditions. There is NO warranty; not even for\n". + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + ),"po4a-normalize",$VERSION)."\n"; } my ($help_fmt,$help,$type,$debug,$verbose,@options); @@ -136,7 +143,7 @@ my $parser=Locale::Po4a::Chooser::new($type,%options); my $filename = shift || pod2usage(1); --e $filename || die sprintf(gettext("File %s does not exists.\n"),$filename); +-e $filename || die sprintf(gettext("File %s does not exist."),$filename)."\n"; $parser->read($filename); $parser->parse(); Index: po4a-translate =================================================================== RCS file: /cvsroot/po4a/po4a/po4a-translate,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- po4a-translate 28 Apr 2004 09:01:10 -0000 1.17 +++ po4a-translate 30 Apr 2004 23:05:43 -0000 1.18 @@ -158,7 +158,14 @@ textdomain("po4a"); sub show_version { - print sprintf(gettext("%s version %s.\nwritten by Martin Quinson and Denis Barbier.\n\nCopyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\nThis is free software; see source code for copying\nconditions. There is NO warranty; not even for \nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),"po4a-translate",$VERSION); + print sprintf(gettext( + "%s version %s.\n". + "written by Martin Quinson and Denis Barbier.\n\n". + "Copyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\n". + "This is free software; see source code for copying\n". + "conditions. There is NO warranty; not even for\n". + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + ),"po4a-translate",$VERSION)."\n"; } @@ -191,8 +198,8 @@ (defined($master_filename) && length($master_filename))||pod2usage(1); (defined($po_filename) && length($po_filename)) ||pod2usage(1); --e $master_filename || die sprintf(gettext("%s: file %s does not exist\n"),"po4a-translate",$master_filename); --e $po_filename || die sprintf(gettext("%s: file %s does not exist\n"),"po4a-translate",$po_filename); +-e $master_filename || die sprintf(gettext("%s: file %s does not exist."),"po4a-translate",$master_filename)."\n"; +-e $po_filename || die sprintf(gettext("%s: file %s does not exist."),"po4a-translate",$po_filename)."\n"; my (@pos,@masters); push @pos,$po_filename; Index: po4a-updatepo =================================================================== RCS file: /cvsroot/po4a/po4a/po4a-updatepo,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- po4a-updatepo 28 Apr 2004 09:01:10 -0000 1.18 +++ po4a-updatepo 30 Apr 2004 23:05:43 -0000 1.19 @@ -123,7 +123,14 @@ textdomain('po4a'); sub show_version { - print sprintf(gettext("%s version %s.\nwritten by Martin Quinson and Denis Barbier.\n\nCopyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\nThis is free software; see source code for copying\nconditions. There is NO warranty; not even for \nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),"po4a-updatepo",$VERSION); + print sprintf(gettext( + "%s version %s.\n". + "written by Martin Quinson and Denis Barbier.\n\n". + "Copyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\n". + "This is free software; see source code for copying\n". + "conditions. There is NO warranty; not even for\n". + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + ),"po4a-updatepo",$VERSION)."\n"; } @@ -166,8 +173,8 @@ # parser my ($doc)=Locale::Po4a::Chooser::new($format,%options); -map { -e $_ || die sprintf(gettext("File %s does not exist\n"),$_) } @masterfiles; -map { die(gettext("po4a-update can't take the input po from the file '-'.\n")) +map { -e $_ || die sprintf(gettext("File %s does not exist."),$_)."\n" } @masterfiles; +map { die(gettext("po4a-update can't take the input po from the file '-'."))."\n" if $_ eq '-' && !-e '-'} @pofiles; my ($pot_filename); @@ -176,7 +183,7 @@ SUFFIX => ".pot", OPEN => 0, UNLINK => 0) - or die sprintf(gettext("Can't create a temporary pot file: %s\n"),$!); + or die sprintf(gettext("Can't create a temporary pot file: %s"),$!)."\n"; print STDERR gettext("Parse input files... ") if $verbose; @@ -194,14 +201,14 @@ print STDERR sprintf(gettext("Updating %s:"),$po_filename) if $verbose; system ("msgmerge","-U",$po_filename,$pot_filename) == 0 || - die sprintf(gettext("Error while running msgmerge: %s\n"),$!); + die sprintf(gettext("Error while running msgmerge: %s"),$!)."\n"; system "msgfmt --statistics -v -o /dev/null $po_filename" if $verbose; } else { print STDERR sprintf(gettext("Creating %s:"),$po_filename) if $verbose; system ("cp",$pot_filename,$po_filename) == 0 || - die sprintf(gettext("Error while copying the po file: %s\n"),$!); + die sprintf(gettext("Error while copying the po file: %s"),$!)."\n"; } } Index: po4a-gettextize =================================================================== RCS file: /cvsroot/po4a/po4a/po4a-gettextize,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- po4a-gettextize 28 Apr 2004 21:52:24 -0000 1.18 +++ po4a-gettextize 30 Apr 2004 23:05:43 -0000 1.19 @@ -142,7 +142,14 @@ sub show_version { - print sprintf(gettext("%s version %s.\nwritten by Martin Quinson and Denis Barbier.\n\nCopyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\nThis is free software; see source code for copying\nconditions. There is NO warranty; not even for \nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"), "po4a-gettextize", $VERSION); + print sprintf(gettext( + "%s version %s.\n". + "written by Martin Quinson and Denis Barbier.\n\n". + "Copyright (C) 2002, 2003, 2004 Software of Public Interest, Inc.\n". + "This is free software; see source code for copying\n". + "conditions. There is NO warranty; not even for\n". + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + ), "po4a-gettextize", $VERSION)."\n"; } my ($pofile)=('-'); @@ -182,9 +189,9 @@ } } # Check file existence --e $masterfile || die sprintf(gettext("File %s does not exists.\n"),$masterfile); +-e $masterfile || die sprintf(gettext("File %s does not exist."),$masterfile)."\n"; if (defined $locfile && length($locfile)) { - -e $locfile || die sprintf(gettext("File %s does not exists.\n"),$locfile); + -e $locfile || die sprintf(gettext("File %s does not exist."),$locfile)."\n"; } # Declare the TransTractor parsers