[gnome-commander] Port from intltool to upstream gettext

[Uwe Scholz <uwescholz src gnome org>]

commit e138a52f700a0f8e245f0874e6d3f841b0bea9e1
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Thu Feb 9 22:51:40 2017 +0100

    Port from intltool to upstream gettext
    
    Since version 0.19.8, gettext has supported everything we need for
    localisation, and in an architecturally nicer way than intltool.

 autogen.sh                          |    1 -
 configure.ac                        |    5 ++---
 data/Makefile.am                    |    2 --
 data/gnome-commander.appdata.xml.in |   22 +++++++++++-----------
 data/gnome-commander.desktop.in.in  |    6 +++---
 po/POTFILES.in                      |    1 -
 6 files changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 02d7f0d..67d2a72 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,6 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
 fi
 
 aclocal --install -I m4/ || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install || exit 1
 
 cd "$olddir"
diff --git a/configure.ac b/configure.ac
index 4d81130..d926539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,8 @@ dnl ===================
 dnl Gettext stuff
 dnl ===================
 
-AC_SUBST([GETTEXT_PACKAGE], [gnome-commander])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define to the gettext package name.])
-
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 dnl ===================
 dnl Check for libraries
diff --git a/data/Makefile.am b/data/Makefile.am
index daa99d6..cbb6e99 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,8 +4,6 @@ desktopdir = $(datadir)/applications
 desktop_in_files = @PACKAGE  desktop in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_DESKTOP_RULE@
-
 gsettings_ENUM_NAMESPACE = org.gnome.gnome-commander
 gsettings_ENUM_FILES = $(top_srcdir)/src/gnome-cmd-types.h \
                        $(top_srcdir)/src/gnome-cmd-data.h \
diff --git a/data/gnome-commander.appdata.xml.in b/data/gnome-commander.appdata.xml.in
index 7306f96..80241f3 100644
--- a/data/gnome-commander.appdata.xml.in
+++ b/data/gnome-commander.appdata.xml.in
@@ -4,31 +4,31 @@
   <id>gnome-commander.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
-  <_name>GNOME Commander</_name>
-  <_summary>Two-pane file manager</_summary>
+  <name>GNOME Commander</name>
+  <summary>Two-pane file manager</summary>
   <description>
-    <_p>
+    <p>
       GNOME Commander is a "two-pane" graphical file manager for the GNOME
       desktop environment. It features separate tabs for each pane,
       setting up custom device buttons, bookmark manager, fully integrated
       commandline, file quick search, an internal image viewer, a powerful
       batch renaming tool, and FTP and Samba access.
-    </_p>
-    <_p>
+    </p>
+    <p>
       GNOME Commander aims to advanced users who like to focus on precise
       file management, working in parallel through special applications,
       and running smart commands.
-    </_p>
+    </p>
   </description>
   <kudos>
     <kudo>UserDocs</kudo>
   </kudos>
   <keywords>
-    <_keyword>file manager</_keyword>
-    <_keyword>file system</_keyword>
-    <_keyword>SSH</_keyword>
-    <_keyword>FTP</_keyword>
-    <_keyword>WebDAV</_keyword>
+    <keyword>file manager</keyword>
+    <keyword>file system</keyword>
+    <keyword>SSH</keyword>
+    <keyword>FTP</keyword>
+    <keyword>WebDAV</keyword>
   </keywords>
   <screenshots>
     <screenshot type="default" width="1280" height="720">
diff --git a/data/gnome-commander.desktop.in.in b/data/gnome-commander.desktop.in.in
index ac7d055..fed2b7c 100644
--- a/data/gnome-commander.desktop.in.in
+++ b/data/gnome-commander.desktop.in.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
-_Name=GNOME Commander
-_Comment=A two paned file manager
+Name=GNOME Commander
+Comment=A two paned file manager
 # TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-_Keywords=file;manager;folder;explore;disk;filesystem;
+Keywords=file;manager;folder;explore;disk;filesystem;
 Exec=gnome-commander
 Icon=gnome-commander
 Terminal=false
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8b2cecb..8000856 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 data/gnome-commander.appdata.xml.in
 data/gnome-commander.desktop.in.in
 data/org.gnome.gnome-commander.gschema.xml