migrate from intltools to gettext

2 files changed, 92 insertions, 13 deletions

diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..31f6faf1
--- /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 --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 d69629f9..e41153b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 baobab/data/mate-disk-usage-analyzer.desktop.in.in
-[type: gettext/glade]baobab/data/baobab-dialog-scan-props.ui
-[type: gettext/glade]baobab/data/baobab-main-window.ui
-[type: gettext/gsettings]baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
+baobab/data/baobab-dialog-scan-props.ui
+baobab/data/baobab-main-window.ui
+baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
 baobab/data/mate-disk-usage-analyzer.appdata.xml.in
 baobab/src/baobab.c
 baobab/src/baobab-chart.c
@@ -16,15 +16,15 @@ baobab/src/baobab-ringschart.c
 baobab/src/callbacks.c
 gsearchtool/data/mate-search-tool.appdata.xml.in
 gsearchtool/data/mate-search-tool.desktop.in
-[type: gettext/gsettings]gsearchtool/data/org.mate.search-tool.gschema.xml.in
+gsearchtool/data/org.mate.search-tool.gschema.xml.in
 gsearchtool/libeggsmclient/eggdesktopfile.c
 gsearchtool/libeggsmclient/eggsmclient.c
 gsearchtool/src/gsearchtool.c
 gsearchtool/src/gsearchtool-callbacks.c
 gsearchtool/src/gsearchtool-support.c
 logview/data/mate-system-log.desktop.in.in
-[type: gettext/gsettings]logview/data/org.mate.system-log.gschema.xml.in
-[type: gettext/glade]logview/data/logview-filter.ui
+logview/data/org.mate.system-log.gschema.xml.in
+logview/data/logview-filter.ui
 logview/src/logview-about.h
 logview/src/logview-app.c
 logview/src/logview-filter-manager.c
@@ -36,8 +36,8 @@ logview/src/logview-window.c
 mate-dictionary/data/default.desktop.in
 mate-dictionary/data/mate-dictionary.desktop.in.in
 mate-dictionary/data/mate-dictionary.appdata.xml.in
-[type: gettext/ini]mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]mate-dictionary/data/org.mate.dictionary.gschema.xml.in
+mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in
+mate-dictionary/data/org.mate.dictionary.gschema.xml.in
 mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in
 mate-dictionary/data/thai.desktop.in
 mate-dictionary/libgdict/gdict-client-context.c
@@ -61,14 +61,14 @@ mate-dictionary/src/gdict-sidebar.c
 mate-dictionary/src/gdict-source-dialog.c
 mate-dictionary/src/gdict-window.c
 mate-dictionary/src/main.c
-[type: gettext/glade]mate-dictionary/data/mate-dictionary-preferences.ui
-[type: gettext/glade]mate-dictionary/data/mate-dictionary-source.ui
-[type: gettext/ini]mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
+mate-dictionary/data/mate-dictionary-preferences.ui
+mate-dictionary/data/mate-dictionary-source.ui
+mate-disk-image-mounter/data/mate-disk-image-mounter.desktop.in
 mate-disk-image-mounter/src/main.c
 mate-screenshot/data/mate-screenshot.appdata.xml.in
 mate-screenshot/data/mate-screenshot.desktop.in
-[type: gettext/glade]mate-screenshot/data/mate-screenshot.ui
-[type: gettext/gsettings]mate-screenshot/data/org.mate.screenshot.gschema.xml.in
+mate-screenshot/data/mate-screenshot.ui
+mate-screenshot/data/org.mate.screenshot.gschema.xml.in
 mate-screenshot/src/mate-screenshot.c
 mate-screenshot/src/screenshot-dialog.c
 mate-screenshot/src/screenshot-save.c