Index: intltool-update.in =================================================================== --- intltool-update.in (révision 2918) +++ intltool-update.in (révision 3631) @@ -458,20 +458,26 @@ if (/\w\.GetString *\(QUOTEDTEXT/) { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { + if (($file =~ /^\.\./) and defined isNotValidMissing (unpack("x3 A*", $file))) { ## Remove the first 3 chars and add newline push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } + elsif (defined isNotValidMissing (unpack("A*", $file))) { + push @buf_allfiles, unpack("A*", $file) . "\n"; + } last; } ## C_ N_ NC_ Q_ and _ are the macros defined in gi8n.h if (/(NC|[CNQ]?)_ *\(QUOTEDTEXT/) { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { + if (($file =~ /^\.\./) and defined isNotValidMissing (unpack("x3 A*", $file))) { ## Remove the first 3 chars and add newline push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } + elsif (defined isNotValidMissing (unpack("A*", $file))) { + push @buf_allfiles, unpack("A*", $file) . "\n"; + } last; } } @@ -487,9 +493,12 @@ # FIXME: share the pattern matching code with intltool-extract if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { + if (($file =~ /^\.\./) and defined isNotValidMissing (unpack("x3 A*", $file))) { push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } + elsif (defined isNotValidMissing (unpack("A*", $file))) { + push @buf_allfiles, unpack("A*", $file) . "\n"; + } last; } } @@ -503,9 +512,12 @@ { if (/_(.*)=/) { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { + if (($file =~ /^\.\./) and defined isNotValidMissing (unpack("x3 A*", $file))) { push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } + elsif (defined isNotValidMissing (unpack("A*", $file))) { + push @buf_allfiles, unpack("A*", $file) . "\n"; + } last; } } @@ -514,9 +526,12 @@ foreach my $file (@buf_i18n_xml_unmarked) { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { + if (($file =~ /^\.\./) and defined isNotValidMissing (unpack("x3 A*", $file))) { push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } + elsif (defined isNotValidMissing (unpack("A*", $file))) { + push @buf_allfiles, unpack("A*", $file) . "\n"; + } }