r16839 - gnucash/branches/2.2 - [r16837] Fix r16733 and r16782 by removing the contents of po/POTFILES.ignore from po/POTFILES.

[Andreas Köhler]

Author: andi5
Date: 2008-01-07 15:25:26 -0500 (Mon, 07 Jan 2008)
New Revision: 16839
Trac: http://svn.gnucash.org/trac/changeset/16839

Modified:
   gnucash/branches/2.2/make-gnucash-potfiles.in
   gnucash/branches/2.2/po/POTFILES.ignore
Log:
[r16837] Fix r16733 and r16782 by removing the contents of po/POTFILES.ignore from po/POTFILES.

For more detail, see
http://lists.gnucash.org/pipermail/gnucash-devel/2008-January/022043.html.


Modified: gnucash/branches/2.2/make-gnucash-potfiles.in
===================================================================
--- gnucash/branches/2.2/make-gnucash-potfiles.in	2008-01-07 20:22:47 UTC (rev 16838)
+++ gnucash/branches/2.2/make-gnucash-potfiles.in	2008-01-07 20:25:26 UTC (rev 16839)
@@ -4,8 +4,8 @@
 # This perl script is used to make po/POTFILES.in, the list
 # of files to be searched for translatable strings.
 #
-# It will exclude any files listed in po/POTFILES.skip or that match the
-# regexp patterns listed in @ignorepatterns.
+# It will exclude any files listed in po/POTFILES.skip, po/POTFILES.ignore
+# or that match the regexp patterns listed in @ignorepatterns.
 #
 # Author: Dave Peticolas <dave at krondo.com>
 
@@ -16,6 +16,7 @@
 my @ignorepatterns = ('gw-', 'test', 'experimental');
 
 my @skipped_files = `grep -v \# @-SRCDIR-@/po/POTFILES.skip`;
+my @ignored_files = `grep -v \# @-SRCDIR-@/po/POTFILES.ignore`;
 
 my @possible_files = `find @-SRCDIR-@/src -name '*.c' -o -name '*.glade' \\
                       -o -name '*.desktop.in' -o -name '*.keys.in' \\
@@ -32,7 +33,7 @@
     my ($name, $path) = fileparse($file);
     $path =~ s/^\.\///;
 
-    foreach my $pat (@ignorepatterns, @skipped_files) {
+    foreach my $pat (@ignorepatterns, @skipped_files, @ignored_files) {
         chomp($pat);
         next unless $pat;
 

Modified: gnucash/branches/2.2/po/POTFILES.ignore
===================================================================
--- gnucash/branches/2.2/po/POTFILES.ignore	2008-01-07 20:22:47 UTC (rev 16838)
+++ gnucash/branches/2.2/po/POTFILES.ignore	2008-01-07 20:25:26 UTC (rev 16839)
@@ -1,6 +1,5 @@
 # Work around the intltool-0.35.5 / automake-1.10 failures
-# due to "missing" files.   Make sure these files NEVER have
-# translatable strings.
+# due to "missing" files.  These files may be distributed.
 lib/glib28/gfileutils-2.8.c
 src/gnome/gnucash.desktop.in.in
 # The features in import-export/qif are still unused.