aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-11-22 22:16:16 +0000
committerRoss Burton <ross.burton@intel.com>2016-11-23 13:48:25 +0000
commitb6d8ad944dd37847355cf39711d211b2d646b0d9 (patch)
treee6bf29729794a0ba341e0ffff1415f2be8fca486
parent89b58d323fbf1841446bd9a5bda37b9dd2754e10 (diff)
downloadmatchbox-panel-2-b6d8ad944dd37847355cf39711d211b2d646b0d9.tar.gz
matchbox-panel-2-b6d8ad944dd37847355cf39711d211b2d646b0d9.tar.bz2
matchbox-panel-2-b6d8ad944dd37847355cf39711d211b2d646b0d9.zip
Port to modern gettext instead of glib-gettext
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac3
-rw-r--r--po/ChangeLog9
-rw-r--r--po/Makevars78
5 files changed, 82 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 87db93c..432a9b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = matchbox-panel applets data po
pcdatadir = $(libdir)/pkgconfig
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index fede3d9..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-autoreconf -v --install || exit 1
-glib-gettextize --force --copy || exit 1
-./configure "$@"
diff --git a/configure.ac b/configure.ac
index 1deb81b..dac7953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,8 @@ GETTEXT_PACKAGE=matchbox-panel
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
[Define the gettext package to be used])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
# output stuff
AC_OUTPUT([
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 31aae30..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2007-08-08 Rob Bradford <rob@openedhand.com>
-
- * POTFILES.in:
- Add source files to POTFILES.in.
-
-2007-04-10 Matthew Allum <mallum@openedhand.com>
-
- * Makefile.in.in:
-
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..1d88454
--- /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 = no
+
+# 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