migrate from intltools to gettext

5 files changed, 91 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index a54fb9c..6ab17f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src examples po
+SUBDIRS = po src examples
 
 if ENABLE_GTK_DOC
 SUBDIRS += docs
@@ -10,11 +10,12 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = caja-python.pc
 
 extensiondir = $(datadir)/caja/extensions
-extension_in_files = libcaja-python.caja-extension.in
-extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension)
-%.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+extension_in_files = libcaja-python.caja-extension.desktop.in
+extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
+$(extension_DATA): $(extension_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
-EXTRA_DIST = autogen.sh caja-python.pc.in libcaja-python.caja-extension.in
+EXTRA_DIST = autogen.sh caja-python.pc.in libcaja-python.caja-extension.desktop.in
 CLEANFILES = libcaja-python.caja-extension
 
 DISTCHECK_CONFIGURE_FLAGS= \
diff --git a/configure.ac b/configure.ac
index a4f3f1e..74330e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,8 @@ GETTEXT_PACKAGE=python-caja
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
 
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
-
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 dnl Check for gtk-doc
 GTK_DOC_CHECK(1.9)
 
@@ -104,7 +103,7 @@ AS_IF([test "${enable_gtk_doc}" != no],[
 
 AC_OUTPUT([
   Makefile
-  libcaja-python.caja-extension.in
+  libcaja-python.caja-extension.desktop.in
   examples/Makefile
   src/Makefile
   caja-python.pc
diff --git a/libcaja-python.caja-extension.in.in b/libcaja-python.caja-extension.desktop.in.in
index 146fbc3..4730b35 100644
--- a/libcaja-python.caja-extension.in.in
+++ b/libcaja-python.caja-extension.desktop.in.in
@@ -1,7 +1,8 @@
 [Caja Extension]
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=text-x-python
-_Name=Python
-_Description=Allows to use Python extensions
+Name=Python
+Description=Allows to use Python extensions
 Author=Perberos <[email protected]>;Stefano Karapetsas <[email protected]>;Steve Zesch <[email protected]>;Johan Dahlin <[email protected]>;Dave Camp <[email protected]>;Calvin Gaisford <[email protected]>
 Copyright=Copyright (C) 2004-2005 Johan Dahlin
 Version=@VERSION@
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..a04c35c
--- /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 --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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1f0df93..865370c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[type: gettext/ini]libcaja-python.caja-extension.in
+libcaja-python.caja-extension.desktop.in