8 files changed, 101 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index b6ca2f6..07154d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,15 +2,17 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = pixmaps po src tools help
+SUBDIRS = po pixmaps src tools help
 
 man_MANS = mate-system-monitor.1
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-system-monitor.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
+$(appdata_DATA): $(appdata_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 org.mate.mate-system-monitor.policy.in: org.mate.mate-system-monitor.policy.in.in Makefile
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
@@ -23,30 +25,28 @@ EXTRA_DIST = \
 	$(appdata_in_files) \
 	org.mate.mate-system-monitor.policy.in.in \
 	mate-system-monitor.desktop.in \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
 	omf.make \
 	xmldocs.make
 
-@INTLTOOL_POLICY_RULE@
 polkit_policydir = $(datadir)/polkit-1/actions
 polkit_policy_in_files = org.mate.mate-system-monitor.policy.in
 polkit_policy_DATA = $(polkit_policy_in_files:.policy.in=.policy)
 
+$(polkit_policy_DATA): $(polkit_policy_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 Applicationsdir = $(datadir)/applications
 Applications_in_files = mate-system-monitor.desktop.in
 Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+
+$(Applications_DATA): $(Applications_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 distuninstallcheck_listfiles = find . -type f -print
 
 CLEANFILES = mate-system-monitor.appdata.xml
 
 DISTCLEANFILES = \
-  intltool-extract \
-  intltool-merge \
-  intltool-update \
   mate-system-monitor.desktop \
   org.mate.mate-system-monitor.policy \
   org.mate.mate-system-monitor.policy.in
diff --git a/configure.ac b/configure.ac
index ae69e14..48281ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,8 @@ dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS"
 
 GLIB_GSETTINGS
 
-# i18n stuff
-IT_PROG_INTLTOOL([0.50.1])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=mate-system-monitor
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/mate-system-monitor.appdata.xml.in b/mate-system-monitor.appdata.xml.in
index 9aefab8..fe751f0 100644
--- a/mate-system-monitor.appdata.xml.in
+++ b/mate-system-monitor.appdata.xml.in
@@ -5,8 +5,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE System Monitor</name>
- <_summary>A Process and resource monitor for MATE Desktop</_summary>
- <_description>
+ <summary>A Process and resource monitor for MATE Desktop</summary>
+ <description>
   <p>
    MATE System Monitor allows to graphically view and manipulate the running
    processes on your system. It also provides an overview of available resources,
@@ -17,7 +17,7 @@
    Desktop Environment. If you would like to know more about MATE and System Monitor,
    please visit the project's home page.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/mate-system-monitor.desktop.in.in b/mate-system-monitor.desktop.in.in
index 6085693..82c9158 100644
--- a/mate-system-monitor.desktop.in.in
+++ b/mate-system-monitor.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=MATE System Monitor
-_GenericName=System Monitor
-_Comment=View current processes and monitor system state
+Name=MATE System Monitor
+GenericName=System Monitor
+Comment=View current processes and monitor system state
 TryExec=mate-system-monitor
 Exec=mate-system-monitor
 Icon=utilities-system-monitor
diff --git a/org.mate.mate-system-monitor.policy.in.in b/org.mate.mate-system-monitor.policy.in.in
index 48fe482..1ed1ad0 100644
--- a/org.mate.mate-system-monitor.policy.in.in
+++ b/org.mate.mate-system-monitor.policy.in.in
@@ -8,8 +8,8 @@
   <icon_name>utilities-system-monitor</icon_name>
 
   <action id="org.mate.mate-system-monitor.kill">
-    <_description>Kill process</_description>
-    <_message>Privileges are required to control other users' processes</_message>
+    <description>Kill process</description>
+    <message>Privileges are required to control other users' processes</message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -19,8 +19,8 @@
   </action>
 
   <action id="org.mate.mate-system-monitor.renice">
-    <_description>Renice process</_description>
-    <_message>Privileges are required to change the priority of processes</_message>
+    <description>Renice process</description>
+    <message>Privileges are required to change the priority of processes</message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..5c3836c
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = MATE Desktop Environment team
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f2dbc2e..3c1fe8a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 mate-system-monitor.appdata.xml.in
@@ -15,7 +14,7 @@ src/load-graph.cpp
 src/lsof.cpp
 src/memmaps.cpp
 src/openfiles.cpp
-[type: gettext/gsettings]src/org.mate.system-monitor.gschema.xml.in
+src/org.mate.system-monitor.gschema.xml.in
 src/procactions.cpp
 src/procdialogs.cpp
 src/procman.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 60a2aba..052e485 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,7 +76,6 @@ gsettingsschema_in_files = org.mate.system-monitor.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 
 @GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
 
 dist_noinst_DATA = \
 	$(gsettings_in_file)