migrate from intltools to gettext

2 files changed, 105 insertions, 28 deletions

diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..e163cf5e
--- /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 --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 = https://www.transifex.com/mate/MATE/
+
+# 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 8005d795..a971cd6a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,25 +1,24 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 #
-[encoding: UTF-8]
 accessx-status/applet.c
-[type: gettext/ini]accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
+accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
 battstat/battstat_applet.c
-[type: gettext/glade]battstat/battstat_applet.ui
-[type: gettext/ini]battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]battstat/org.mate.panel.applet.battstat.gschema.xml.in
+battstat/battstat_applet.ui
+battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
+battstat/org.mate.panel.applet.battstat.gschema.xml.in
 battstat/properties.c
-battstat/sounds/mate-battstat_applet.soundlist.in
+battstat/sounds/mate-battstat_applet.soundlist.desktop.in
 charpick/charpick.c
-[type: gettext/ini]charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]charpick/org.mate.panel.applet.charpick.gschema.xml.in
+charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
+charpick/org.mate.panel.applet.charpick.gschema.xml.in
 charpick/properties.c
 command/command.c
-[type: gettext/ini]command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]command/org.mate.panel.applet.command.gschema.xml.in
-[type: gettext/glade]cpufreq/cpufreq-preferences.ui
-[type: gettext/ini]cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
+command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
+command/org.mate.panel.applet.command.gschema.xml.in
+cpufreq/cpufreq-preferences.ui
+cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
 cpufreq/src/cpufreq-applet.c
 cpufreq/src/cpufreq-prefs.c
 cpufreq/src/cpufreq-monitor-cpuinfo.c
@@ -29,40 +28,40 @@ cpufreq/src/cpufreq-popup.c
 cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in
 drivemount/drive-button.c
 drivemount/drivemount.c
-[type: gettext/ini]drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
+drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
 geyes/geyes.c
-[type: gettext/ini]geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]geyes/org.mate.panel.applet.geyes.gschema.xml.in
+geyes/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
+geyes/org.mate.panel.applet.geyes.gschema.xml.in
 geyes/themes.c
 mateweather/mateweather-about.c
 mateweather/mateweather-applet.c
 mateweather/mateweather-dialog.c
 mateweather/mateweather-pref.c
 mateweather/main.c
-[type: gettext/ini]mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
+mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
 # NB. these are actually separate files
 multiload/linux-proc.c
 multiload/load-graph.c
 multiload/main.c
 multiload/netspeed.c
-[type: gettext/ini]multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]multiload/org.mate.panel.applet.multiload.gschema.xml.in
+multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+multiload/org.mate.panel.applet.multiload.gschema.xml.in
 multiload/properties.c
-[type: gettext/gsettings]netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
-[type: gettext/ini]netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in
+netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
+netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
 netspeed/src/netspeed.c
 # NB. these are actually separate files
-[type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
+stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
 stickynotes/stickynotes.c
-[type: gettext/glade]stickynotes/stickynotes.ui
-[type: gettext/gsettings]stickynotes/org.mate.stickynotes.gschema.xml.in
+stickynotes/stickynotes.ui
+stickynotes/org.mate.stickynotes.gschema.xml.in
 stickynotes/stickynotes_applet.c
 stickynotes/stickynotes_applet_callbacks.c
 stickynotes/stickynotes_callbacks.c
-[type: gettext/ini]timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]timerapplet/org.mate.panel.applet.timer.gschema.xml.in
+timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
+timerapplet/org.mate.panel.applet.timer.gschema.xml.in
 timerapplet/timerapplet.c
-[type: gettext/ini]trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in
+trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
 trashapplet/src/trashapplet.c
 trashapplet/src/trash-empty.c
-[type: gettext/glade]trashapplet/trashapplet-empty-progress.ui
+trashapplet/trashapplet-empty-progress.ui