Use upstream gettext instead intltool

8 files changed, 83 insertions, 29 deletions

diff --git a/.bzrignore b/.bzrignore
index 6b0a7d79..5cf96947 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -12,13 +12,6 @@ gnome-doc-utils.make
 *.gz
 INSTALL
 install-sh
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-modules
-intltool-update
-intltool-update.in
 Makefile
 Makefile.in
 missing
diff --git a/.cvsignore b/.cvsignore
index 0cfe1fad..a880aeb6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -12,13 +12,6 @@ gnome-doc-utils.make
 *.gz
 INSTALL
 install-sh
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-modules
-intltool-update
-intltool-update.in
 Makefile
 Makefile.in
 missing
diff --git a/Makefile.am b/Makefile.am
index 1e51c3e6..871888b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS = \
 
 EXTRA_DIST = \
 	autogen.sh		\
+	config.rpath		\
 	COPYING			\
 	HACKING			\
 	ChangeLog		\
@@ -15,13 +16,6 @@ EXTRA_DIST = \
 	README			\
 	AUTHORS
 
-DISTCLEANFILES =                \
-	intltool-extract        \
-	intltool-merge          \
-	intltool-update
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
 	then \
diff --git a/README b/README
index 57d6660d..d8699505 100644
--- a/README
+++ b/README
@@ -9,5 +9,4 @@ This software is licensed under the LGPL.
 
 Zen Requirements -
 ==================
-scrollkeeper and intltool.
-gtk+-2.0
+gtk+-3.0
diff --git a/configure.ac b/configure.ac
index 2d72942d..764868f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,14 +108,13 @@ GNOME_COMPILE_WARNINGS([maximum])
 # *******************************
 # Internationalization
 # ******************************* 
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=zenity
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])
 
-AM_GLIB_GNU_GETTEXT
-
 # *******************************
 # User manual
 # *******************************
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index a8b28ea5..00000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-doc-utils.m4
-intltool.m4
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..579ebd17
--- /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 = --keyword=_ --keyword=N_
+
+# 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 = Free Software Foundation, Inc.
+
+# 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 = no
+
+# 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 = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b561c2fd..90efb185 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,5 +5,5 @@ src/password.c
 src/scale.c
 src/tree.c
 src/util.c
-[type: gettext/glade]src/zenity.ui
+src/zenity.ui
 src/option.c