migrate from intltool to gettext

2 files changed, 98 insertions, 20 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 5369264b..93215507 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,16 @@
 # Add files with translateable strings here.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
-[type: gettext/gsettings]org.mate.control-center.gschema.xml.in
-[type: gettext/gsettings]org.mate.control-center.keybinding.gschema.xml.in
+org.mate.control-center.gschema.xml.in
+org.mate.control-center.keybinding.gschema.xml.in
 capplets/about-me/e-image-chooser.c
 capplets/about-me/mate-about-me.c
-[type: gettext/glade]capplets/about-me/mate-about-me-dialog.ui
+capplets/about-me/mate-about-me-dialog.ui
 capplets/about-me/mate-about-me.desktop.in
 capplets/about-me/mate-about-me-fingerprint.c
-[type: gettext/glade]capplets/about-me/mate-about-me-fingerprint.ui
+capplets/about-me/mate-about-me-fingerprint.ui
 capplets/about-me/mate-about-me-password.c
-[type: gettext/glade]capplets/about-me/mate-about-me-password.ui
-[type: gettext/glade]capplets/accessibility/at-properties/at-enable-dialog.ui
+capplets/about-me/mate-about-me-password.ui
+capplets/accessibility/at-properties/at-enable-dialog.ui
 capplets/accessibility/at-properties/mate-at-properties.desktop.in
 capplets/accessibility/at-properties/main.c
 capplets/appearance/appearance-desktop.c
@@ -19,7 +18,7 @@ capplets/appearance/appearance-font.c
 capplets/appearance/appearance-main.c
 capplets/appearance/appearance-style.c
 capplets/appearance/appearance-themes.c
-[type: gettext/glade]capplets/appearance/data/appearance.ui
+capplets/appearance/data/appearance.ui
 capplets/appearance/data/mate-appearance-properties.desktop.in
 capplets/appearance/data/mate-theme-installer.desktop.in
 capplets/appearance/data/mate-theme-package.xml.in
@@ -35,8 +34,8 @@ capplets/common/mate-theme-info.c
 capplets/common/theme-thumbnail.c
 capplets/default-applications/mate-default-applications-properties.desktop.in
 capplets/default-applications/mate-da-capplet.c
-[type: gettext/glade]capplets/default-applications/mate-default-applications-properties.ui
-[type: gettext/glade]capplets/display/display-capplet.ui
+capplets/default-applications/mate-default-applications-properties.ui
+capplets/display/display-capplet.ui
 capplets/display/mate-display-properties.desktop.in
 capplets/display/mate-display-properties-install-systemwide.c
 capplets/display/org.mate.randr.policy.in
@@ -45,14 +44,14 @@ capplets/keybindings/00-multimedia-key.xml.in
 capplets/keybindings/01-desktop-key.xml.in
 capplets/keybindings/eggcellrendererkeys.c
 capplets/keybindings/mate-keybinding-properties.c
-[type: gettext/glade]capplets/keybindings/mate-keybinding-properties.ui
+capplets/keybindings/mate-keybinding-properties.ui
 capplets/keybindings/mate-keybinding.desktop.in
 capplets/keyboard/mate-keyboard-properties.c
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-dialog.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-model-chooser.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-options-dialog.ui
+capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
+capplets/keyboard/mate-keyboard-properties-dialog.ui
+capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
+capplets/keyboard/mate-keyboard-properties-model-chooser.ui
+capplets/keyboard/mate-keyboard-properties-options-dialog.ui
 capplets/keyboard/mate-keyboard-properties-xkb.c
 capplets/keyboard/mate-keyboard-properties-xkbltadd.c
 capplets/keyboard/mate-keyboard-properties-xkblt.c
@@ -61,16 +60,16 @@ capplets/keyboard/mate-keyboard-properties-xkbot.c
 capplets/keyboard/mate-keyboard-properties-xkbpv.c
 capplets/keyboard/mate-keyboard.desktop.in
 capplets/mouse/mate-mouse-properties.c
-[type: gettext/glade]capplets/mouse/mate-mouse-properties.ui
+capplets/mouse/mate-mouse-properties.ui
 capplets/mouse/mate-settings-mouse.desktop.in
 capplets/network/mate-network-properties.c
 capplets/network/mate-network-properties.desktop.in
-[type: gettext/glade]capplets/network/mate-network-properties.ui
+capplets/network/mate-network-properties.ui
 capplets/windows/mate-metacity-support.c
 capplets/windows/mate-window-properties.c
 capplets/windows/mate-window-properties.desktop.in
 capplets/time-admin/src/main.c
-[type: gettext/glade]capplets/time-admin/src/time-admin.ui
+capplets/time-admin/src/time-admin.ui
 capplets/time-admin/src/time-map.c
 capplets/time-admin/src/time-tool.c
 capplets/time-admin/src/time-share.c
@@ -81,7 +80,7 @@ libwindow-settings/mate-wm-manager.c
 libwindow-settings/marco-window-manager.c
 shell/control-center.c
 shell/matecc.desktop.in
-shell/matecc.directory.in
+shell/matecc.directory.desktop.in
 typing-break/drw-break-window.c
 typing-break/drwright.c
 typing-break/main.c