i18n: port from intltool to gettext

Signed-off-by: Marty E. Plummer <[email protected]>

29 files changed, 151 insertions, 96 deletions

diff --git a/Makefile.am b/Makefile.am
index 4cb9c4f..0009be1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libmate-desktop man docs po schemas tools icons
+SUBDIRS = libmate-desktop man docs schemas tools icons po
 
 if MATE_ABOUT_ENABLED
 SUBDIRS += mate-about
diff --git a/configure.ac b/configure.ac
index 3d9fd0f..384196d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,6 @@ AC_SUBST(LT_VERSION)
 
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.50.1])
-
 AC_PROG_CC
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
@@ -198,13 +196,14 @@ AC_SUBST(MATE_ABOUT_CFLAGS)
 AC_SUBST(MATE_ABOUT_LIBS)
 
 dnl Language Support
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 GETTEXT_PACKAGE=mate-desktop
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 		   [The gettext translation domain])
 AC_SUBST(GETTEXT_PACKAGE)
-
-AM_GLIB_GNU_GETTEXT
+AC_PATH_PROG([ITSTOOL], [itstool], [notfound])
 
 GLIB_GSETTINGS
 
@@ -238,7 +237,7 @@ fi
 AC_CONFIG_FILES([
 Makefile
 mate-about/Makefile
-mate-about/mate-version.xml.in
+mate-about/mate-version.xml
 libmate-desktop/Makefile
 libmate-desktop/mate-desktop-2.0.pc
 libmate-desktop/mate-desktop-2.0-uninstalled.pc
@@ -247,24 +246,7 @@ docs/reference/Makefile
 docs/reference/mate-desktop/Makefile
 po/Makefile.in
 schemas/Makefile
-schemas/org.mate.accessibility-keyboard.gschema.xml
-schemas/org.mate.accessibility-startup.gschema.xml
-schemas/org.mate.applications-at-mobility.gschema.xml
-schemas/org.mate.applications-at-visual.gschema.xml
-schemas/org.mate.applications-browser.gschema.xml
-schemas/org.mate.applications-office.gschema.xml
-schemas/org.mate.applications-terminal.gschema.xml
 schemas/org.mate.background.gschema.xml
-schemas/org.mate.debug.gschema.xml
-schemas/org.mate.file-views.gschema.xml
-schemas/org.mate.interface.gschema.xml
-schemas/org.mate.lockdown.gschema.xml
-schemas/org.mate.peripherals-keyboard.gschema.xml
-schemas/org.mate.peripherals-mouse.gschema.xml
-schemas/org.mate.sound.gschema.xml
-schemas/org.mate.thumbnail-cache.gschema.xml
-schemas/org.mate.thumbnailers.gschema.xml
-schemas/org.mate.typing-break.gschema.xml
 man/Makefile
 tools/Makefile
 icons/Makefile
diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
index 7e028e6..7495e05 100644
--- a/mate-about/Makefile.am
+++ b/mate-about/Makefile.am
@@ -9,17 +9,15 @@ AM_CPPFLAGS = \
 	-DLOCALE_DIR=\"$(datadir)/locale\" \
 	-DPIXMAPS_DIR=\"$(datadir)/pixmaps/\"
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-about.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+mate-about.desktop: mate-about.desktop.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 versiondir = $(datadir)/mate-about
 version_DATA = mate-version.xml
 
-@INTLTOOL_XML_RULE@
-
 EXTRA_DIST = $(desktop_in_files)	\
 	     mate-version.xml.in
 
diff --git a/mate-about/mate-about.desktop.in b/mate-about/mate-about.desktop.in
index 01eb829..4d84b59 100644
--- a/mate-about/mate-about.desktop.in
+++ b/mate-about/mate-about.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=About MATE
-_Comment=Learn more about MATE
+Name=About MATE
+Comment=Learn more about MATE
 Exec=mate-about
 Icon=mate
 Terminal=false
diff --git a/mate-about/mate-version.xml.in.in b/mate-about/mate-version.xml.in
index 524afa8..524afa8 100644
--- a/mate-about/mate-version.xml.in.in
+++ b/mate-about/mate-version.xml.in
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..b6d439d
--- /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 = mate-desktop
+
+# 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
+
+# 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 Developers
+
+# 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3793bc3..0f6898d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,23 +16,25 @@ libmate-desktop/mate-languages.c
 libmate-desktop/mate-rr.c
 libmate-desktop/mate-rr-config.c
 libmate-desktop/mate-rr-labeler.c
-[type: gettext/gsettings]schemas/org.mate.accessibility-keyboard.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.accessibility-startup.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.applications-at-mobility.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.applications-at-visual.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.applications-browser.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.applications-office.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.applications-terminal.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.background.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.file-views.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.interface.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.lockdown.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.peripherals-keyboard.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.peripherals-mouse.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.sound.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.thumbnail-cache.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.thumbnailers.gschema.xml.in
-[type: gettext/gsettings]schemas/org.mate.typing-break.gschema.xml.in
+schemas/org.mate.accessibility-keyboard.gschema.xml
+schemas/org.mate.accessibility-startup.gschema.xml
+schemas/org.mate.applications-at-mobility.gschema.xml
+schemas/org.mate.applications-at-visual.gschema.xml
+schemas/org.mate.applications-browser.gschema.xml
+schemas/org.mate.applications-calculator.gschema.xml
+schemas/org.mate.applications-office.gschema.xml
+schemas/org.mate.applications-terminal.gschema.xml
+schemas/org.mate.background.gschema.xml.in
+schemas/org.mate.debug.gschema.xml
+schemas/org.mate.file-views.gschema.xml
+schemas/org.mate.interface.gschema.xml
+schemas/org.mate.lockdown.gschema.xml
+schemas/org.mate.peripherals-keyboard.gschema.xml
+schemas/org.mate.peripherals-mouse.gschema.xml
+schemas/org.mate.sound.gschema.xml
+schemas/org.mate.thumbnail-cache.gschema.xml
+schemas/org.mate.thumbnailers.gschema.xml
+schemas/org.mate.typing-break.gschema.xml
 tools/mate-color-select.c
 tools/mate-color-select.desktop.in
 
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index ac926f8..ec4054d 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,33 +1,28 @@
-desktop_gschemas_in = \
-	org.mate.accessibility-keyboard.gschema.xml.in \
-	org.mate.accessibility-startup.gschema.xml.in \
-	org.mate.applications-at-mobility.gschema.xml.in \
-	org.mate.applications-at-visual.gschema.xml.in \
-	org.mate.applications-browser.gschema.xml.in \
-	org.mate.applications-calculator.gschema.xml.in \
-	org.mate.applications-office.gschema.xml.in \
-	org.mate.applications-terminal.gschema.xml.in \
-	org.mate.background.gschema.xml.in \
-	org.mate.debug.gschema.xml.in \
-	org.mate.file-views.gschema.xml.in \
-	org.mate.interface.gschema.xml.in \
-	org.mate.lockdown.gschema.xml.in \
-	org.mate.peripherals-keyboard.gschema.xml.in \
-	org.mate.peripherals-mouse.gschema.xml.in \
-	org.mate.sound.gschema.xml.in \
-	org.mate.thumbnail-cache.gschema.xml.in \
-	org.mate.thumbnailers.gschema.xml.in \
-	org.mate.typing-break.gschema.xml.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_SCHEMAS = $(desktop_gschemas_in:.xml.in=.xml)
+gsettings_SCHEMAS = \
+	org.mate.accessibility-keyboard.gschema.xml \
+	org.mate.accessibility-startup.gschema.xml \
+	org.mate.applications-at-mobility.gschema.xml \
+	org.mate.applications-at-visual.gschema.xml \
+	org.mate.applications-browser.gschema.xml \
+	org.mate.applications-calculator.gschema.xml \
+	org.mate.applications-office.gschema.xml \
+	org.mate.applications-terminal.gschema.xml \
+	org.mate.background.gschema.xml \
+	org.mate.debug.gschema.xml \
+	org.mate.file-views.gschema.xml \
+	org.mate.interface.gschema.xml \
+	org.mate.lockdown.gschema.xml \
+	org.mate.peripherals-keyboard.gschema.xml \
+	org.mate.peripherals-mouse.gschema.xml \
+	org.mate.sound.gschema.xml \
+	org.mate.thumbnail-cache.gschema.xml \
+	org.mate.thumbnailers.gschema.xml \
+	org.mate.typing-break.gschema.xml
 
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	$(desktop_gschemas_in)
+	$(gsettings_SCHEMAS)
 
 CLEANFILES = \
-	$(gsettings_SCHEMAS) \
 	*.gschema.valid
diff --git a/schemas/org.mate.accessibility-keyboard.gschema.xml.in b/schemas/org.mate.accessibility-keyboard.gschema.xml
index 36dea0b..26f295e 100644
--- a/schemas/org.mate.accessibility-keyboard.gschema.xml.in
+++ b/schemas/org.mate.accessibility-keyboard.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.accessibility-keyboard" path="/org/mate/desktop/accessibility/keyboard/">
     <key name="enable" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.accessibility-startup.gschema.xml.in b/schemas/org.mate.accessibility-startup.gschema.xml
index c2c3aec..0c7a56d 100644
--- a/schemas/org.mate.accessibility-startup.gschema.xml.in
+++ b/schemas/org.mate.accessibility-startup.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.accessibility-startup" path="/org/mate/desktop/accessibility/startup/">
     <key name="exec-ats" type="as">
       <default>[]</default>
diff --git a/schemas/org.mate.applications-at-mobility.gschema.xml.in b/schemas/org.mate.applications-at-mobility.gschema.xml
index 993f2ea..4acb619 100644
--- a/schemas/org.mate.applications-at-mobility.gschema.xml.in
+++ b/schemas/org.mate.applications-at-mobility.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-at-mobility" path="/org/mate/desktop/applications/at/mobility/">
     <key name="exec" type="s">
       <default>'dasher'</default>
diff --git a/schemas/org.mate.applications-at-visual.gschema.xml.in b/schemas/org.mate.applications-at-visual.gschema.xml
index a4f3c96..6f40493 100644
--- a/schemas/org.mate.applications-at-visual.gschema.xml.in
+++ b/schemas/org.mate.applications-at-visual.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-at-visual" path="/org/mate/desktop/applications/at/visual/">
     <key name="exec" type="s">
       <default>'orca'</default>
diff --git a/schemas/org.mate.applications-browser.gschema.xml.in b/schemas/org.mate.applications-browser.gschema.xml
index 47d009f..8f7f6cc 100644
--- a/schemas/org.mate.applications-browser.gschema.xml.in
+++ b/schemas/org.mate.applications-browser.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-browser" path="/org/mate/desktop/applications/browser/">
     <key name="exec" type="s">
       <default>'mozilla'</default>
diff --git a/schemas/org.mate.applications-calculator.gschema.xml.in b/schemas/org.mate.applications-calculator.gschema.xml
index 40966d5..d252bd6 100644
--- a/schemas/org.mate.applications-calculator.gschema.xml.in
+++ b/schemas/org.mate.applications-calculator.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-calculator" path="/org/mate/desktop/applications/calculator/">
     <key name="exec" type="s">
       <default>'mate-calc'</default>
diff --git a/schemas/org.mate.applications-office.gschema.xml.in b/schemas/org.mate.applications-office.gschema.xml
index 9ae3908..367f498 100644
--- a/schemas/org.mate.applications-office.gschema.xml.in
+++ b/schemas/org.mate.applications-office.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-office" path="/org/mate/desktop/applications/">
     <child name="calendar" schema="org.mate.applications-office.calendar"/>
     <child name="tasks" schema="org.mate.applications-office.tasks"/>
diff --git a/schemas/org.mate.applications-terminal.gschema.xml.in b/schemas/org.mate.applications-terminal.gschema.xml
index 8351509..3e3a5a2 100644
--- a/schemas/org.mate.applications-terminal.gschema.xml.in
+++ b/schemas/org.mate.applications-terminal.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-terminal" path="/org/mate/desktop/applications/terminal/">
     <key name="exec" type="s">
       <default>'mate-terminal'</default>
diff --git a/schemas/org.mate.background.gschema.xml.in b/schemas/org.mate.background.gschema.xml.in
index 50619d5..519bd39 100644
--- a/schemas/org.mate.background.gschema.xml.in
+++ b/schemas/org.mate.background.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <enum id="org.mate.background.picture-options-enum">
 	<value nick="wallpaper" value="0"/>
 	<value nick="zoom" value="1"/>
diff --git a/schemas/org.mate.debug.gschema.xml.in b/schemas/org.mate.debug.gschema.xml
index 63e7319..929a77c 100644
--- a/schemas/org.mate.debug.gschema.xml.in
+++ b/schemas/org.mate.debug.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.debug" path="/org/mate/debug/">
     <key name="caja" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.file-views.gschema.xml.in b/schemas/org.mate.file-views.gschema.xml
index 35b846a..4e034b3 100644
--- a/schemas/org.mate.file-views.gschema.xml.in
+++ b/schemas/org.mate.file-views.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.file-views" path="/org/mate/desktop/file-views/">
     <key name="icon-theme" type="s">
       <default>'crux_teal'</default>
diff --git a/schemas/org.mate.interface.gschema.xml.in b/schemas/org.mate.interface.gschema.xml
index bcb2a61..d30be52 100644
--- a/schemas/org.mate.interface.gschema.xml.in
+++ b/schemas/org.mate.interface.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.interface" path="/org/mate/desktop/interface/">
     <key name="accessibility" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.lockdown.gschema.xml.in b/schemas/org.mate.lockdown.gschema.xml
index 1517bd1..5d6f12a 100644
--- a/schemas/org.mate.lockdown.gschema.xml.in
+++ b/schemas/org.mate.lockdown.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.lockdown" path="/org/mate/desktop/lockdown/">
     <key name="disable-command-line" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.peripherals-keyboard.gschema.xml.in b/schemas/org.mate.peripherals-keyboard.gschema.xml
index 7143f2d..f519987 100644
--- a/schemas/org.mate.peripherals-keyboard.gschema.xml.in
+++ b/schemas/org.mate.peripherals-keyboard.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <enum id="org.mate.peripherals-keyboard.NumLockState">
     <value nick="off" value="0"/>
     <value nick="on" value="1"/>
diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in b/schemas/org.mate.peripherals-mouse.gschema.xml
index d1247d4..4c7d02c 100644
--- a/schemas/org.mate.peripherals-mouse.gschema.xml.in
+++ b/schemas/org.mate.peripherals-mouse.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.peripherals-mouse" path="/org/mate/desktop/peripherals/mouse/">
     <key name="left-handed" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.sound.gschema.xml.in b/schemas/org.mate.sound.gschema.xml
index 7117689..6e12556 100644
--- a/schemas/org.mate.sound.gschema.xml.in
+++ b/schemas/org.mate.sound.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.sound" path="/org/mate/desktop/sound/">
     <key name="default-mixer-device" type="s">
       <default>''</default>
diff --git a/schemas/org.mate.thumbnail-cache.gschema.xml.in b/schemas/org.mate.thumbnail-cache.gschema.xml
index eebbe5d..8242e92 100644
--- a/schemas/org.mate.thumbnail-cache.gschema.xml.in
+++ b/schemas/org.mate.thumbnail-cache.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.thumbnail-cache" path="/org/mate/desktop/thumbnail-cache/">
     <key name="maximum-age" type="i">
       <default>180</default>
diff --git a/schemas/org.mate.thumbnailers.gschema.xml.in b/schemas/org.mate.thumbnailers.gschema.xml
index 3f0f099..4191410 100644
--- a/schemas/org.mate.thumbnailers.gschema.xml.in
+++ b/schemas/org.mate.thumbnailers.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.thumbnailers" path="/org/mate/desktop/thumbnailers/">
     <key name="disable-all" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.typing-break.gschema.xml.in b/schemas/org.mate.typing-break.gschema.xml
index 5420e84..af1a8ff 100644
--- a/schemas/org.mate.typing-break.gschema.xml.in
+++ b/schemas/org.mate.typing-break.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.typing-break" path="/org/mate/desktop/typing-break/">
     <key name="type-time" type="i">
       <default>60</default>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 281e127..a272a9b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,11 +15,11 @@ mate_color_select_LDADD = \
 	$(top_builddir)/libmate-desktop/libmate-desktop-2.la \
 	$(MATE_DESKTOP_LIBS)
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-color-select.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+mate-color-select.desktop: mate-color-select.desktop.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(desktop_in_files)
 
diff --git a/tools/mate-color-select.desktop.in b/tools/mate-color-select.desktop.in
index 458ab6e..15ee88f 100644
--- a/tools/mate-color-select.desktop.in
+++ b/tools/mate-color-select.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=MATE Color Selection
-_GenericName=Color selection dialog
-_Comment=Choose colors from the palette or the screen
+Name=MATE Color Selection
+GenericName=Color selection dialog
+Comment=Choose colors from the palette or the screen
 Exec=mate-color-select
 Icon=gtk-select-color
 Terminal=false