Migrate from intltool to gettext

12 files changed, 196 insertions, 98 deletions

diff --git a/Makefile.am b/Makefile.am
index dca39343..6d4b415c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
 
-SUBDIRS=src po doc
+SUBDIRS = po src doc
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-EXTRA_DIST = autogen.sh HACKING rationales.txt \
-	intltool-extract.in intltool-merge.in intltool-update.in
+EXTRA_DIST = its autogen.sh HACKING rationales.txt
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
+DISTCLEANFILES = po/stamp-it
 
 # Build ChangeLog from GIT  history
 ChangeLog:
diff --git a/configure.ac b/configure.ac
index 9918faf6..d66c95bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,8 @@ GETTEXT_PACKAGE=marco
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
 
-IT_PROG_INTLTOOL([0.50.1])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 AC_PROG_CC
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
@@ -153,8 +154,6 @@ AC_ARG_ENABLE(shape,
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
-AM_GLIB_GNU_GETTEXT
-
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.58.0)
 PKG_CHECK_MODULES(MARCO_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
 PKG_CHECK_MODULES(MARCO_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
diff --git a/its/marco-keybindings.its b/its/marco-keybindings.its
new file mode 100644
index 00000000..43ade876
--- /dev/null
+++ b/its/marco-keybindings.its
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+           xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
+           version="2.0">
+  <its:translateRule selector="/KeyListEntries" translate="no"/>
+  <its:translateRule selector="/KeyListEntries/@name" translate="yes"/>
+  <its:translateRule selector="//KeyListEntry" translate="yes"/>
+  <its:translateRule selector="//KeyListEntry/@description" translate="yes"/>
+
+  <gt:contextRule selector="//KeyListEntry[@msgctxt]" contextPointer="@msgctxt"/>
+
+  <!-- Extracted strings are consumed by the library and are never
+       merged back; we don't want to escape special characters.  -->
+  <gt:escapeRule selector="/KeyListEntries" escape="no"/>
+</its:rules>
diff --git a/its/marco-keybindings.loc b/its/marco-keybindings.loc
new file mode 100644
index 00000000..13ad7d66
--- /dev/null
+++ b/its/marco-keybindings.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="MarcoKeybindings" pattern="*.xml">
+    <documentRule localName="KeyListEntries" target="marco-keybindings.its"/>
+  </locatingRule>
+</locatingRules>
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..71210e1b
--- /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
+
+# 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 GETTEXTDATADIR = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5c585ccb..84c49730 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
 src/50-marco-desktop-key.xml.in
 src/50-marco-global-key.xml.in
 src/50-marco-window-key.xml.in
-[type: gettext/gsettings]src/org.mate.marco.gschema.xml
+src/org.mate.marco.gschema.xml
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in
index 219109e3..61f2ff4f 100644
--- a/src/50-marco-desktop-key.xml.in
+++ b/src/50-marco-desktop-key.xml.in
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+<KeyListEntries name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
 
-	<KeyListEntry name="panel-run-dialog" _description="Show the panel's &quot;Run Application&quot; dialog box" />
+	<KeyListEntry name="panel-run-dialog" description="Show the panel's &quot;Run Application&quot; dialog box" />
 
-	<KeyListEntry name="panel-main-menu" _description="Show the panel's main menu" />
+	<KeyListEntry name="panel-main-menu" description="Show the panel's main menu" />
 
-	<KeyListEntry name="run-command-screenshot" _description="Take a screenshot" />
+	<KeyListEntry name="run-command-screenshot" description="Take a screenshot" />
 
-	<KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window" />
+	<KeyListEntry name="run-command-window-screenshot" description="Take a screenshot of a window" />
 
-	<KeyListEntry name="run-command-terminal" _description="Run a terminal" />
+	<KeyListEntry name="run-command-terminal" description="Run a terminal" />
 
-	<KeyListEntry name="rename-workspace" _description="Rename current workspace" />
+	<KeyListEntry name="rename-workspace" description="Rename current workspace" />
 
 </KeyListEntries>
 
diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in
index 84276a86..39c69d8c 100644
--- a/src/50-marco-global-key.xml.in
+++ b/src/50-marco-global-key.xml.in
@@ -1,134 +1,134 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+<KeyListEntries name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
 
-	<KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" />
+	<KeyListEntry name="switch-windows" description="Move between windows, using a popup window" />
 
-	<KeyListEntry name="switch-group" _description="Move between windows of an application, using a popup window" />
+	<KeyListEntry name="switch-group" description="Move between windows of an application, using a popup window" />
 
-	<KeyListEntry name="switch-panels" _description="Move between panels and the desktop, using a popup window" />
+	<KeyListEntry name="switch-panels" description="Move between panels and the desktop, using a popup window" />
 
-	<KeyListEntry name="cycle-windows" _description="Move between windows immediately" />
+	<KeyListEntry name="cycle-windows" description="Move between windows immediately" />
 
-	<KeyListEntry name="cycle-group" _description="Move between windows of an application immediately" />
+	<KeyListEntry name="cycle-group" description="Move between windows of an application immediately" />
 
-	<KeyListEntry name="cycle-panels" _description="Move between panels and the desktop immediately" />
+	<KeyListEntry name="cycle-panels" description="Move between panels and the desktop immediately" />
 
-	<KeyListEntry name="show-desktop" _description="Hide all normal windows and set focus to the desktop" />
+	<KeyListEntry name="show-desktop" description="Hide all normal windows and set focus to the desktop" />
 
 	<KeyListEntry name="switch-to-workspace-1"
-	_description="Switch to workspace 1"
+	description="Switch to workspace 1"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-2"
-	_description="Switch to workspace 2"
+	description="Switch to workspace 2"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-3"
-	_description="Switch to workspace 3"
+	description="Switch to workspace 3"
 	value="2"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-4"
-	_description="Switch to workspace 4"
+	description="Switch to workspace 4"
 	value="3"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-5"
-	_description="Switch to workspace 5"
+	description="Switch to workspace 5"
 	value="4"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-6"
-	_description="Switch to workspace 6"
+	description="Switch to workspace 6"
 	value="5"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-7"
-	_description="Switch to workspace 7"
+	description="Switch to workspace 7"
 	value="6"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-8"
-	_description="Switch to workspace 8"
+	description="Switch to workspace 8"
 	value="7"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-9"
-	_description="Switch to workspace 9"
+	description="Switch to workspace 9"
 	value="8"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-10"
-	_description="Switch to workspace 10"
+	description="Switch to workspace 10"
 	value="9"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-11"
-	_description="Switch to workspace 11"
+	description="Switch to workspace 11"
 	value="10"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-12"
-	_description="Switch to workspace 12"
+	description="Switch to workspace 12"
 	value="11"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-left"
-	_description="Switch to workspace on the left of the current workspace"
+	description="Switch to workspace on the left of the current workspace"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-right"
-	_description="Switch to workspace on the right of the current workspace"
+	description="Switch to workspace on the right of the current workspace"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-up"
-	_description="Switch to workspace above the current workspace"
+	description="Switch to workspace above the current workspace"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-down"
-	_description="Switch to workspace below the current workspace"
+	description="Switch to workspace below the current workspace"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
 	comparison="gt" />
 
 	<KeyListEntry name="switch-to-workspace-prev"
-	_description="Switch to previously selected workspace" />
+	description="Switch to previously selected workspace" />
 
 </KeyListEntries>
 
diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in
index 217354e6..5a94183a 100644
--- a/src/50-marco-window-key.xml.in
+++ b/src/50-marco-window-key.xml.in
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
+<KeyListEntries name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
 
 	<KeyListEntry
 	name="activate-window-menu"
-	_description="Activate the window menu" />
+	description="Activate the window menu" />
 
 	<KeyListEntry
 	name="toggle-fullscreen"
-	_description="Toggle fullscreen mode" />
+	description="Toggle fullscreen mode" />
 
 	<KeyListEntry
 	name="toggle-maximized"
-	_description="Toggle maximization state" />
+	description="Toggle maximization state" />
 
 	<KeyListEntry
 	name="maximize"
-	_description="Maximize window" />
+	description="Maximize window" />
 
 	<KeyListEntry
 	name="unmaximize"
-	_description="Restore window" />
+	description="Restore window" />
 
 	<KeyListEntry
 	name="toggle-shaded"
-	_description="Toggle shaded state" />
+	description="Toggle shaded state" />
 
 	<KeyListEntry
 	name="close"
-	_description="Close window" />
+	description="Close window" />
 
 	<KeyListEntry
 	name="minimize"
-	_description="Minimize window" />
+	description="Minimize window" />
 
 	<KeyListEntry
 	name="begin-move"
-	_description="Move window" />
+	description="Move window" />
 
 	<KeyListEntry
 	name="begin-resize"
-	_description="Resize window" />
+	description="Resize window" />
 
 	<KeyListEntry
 	name="toggle-on-all-workspaces"
-	_description="Toggle whether window is on all workspaces or just one"
+	description="Toggle whether window is on all workspaces or just one"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -51,103 +51,103 @@
 
 	<KeyListEntry
 	name="raise-or-lower"
-	_description="Raise window if it's covered by another window, otherwise lower it" />
+	description="Raise window if it's covered by another window, otherwise lower it" />
 
 	<KeyListEntry
 	name="raise"
-	_description="Raise window above other windows" />
+	description="Raise window above other windows" />
 
 	<KeyListEntry
 	name="lower"
-	_description="Lower window below other windows" />
+	description="Lower window below other windows" />
 
 	<KeyListEntry
 	name="maximize-vertically"
-	_description="Maximize window vertically" />
+	description="Maximize window vertically" />
 
 	<KeyListEntry
 	name="maximize-horizontally"
-	_description="Maximize window horizontally" />
+	description="Maximize window horizontally" />
 
 	<KeyListEntry
 	name="tile-to-side-e"
-	_description="Tile window to east (right) side of screen" />
+	description="Tile window to east (right) side of screen" />
 
 	<KeyListEntry
 	name="tile-to-side-w"
-	_description="Tile window to west (left) side of screen" />
+	description="Tile window to west (left) side of screen" />
 
 	<KeyListEntry
 	name="tile-to-corner-nw"
-	_description="Tile window to north-west (top left) corner" />
+	description="Tile window to north-west (top left) corner" />
 
 	<KeyListEntry
 	name="tile-to-corner-ne"
-	_description="Tile window to north-east (top right) corner" />
+	description="Tile window to north-east (top right) corner" />
 
 	<KeyListEntry
 	name="tile-to-corner-sw"
-	_description="Tile window to south-west (bottom left) corner" />
+	description="Tile window to south-west (bottom left) corner" />
 
 	<KeyListEntry
 	name="tile-to-corner-se"
-	_description="Tile window to south-east (bottom right) corner" />
+	description="Tile window to south-east (bottom right) corner" />
 
 	<KeyListEntry
 	name="move-to-corner-nw"
-	_description="Move window to north-west (top left) corner" />
+	description="Move window to north-west (top left) corner" />
 
 	<KeyListEntry
 	name="move-to-corner-ne"
-	_description="Move window to north-east (top right) corner" />
+	description="Move window to north-east (top right) corner" />
 
 	<KeyListEntry
 	name="move-to-corner-sw"
-	_description="Move window to south-west (bottom left) corner" />
+	description="Move window to south-west (bottom left) corner" />
 
 	<KeyListEntry
 	name="move-to-corner-se"
-	_description="Move window to south-east (bottom right) corner" />
+	description="Move window to south-east (bottom right) corner" />
 
 	<KeyListEntry
 	name="move-to-side-n"
-	_description="Move window to north (top) side of screen" />
+	description="Move window to north (top) side of screen" />
 
 	<KeyListEntry
 	name="move-to-side-s"
-	_description="Move window to south (bottom) side of screen" />
+	description="Move window to south (bottom) side of screen" />
 
 	<KeyListEntry
 	name="move-to-side-e"
-	_description="Move window to east (right) side of screen" />
+	description="Move window to east (right) side of screen" />
 
 	<KeyListEntry
 	name="move-to-side-w"
-	_description="Move window to west (left) side of screen" />
+	description="Move window to west (left) side of screen" />
 
 	<KeyListEntry
 	name="move-to-center"
-	_description="Move window to center of screen" />
+	description="Move window to center of screen" />
 
 	<KeyListEntry
 	name="move-to-monitor-n"
-	_description="Move window to north (top) monitor" />
+	description="Move window to north (top) monitor" />
 
 	<KeyListEntry
 	name="move-to-monitor-s"
-	_description="Move window to south (bottom) monitor" />
+	description="Move window to south (bottom) monitor" />
 
 	<KeyListEntry
 	name="move-to-monitor-e"
-	_description="Move window to east (right) monitor" />
+	description="Move window to east (right) monitor" />
 
 	<KeyListEntry
 	name="move-to-monitor-w"
-	_description="Move window to west (left) monitor" />
+	description="Move window to west (left) monitor" />
 
 	<KeyListEntry
 	name="move-to-workspace-1"
-	_description="Move window to workspace 1"
+	description="Move window to workspace 1"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -155,7 +155,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-2"
-	_description="Move window to workspace 2"
+	description="Move window to workspace 2"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -163,7 +163,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-3"
-	_description="Move window to workspace 3"
+	description="Move window to workspace 3"
 	value="2"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -171,7 +171,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-4"
-	_description="Move window to workspace 4"
+	description="Move window to workspace 4"
 	value="3"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -179,7 +179,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-5"
-	_description="Move window to workspace 5"
+	description="Move window to workspace 5"
 	value="4"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -187,7 +187,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-6"
-	_description="Move window to workspace 6"
+	description="Move window to workspace 6"
 	value="5"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -195,7 +195,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-7"
-	_description="Move window to workspace 7"
+	description="Move window to workspace 7"
 	value="6"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -203,7 +203,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-8"
-	_description="Move window to workspace 8"
+	description="Move window to workspace 8"
 	value="7"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -211,7 +211,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-9"
-	_description="Move window to workspace 9"
+	description="Move window to workspace 9"
 	value="8"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -219,7 +219,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-10"
-	_description="Move window to workspace 10"
+	description="Move window to workspace 10"
 	value="9"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -227,7 +227,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-11"
-	_description="Move window to workspace 11"
+	description="Move window to workspace 11"
 	value="10"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -235,7 +235,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-12"
-	_description="Move window to workspace 12"
+	description="Move window to workspace 12"
 	value="11"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -243,7 +243,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-left"
-	_description="Move window one workspace to the left"
+	description="Move window one workspace to the left"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -251,7 +251,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-right"
-	_description="Move window one workspace to the right"
+	description="Move window one workspace to the right"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -259,7 +259,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-up"
-	_description="Move window one workspace up"
+	description="Move window one workspace up"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
@@ -267,7 +267,7 @@
 
 	<KeyListEntry
 	name="move-to-workspace-down"
-	_description="Move window one workspace down"
+	description="Move window one workspace down"
 	value="1"
 	key="num-workspaces"
 	schema="org.mate.Marco.general"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a5f8ed3..6d5c50f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,7 +159,8 @@ testboxes_LDADD= @MARCO_LIBS@
 testgradient_LDADD= @MARCO_LIBS@
 testasyncgetprop_LDADD= @MARCO_LIBS@
 
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 desktopfilesdir=$(datadir)/applications
 desktopfiles_in_files=marco.desktop.in
@@ -174,8 +175,6 @@ wmproperties_DATA = $(wmproperties_files)
 gsettings_SCHEMAS = org.mate.marco.gschema.xml
 @GSETTINGS_RULES@
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 xmldir = @MATE_KEYBINDINGS_KEYSDIR@
 xml_in_files = \
 	50-marco-desktop-key.xml.in \
@@ -183,6 +182,9 @@ xml_in_files = \
 	50-marco-global-key.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
+%.xml: %.xml.in
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 BUILT_SOURCES =
 CLEANFILES = \
 	marco.desktop \
diff --git a/src/marco-wm.desktop.in b/src/marco-wm.desktop.in
index fc9c5318..62efebff 100644
--- a/src/marco-wm.desktop.in
+++ b/src/marco-wm.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=Marco
+Name=Marco
 Exec=marco
 # name of loadable control center module
 X-MATE-WMSettingsModule=marco
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index fe636946..0a1da4b6 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,5 +1,3 @@
-@INTLTOOL_DESKTOP_RULE@
-
 icondir=$(pkgdatadir)/icons
 icon_DATA=marco-window-demo.png