diff --git a/.gitignore b/.gitignore
index 6b59889..04d80e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ doc/tip_of_the_day.list
 gnucash-*.*.*.tar.*
 gnucash-*.*.*/
 install-sh
-intl-scm/guile-strings.c
 intltool-extract
 intltool-extract.in
 intltool-merge
diff --git a/Makefile.am b/Makefile.am
index 965873e..19631ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,10 +178,8 @@ $(srcdir)/po/POTFILES.in: make-gnucash-potfiles .potfiles
 
 # Creation rules so that po/gnucash.pot can always be created for
 # make dist.
-po/gnucash.pot: po/POTFILES.in intl-scm/guile-strings.c
+po/gnucash.pot: po/POTFILES.in
 	${MAKE} -C po gnucash.pot
-intl-scm/guile-strings.c:
-	${MAKE} -C intl-scm guile-strings.c
 
 .potfiles:
 
diff --git a/configure.ac b/configure.ac
index 8a0f501..9161fef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,12 @@ AM_PROG_CC_C_O
 AC_GNU_SOURCE
 AC_PROG_INTLTOOL
 
+# Use a patched version of intltool-update until intltool has released a fixed version
+# See https://bugzilla.gnome.org/show_bug.cgi?id=619899
+# and https://bugs.launchpad.net/intltool/+bug/790574
+INTLTOOL_UPDATE='${top_srcdir}/intl-scm/gnc-intltool-update'
+AC_SUBST(INTL_TOOL_UPDATE)
+
 AM_GCONF_SOURCE_2
 
 # Override gconf default install locations.  The default is to always
diff --git a/intl-scm/Makefile.am b/intl-scm/Makefile.am
index 18c2c7c..f830edb 100644
--- a/intl-scm/Makefile.am
+++ b/intl-scm/Makefile.am
@@ -1,22 +1,2 @@
-abs_top_srcdir=@abs_top_srcdir@
-
 EXTRA_DIST = \
-  guile-strings.c \
-  xgettext.scm
-
-# Cause automake to generate correct rules
-# for maintainers
-noinst_HEADERS = guile-strings.c
-
-BUILT_SOURCES = guile-strings.c
-
-SCMFILES = $(shell find ${abs_top_srcdir}/src -name test -prune -o -name '*.scm' -print | sort)
-
-if BUILDING_FROM_SVN
-# This needs to be generated in srcdir
-guile-strings.c: $(SCMFILES)
-	rm -f guile-strings.c
-	cd ${srcdir} && rm -f guile-strings.c \
-	&& ${GUILE} -s ./xgettext.scm ${abs_top_srcdir} $(SCMFILES)
-
-endif
+  gnc-intltool-update
diff --git a/intl-scm/gnc-intltool-update b/intl-scm/gnc-intltool-update
new file mode 100755
index 0000000..7bee7c9
--- /dev/null
+++ b/intl-scm/gnc-intltool-update
@@ -0,0 +1,1270 @@
+#!/usr/bin/perl -w
+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
+
+#
+#  The Intltool Message Updater
+#
+#  Copyright (C) 2000-2003 Free Software Foundation.
+#
+#  Intltool is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  version 2 published by the Free Software Foundation.
+#
+#  Intltool is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#  As a special exception to the GNU General Public License, if you
+#  distribute this file as part of a program that contains a
+#  configuration script generated by Autoconf, you may include it under
+#  the same distribution terms that you use for the rest of that program.
+#
+#  Authors: Kenneth Christiansen <kenneth@gnu.org>
+#           Maciej Stachowiak
+#           Darin Adler <darin@bentspoon.com>
+
+## Release information
+my $PROGRAM = "intltool-update";
+my $VERSION = "0.41.1";
+my $PACKAGE = "intltool";
+
+## Loaded modules
+use strict;
+use Getopt::Long;
+use Cwd;
+use File::Copy;
+use File::Find;
+
+## Scalars used by the option stuff
+my $HELP_ARG 	   = 0;
+my $VERSION_ARG    = 0;
+my $DIST_ARG	   = 0;
+my $POT_ARG	   = 0;
+my $HEADERS_ARG    = 0;
+my $MAINTAIN_ARG   = 0;
+my $REPORT_ARG     = 0;
+my $VERBOSE	   = 0;
+my $GETTEXT_PACKAGE = "";
+my $OUTPUT_FILE    = "";
+
+my @languages;
+my %varhash = ();
+my %po_files_by_lang = ();
+
+# Regular expressions to categorize file types.
+# FIXME: Please check if the following is correct
+
+my $xml_support =
+"xml(?:\\.in)*|".	# http://www.w3.org/XML/ (Note: .in is not required)
+"ui|".			# Bonobo specific - User Interface desc. files
+"lang|".		# ?
+"glade2?(?:\\.in)*|".	# Glade specific - User Interface desc. files (Note: .in is not required)
+"oaf(?:\\.in)+|".	# DEPRECATED: Replaces by Bonobo .server files
+"etspec|".		# ?
+"server(?:\\.in)+|".	# Bonobo specific
+"sheet(?:\\.in)+|".	# ?
+"schemas(?:\\.in)+|".	# GConf specific
+"pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
+"kbd(?:\\.in)+|".	# GOK specific.
+"policy(?:\\.in)+";	# PolicyKit files
+
+my $ini_support =
+"icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
+"desktop(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
+"caves(?:\\.in)+|".	# GNOME Games specific
+"directory(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
+"soundlist(?:\\.in)+|".	# GNOME specific
+"keys(?:\\.in)+|".	# GNOME Mime database specific
+"theme(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
+"service(?:\\.in)+";    # DBus specific
+
+my $tlk_support =
+"tlk(?:\\.in)+";        # Bioware Aurora Talk Table Format
+
+my $buildin_gettext_support =
+"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py|scm(?:\\.in)*";
+
+## Always flush buffer when printing
+$| = 1;
+
+## Sometimes the source tree will be rooted somewhere else.
+my $SRCDIR = $ENV{"srcdir"} || ".";
+my $POTFILES_in;
+
+$POTFILES_in = "<$SRCDIR/POTFILES.in";
+
+my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+
+## Handle options
+GetOptions
+(
+ "help" 	       => \$HELP_ARG,
+ "version" 	       => \$VERSION_ARG,
+ "dist|d"	       => \$DIST_ARG,
+ "pot|p"	       => \$POT_ARG,
+ "headers|s"	       => \$HEADERS_ARG,
+ "maintain|m"	       => \$MAINTAIN_ARG,
+ "report|r"	       => \$REPORT_ARG,
+ "verbose|x"	       => \$VERBOSE,
+ "gettext-package|g=s" => \$GETTEXT_PACKAGE,
+ "output-file|o=s"     => \$OUTPUT_FILE,
+ ) or &Console_WriteError_InvalidOption;
+
+&Console_Write_IntltoolHelp if $HELP_ARG;
+&Console_Write_IntltoolVersion if $VERSION_ARG;
+
+my $arg_count = ($DIST_ARG > 0)
+    + ($POT_ARG > 0)
+    + ($HEADERS_ARG > 0)
+    + ($MAINTAIN_ARG > 0)
+    + ($REPORT_ARG > 0);
+
+&Console_Write_IntltoolHelp if $arg_count > 1;
+
+my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown";
+
+if ($POT_ARG)
+{
+    &GenerateHeaders;
+    &GeneratePOTemplate;
+}
+elsif ($HEADERS_ARG)
+{
+    &GenerateHeaders;
+}
+elsif ($MAINTAIN_ARG)
+{
+    &FindLeftoutFiles;
+}
+elsif ($REPORT_ARG)
+{
+    &GenerateHeaders;
+    &GeneratePOTemplate;
+    &Console_Write_CoverageReport;
+}
+elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/)
+{
+    my $lang = $ARGV[0];
+
+    ## Report error if the language file supplied
+    ## to the command line is non-existent
+    &Console_WriteError_NotExisting("$SRCDIR/$lang.po")
+        if ! -s "$SRCDIR/$lang.po";
+
+    if (!$DIST_ARG)
+    {
+	print "Working, please wait..." if $VERBOSE;
+	&GenerateHeaders;
+	&GeneratePOTemplate;
+    }
+    &POFile_Update ($lang, $OUTPUT_FILE);
+    &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE);
+}
+else
+{
+    &Console_Write_IntltoolHelp;
+}
+
+exit;
+
+#########
+
+sub Console_Write_IntltoolVersion
+{
+    print <<_EOF_;
+${PROGRAM} (${PACKAGE}) $VERSION
+Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.
+
+Copyright (C) 2000-2003 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+_EOF_
+    exit;
+}
+
+sub Console_Write_IntltoolHelp
+{
+    print <<_EOF_;
+Usage: ${PROGRAM} [OPTION]... LANGCODE
+Updates PO template files and merge them with the translations.
+
+Mode of operation (only one is allowed):
+  -p, --pot                   generate the PO template only
+  -s, --headers               generate the header files in POTFILES.in
+  -m, --maintain              search for left out files from POTFILES.in
+  -r, --report                display a status report for the module
+  -d, --dist                  merge LANGCODE.po with existing PO template
+
+Extra options:
+  -g, --gettext-package=NAME  override PO template name, useful with --pot
+  -o, --output-file=FILE      write merged translation to FILE
+  -x, --verbose               display lots of feedback
+      --help                  display this help and exit
+      --version               output version information and exit
+
+Examples of use:
+${PROGRAM} --pot    just create a new PO template
+${PROGRAM} xy       create new PO template and merge xy.po with it
+
+Report bugs to http://bugs.launchpad.net/intltool
+_EOF_
+    exit;
+}
+
+sub echo_n
+{
+    my $str = shift;
+    my $ret = `echo "$str"`;
+
+    $ret =~ s/\n$//; # do we need the "s" flag?
+
+    return $ret;
+}
+
+sub POFile_DetermineType ($)
+{
+   my $type = $_;
+   my $gettext_type;
+
+   my $xml_regex     = "(?:" . $xml_support . ")";
+   my $ini_regex     = "(?:" . $ini_support . ")";
+   my $tlk_regex     = "(?:" . $tlk_support . ")";
+   my $buildin_regex = "(?:" . $buildin_gettext_support . ")";
+
+   if ($type =~ /\[type: gettext\/([^\]].*)]/)
+   {
+	$gettext_type=$1;
+   }
+   elsif ($type =~ /schemas(\.in)+$/)
+   {
+	$gettext_type="schemas";
+   }
+   elsif ($type =~ /glade2?(\.in)*$/)
+   {
+       $gettext_type="glade";
+   }
+   elsif ($type =~ /scm(\.in)*$/)
+   {
+       $gettext_type="scheme";
+   }
+   elsif ($type =~ /keys(\.in)+$/)
+   {
+       $gettext_type="keys";
+   }
+
+   # bucket types
+
+   elsif ($type =~ /$xml_regex$/)
+   {
+       $gettext_type="xml";
+   }
+   elsif ($type =~ /$ini_regex$/)
+   {
+       $gettext_type="ini";
+   }
+   elsif ($type =~ /$tlk_regex$/)
+   {
+       $gettext_type="tlk";
+   }
+   elsif ($type =~ /$buildin_regex$/)
+   {
+       $gettext_type="buildin";
+   }
+   else
+   {
+       $gettext_type="unknown";
+   }
+
+   return "gettext\/$gettext_type";
+}
+
+sub TextFile_DetermineEncoding ($)
+{
+    my $gettext_code="UTF-8"; # All files are UTF-8 by default
+    my $filetype=`file $_ | cut -d ' ' -f 2`;
+
+    if ($? eq "0")
+    {
+	if ($filetype =~ /^(ISO|UTF)/)
+	{
+	    chomp ($gettext_code = $filetype);
+	}
+	elsif ($filetype =~ /^XML/)
+	{
+	    $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8
+	}
+    }
+
+    return $gettext_code;
+}
+
+sub isNotValidMissing
+{
+    my ($file) = @_;
+
+    return if $file =~ /^\{arch\}\/.*$/;
+    return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/;
+}
+
+sub removeFromArray
+{
+    my ($file, @array) = @_;
+
+    my $i = 0;
+    foreach my $potfile (@array) {
+        delete $array[$i] if $potfile =~ m/$file/;
+        $i++;
+    }
+}
+
+sub AddFileToListIfMissing
+{
+    my ($file, $list) = @_;
+
+    my $name_pattern;
+    if ($file =~ /^\.\.\//) {
+        $name_pattern = "x3 A*";
+    } else {
+        $name_pattern = "A*";
+    }
+
+    my $file_name = unpack($name_pattern, $file);
+    if (defined isNotValidMissing ($file_name)) {
+        ## Remove the first 3 chars if needed and add newline
+        push @$list, $file_name . "\n";
+    }
+}
+
+sub FindLeftoutFiles
+{
+    my (@buf_i18n_plain,
+	@buf_i18n_xml,
+	@buf_i18n_xml_unmarked,
+	@buf_i18n_ini,
+	@buf_potfiles,
+	@buf_potfiles_ignore,
+	@buf_allfiles,
+	@buf_allfiles_sorted,
+	@buf_potfiles_sorted,
+        @buf_potfiles_ignore_sorted
+    );
+
+    ## Search and find all translatable files
+    find sub {
+	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
+	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
+	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
+	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+	}, "..";
+    find sub {
+	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
+	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
+	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
+	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+	}, "$SRCDIR/.." if "$SRCDIR" ne ".";
+
+    open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
+    @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+    close POTFILES;
+
+    foreach (@buf_potfiles) {
+	s/^\[.*]\s*//;
+    }
+
+    print "Searching for missing translatable files...\n" if $VERBOSE;
+
+    ## Check if we should ignore some found files, when
+    ## comparing with POTFILES.in
+    foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
+    {
+	(-s "$SRCDIR/$ignore") or next;
+
+	if ("$ignore" eq "POTFILES.ignore")
+	{
+	    print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n".
+		  "content of this file to POTFILES.skip.\n";
+	}
+
+	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
+	open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
+
+	while (<FILE>)
+	{
+            next if (/^$/);
+            next if (/^(#|\s*$)/);
+
+            my $skipdir = "../$_";
+            $skipdir = "$SRCDIR/../$_" if "$SRCDIR" ne ".";
+            $skipdir =~ s/\n//g;
+
+            my @dirignored;
+
+            if (-d "$skipdir")
+            {
+                find sub {
+                    push @dirignored, "$File::Find::name" if /\.($buildin_gettext_support)$/;
+                    push @dirignored, "$File::Find::name" if /\.($xml_support)$/;
+                    push @dirignored, "$File::Find::name" if /\.($ini_support)$/;
+                    push @dirignored, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+                }, "$skipdir";
+                foreach my $ignored (@dirignored)
+                {
+                    $ignored =~ s/^$SRCDIR\///g;
+                    $ignored =~ s/^..\///g;
+                    $ignored =~ s/$/\n/g;
+
+                    removeFromArray ($ignored, @buf_i18n_plain);
+                    removeFromArray ($ignored, @buf_i18n_xml);
+                    removeFromArray ($ignored, @buf_i18n_ini);
+                    removeFromArray ($ignored, @buf_i18n_xml_unmarked);
+                    push @buf_potfiles_ignore, $ignored;
+                }
+                next;
+            }
+            removeFromArray ($_, @buf_i18n_plain);
+            removeFromArray ($_, @buf_i18n_xml);
+            removeFromArray ($_, @buf_i18n_ini);
+            removeFromArray ($_, @buf_i18n_xml_unmarked);
+            push @buf_potfiles_ignore, $_;
+	}
+	close FILE;
+
+	@buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
+    }
+
+    foreach my $file (@buf_i18n_plain)
+    {
+	my $in_comment = 0;
+	my $in_macro = 0;
+        my $in_string = 0;
+
+	open FILE, "<$file";
+	while (<FILE>)
+	{
+	    # Handle continued multi-line comment.
+	    if ($in_comment)
+	    {
+		next unless s-.*\*/--;
+		$in_comment = 0;
+	    }
+
+            # Handle continued multi-line string.
+            if ($in_string)
+            {
+                next unless /(\'\'\'|\"\"\")/;
+                $in_string = 0;
+            }
+
+	    # Handle continued macro.
+	    if ($in_macro)
+	    {
+		$in_macro = 0 unless /\\$/;
+		next;
+	    }
+
+	    # Handle start of macro (or any preprocessor directive).
+	    if (/^\s*\#/)
+	    {
+		$in_macro = 1 if /^([^\\]|\\.)*\\$/;
+		next;
+	    }
+
+	    # Handle comments and quoted text.
+	    while (m-(/\*|//|\'\'\'|\"\"\"|\'|\")-) # \' and \" keep emacs perl mode happy
+	    {
+		my $match = $1;
+		if ($match eq "/*")
+		{
+		    if (!s-/\*.*?\*/--)
+		    {
+			s-/\*.*--;
+			$in_comment = 1;
+		    }
+		}
+		elsif ($match eq "//")
+		{
+		    s-//.*--;
+		}
+                elsif ($match eq "\"\"\"" or $match eq "\'\'\'")
+                {
+                    if (!s-$match.*?$match--)
+                    {
+                        s-$match.*--;
+                        $in_string = 1;
+                    }
+                }
+		else # ' or "
+		{
+		    if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
+		    {
+			warn "mismatched quotes at line $. in $file\n";
+			s-$match.*--;
+		    }
+		}
+	    }
+
+	    if (/\w\.GetString *\(QUOTEDTEXT/)
+	    {
+                AddFileToListIfMissing($file, \@buf_allfiles);
+		last;
+	    }
+
+            ## C_ N_ NC_ Q_ and _ are the macros defined in gi8n.h
+	    if (/(NC_|[NCQ]_|[^_]_|(^|$)[_]) *\(QUOTEDTEXT/m)
+	    {
+                AddFileToListIfMissing($file, \@buf_allfiles);
+		last;
+	    }
+
+            # Check for direct calls to the glib gettext wrappers
+            if (/g_d[np]?gettext[2]? *\(QUOTEDTEXT/)
+            {
+                AddFileToListIfMissing($file, \@buf_allfiles);
+                last;
+            }
+	}
+	close FILE;
+    }
+
+    foreach my $file (@buf_i18n_xml)
+    {
+	open FILE, "<$file";
+
+	while (<FILE>)
+	{
+	    # FIXME: share the pattern matching code with intltool-extract
+	    if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/)
+	    {
+                AddFileToListIfMissing($file, \@buf_allfiles);
+		last;
+	    }
+	}
+	close FILE;
+    }
+
+    foreach my $file (@buf_i18n_ini)
+    {
+	open FILE, "<$file";
+	while (<FILE>)
+	{
+	    if (/_(.*)=/)
+	    {
+                AddFileToListIfMissing($file, \@buf_allfiles);
+		last;
+	    }
+	}
+	close FILE;
+    }
+
+    foreach my $file (@buf_i18n_xml_unmarked)
+    {
+        AddFileToListIfMissing($file, \@buf_allfiles);
+    }
+
+
+    @buf_allfiles_sorted = sort (@buf_allfiles);
+    @buf_potfiles_sorted = sort (@buf_potfiles);
+
+    my %in2;
+    foreach (@buf_potfiles_sorted)
+    {
+        s#^$SRCDIR/../##;
+        s#^$SRCDIR/##;
+	$in2{$_} = 1;
+    }
+
+    foreach (@buf_potfiles_ignore_sorted)
+    {
+        s#^$SRCDIR/../##;
+        s#^$SRCDIR/##;
+	$in2{$_} = 1;
+    }
+
+    my @result;
+
+    foreach (@buf_allfiles_sorted)
+    {
+        my $dummy = $_;
+        my $srcdir = $SRCDIR;
+
+        $srcdir =~ s#^../##;
+        $dummy =~ s#^$srcdir/../##;
+        $dummy =~ s#^$srcdir/##;
+        $dummy =~ s#_build/##;
+	if (!exists($in2{$dummy}))
+	{
+	    push @result, $dummy
+	}
+    }
+
+    my @buf_potfiles_notexist;
+
+    foreach (@buf_potfiles_sorted)
+    {
+	chomp (my $dummy = $_);
+	if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+	{
+	    push @buf_potfiles_notexist, $_;
+	}
+    }
+
+    ## Save file with information about the files missing
+    ## if any, and give information about this procedure.
+    if (@result + @buf_potfiles_notexist > 0)
+    {
+	if (@result)
+	{
+	    print "\n" if $VERBOSE;
+	    unlink "missing";
+	    open OUT, ">missing";
+	    print OUT @result;
+	    close OUT;
+	    warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n".
+	         "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n";
+	    print STDERR @result, "\n";
+	    warn "If some of these files are left out on purpose then please add them to\n".
+		 "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n".
+		 "of left out files has been written in the current directory.\n";
+            warn "Please report to ". $varhash{"PACKAGE_BUGREPORT"} ."\n" if (defined $varhash{"PACKAGE_BUGREPORT"});
+	}
+	if (@buf_potfiles_notexist)
+	{
+	    unlink "notexist";
+	    open OUT, ">notexist";
+	    print OUT @buf_potfiles_notexist;
+	    close OUT;
+	    warn "\n" if ($VERBOSE or @result);
+	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
+	    warn @buf_potfiles_notexist, "\n";
+	    warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
+                "containing this list of absent files has been written in the current directory.\n";
+            warn "Please report to ". $varhash{"PACKAGE_BUGREPORT"} ."\n" if (defined $varhash{"PACKAGE_BUGREPORT"});
+	}
+    }
+
+    ## If there is nothing to complain about, notify the user
+    else {
+	print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE;
+    }
+}
+
+sub Console_WriteError_InvalidOption
+{
+    ## Handle invalid arguments
+    print STDERR "Try `${PROGRAM} --help' for more information.\n";
+    exit 1;
+}
+
+sub isProgramInPath
+{
+    my ($file) = @_;
+    # If a file is executable (or exists on Windows),
+    # or when it returns 0 exit status.
+    return 1 if (
+        ((-x $file) or ($^O eq 'MSWin32' and (-e $file))) or
+        (system("$file --version >$devnull") == 0));
+    return 0;
+}
+
+sub isGNUGettextTool
+{
+    my ($file) = @_;
+    # Check that we are using GNU gettext tools
+    if (isProgramInPath ($file))
+    {
+        my $version = `$file --version`;
+        return 1 if ($version =~ m/.*\(GNU .*\).*/);
+    }
+    return 0;
+}
+
+sub GenerateHeaders
+{
+    my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+
+    ## Generate the .h header files, so we can allow glade and
+    ## xml translation support
+    if (! isProgramInPath ("$EXTRACT"))
+    {
+	print STDERR "\n *** The intltool-extract script wasn't found!"
+	     ."\n *** Without it, intltool-update can not generate files.\n";
+	exit;
+    }
+    else
+    {
+	open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n";
+
+	while (<FILE>)
+	{
+	   chomp;
+	   next if /^\[\s*encoding/;
+
+	   ## Find xml files in POTFILES.in and generate the
+	   ## files with help from the extract script
+
+	   my $gettext_type= &POFile_DetermineType ($1);
+
+	   if (/\.($xml_support|$ini_support|$tlk_support)$/ || /^\[/)
+	   {
+	       s/^\[[^\[].*]\s*//;
+
+	       my @cmd = ($EXTRACT, "--update", "--type=$gettext_type",
+	                  "--srcdir=$SRCDIR");
+
+	       unshift (@cmd, $^X) if ($^O eq 'MSWin32' && !($EXTRACT =~ /perl/));
+
+	       push (@cmd, "--quiet") if (! $VERBOSE);
+	       push (@cmd, "../$_");
+
+	       system (@cmd);
+	   }
+       }
+       close FILE;
+   }
+}
+
+#
+# Generate .pot file from POTFILES.in
+#
+sub GeneratePOTemplate
+{
+    my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
+    my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
+    chomp $XGETTEXT;
+
+    if (! isGNUGettextTool ("$XGETTEXT"))
+    {
+	print STDERR " *** GNU xgettext is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
+
+    print "Building $MODULE.pot...\n" if $VERBOSE;
+
+    open INFILE, $POTFILES_in;
+    unlink "POTFILES.in.temp";
+    open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing");
+
+    my $gettext_support_nonascii = 0;
+
+    # checks for GNU gettext >= 0.12
+    my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`;
+    if ($? == 0)
+    {
+	$gettext_support_nonascii = 1;
+    }
+    else
+    {
+	# require gnu gettext >= 0.12
+	die "$PROGRAM: GNU gettext >= 0.12 is required for intltool\n";
+    }
+
+    my $encoding = "UTF-8";
+    my $forced_gettext_code;
+    my @temp_headers;
+    my $encoding_problem_is_reported = 0;
+
+    while (<INFILE>)
+    {
+	next if (/^#/ or /^\s*$/);
+
+	chomp;
+
+	my $gettext_code;
+
+	if (/^\[\s*encoding:\s*(.*)\s*\]/)
+	{
+	    $forced_gettext_code=$1;
+	}
+	elsif (/\.($xml_support|$ini_support|$tlk_support)$/ || /^\[/)
+	{
+	    s/^\[.*]\s*//;
+            print OUTFILE "../$_.h\n";
+	    push @temp_headers, "../$_.h";
+	    $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+	}
+	else
+	{
+            print OUTFILE "$SRCDIR/../$_\n";
+	    $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+	}
+
+	next if (! $gettext_support_nonascii);
+
+	if (defined $forced_gettext_code)
+	{
+	    $encoding=$forced_gettext_code;
+	}
+	elsif (defined $gettext_code and "$encoding" ne "$gettext_code")
+	{
+	    if ($encoding eq "ASCII")
+	    {
+		$encoding=$gettext_code;
+	    }
+	    elsif ($gettext_code ne "ASCII")
+	    {
+		# Only report once because the message is quite long
+		if (! $encoding_problem_is_reported)
+		{
+		    print STDERR "WARNING: You should use the same file encoding for all your project files,\n".
+				 "         but $PROGRAM thinks that most of the source files are in\n".
+				 "         $encoding encoding, while \"$_\" is (likely) in\n".
+		       		 "         $gettext_code encoding. If you are sure that all translatable strings\n".
+				 "         are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n".
+				 "         line to POTFILES.in:\n\n".
+				 "                 [encoding: UTF-8]\n\n".
+				 "         and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n".
+				 "(such warning message will only be reported once.)\n";
+		    $encoding_problem_is_reported = 1;
+		}
+	    }
+	}
+    }
+
+    close OUTFILE;
+    close INFILE;
+
+    unlink "$MODULE.pot";
+    my @xgettext_argument=("$XGETTEXT",
+			   "--add-comments",
+			   "--directory\=.",
+                           "--default-domain\=$MODULE",
+                           "--flag\=g_strdup_printf:1:c-format",
+                           "--flag\=g_string_printf:2:c-format",
+                           "--flag\=g_string_append_printf:2:c-format",
+                           "--flag\=g_error_new:3:c-format",
+                           "--flag\=g_set_error:4:c-format",
+                           "--flag\=g_markup_printf_escaped:1:c-format",
+                           "--flag\=g_log:3:c-format",
+                           "--flag\=g_print:1:c-format",
+                           "--flag\=g_printerr:1:c-format",
+                           "--flag\=g_printf:1:c-format",
+                           "--flag\=g_fprintf:2:c-format",
+                           "--flag\=g_sprintf:2:c-format",
+                           "--flag\=g_snprintf:3:c-format",
+                           "--flag\=g_scanner_error:2:c-format",
+                           "--flag\=g_scanner_warn:2:c-format",
+			   "--output\=$MODULE\.pot",
+			   "--files-from\=\.\/POTFILES\.in\.temp");
+    my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+    push @xgettext_argument, $XGETTEXT_KEYWORDS;
+    my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+    push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+    push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
+    push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
+    my $xgettext_command = join ' ', @xgettext_argument;
+
+    # intercept xgettext error message
+    print "Running $xgettext_command\n" if $VERBOSE;
+    my $xgettext_error_msg = `$xgettext_command 2>\&1`;
+    my $command_failed = $?;
+
+    unlink "POTFILES.in.temp";
+
+    print "Removing generated header (.h) files..." if $VERBOSE;
+    unlink foreach (@temp_headers);
+    print "done.\n" if $VERBOSE;
+
+    if (! $command_failed)
+    {
+	if (! -e "$MODULE.pot")
+	{
+	    print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE;
+	}
+	else
+	{
+	    print "Wrote $MODULE.pot\n" if $VERBOSE;
+	}
+    }
+    else
+    {
+	if ($xgettext_error_msg =~ /--from-code/)
+	{
+            my $errlocation = "unknown";
+
+            if ($xgettext_error_msg =~ /Non-ASCII string at (.*)\..*/)
+            {
+                $errlocation = $1;
+            }
+            print STDERR "ERROR: xgettext failed to generate PO tempalte file because the following     \n".
+                         "       file contains strings marked for translation, not encoded in UTF-8.    \n".
+                         "       Please ensure all strings marked for translation are UTF-8 encoded.  \n\n".
+                         "           $errlocation\n\n";
+	}
+	else
+	{
+	    print STDERR "$xgettext_error_msg";
+	    if (-e "$MODULE.pot")
+	    {
+		# is this possible?
+		print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n".
+			     "       Please consult error message above if there is any.\n";
+	    }
+	    else
+	    {
+		print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n".
+			     "       error message above if there is any.\n";
+	    }
+	}
+	exit (1);
+    }
+}
+
+sub POFile_Update
+{
+    -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
+
+    my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
+    my ($lang, $outfile) = @_;
+
+    if (! isGNUGettextTool ("$MSGMERGE"))
+    {
+	print STDERR " *** GNU msgmerge is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
+
+    print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
+
+    my $infile = "$SRCDIR/$lang.po";
+    $outfile = "$SRCDIR/$lang.po" if ($outfile eq "");
+
+    # I think msgmerge won't overwrite old file if merge is not successful
+    system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot");
+}
+
+sub Console_WriteError_NotExisting
+{
+    my ($file) = @_;
+
+    ## Report error if supplied language file is non-existing
+    print STDERR "$PROGRAM: $file does not exist!\n";
+    print STDERR "Try '$PROGRAM --help' for more information.\n";
+    exit;
+}
+
+sub GatherPOFiles
+{
+    my @po_files = glob ("./*.po");
+
+    @languages = map (&POFile_GetLanguage, @po_files);
+
+    foreach my $lang (@languages)
+    {
+	$po_files_by_lang{$lang} = shift (@po_files);
+    }
+}
+
+sub POFile_GetLanguage ($)
+{
+    s/^(.*\/)?(.+)\.po$/$2/;
+    return $_;
+}
+
+sub Console_Write_TranslationStatus
+{
+    my ($lang, $output_file) = @_;
+    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+    if (! isGNUGettextTool ("$MSGFMT"))
+    {
+	print STDERR " *** GNU msgfmt is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
+
+    $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
+
+    system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file);
+}
+
+sub Console_Write_CoverageReport
+{
+    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+    if (! isGNUGettextTool ("$MSGFMT"))
+    {
+	print STDERR " *** GNU msgfmt is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
+
+    &GatherPOFiles;
+
+    foreach my $lang (@languages)
+    {
+	print STDERR "$lang: ";
+	&POFile_Update ($lang, "");
+    }
+
+    print STDERR "\n\n * Current translation support in $MODULE \n\n";
+
+    foreach my $lang (@languages)
+    {
+	print STDERR "$lang: ";
+	system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
+    }
+}
+
+sub SubstituteVariable
+{
+    my ($str) = @_;
+
+    # always need to rewind file whenever it has been accessed
+    seek (CONF, 0, 0);
+
+    # cache each variable. varhash is global to we can add
+    # variables elsewhere.
+    while (<CONF>)
+    {
+	if (/^(\w+)=(.*)$/)
+	{
+	    ($varhash{$1} = $2) =~  s/^["'](.*)["']$/$1/;
+	}
+    }
+
+    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
+    {
+	my $rest = $3;
+	my $untouched = $1;
+	my $sub = "";
+        # Ignore recursive definitions of variables
+        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+
+	return SubstituteVariable ("$untouched$sub$rest");
+    }
+
+    # We're using Perl backticks ` and "echo -n" here in order to
+    # expand any shell escapes (such as backticks themselves) in every variable
+    return echo_n ($str);
+}
+
+sub CONF_Handle_Open
+{
+    my $base_dirname = getcwd();
+    $base_dirname =~ s@.*/@@;
+
+    my ($conf_in, $src_dir);
+
+    if ($base_dirname =~ /^po(-.+)?$/)
+    {
+	if (-f "Makevars")
+	{
+	    my $makefile_source;
+
+	    local (*IN);
+	    open (IN, "<Makevars") || die "can't open Makevars: $!";
+
+	    while (<IN>)
+	    {
+		if (/^top_builddir[ \t]*=/)
+		{
+		    $src_dir = $_;
+		    $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
+
+		    chomp $src_dir;
+                    if (-f "$src_dir" . "/configure.ac") {
+                        $conf_in = "$src_dir" . "/configure.ac" . "\n";
+                    } else {
+                        $conf_in = "$src_dir" . "/configure.in" . "\n";
+                    }
+		    last;
+		}
+	    }
+	    close IN;
+
+	    $conf_in || die "Cannot find top_builddir in Makevars.";
+	}
+	elsif (-f "$SRCDIR/../configure.ac")
+	{
+	    $conf_in = "$SRCDIR/../configure.ac";
+	}
+	elsif (-f "$SRCDIR/../configure.in")
+	{
+	    $conf_in = "$SRCDIR/../configure.in";
+	}
+	else
+	{
+	    my $makefile_source;
+
+	    local (*IN);
+	    open (IN, "<Makefile") || return;
+
+	    while (<IN>)
+	    {
+		if (/^top_srcdir[ \t]*=/)
+		{
+		    $src_dir = $_;
+		    $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
+
+		    chomp $src_dir;
+		    $conf_in = "$src_dir" . "/configure.in" . "\n";
+
+		    last;
+		}
+	    }
+	    close IN;
+
+	    $conf_in || die "Cannot find top_srcdir in Makefile.";
+	}
+
+	open (CONF, "<$conf_in");
+    }
+    else
+    {
+	print STDERR "$PROGRAM: Unable to proceed.\n" .
+		     "Make sure to run this script inside the po directory.\n";
+	exit;
+    }
+}
+
+sub FindPackageName
+{
+    my $version;
+    my $domain = &FindMakevarsDomain;
+    my $name = $domain || "untitled";
+    my $bugurl;
+
+    &CONF_Handle_Open;
+
+    my $conf_source; {
+	local (*IN);
+	open (IN, "<&CONF") || return $name;
+	seek (IN, 0, 0);
+	local $/; # slurp mode
+	$conf_source = <IN>;
+	close IN;
+    }
+
+    # priority for getting package name:
+    # 1. GETTEXT_PACKAGE
+    # 2. first argument of AC_INIT (with >= 2 arguments)
+    # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument)
+
+    # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m
+    # the \s makes this not work, why?
+    if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m)
+    {
+	($name, $version) = ($1, $2);
+	$name    =~ s/[\[\]\s]//g;
+	$version =~ s/[\[\]\s]//g;
+	$name    =~ s/\(+$//g;
+	$version =~ s/\(+$//g;
+
+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+    }
+
+    if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+    {
+	($name, $version) = ($1, $2);
+        $bugurl = $3 if (defined $3);
+
+        # Handle m4_esyscmd
+        # FIXME: We should do this in a more generic way that works for all vars
+        if ($version =~ /m4_esyscmd\([\[]?([^\)\]]+)/)
+        {
+            my $cwd = getcwd ();
+            chdir ("$SRCDIR/..");
+            $version = qx($1);
+            chdir ($cwd);
+        }
+
+
+	$name    =~ s/[\[\]\s]//g;
+	$version =~ s/[\[\]\s]//g;
+        $bugurl  =~ s/[\[\]\s]//g if (defined $bugurl);
+	$name    =~ s/\(+$//g;
+	$version =~ s/\(+$//g;
+        $bugurl  =~ s/\(+$//g if (defined $bugurl);
+
+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
+    }
+
+    # \s makes this not work, why?
+    $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
+
+    # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value
+    # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables.
+    $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g;
+
+    $name = $domain if $domain;
+
+    $name = SubstituteVariable ($name);
+    $name =~ s/^["'](.*)["']$/$1/;
+
+    return $name if $name;
+}
+
+
+sub FindPOTKeywords
+{
+
+    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);
+	open (IN, "<Makevars") || (open(IN, "<Makefile.in.in") && ($varname = "XGETTEXT_KEYWORDS")) || return $keywords;
+	seek (IN, 0, 0);
+	local $/; # slurp mode
+	$make_source = <IN>;
+	close IN;
+    }
+
+    # unwrap lines split with a trailing \
+    $make_source =~  s/\\ $ \n/ /mxg;
+    $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
+
+    return $keywords;
+}
+
+sub FindMakevarsDomain
+{
+
+    my $domain = "";
+    my $makevars_source; {
+	local (*IN);
+	open (IN, "<Makevars") || return $domain;
+	seek (IN, 0, 0);
+	local $/; # slurp mode
+	$makevars_source = <IN>;
+	close IN;
+    }
+
+    $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m;
+    $domain =~ s/^\s+//;
+    $domain =~ s/\s+$//;
+
+    return $domain;
+}
+
+sub FindMakevarsBugAddress
+{
+
+    my $address = "";
+    my $makevars_source; {
+	local (*IN);
+	open (IN, "<Makevars") || return undef;
+	seek (IN, 0, 0);
+	local $/; # slurp mode
+	$makevars_source = <IN>;
+	close IN;
+    }
+
+    $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
+    $address =~ s/^\s+//;
+    $address =~ s/\s+$//;
+
+    return $address;
+}
diff --git a/intl-scm/xgettext.scm b/intl-scm/xgettext.scm
deleted file mode 100644
index 93df3b9..0000000
--- a/intl-scm/xgettext.scm
+++ /dev/null
@@ -1,76 +0,0 @@
-;; Find translatable strings in guile files
-(define *base-dir-len* 0)
-
-(define (expand-newlines string out-port)
-  (define (output-prefix-newlines chars)
-    (if (and (pair? chars) (char=? (car chars) #\newline))
-        (begin
-          (display "\\n" out-port)
-          (output-prefix-newlines (cdr chars)))
-        chars))
-
-  (let loop ((chars (string->list string))
-             (accum '()))
-    (cond
-     ((null? chars)
-      (if (not (null? accum))
-          (write (list->string (reverse accum)) out-port)))
-     ((char=? (car chars) #\newline)
-      (write (list->string (reverse accum)) out-port)
-      (display "\"" out-port)
-      (set! chars (output-prefix-newlines chars))
-      (display "\"" out-port)
-      (if (not (null? chars))
-          (display "\n  " out-port))
-      (loop chars '()))
-     (else
-      (loop (cdr chars) (cons (car chars) accum))))))
-
-(define (write-string string out-port filename line-number)
-  (display (string-append "/* " (substring filename *base-dir-len*)) out-port)
-  ;;(display line-number out-port)
-  (display " */\n" out-port)
-  (display "_(" out-port)
-  (expand-newlines string out-port)
-  (display ")\n" out-port))
-
-(define (find-strings-in-item item out-port filename line-no)
-  (define (find-internal rest)
-    (cond
-     ((and (list? rest)                    ; if it's a list
-           (= (length rest) 2)             ; of length 2
-           (symbol? (car rest))            ; starting with a symbol
-           (string? (cadr rest))           ; and ending with a string
-           (or (eqv? '_ (car rest))        ; and the symbol is _
-               (eqv? 'N_ (car rest))       ; or N_
-               (eqv? 'gnc:_ (car rest))))  ; or gnc:_
-      (write-string (cadr rest) out-port filename line-no)) ; then write it out
-
-     ((pair? rest)                         ; otherwise, recurse
-      (find-internal (car rest))
-      (find-internal (cdr rest)))))
-
-  (find-internal item))
-
-(define (count-newlines string)
-  (define (count-internal from)
-    (let ((index (string-index string #\newline from)))
-      (if index
-	  (+ 1 (count-internal (+ 1 index)))
-	  0)))
-  (count-internal 0))
-
-(define (find-strings in-port out-port filename)
-  (do ((item (read in-port) (read in-port))
-       (line-no 1 (+ 1 line-no)))
-      ((eof-object? item) #t)
-    (find-strings-in-item item out-port filename line-no)))
-
-(let ((out-port (open "guile-strings.c" (logior O_WRONLY O_CREAT O_TRUNC)))
-      (base-dir (cadr (command-line)))
-      (in-files (cddr (command-line))))
-  (set! *base-dir-len* (+ (string-length base-dir) 1))
-  (for-each (lambda (file)
-              (call-with-input-file file (lambda (port)
-                                           (find-strings port out-port file))))
-            in-files))
diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in
index 7f98184..cb29e35 100644
--- a/make-gnucash-potfiles.in
+++ b/make-gnucash-potfiles.in
@@ -20,7 +20,7 @@ my @ignored_files = `grep -v \# @-SRCDIR-@/po/POTFILES.ignore`;
 
 my @possible_files = `cd @-SRCDIR-@ && find src -name '*.c' -o -name '*.glade' \\
                       -o -name '*.desktop.in' -o -name '*.keys.in' \\
-                      -o -name '*.schemas.in' |sort`;
+                      -o -name '*.schemas.in' -o -name '*.scm' |sort`;
 ## For perl files add the following:
 # -o -name '*.pl'
 
@@ -53,5 +53,4 @@ foreach my $file (@possible_files) {
 print "src/gnome/gnucash.desktop.in.in\n";
 print "src/libqof/qof/gnc-date.c\n";
 print "src/libqof/qof/qofbookslots.h\n";
-print "intl-scm/guile-strings.c\n";
 print "doc/tip_of_the_day.list.in\n";
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d6c6da3..01118c4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,10 @@
 # This is a list of files which contain translatable strings.
 # This file was generated by ../make-gnucash-potfiles.
+src/app-utils/app-utils.scm
 src/app-utils/business-options.c
+src/app-utils/c-interface.scm
+src/app-utils/config-var.scm
+src/app-utils/date-utilities.scm
 src/app-utils/file-utils.c
 src/app-utils/gfec.c
 src/app-utils/gnc-accounting-period.c
@@ -25,8 +29,13 @@ src/app-utils/gncmod-app-utils.c
 src/app-utils/gnc-sx-instance-model.c
 src/app-utils/gnc-ui-util.c
 src/app-utils/guile-util.c
+src/app-utils/hooks.scm
+src/app-utils/options.scm
 src/app-utils/option-util.c
+src/app-utils/prefs.scm
+src/app-utils/prefs_tst.scm
 src/app-utils/QuickFill.c
+src/app-utils/simple-obj.scm
 src/backend/dbi/gnc-backend-dbi.c
 src/backend/sql/escape.c
 src/backend/sql/gnc-account-sql.c
@@ -85,7 +94,9 @@ src/backend/xml/sixtp-stack.c
 src/backend/xml/sixtp-to-dom-parser.c
 src/backend/xml/sixtp-utils.c
 src/bin/gnucash-bin.c
+src/business/business-core/business-core.scm
 src/business/business-core/gncmod-business-core.c
+src/business/business-gnome/business-gnome.scm
 src/business/business-gnome/business-gnome-utils.c
 src/business/business-gnome/business-options-gnome.c
 src/business/business-gnome/business-urls.c
@@ -122,8 +133,12 @@ src/business/business-ledger/gncEntryLedgerDisplay.c
 src/business/business-ledger/gncEntryLedgerLayout.c
 src/business/business-ledger/gncEntryLedgerLoad.c
 src/business/business-ledger/gncEntryLedgerModel.c
+src/business/business-utils/business-options.scm
+src/business/business-utils/business-prefs.scm
+src/business/business-utils/business-utils.scm
 src/business/business-utils/gncmod-business-utils.c
 src/business/dialog-tax-table/dialog-tax-table.c
+src/business/dialog-tax-table/dialog-tax-table.scm
 src/business/dialog-tax-table/gncmod-dialog-tax-table.c
 src/business/dialog-tax-table/tax-tables.glade
 src/calculation/amort_opt.c
@@ -135,6 +150,7 @@ src/calculation/fin-main.c
 src/calculation/gncmod-calculation.c
 src/calculation/numeric_ops.c
 src/core-utils/binreloc.c
+src/core-utils/core-utils.scm
 src/core-utils/gnc-filepath-utils.c
 src/core-utils/gnc-gconf-utils.c
 src/core-utils/gnc-gdate-utils.c
@@ -149,7 +165,11 @@ src/doc/doxygen_main_page.c
 src/engine/Account.c
 src/engine/cap-gains.c
 src/engine/cashobjects.c
+src/engine/commodity-table.scm
 src/engine/engine-helpers.c
+src/engine/engine-interface.scm
+src/engine/engine.scm
+src/engine/engine-utilities.scm
 src/engine/glib-helpers.c
 src/engine/gncAddress.c
 src/engine/gnc-associate-account.c
@@ -169,6 +189,7 @@ src/engine/gncInvoice.c
 src/engine/gncJob.c
 src/engine/gnc-lot.c
 src/engine/gncmod-engine.c
+src/engine/gnc-numeric.scm
 src/engine/gncOrder.c
 src/engine/gncOwner.c
 src/engine/gnc-pricedb.c
@@ -177,6 +198,7 @@ src/engine/gnc-session.c
 src/engine/gnc-session-scm.c
 src/engine/gncTaxTable.c
 src/engine/gncVendor.c
+src/engine/iso-4217-currencies.scm
 src/engine/kvp-scm.c
 src/engine/Period.c
 src/engine/policy.c
@@ -192,6 +214,7 @@ src/engine/SX-ttinfo.c
 src/engine/Transaction.c
 src/engine/TransLog.c
 src/gnc-module/gnc-module.c
+src/gnc-module/gnc-module.scm
 src/gnome/assistant-hierarchy.c
 src/gnome/assistant-stock-split.c
 src/gnome/dialog-commodities.c
@@ -340,6 +363,7 @@ src/gnome-utils/gnc-icons.c
 src/gnome-utils/gnc-keyring.c
 src/gnome-utils/gnc-main-window.c
 src/gnome-utils/gnc-menu-extensions.c
+src/gnome-utils/gnc-menu-extensions.scm
 src/gnome-utils/gncmod-gnome-utils.c
 src/gnome-utils/gnc-period-select.c
 src/gnome-utils/gnc-plugin.c
@@ -366,6 +390,7 @@ src/gnome-utils/gnc-tree-view-owner.c
 src/gnome-utils/gnc-tree-view-price.c
 src/gnome-utils/gnc-tree-view-sx-list.c
 src/gnome-utils/gnc-window.c
+src/gnome-utils/gnome-utils.scm
 src/gnome-utils/misc-gnome-utils.c
 src/gnome-utils/print-session.c
 src/gnome-utils/schemas/apps_gnucash_history.schemas.in
@@ -428,9 +453,27 @@ src/import-export/qif-import/dialog-account-picker.c
 src/import-export/qif-import/druid-qif-import.c
 src/import-export/qif-import/gncmod-qif-import.c
 src/import-export/qif-import/gnc-plugin-qif-import.c
+src/import-export/qif-import/qif-dialog-utils.scm
+src/import-export/qif-import/qif-file.scm
 src/import-export/qif-import/qif.glade
+src/import-export/qif-import/qif-guess-map.scm
+src/import-export/qif-import/qif-import.scm
+src/import-export/qif-import/qif-merge-groups.scm
+src/import-export/qif-import/qif-objects.scm
+src/import-export/qif-import/qif-parse.scm
+src/import-export/qif-import/qif-to-gnc.scm
+src/import-export/qif-import/qif-utils.scm
 src/import-export/qif-import/schemas/apps_gnucash_import_qif.schemas.in
 src/import-export/qif-io-core/gncmod-qifiocore.c
+src/import-export/qif-io-core/qif-acct-table.scm
+src/import-export/qif-io-core/qif-bank-xtn-import.scm
+src/import-export/qif-io-core/qif-file.scm
+src/import-export/qif-io-core/qif-format-check.scm
+src/import-export/qif-io-core/qif-invst-xtn-import.scm
+src/import-export/qif-io-core/qif-io-core.scm
+src/import-export/qif-io-core/qif-objects.scm
+src/import-export/qif-io-core/qif-parse.scm
+src/import-export/qif-io-core/qif-record-xform.scm
 src/import-export/qif/qif-context.c
 src/import-export/qif/qif-file.c
 src/import-export/qif/qif-objects.c
@@ -507,7 +550,23 @@ src/register/register-gnome/gnucash-style.c
 src/register/register-gnome/pricecell-gnome.c
 src/register/register-gnome/quickfillcell-gnome.c
 src/register/register-gnome/table-gnome.c
+src/report/business-reports/aging.scm
+src/report/business-reports/business-reports.scm
+src/report/business-reports/customer-summary.scm
+src/report/business-reports/easy-invoice.scm
+src/report/business-reports/fancy-invoice.scm
+src/report/business-reports/invoice.scm
+src/report/business-reports/job-report.scm
+src/report/business-reports/owner-report.scm
+src/report/business-reports/payables.scm
+src/report/business-reports/receivables.scm
+src/report/business-reports/taxinvoice.eguile.scm
+src/report/business-reports/taxinvoice.scm
+src/report/locale-specific/us/de_DE.scm
 src/report/locale-specific/us/gncmod-locale-reports-us.c
+src/report/locale-specific/us/taxtxf-de_DE.scm
+src/report/locale-specific/us/taxtxf.scm
+src/report/locale-specific/us/us.scm
 src/report/report-gnome/custom-report-dialog.glade
 src/report/report-gnome/dialog-column-view.c
 src/report/report-gnome/dialog-custom-report.c
@@ -515,16 +574,91 @@ src/report/report-gnome/dialog-style-sheet.c
 src/report/report-gnome/gncmod-report-gnome.c
 src/report/report-gnome/gnc-plugin-page-report.c
 src/report/report-gnome/report.glade
+src/report/report-gnome/report-gnome.scm
 src/report/report-gnome/window-report.c
+src/report/report-system/commodity-utilities.scm
+src/report/report-system/eguile-gnc.scm
+src/report/report-system/eguile-html-utilities.scm
+src/report/report-system/eguile-utilities.scm
 src/report/report-system/gncmod-report-system.c
 src/report/report-system/gnc-report.c
+src/report/report-system/html-acct-table.scm
+src/report/report-system/html-barchart.scm
+src/report/report-system/html-document.scm
+src/report/report-system/html-fonts.scm
+src/report/report-system/html-jqplot.scm
+src/report/report-system/html-linechart.scm
+src/report/report-system/html-piechart.scm
+src/report/report-system/html-scatter.scm
+src/report/report-system/html-style-info.scm
+src/report/report-system/html-style-sheet.scm
+src/report/report-system/html-table.scm
+src/report/report-system/html-text.scm
+src/report/report-system/html-utilities.scm
+src/report/report-system/options-utilities.scm
+src/report/report-system/report.scm
+src/report/report-system/report-system.scm
+src/report/report-system/report-utilities.scm
+src/report/standard-reports/account-piecharts.scm
+src/report/standard-reports/account-summary.scm
+src/report/standard-reports/advanced-portfolio.scm
+src/report/standard-reports/average-balance.scm
+src/report/standard-reports/balance-sheet.scm
+src/report/standard-reports/balsheet-eg.eguile.scm
+src/report/standard-reports/balsheet-eg.scm
+src/report/standard-reports/budget-balance-sheet.scm
+src/report/standard-reports/budget-barchart.scm
+src/report/standard-reports/budget-flow.scm
+src/report/standard-reports/budget-income-statement.scm
+src/report/standard-reports/budget.scm
+src/report/standard-reports/cash-flow.scm
+src/report/standard-reports/category-barchart.scm
+src/report/standard-reports/daily-reports.scm
+src/report/standard-reports/equity-statement.scm
+src/report/standard-reports/general-journal.scm
+src/report/standard-reports/general-ledger.scm
 src/report/standard-reports/gncmod-standard-reports.c
+src/report/standard-reports/income-statement.scm
+src/report/standard-reports/net-barchart.scm
+src/report/standard-reports/portfolio.scm
+src/report/standard-reports/price-scatter.scm
+src/report/standard-reports/register.scm
+src/report/standard-reports/standard-reports.scm
+src/report/standard-reports/sx-summary.scm
+src/report/standard-reports/transaction.scm
+src/report/standard-reports/trial-balance.scm
 src/report/stylesheets/gncmod-stylesheets.c
 src/report/stylesheets/gnc-plugin-stylesheets.c
+src/report/stylesheets/stylesheet-easy.scm
+src/report/stylesheets/stylesheet-fancy.scm
+src/report/stylesheets/stylesheet-footer.scm
+src/report/stylesheets/stylesheet-plain.scm
+src/report/stylesheets/stylesheets.scm
 src/report/utility-reports/gncmod-utility-reports.c
+src/report/utility-reports/hello-world.scm
+src/report/utility-reports/utility-reports.scm
+src/report/utility-reports/view-column.scm
+src/report/utility-reports/welcome-to-gnucash.scm
+src/scm/command-line.scm
+src/scm/doc.scm
+src/scm/fin.scm
+src/scm/gnumeric/gnumeric-utilities.scm
+src/scm/gnumeric/table-utils.scm
+src/scm/main.scm
+src/scm/main-window.scm
+src/scm/price-quotes.scm
+src/scm/printf.scm
+src/scm/string.scm
+src/scm/substring-search.scm
+src/scm/xml-generator.scm
+src/tax/us/de_DE.scm
 src/tax/us/gncmod-tax-us.c
+src/tax/us/txf-de_DE.scm
+src/tax/us/txf-help-de_DE.scm
+src/tax/us/txf-help.scm
+src/tax/us/txf.scm
+src/tax/us/us.scm
 src/gnome/gnucash.desktop.in.in
 src/libqof/qof/gnc-date.c
 src/libqof/qof/qofbookslots.h
-intl-scm/guile-strings.c
 doc/tip_of_the_day.list.in
