Merge lp:~amigadave/account-plugins/i18n-support into lp:account-plugins

[David King]

Use intltool for i18n support

* Correct project URLs in configure.ac
* Add intltool support to build system
* Extract strings from provider and service files
* Skip service files without translations

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:73
http://s-jenkins:8080/job/online-accounts-account-plugins-ci/10/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-account-plugins-ci/./label=quantal/10/console

review: Needs Fixing (continuous-integration)

[Víctor R. Ruiz (vrruiz)]

Problem with the packaging branch. Would you please resubmit?

[lp:~amigadave/account-plugins/i18n-support]

73. By David King on 2012-10-05

Skip service files without translations

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2012-07-25 11:09:39 +0000
+++ .bzrignore	2012-10-04 14:34:23 +0000
@@ -1,5 +1,7 @@
 *.la
 *.lo
+*.provider
+*.service
 *.stamp
 COPYING
 INSTALL
@@ -21,6 +23,9 @@
 ltmain.sh
 m4
 missing
+/po/Makefile.in.in
+/po/POTFILES
+/po/stamp-it
 stamp-h1
 .deps
 .dirstamp

=== modified file 'Makefile.am'
--- Makefile.am	2012-07-19 17:18:08 +0000
+++ Makefile.am	2012-10-04 14:34:23 +0000
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	data \
+	po \
 	tools
 
 # Plugins.
@@ -99,3 +100,9 @@
 	src/accounts.vapi \
 	src/signon.vapi \
 	src/AccountPlugin.vapi
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update \
+	po/.intltool-merge-cache

=== modified file 'autogen.sh'
--- autogen.sh	2011-12-23 14:28:12 +0000
+++ autogen.sh	2012-10-04 14:34:23 +0000
@@ -1,2 +1,1 @@
-autoreconf -i && ./configure "$@"
-
+intltoolize --copy --force --automake && autoreconf -i && ./configure "$@"

=== modified file 'configure.ac'
--- configure.ac	2012-09-19 19:24:48 +0000
+++ configure.ac	2012-10-04 14:34:23 +0000
@@ -2,9 +2,9 @@
 
 AC_INIT([account-plugins],
         [0.8],
-        [https://bugs.launchpad.net/opensesame-account-plugins/+filebug],
+        [https://bugs.launchpad.net/online-accounts-account-plugins/+filebug],
         [account-plugins],
-        [https://launchpad.net/opensesame-account-plugins])
+        [https://launchpad.net/online-accounts-account-plugins])
 
 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-portability subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -21,6 +21,9 @@
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
+IT_PROG_INTLTOOL([0.50.0])
+AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
+
 PKG_CHECK_MODULES(ACCOUNT_PLUGINS,
 	account-plugin)
 AC_SUBST(ACCOUNT_PLUGINS_CFLAGS)
@@ -150,6 +153,7 @@
 	data/providers/Makefile
 	data/services/Makefile
 	data/webkit-options/Makefile
+	po/Makefile.in
 	tools/Makefile
 ])
 AC_OUTPUT

=== modified file 'data/providers/Makefile.am'
--- data/providers/Makefile.am	2012-07-19 17:18:08 +0000
+++ data/providers/Makefile.am	2012-10-04 14:34:23 +0000
@@ -1,10 +1,23 @@
-dist_providers_DATA = \
-	facebook.provider \
-	flickr.provider \
-	foursquare.provider \
-	google.provider \
-	identica.provider \
-	sina.provider \
-	sohu.provider \
-	twitter.provider \
-	windows-live.provider
+# Extract transatable strings from .provider files
+%.provider: %.provider.in $(INTLTOOL_MERGE)
+	$(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
+
+providers_in_files = \
+	facebook.provider.in \
+	flickr.provider.in \
+	foursquare.provider.in \
+	google.provider.in \
+	identica.provider.in \
+	sina.provider.in \
+	sohu.provider.in \
+	twitter.provider.in \
+	windows-live.provider.in
+
+providers_DATA = \
+	$(providers_in_files:.provider.in=.provider)
+
+dist_noinst_DATA = \
+	$(providers_in_files)
+
+CLEANFILES = \
+	$(services_DATA)

=== renamed file 'data/providers/facebook.provider' => 'data/providers/facebook.provider.in'
--- data/providers/facebook.provider	2012-06-06 08:56:59 +0000
+++ data/providers/facebook.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="facebook">
   <name>Facebook</name>
   <icon>facebook</icon>
+  <translations>account-plugins</translations>
   <domains>.*facebook\.com</domains>
 </provider>

=== renamed file 'data/providers/flickr.provider' => 'data/providers/flickr.provider.in'
--- data/providers/flickr.provider	2012-06-06 12:56:03 +0000
+++ data/providers/flickr.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="flickr">
   <name>Flickr</name>
   <icon>flickr</icon>
+  <translations>account-plugins</translations>
   <domains>.*flickr\.com</domains>
 </provider>

=== renamed file 'data/providers/foursquare.provider' => 'data/providers/foursquare.provider.in'
--- data/providers/foursquare.provider	2012-06-26 10:05:06 +0000
+++ data/providers/foursquare.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="foursquare">
   <name>Foursquare</name>
   <icon>foursquare</icon>
+  <translations>account-plugins</translations>
   <domains>.*foursquare\.com</domains>
 </provider>

=== renamed file 'data/providers/google.provider' => 'data/providers/google.provider.in'
--- data/providers/google.provider	2012-06-13 11:33:24 +0000
+++ data/providers/google.provider.in	2012-10-04 14:34:23 +0000
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <provider id="google">
   <name>Google</name>
-  <description>Includes Gmail, Google Docs, Google+, YouTube and Picasa</description>
+  <_description>Includes Gmail, Google Docs, Google+, YouTube and Picasa</_description>
   <icon>google</icon>
+  <translations>account-plugins</translations>
   <domains>.*google\.com</domains>
 </provider>

=== renamed file 'data/providers/identica.provider' => 'data/providers/identica.provider.in'
--- data/providers/identica.provider	2012-06-26 10:15:24 +0000
+++ data/providers/identica.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="identica">
   <name>identi.ca</name>
   <icon>identica</icon>
+  <translations>account-plugins</translations>
   <domains>.*identi\.ca</domains>
 </provider>

=== renamed file 'data/providers/sina.provider' => 'data/providers/sina.provider.in'
--- data/providers/sina.provider	2012-06-27 11:41:09 +0000
+++ data/providers/sina.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="sina">
   <name>Sina</name>
   <icon>sina</icon>
+  <translations>account-plugins</translations>
   <domains>.*t\.sina\.com\.cn</domains>
 </provider>

=== renamed file 'data/providers/sohu.provider' => 'data/providers/sohu.provider.in'
--- data/providers/sohu.provider	2012-06-27 11:41:43 +0000
+++ data/providers/sohu.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="sohu">
   <name>Sohu</name>
   <icon>sohu</icon>
+  <translations>account-plugins</translations>
   <domains>.*t\.sohu\.com</domains>
 </provider>

=== renamed file 'data/providers/twitter.provider' => 'data/providers/twitter.provider.in'
--- data/providers/twitter.provider	2012-06-14 07:10:53 +0000
+++ data/providers/twitter.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="twitter">
   <name>Twitter</name>
   <icon>twitter</icon>
+  <translations>account-plugins</translations>
   <domains>.*twitter\.com</domains>
 </provider>

=== renamed file 'data/providers/windows-live.provider' => 'data/providers/windows-live.provider.in'
--- data/providers/windows-live.provider	2012-07-19 17:18:08 +0000
+++ data/providers/windows-live.provider.in	2012-10-04 14:34:23 +0000
@@ -2,5 +2,6 @@
 <provider id="windows-live">
   <name>Windows Live</name>
   <icon>live</icon>
+  <translations>account-plugins</translations>
   <domains>.*live\.com</domains>
 </provider>

=== modified file 'data/services/Makefile.am'
--- data/services/Makefile.am	2012-07-19 17:18:08 +0000
+++ data/services/Makefile.am	2012-10-04 14:34:23 +0000
@@ -1,15 +1,28 @@
-dist_services_DATA = \
-	facebook-im.service \
-	facebook-microblog.service \
-	facebook-sharing.service \
-	flickr-microblog.service \
-	flickr-sharing.service \
-	foursquare-microblog.service \
-	google-docs.service \
-	google-im.service \
-	identica-microblog.service \
-	picasa.service \
-	sina-microblog.service \
-	sohu-microblog.service \
-	twitter-microblog.service \
-	wlm.service
+# Extract translatable strings from .service files
+%.service: %.service.in $(INTLTOOL_MERGE)
+	$(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
+
+services_in_files = \
+	facebook-im.service.in \
+	facebook-microblog.service.in \
+	facebook-sharing.service.in \
+	flickr-microblog.service.in \
+	flickr-sharing.service.in \
+	foursquare-microblog.service.in \
+	google-docs.service.in \
+	google-im.service.in \
+	identica-microblog.service.in \
+	picasa.service.in \
+	sina-microblog.service.in \
+	sohu-microblog.service.in \
+	twitter-microblog.service.in \
+	wlm.service.in
+
+services_DATA = \
+	$(services_in_files:.service.in=.service)
+
+dist_noinst_DATA = \
+	$(services_in_files)
+
+CLEANFILES = \
+	$(services_DATA)

=== renamed file 'data/services/facebook-im.service' => 'data/services/facebook-im.service.in'
--- data/services/facebook-im.service	2012-07-25 08:39:12 +0000
+++ data/services/facebook-im.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Facebook</name>
   <icon>facebook</icon>
   <provider>facebook</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/facebook-microblog.service' => 'data/services/facebook-microblog.service.in'
--- data/services/facebook-microblog.service	2012-06-26 19:38:23 +0000
+++ data/services/facebook-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Facebook</name>
   <icon>facebook</icon>
   <provider>facebook</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/facebook-sharing.service' => 'data/services/facebook-sharing.service.in'
--- data/services/facebook-sharing.service	2011-12-23 14:28:12 +0000
+++ data/services/facebook-sharing.service.in	2012-10-04 14:34:23 +0000
@@ -2,8 +2,9 @@
 <service id="service">
   <type>sharing</type>
   <name>Facebook</name>
-  <icon>icon_facebook</icon>
+  <icon>facebook</icon>
   <provider>facebook</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/flickr-microblog.service' => 'data/services/flickr-microblog.service.in'
--- data/services/flickr-microblog.service	2012-06-26 19:38:23 +0000
+++ data/services/flickr-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Flickr</name>
   <icon>flickr</icon>
   <provider>flickr</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/flickr-sharing.service' => 'data/services/flickr-sharing.service.in'
--- data/services/flickr-sharing.service	2012-07-04 04:55:03 +0000
+++ data/services/flickr-sharing.service.in	2012-10-04 14:34:23 +0000
@@ -4,4 +4,5 @@
   <name>Flickr</name>
   <icon>flickr</icon>
   <provider>flickr</provider>
+  <translations>account-plugins</translations>
 </service>

=== renamed file 'data/services/foursquare-microblog.service' => 'data/services/foursquare-microblog.service.in'
--- data/services/foursquare-microblog.service	2012-07-03 16:31:41 +0000
+++ data/services/foursquare-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Foursquare</name>
   <icon>foursquare</icon>
   <provider>foursquare</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/google-docs.service' => 'data/services/google-docs.service.in'
--- data/services/google-docs.service	2012-03-14 12:03:35 +0000
+++ data/services/google-docs.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>GoogleDocs</name>
   <icon>icon_google_docs</icon>
   <provider>google</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/google-im.service' => 'data/services/google-im.service.in'
--- data/services/google-im.service	2012-07-25 08:39:12 +0000
+++ data/services/google-im.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>GoogleTalk</name>
   <icon>im-google-talk</icon>
   <provider>google</provider>
+  <translations>account-plugins</translations>
  
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/identica-microblog.service' => 'data/services/identica-microblog.service.in'
--- data/services/identica-microblog.service	2012-07-03 16:31:58 +0000
+++ data/services/identica-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>identi.ca</name>
   <icon>identica</icon>
   <provider>identica</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/picasa.service' => 'data/services/picasa.service.in'
--- data/services/picasa.service	2012-03-14 12:03:35 +0000
+++ data/services/picasa.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Picasa</name>
   <icon>icon_picasa</icon>
   <provider>google</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/sina-microblog.service' => 'data/services/sina-microblog.service.in'
--- data/services/sina-microblog.service	2012-06-27 11:41:09 +0000
+++ data/services/sina-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,4 +4,5 @@
   <name>Sina</name>
   <icon>sina</icon>
   <provider>sina</provider>
+  <translations>account-plugins</translations>
 </service>

=== renamed file 'data/services/sohu-microblog.service' => 'data/services/sohu-microblog.service.in'
--- data/services/sohu-microblog.service	2012-06-27 11:41:43 +0000
+++ data/services/sohu-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,4 +4,5 @@
   <name>Sohu</name>
   <icon>sohu</icon>
   <provider>sohu</provider>
+  <translations>account-plugins</translations>
 </service>

=== renamed file 'data/services/twitter-microblog.service' => 'data/services/twitter-microblog.service.in'
--- data/services/twitter-microblog.service	2012-06-26 19:38:23 +0000
+++ data/services/twitter-microblog.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Twitter</name>
   <icon>twitter</icon>
   <provider>twitter</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== renamed file 'data/services/wlm.service' => 'data/services/wlm.service.in'
--- data/services/wlm.service	2012-08-03 09:06:29 +0000
+++ data/services/wlm.service.in	2012-10-04 14:34:23 +0000
@@ -4,6 +4,7 @@
   <name>Windows Live Messenger</name>
   <icon>msn</icon>
   <provider>windows-live</provider>
+  <translations>account-plugins</translations>
 
   <!-- default settings (account settings have precedence over these) -->
   <template>

=== removed file 'po/Makefile.in.in'
--- po/Makefile.in.in	2011-12-23 14:28:12 +0000
+++ po/Makefile.in.in	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <[e-mail]>
-# Copyright (C) 2004-2008 Rodney Dawes <[e-mail]>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <[e-mail]> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <[e-mail]> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <[e-mail]> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-12-23 14:28:12 +0000
+++ po/POTFILES.in	2012-10-04 14:34:23 +0000
@@ -0,0 +1,1 @@
+[type: gettext/xml]data/providers/google.provider.in