Merge lp:~dobey/intltool/gdngettext-support into lp:intltool

[dobey]

Handle g_dngettext and calling the glib gettext wrappers directly

=== modified file 'intltool-update.in'
--- intltool-update.in	2009-04-21 01:58:31 +0000
+++ intltool-update.in	2009-07-12 18:46:16 +0000
@@ -494,6 +494,16 @@
                 }
 		last;
 	    }
+
+            # Check for direct calls to the glib gettext wrappers
+            if (/g_d[np]?gettext[2]? *\(QUOTEDTEXT/)
+            {
+                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+                    ## Remove the first 3 chars and add newline
+                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+                }
+                last;
+            }
 	}
 	close FILE;
     }
@@ -1175,7 +1185,7 @@
 sub FindPOTKeywords
 {
 
-    my $keywords = "--keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=Q_";
+    my $keywords = "--keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=Q_ --keyword=g_dgettext:2 --keyword=g_dngettext:2,3 --keyword=g_dpgettext:2 --keyword=g_dpgettext2=2c,3";
     my $varname = "XGETTEXT_OPTIONS";
     my $make_source; {
 	local (*IN);