migrate from intltools to gettext

7 files changed, 104 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index 35869f8..1e6150a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,6 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz check-news])
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
 
-IT_PROG_INTLTOOL([0.35.0])
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_STDC_HEADERS
@@ -237,14 +236,14 @@ AC_DEFUN([AC_DEFINE_PATH], [
 ###########################
 # Internationalization
 ###########################
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=mate-indicator-applet
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default gettext domain])
 AC_DEFINE_PATH(MATELOCALEDIR, "${datadir}/locale", [locale directory])
 
-AM_GLIB_GNU_GETTEXT
-
 ##############################
 # ./configure Flags messings
 ##############################
diff --git a/data/Makefile.am b/data/Makefile.am
index b1b17f9..fdc1bb7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,18 +6,18 @@
 
 appletdir       = $(datadir)/mate-panel/applets
 applet_in_files = \
-	org.ayatana.panel.IndicatorApplet.mate-panel-applet.in \
-	org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in \
-	org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in 
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+	org.ayatana.panel.IndicatorApplet.mate-panel-applet.desktop.in \
+	org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.desktop.in \
+	org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
-%.mate-panel-applet.in: %.mate-panel-applet.in.in Makefile
+%.mate-panel-applet.desktop.in: %.mate-panel-applet.desktop.in.in Makefile
 	$(AM_V_GEN)sed \
 	    -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 	    $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
+%.mate-panel-applet: %.mate-panel-applet.desktop.in Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 ##############################
 # DBus Services
@@ -27,7 +27,7 @@ servicedir       = $(datadir)/dbus-1/services
 service_in_files = \
 	org.mate.panel.applet.IndicatorAppletFactory.service.in \
 	org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in \
-	org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in 
+	org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in Makefile
@@ -35,7 +35,6 @@ service_DATA     = $(service_in_files:.service.in=.service)
 	    -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 	    $< > $@
 
-
 ##############################
 # Icons
 ##############################
@@ -70,10 +69,10 @@ CLEANFILES =					\
 
 EXTRA_DIST =					\
 	$(icons_DATA)				\
-	$(applet_in_files:.in=.in.in)		\
+	org.ayatana.panel.IndicatorApplet.mate-panel-applet.desktop.in.in \
+	org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.desktop.in.in \
+	org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.desktop.in.in	\
 	$(service_in_files)
 
 MAINTAINERCLEANFILES =				\
 	Makefile.in
-
-
diff --git a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.desktop.in.in
index 1f67e56..e6734a7 100644
--- a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
+++ b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.desktop.in.in
@@ -5,7 +5,8 @@ Name=Indicator Applet Factory
 Description=Indicator Applet Factory
 
 [IndicatorApplet]
-_Name=Indicator Applet
-_Description=An indicator of something that needs your attention on the desktop
+Name=Indicator Applet
+Description=An indicator of something that needs your attention on the desktop
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-indicator-applet
 MateComponentId=OAFIID:MATE_IndicatorApplet
diff --git a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.desktop.in.in
index 9147727..404b601 100644
--- a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
+++ b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.desktop.in.in
@@ -5,7 +5,8 @@ Name=Indicator Applet Appmenu Factory
 Description=Indicator Applet Appmenu Factory
 
 [IndicatorAppletAppmenu]
-_Name=Indicator Applet Appmenu
-_Description=A applet containing the application menus.
+Name=Indicator Applet Appmenu
+Description=A applet containing the application menus.
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-indicator-applet
 MateComponentId=OAFIID:MATE_IndicatorAppletAppmenu
diff --git a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.desktop.in.in
index 9a34be6..2762db4 100644
--- a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
+++ b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.desktop.in.in
@@ -5,7 +5,8 @@ Name=Indicator Applet Complete Factory
 Description=Indicator Applet Complete Factory
 
 [IndicatorAppletComplete]
-_Name=Indicator Applet Complete
-_Description=A unified applet containing all of the indicators.
+Name=Indicator Applet Complete
+Description=A unified applet containing all of the indicators.
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-indicator-applet
 MateComponentId=OAFIID:MATE_IndicatorAppletComplete
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..c03ef08
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,79 @@
+# 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 --keyword=Description --add-comments=Translators:
+
+# 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
+$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f603e84..a305e8f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
-[encoding: UTF-8]
-[type: gettext/keys]data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
-[type: gettext/keys]data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
-[type: gettext/keys]data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
+data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.desktop.in.in
+data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.desktop.in.in
+data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.desktop.in.in
 src/applet-main.c