Merge tag 'v2.0.4' into fiksgatami-dev

1 files changed, 5 insertions, 5 deletions

diff --git a/bin/gettext-nget-patch b/bin/gettext-nget-patch
index 92b687552..67f98e319 100755
--- a/bin/gettext-nget-patch
+++ b/bin/gettext-nget-patch
@@ -18,19 +18,19 @@ find( sub {
         do {
             $text .= <FP>;
         } until $text =~ /\)/;
-        if ($text =~ /nget\(\s*"(.*?)"\s*,\s*"(.*?)"\s*,\s*(.*?)\s*\)/s) {
-            $out{$1} = {
+        if ($text =~ /nget\(\s*(['"])(.*?)\1\s*,\s*(['"])(.*?)\3\s*,\s*(.*?)\s*\)/s) {
+            $out{$2} = {
                 file => $File::Find::name,
                 line => $line,
-                s => $1,
-                p => $2,
+                s => $2,
+                p => $4,
             };
         }
     }
     close FP;
 }, 'templates', 'perllib');
 
-foreach (values %out) {
+foreach (sort { $a->{s} cmp $b->{s} } values %out) {
     print <<EOF;
 
 #: $_->{file}:$_->{line}