← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/rhythmbox/oneiric

« back to all changes in this revision

Viewing changes to intltool-merge.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2006-06-26 19:06:10 UTC
  • mto: (2.1.1 lenny) (1.1.37 upstream)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20060626190610-08x8lgvvfs0gr619
Tags: upstream-0.9.5
Import upstream version 0.9.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
intltool-merge.in
35
35
## Release information
36
36
my $PROGRAM = "intltool-merge";
37
37
my $PACKAGE = "intltool";
38
 
my $VERSION = "0.34.1";
 
38
my $VERSION = "0.35.0";
39
39
 
40
40
## Loaded modules
41
41
use strict; 
91
91
 
92
92
my %po_files_by_lang = ();
93
93
my %translations = ();
94
 
my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
 
94
my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
95
95
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
96
96
 
97
97
# Use this instead of \w for XML files to handle more possible characters.
257
257
sub get_local_charset
258
258
{
259
259
    my ($encoding) = @_;
260
 
    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
 
260
    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias";
261
261
 
262
262
    # seek character encoding aliases in charset.alias (glib)
263
263
 
395
395
            } 
396
396
            else 
397
397
            {
398
 
                print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
 
398
                print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
399
399
 
400
400
                open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; 
401
401
            }