migrate from intltool to gettext

2 files changed, 101 insertions, 23 deletions

diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..264ca52d
--- /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 --keyword=Name --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
+$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ef4859b..6a00d4ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,36 +1,35 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 applets/clock/calendar-window.c
 applets/clock/clock.c
-[type: gettext/glade]applets/clock/clock.ui
+applets/clock/clock.ui
 applets/clock/clock-location.c
 applets/clock/clock-location-tile.c
 applets/clock/clock-utils.c
-[type: gettext/gsettings]applets/clock/org.mate.panel.applet.clock.gschema.xml.in
-[type: gettext/ini]applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in
+applets/clock/org.mate.panel.applet.clock.gschema.xml.in
+applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in
 applets/fish/fish.c
-[type: gettext/glade]applets/fish/fish.ui
-[type: gettext/gsettings]applets/fish/org.mate.panel.applet.fish.gschema.xml.in
-[type: gettext/ini]applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in
+applets/fish/fish.ui
+applets/fish/org.mate.panel.applet.fish.gschema.xml.in
+applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in
 applets/notification_area/main.c
-[type: gettext/glade]applets/notification_area/notification-area-preferences-dialog.ui
-[type: gettext/gsettings]applets/notification_area/org.mate.panel.applet.notification-area.gschema.xml.in
-[type: gettext/ini]applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
-[type: gettext/gsettings]applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
-[type: gettext/ini]applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in
+applets/notification_area/notification-area-preferences-dialog.ui
+applets/notification_area/org.mate.panel.applet.notification-area.gschema.xml.in
+applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in
+applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
+applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
+applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in
 applets/wncklet/showdesktop.c
 applets/wncklet/window-list.c
-[type: gettext/glade]applets/wncklet/window-list.ui
+applets/wncklet/window-list.ui
 applets/wncklet/window-menu.c
 applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
-[type: gettext/glade]applets/wncklet/workspace-switcher.ui
-[type: gettext/gsettings]data/org.mate.panel.gschema.xml.in
-[type: gettext/gsettings]data/org.mate.panel.menubar.gschema.xml.in
-[type: gettext/gsettings]data/org.mate.panel.object.gschema.xml.in
-[type: gettext/gsettings]data/org.mate.panel.toplevel.gschema.xml.in
+applets/wncklet/workspace-switcher.ui
+data/org.mate.panel.gschema.xml.in
+data/org.mate.panel.menubar.gschema.xml.in
+data/org.mate.panel.object.gschema.xml.in
+data/org.mate.panel.toplevel.gschema.xml.in
 mate-panel/libegg/eggdesktopfile.c
 mate-panel/libegg/eggsmclient.c
 mate-panel/libpanel-util/panel-gtk.c
@@ -59,17 +58,17 @@ mate-panel/panel-menu-button.c
 mate-panel/panel-menu-items.c
 mate-panel/panel-profile.c
 mate-panel/panel-properties-dialog.c
-[type: gettext/glade]mate-panel/panel-properties-dialog.ui
+mate-panel/panel-properties-dialog.ui
 mate-panel/panel-recent.c
 mate-panel/panel-run-dialog.c
-[type: gettext/glade]mate-panel/panel-run-dialog.ui
+mate-panel/panel-run-dialog.ui
 mate-panel/panel-separator.c
 mate-panel/panel-shell.c
 mate-panel/panel-stock-icons.c
 mate-panel/panel-test-applets.c
-[type: gettext/glade]mate-panel/panel-test-applets.ui
+mate-panel/panel-test-applets.ui
 mate-panel/panel-toplevel.c
 mate-panel/panel-util.c
 mate-panel/panel.c
 libmate-panel-applet/mate-panel-applet.c
-libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in
+libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.desktop.in