diff options
| -rw-r--r-- | intltool-extract.in | 2 | ||||
| -rw-r--r-- | intltool-merge.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intltool-extract.in b/intltool-extract.in index 45a969c..47a539b 100644 --- a/intltool-extract.in +++ b/intltool-extract.in @@ -276,7 +276,7 @@ sub add_message sub type_ini { ### For generic translatable desktop files ### - while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) { + while ($input =~ /^(#(.+)\n)?^_[A-Za-z0-9\-]+\s*=\s*(.*)$/mg) { if (defined($2)) { $comments{$3} = $2; } diff --git a/intltool-merge.in b/intltool-merge.in index 1afa2a4..05db7cf 100644 --- a/intltool-merge.in +++ b/intltool-merge.in @@ -1186,7 +1186,7 @@ sub desktop_merge_translations while (<INPUT>) { - if (s/^(\s*)_([A-Za-z0-9\-]+=(.*))/$1$2/) + if (s/^(\s*)_([A-Za-z0-9\-]+\s*=\s*(.*))/$1$2/) { my $string = $3; @@ -1200,7 +1200,7 @@ sub desktop_merge_translations next if !$translation; $_ = $non_translated_line; - s/(\w+)=.*/${1}[$lang]=$translation/; + s/(\w+)\s*=\s*.*/${1}[$lang]=$translation/; print OUTPUT; } } |