intltool r739 - trunk

[dobey svn gnome org]

Author: dobey
Date: Sun Jul 20 23:34:41 2008
New Revision: 739
URL: http://svn.gnome.org/viewvc/intltool?rev=739&view=rev

Log:
2008-07-20  Rodney Dawes  <dobey pwns gmail com>

	* intltool-update.in (FindLeftoutFiles):
	Check for NC_ as well as C_ N_ Q_ and _
	(FindPOTKeywords):
	No need to escape = and _ in a string
	Add NC_ to the list of keywords
	Use context and string argument specifiers for C_ and NC_

	Fixes #543665



Modified:
   trunk/ChangeLog
   trunk/intltool-update.in

Modified: trunk/intltool-update.in
==============================================================================
--- trunk/intltool-update.in	(original)
+++ trunk/intltool-update.in	Sun Jul 20 23:34:41 2008
@@ -457,8 +457,8 @@
 		last;
 	    }
 
-            ## C_ N_ Q_ and _ are the macros defined in gi8n.h
-	    if (/[CNQ]?_ *\(QUOTEDTEXT/)
+            ## C_ N_ NC_ Q_ and _ are the macros defined in gi8n.h
+	    if (/(NC|[CNQ]?)_ *\(QUOTEDTEXT/)
 	    {
                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
                     ## Remove the first 3 chars and add newline
@@ -1139,7 +1139,7 @@
 sub FindPOTKeywords
 {
 
-    my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=C\_ --keyword\=Q\_";
+    my $keywords = "--keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=Q_";
     my $varname = "XGETTEXT_OPTIONS";
     my $make_source; {
 	local (*IN);