[epiphany/gnome-3-24-loki: 5/16] Revert "Stop using intltool"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d14c3002a007773c277cb0a285bfe87f7b1883a8
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Sep 21 17:50:35 2017 -0500

    Revert "Stop using intltool"
    
    This reverts commit b74f5c614e4cb9886e8ff6404f220b23df212be4.

 autogen.sh                             |    3 +-
 configure.ac                           |    3 +-
 data/Makefile.am                       |   17 ++++---
 data/org.gnome.Epiphany.appdata.xml.in |   16 +++---
 data/org.gnome.Epiphany.desktop.in     |   12 +++---
 po/Makevars                            |   78 --------------------------------
 po/POTFILES.in                         |   29 ++++++------
 7 files changed, 42 insertions(+), 116 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 66773e2..adcfccd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,7 +25,8 @@ fi
 git submodule update --init --recursive
 
 aclocal --install || exit 1
-autoreconf --verbose --force --install || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install -Wno-portability || exit 1
 
 cd "$olddir"
 if [ "$NOCONFIGURE" = "" ]; then
diff --git a/configure.ac b/configure.ac
index d16a46d..4266d75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,8 +183,7 @@ else
        AC_MSG_ERROR([iso-codes is required])
 fi
 
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+IT_PROG_INTLTOOL([0.50.0])
 AC_SUBST([GETTEXT_PACKAGE], [epiphany])
 
 # ****************
diff --git a/data/Makefile.am b/data/Makefile.am
index 69e841c..e5dba43 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,8 +4,9 @@ desktop_in_files = org.gnome.Epiphany.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-$(desktop_DATA): $(desktop_in_files)
-       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+@INTLTOOL_SERVER_RULE@
+@INTLTOOL_DESKTOP_RULE@
+@INTLTOOL_XML_RULE@
 
 gsettings_ENUM_NAMESPACE = org.gnome.Epiphany
 gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h
@@ -17,9 +18,6 @@ appstream_in_files = org.gnome.Epiphany.appdata.xml.in
 appstream_XML = $(appstream_in_files:.xml.in=.xml)
 @APPSTREAM_XML_RULES@
 
-$(appstream_XML): $(appstream_in_files)
-       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
 # Dbus service file
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.EpiphanySearchProvider.service.in
@@ -30,11 +28,16 @@ $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) sed -e "s|\@libexecdir[@]|$(libexecdir)|g" $< > $@
 
 # Default bookmarks
+# We don't put translations in the resulting rdf since the code can get
+# the translations via gettext (although it can also get translations
+# from the rdf if they are there and not available via gettext)
 default_bookmarksdir = $(pkgdatadir)
 default_bookmarks_in_files = default-bookmarks.rdf.in
 default_bookmarks_DATA = $(default_bookmarks_in_files:.rdf.in=.rdf)
-$(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile
-       $(AM_V_GEN) sed -e "s|\@pkgdatadir[@]|$(pkgdatadir)|g" $< > $@
+$(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile $(INTLTOOL_MERGE)
+       LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@.tmp
+       sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" $@.tmp > $@ || rm -f $@.tmp
+       rm -f $@.tmp
 
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 dist_searchprovider_DATA = epiphany-search-provider.ini
diff --git a/data/org.gnome.Epiphany.appdata.xml.in b/data/org.gnome.Epiphany.appdata.xml.in
index 05d97c6..da41107 100644
--- a/data/org.gnome.Epiphany.appdata.xml.in
+++ b/data/org.gnome.Epiphany.appdata.xml.in
@@ -3,23 +3,23 @@
 <component type="desktop">
   <id>org.gnome.Epiphany.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <name>GNOME Web</name>
-  <summary>Web browser for GNOME</summary>
+  <_name>GNOME Web</_name>
+  <_summary>Web browser for GNOME</_summary>
   <description>
-    <p>
+    <_p>
       The web browser for GNOME, featuring tight integration with the desktop
       and a simple and intuitive user interface that allows you to focus on your
       web pages. If you’re looking for a simple, clean, beautiful view of the
       web, this is the browser for you.
-    </p>
-    <p>
+    </_p>
+    <_p>
       GNOME Web is often referred to by its code name, Epiphany.
-    </p>
+    </_p>
   </description>
   <screenshots>
     <screenshot type="default">
       <image>https://git.gnome.org/browse/epiphany/plain/data/screenshot.png</image>
-      <caption>The GNOME web site displayed in GNOME Web</caption>
+      <_caption>The GNOME web site displayed in GNOME Web</_caption>
     </screenshot>
   </screenshots>
   <url type="homepage">https://wiki.gnome.org/Apps/Web</url>
@@ -34,7 +34,7 @@
   <project_group>GNOME</project_group>
   <compulsory_for_desktop>GNOME</compulsory_for_desktop>
   <project_license>GPL-2.0+</project_license>
-  <developer_name>The GNOME Project</developer_name>
+  <_developer_name>The GNOME Project</_developer_name>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=epiphany</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/epiphany/stable/</url>
diff --git a/data/org.gnome.Epiphany.desktop.in b/data/org.gnome.Epiphany.desktop.in
index 19a1ba3..ae0e2f3 100644
--- a/data/org.gnome.Epiphany.desktop.in
+++ b/data/org.gnome.Epiphany.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Web
-GenericName=Web Browser
-Comment=Browse the web
-# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-Keywords=web;browser;internet;
+_Name=Web
+_GenericName=Web Browser
+_X-GNOME-FullName=Epiphany Web Browser
+_Comment=Browse the web
+_Keywords=web;browser;internet;
 Exec=epiphany %U
 StartupNotify=true
 Terminal=false
@@ -15,5 +15,5 @@ MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme
 Actions=Incognito;
 
 [Desktop Action Incognito]
-Name=New Incognito Window
+_Name=New Incognito Window
 Exec=epiphany --incognito-mode
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 939bfd7..ec91980 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+[encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/org.gnome.Epiphany.appdata.xml.in
@@ -45,20 +46,20 @@ src/passwords-dialog.c
 src/popup-commands.c
 src/prefs-dialog.c
 src/profile-migrator/ephy-profile-migrator.c
-src/resources/gtk/application-menu.ui
-src/resources/gtk/bookmark-properties-grid.ui
-src/resources/gtk/bookmarks-popover.ui
-src/resources/gtk/clear-data-dialog.ui
-src/resources/gtk/cookies-dialog.ui
-src/resources/gtk/encoding-dialog.ui
-src/resources/gtk/history-dialog.ui
-src/resources/gtk/menus.ui
-src/resources/gtk/page-menu-popover.ui
-src/resources/gtk/passwords-dialog.ui
-src/resources/gtk/prefs-dialog.ui
-src/resources/gtk/prefs-lang-dialog.ui
-src/resources/gtk/search-engine-dialog.ui
-src/resources/gtk/shortcuts-dialog.ui
+[type: gettext/glade]src/resources/gtk/application-menu.ui
+[type: gettext/glade]src/resources/gtk/bookmark-properties-grid.ui
+[type: gettext/glade]src/resources/gtk/bookmarks-popover.ui
+[type: gettext/glade]src/resources/gtk/clear-data-dialog.ui
+[type: gettext/glade]src/resources/gtk/cookies-dialog.ui
+[type: gettext/glade]src/resources/gtk/encoding-dialog.ui
+[type: gettext/glade]src/resources/gtk/history-dialog.ui
+[type: gettext/glade]src/resources/gtk/menus.ui
+[type: gettext/glade]src/resources/gtk/page-menu-popover.ui
+[type: gettext/glade]src/resources/gtk/passwords-dialog.ui
+[type: gettext/glade]src/resources/gtk/prefs-dialog.ui
+[type: gettext/glade]src/resources/gtk/prefs-lang-dialog.ui
+[type: gettext/glade]src/resources/gtk/search-engine-dialog.ui
+[type: gettext/glade]src/resources/gtk/shortcuts-dialog.ui
 src/search-provider/ephy-search-provider.c
 src/sync/ephy-sync-secret.c
 src/sync/ephy-sync-service.c