7 files changed, 97 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index 9c69eb3..8a8b583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,8 @@ AC_CHECK_LIB(m, log)
 dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
-
-IT_PROG_INTLTOOL([0.35.0])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 AC_SUBST(GETTEXT_PACKAGE, mate-calc)
 
 # **********************
diff --git a/data/Makefile.am b/data/Makefile.am
index 1a8150b..3b68c3a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,8 @@
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-calc.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 $@
 
 gsettings_SCHEMAS = org.mate.calc.gschema.xml
 @GSETTINGS_RULES@
@@ -9,12 +10,13 @@ gsettings_SCHEMAS = org.mate.calc.gschema.xml
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-calc.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(Utilities_DATA): $(Utilities_in_files)
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 man1_MANS = mate-calc.1 mate-calc-cmd.1
 
 EXTRA_DIST = \
- org.mate.calc.gschema.xml.in \
+ org.mate.calc.gschema.xml \
 mate-calc.desktop.in \
 $(appdata_in_files) \
 $(man1_MANS)
diff --git a/data/mate-calc.appdata.xml.in b/data/mate-calc.appdata.xml.in
index 80cbad1..13c634f 100644
--- a/data/mate-calc.appdata.xml.in
+++ b/data/mate-calc.appdata.xml.in
@@ -5,8 +5,8 @@
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-2.0+</project_license>
 <name>MATE Calc</name>
- <_summary>MATE Desktop calculator</_summary>
- <_description>
+ <summary>MATE Desktop calculator</summary>
+ <description>
 <p>
 MATE Calc is a powerful graphical calculator with financial,
 logical and scientific modes. It uses a multiple precision package
@@ -17,7 +17,7 @@
 If you would like to know more about MATE and MATE Calc, please visit the
 project's home page.
 </p>
- </_description>
+ </description>
 <screenshots>
 <screenshot type="default">
 <image width="314" height="247">
diff --git a/data/mate-calc.desktop.in b/data/mate-calc.desktop.in
index 2e61e3c..d51b4a2 100644
--- a/data/mate-calc.desktop.in
+++ b/data/mate-calc.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=MATE Calculator
-_GenericName=Calculator
-_Comment=Perform arithmetic, scientific or financial calculations
+Name=MATE Calculator
+GenericName=Calculator
+Comment=Perform arithmetic, scientific or financial calculations
 Exec=mate-calc
 Icon=accessories-calculator
 Terminal=false
diff --git a/data/org.mate.calc.gschema.xml.in b/data/org.mate.calc.gschema.xml
index 37295c1..37295c1 100644
--- a/data/org.mate.calc.gschema.xml.in
+++ b/data/org.mate.calc.gschema.xml
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 40f90fe..59ed34c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,13 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
-[type: gettext/glade]src/buttons-advanced.ui
-[type: gettext/glade]src/buttons-basic.ui
-[type: gettext/glade]src/buttons-financial.ui
-[type: gettext/glade]src/buttons-programming.ui
-[type: gettext/glade]src/preferences.ui
+src/buttons-advanced.ui
+src/buttons-basic.ui
+src/buttons-financial.ui
+src/buttons-programming.ui
+src/preferences.ui
 data/mate-calc.appdata.xml.in
 data/mate-calc.desktop.in
-data/org.mate.calc.gschema.xml.in
+data/org.mate.calc.gschema.xml
 src/currency.c
 src/currency-manager.c
 src/financial.c