intltool r727 - branches/intltool-thirty-somethings

[dobey svn gnome org]

Author: dobey
Date: Mon Feb 25 18:15:26 2008
New Revision: 727
URL: http://svn.gnome.org/viewvc/intltool?rev=727&view=rev

Log:
2008-02-25  Rodney Dawes  <dobey pwns gmail com>

	* intltool-extract.in.in (type_glade):
	Handle the col tag when extracting strings, for GTK+ ui files

	Fixes #517559

2008-02-25  Rodney Dawes  <dobey pwns gmail com>

	* Makefile.am:
	Make the resulting final script output executable



Modified:
   branches/intltool-thirty-somethings/ChangeLog
   branches/intltool-thirty-somethings/Makefile.am
   branches/intltool-thirty-somethings/intltool-extract.in.in

Modified: branches/intltool-thirty-somethings/Makefile.am
==============================================================================
--- branches/intltool-thirty-somethings/Makefile.am	(original)
+++ branches/intltool-thirty-somethings/Makefile.am	Mon Feb 25 18:15:26 2008
@@ -52,3 +52,4 @@
 
 %: %.in Makefile
 	$(edit) < $< > $@
+	chmod +x $@

Modified: branches/intltool-thirty-somethings/intltool-extract.in.in
==============================================================================
--- branches/intltool-thirty-somethings/intltool-extract.in.in	(original)
+++ branches/intltool-thirty-somethings/intltool-extract.in.in	Mon Feb 25 18:15:26 2008
@@ -764,7 +764,7 @@
     }
 
     ## handle new glade files
-    while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
+    while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
 	$messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
         if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
 	   $comments{entity_decode($3)} = entity_decode($2) ;