build: Say good-bye to intltool

intltool is unmaintained nowadays while upstream gettext gained
support for formats like GSettings schemas and .desktop files,
and offers a mechanism to teach it about other XML formats not
yet supported out of the box which we can use for the rest.
So there's nothing stopping us, just make the switch ...

https://bugzilla.gnome.org/show_bug.cgi?id=769073

8 files changed, 148 insertions, 146 deletions

diff --git a/data/50-mutter-navigation.xml.in b/data/50-mutter-navigation.xml
index 65742299c..1f9161b36 100644
--- a/data/50-mutter-navigation.xml.in
+++ b/data/50-mutter-navigation.xml
@@ -1,140 +1,140 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries schema="org.gnome.desktop.wm.keybindings"
                 group="system"
-                _name="Navigation"
+                name="Navigation"
                 wm_name="Mutter"
                 package="mutter">
 
 	<KeyListEntry name="move-to-workspace-1"
-	              _description="Move window to workspace 1" />
+	              description="Move window to workspace 1" />
 
 	<KeyListEntry name="move-to-workspace-2"
-	              _description="Move window to workspace 2" />
+	              description="Move window to workspace 2" />
 
 	<KeyListEntry name="move-to-workspace-3"
-	              _description="Move window to workspace 3" />
+	              description="Move window to workspace 3" />
 
 	<KeyListEntry name="move-to-workspace-4"
-	              _description="Move window to workspace 4" />
+	              description="Move window to workspace 4" />
 
         <KeyListEntry name="move-to-workspace-last"
-                      _description="Move window to last workspace" />
+                      description="Move window to last workspace" />
 
 	<KeyListEntry name="move-to-workspace-left"
-	              _description="Move window one workspace to the left" />
+	              description="Move window one workspace to the left" />
 
 	<KeyListEntry name="move-to-workspace-right"
-	              _description="Move window one workspace to the right" />
+	              description="Move window one workspace to the right" />
 
 	<KeyListEntry name="move-to-workspace-up"
-	              _description="Move window one workspace up" />
+	              description="Move window one workspace up" />
 
 	<KeyListEntry name="move-to-workspace-down"
-	              _description="Move window one workspace down" />
+	              description="Move window one workspace down" />
 
 	<KeyListEntry name="move-to-monitor-left"
-	              _description="Move window one monitor to the left" />
+	              description="Move window one monitor to the left" />
 
 	<KeyListEntry name="move-to-monitor-right"
-	              _description="Move window one monitor to the right" />
+	              description="Move window one monitor to the right" />
 
 	<KeyListEntry name="move-to-monitor-up"
-	              _description="Move window one monitor up" />
+	              description="Move window one monitor up" />
 
 	<KeyListEntry name="move-to-monitor-down"
-	              _description="Move window one monitor down" />
+	              description="Move window one monitor down" />
 
 	<KeyListEntry name="switch-applications"
 	              reverse-entry="switch-applications-backward"
-	              _description="Switch applications"/>
+	              description="Switch applications"/>
 
 	<KeyListEntry name="switch-applications-backward"
 	              reverse-entry="switch-applications"
 	              hidden="true"
-	              _description="Switch to previous application"/>
+	              description="Switch to previous application"/>
 
 	<KeyListEntry name="switch-windows"
 	              reverse-entry="switch-windows-backward"
-	              _description="Switch windows"/>
+	              description="Switch windows"/>
 
 	<KeyListEntry name="switch-windows-backward"
 	              reverse-entry="switch-windows"
 	              hidden="true"
-	              _description="Switch to previous window"/>
+	              description="Switch to previous window"/>
 
 	<KeyListEntry name="switch-group"
 	              reverse-entry="switch-group-backward"
-	              _description="Switch windows of an application"/>
+	              description="Switch windows of an application"/>
 
 	<KeyListEntry name="switch-group-backward"
 	              reverse-entry="switch-group"
 	              hidden="true"
-	              _description="Switch to previous window of an application"/>
+	              description="Switch to previous window of an application"/>
 
 	<KeyListEntry name="switch-panels"
 	              reverse-entry="switch-panels-backward"
-	              _description="Switch system controls"/>
+	              description="Switch system controls"/>
 
 	<KeyListEntry name="switch-panels-backward"
 	              reverse-entry="switch-panels"
 	              hidden="true"
-	              _description="Switch to previous system control"/>
+	              description="Switch to previous system control"/>
 
 	<KeyListEntry name="cycle-windows"
 	              reverse-entry="cycle-windows-backward"
-	              _description="Switch windows directly"/>
+	              description="Switch windows directly"/>
 
 	<KeyListEntry name="cycle-windows-backward"
 	              reverse-entry="cycle-windows"
 	              hidden="true"
-	              _description="Switch directly to previous window"/>
+	              description="Switch directly to previous window"/>
 
 	<KeyListEntry name="cycle-group"
 	              reverse-entry="cycle-group-backward"
-	              _description="Switch windows of an app directly"/>
+	              description="Switch windows of an app directly"/>
 
 	<KeyListEntry name="cycle-group-backward"
 	              reverse-entry="cycle-group"
 	              hidden="true"
-	              _description="Switch directly to previous window of an app"/>
+	              description="Switch directly to previous window of an app"/>
 
 	<KeyListEntry name="cycle-panels"
 	              reverse-entry="cycle-panels-backward"
-	              _description="Switch system controls directly"/>
+	              description="Switch system controls directly"/>
 
 	<KeyListEntry name="cycle-panels-backward"
 	              reverse-entry="cycle-panels"
 	              hidden="true"
-	              _description="Switch directly to previous system control"/>
+	              description="Switch directly to previous system control"/>
 
 	<KeyListEntry name="show-desktop"
-	              _description="Hide all normal windows"/>
+	              description="Hide all normal windows"/>
 
 	<KeyListEntry name="switch-to-workspace-1"
-	              _description="Switch to workspace 1" />
+	              description="Switch to workspace 1" />
 
 	<KeyListEntry name="switch-to-workspace-2"
-	              _description="Switch to workspace 2" />
+	              description="Switch to workspace 2" />
 
 	<KeyListEntry name="switch-to-workspace-3"
-	              _description="Switch to workspace 3" />
+	              description="Switch to workspace 3" />
 
 	<KeyListEntry name="switch-to-workspace-4"
-	              _description="Switch to workspace 4" />
+	              description="Switch to workspace 4" />
 
 	<KeyListEntry name="switch-to-workspace-last"
-	              _description="Switch to last workspace" />
+	              description="Switch to last workspace" />
 
 	<KeyListEntry name="switch-to-workspace-left"
-	              _description="Move to workspace left" />
+	              description="Move to workspace left" />
 
 	<KeyListEntry name="switch-to-workspace-right"
-	              _description="Move to workspace right" />
+	              description="Move to workspace right" />
 
 	<KeyListEntry name="switch-to-workspace-up"
-	              _description="Move to workspace above" />
+	              description="Move to workspace above" />
 
 	<KeyListEntry name="switch-to-workspace-down"
-	              _description="Move to workspace below" />
+	              description="Move to workspace below" />
 
 </KeyListEntries>
diff --git a/data/50-mutter-system.xml.in b/data/50-mutter-system.xml
index b8f4e6bda..07da17a89 100644
--- a/data/50-mutter-system.xml.in
+++ b/data/50-mutter-system.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries schema="org.gnome.desktop.wm.keybindings"
                 group="system"
-                _name="System"
+                name="System"
                 wm_name="Mutter"
                 package="mutter">
 
-	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt"/>
+	<KeyListEntry name="panel-run-dialog" description="Show the run command prompt"/>
 
-	<KeyListEntry name="panel-main-menu" _description="Show the activities overview"/>
+	<KeyListEntry name="panel-main-menu" description="Show the activities overview"/>
 
 </KeyListEntries>
 
diff --git a/data/50-mutter-windows.xml b/data/50-mutter-windows.xml
new file mode 100644
index 000000000..a9316d1e9
--- /dev/null
+++ b/data/50-mutter-windows.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+                group="system"
+                name="Windows"
+                wm_name="Mutter"
+                package="mutter">
+
+	<KeyListEntry name="activate-window-menu" description="Activate the window menu"/>
+
+	<KeyListEntry name="toggle-fullscreen" description="Toggle fullscreen mode"/>
+
+	<KeyListEntry name="toggle-maximized" description="Toggle maximization state"/>
+
+	<KeyListEntry name="maximize" description="Maximize window"/>
+
+	<KeyListEntry name="unmaximize" description="Restore window"/>
+
+	<KeyListEntry name="toggle-shaded" description="Toggle shaded state"/>
+
+	<KeyListEntry name="close" description="Close window"/>
+
+	<KeyListEntry name="minimize" description="Hide window"/>
+
+	<KeyListEntry name="begin-move" description="Move window"/>
+
+	<KeyListEntry name="begin-resize" description="Resize window"/>
+
+	<KeyListEntry name="toggle-on-all-workspaces"
+	              description="Toggle window on all workspaces or one"/>
+
+	<KeyListEntry name="raise-or-lower" description="Raise window if covered, otherwise lower it"/>
+
+	<KeyListEntry name="raise" description="Raise window above other windows"/>
+
+	<KeyListEntry name="lower" description="Lower window below other windows"/>
+
+	<KeyListEntry name="maximize-vertically" description="Maximize window vertically"/>
+
+	<KeyListEntry name="maximize-horizontally" description="Maximize window horizontally"/>
+
+	<KeyListEntry name="toggle-tiled-left"
+                      schema="org.gnome.mutter.keybindings"
+                      description="View split on left"/>
+
+	<KeyListEntry name="toggle-tiled-right"
+                      schema="org.gnome.mutter.keybindings"
+                      description="View split on right"/>
+
+</KeyListEntries>
+
diff --git a/data/50-mutter-windows.xml.in b/data/50-mutter-windows.xml.in
deleted file mode 100644
index 6679958a7..000000000
--- a/data/50-mutter-windows.xml.in
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
-                group="system"
-                _name="Windows"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="activate-window-menu" _description="Activate the window menu"/>
-
-	<KeyListEntry name="toggle-fullscreen" _description="Toggle fullscreen mode"/>
-
-	<KeyListEntry name="toggle-maximized" _description="Toggle maximization state"/>
-
-	<KeyListEntry name="maximize" _description="Maximize window"/>
-
-	<KeyListEntry name="unmaximize" _description="Restore window"/>
-
-	<KeyListEntry name="toggle-shaded" _description="Toggle shaded state"/>
-
-	<KeyListEntry name="close" _description="Close window"/>
-
-	<KeyListEntry name="minimize" _description="Hide window"/>
-
-	<KeyListEntry name="begin-move" _description="Move window"/>
-
-	<KeyListEntry name="begin-resize" _description="Resize window"/>
-
-	<KeyListEntry name="toggle-on-all-workspaces"
-	              _description="Toggle window on all workspaces or one"/>
-
-	<KeyListEntry name="raise-or-lower" _description="Raise window if covered, otherwise lower it"/>
-
-	<KeyListEntry name="raise" _description="Raise window above other windows"/>
-
-	<KeyListEntry name="lower" _description="Lower window below other windows"/>
-
-	<KeyListEntry name="maximize-vertically" _description="Maximize window vertically"/>
-
-	<KeyListEntry name="maximize-horizontally" _description="Maximize window horizontally"/>
-
-	<KeyListEntry name="toggle-tiled-left"
-                      schema="org.gnome.mutter.keybindings"
-                      _description="View split on left"/>
-
-	<KeyListEntry name="toggle-tiled-right"
-                      schema="org.gnome.mutter.keybindings"
-                      _description="View split on right"/>
-
-</KeyListEntries>
-
diff --git a/data/Makefile.am b/data/Makefile.am
index 699a83401..5188765a8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,21 +3,24 @@ desktopfiles_in_files = \
 desktopfilesdir = $(datadir)/applications
 desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_DESKTOP_RULE@
+%.desktop:%.desktop.in
+	$(AM_V_GET) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-xml_in_files = \
-        50-mutter-navigation.xml.in \
-        50-mutter-system.xml.in \
-        50-mutter-windows.xml.in
 xmldir = $(GNOME_KEYBINDINGS_KEYSDIR)
-xml_DATA = $(xml_in_files:.xml.in=.xml)
+xml_DATA = \
+        50-mutter-navigation.xml \
+        50-mutter-system.xml \
+        50-mutter-windows.xml
 
 gschema_in_files = \
 	org.gnome.mutter.gschema.xml.in	\
 	org.gnome.mutter.wayland.gschema.xml.in
 gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_NOMERGE_RULE@
+%.gschema.xml: %.gschema.xml.in Makefile
+	$(AM_V_GEN) sed -e 's|@GETTEXT_DOMAIN[@]|$(GETTEXT_DOMAIN)|g' \
+	$< > $@ || rm $@
+
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/GConf/gsettings
@@ -25,11 +28,10 @@ convert_DATA = mutter-schemas.convert
 
 CLEANFILES = \
 	$(desktopfiles_DATA) \
-	$(gsettings_SCHEMAS) \
-	$(xml_DATA)
+	$(gsettings_SCHEMAS)
 
 EXTRA_DIST = \
 	$(convert_DATA) \
 	$(desktopfiles_in_files) \
 	$(gschema_in_files) \
-	$(xml_in_files)
+	$(xml_DATA)
diff --git a/data/mutter.desktop.in b/data/mutter.desktop.in
index 3bfb88d2d..e3ae07009 100644
--- a/data/mutter.desktop.in
+++ b/data/mutter.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=Mutter
+Name=Mutter
 Exec=mutter
 NoDisplay=true
 # name of loadable control center module
diff --git a/data/org.gnome.mutter.gschema.xml.in b/data/org.gnome.mutter.gschema.xml.in
index cffeeb8c5..3e3f8f790 100644
--- a/data/org.gnome.mutter.gschema.xml.in
+++ b/data/org.gnome.mutter.gschema.xml.in
@@ -4,102 +4,102 @@
 
     <key name="overlay-key" type="s">
       <default>'Super_L'</default>
-      <_summary>Modifier to use for extended window management operations</_summary>
-      <_description>
+      <summary>Modifier to use for extended window management operations</summary>
+      <description>
         This key will initiate the "overlay", which is a combination window
         overview and application launching system.  The default is intended
         to be the "Windows key" on PC hardware.
 
         It's expected that this binding either the default or set to
         the empty string.
-      </_description>
+      </description>
     </key>
 
     <key name="attach-modal-dialogs" type="b">
       <default>false</default>
-      <_summary>Attach modal dialogs</_summary>
-      <_description>
+      <summary>Attach modal dialogs</summary>
+      <description>
         When true, instead of having independent titlebars, modal dialogs
         appear attached to the titlebar of the parent window and are moved
         together with the parent window.
-      </_description>
+      </description>
     </key>
 
     <key name="edge-tiling" type="b">
       <default>false</default>
-      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <_description>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
         If enabled, dropping windows on vertical screen edges maximizes them
         vertically and resizes them horizontally to cover half of the available
         area. Dropping windows on the top screen edge maximizes them completely.
-      </_description>
+      </description>
     </key>
 
     <key name="dynamic-workspaces" type="b">
       <default>false</default>
-      <_summary>Workspaces are managed dynamically</_summary>
-      <_description>
+      <summary>Workspaces are managed dynamically</summary>
+      <description>
         Determines whether workspaces are managed dynamically or
         whether there's a static number of workspaces (determined
         by the num-workspaces key in org.gnome.desktop.wm.preferences).
-      </_description>
+      </description>
     </key>
 
     <key name="workspaces-only-on-primary" type="b">
       <default>false</default>
-      <_summary>Workspaces only on primary</_summary>
-      <_description>
+      <summary>Workspaces only on primary</summary>
+      <description>
         Determines whether workspace switching should happen for windows
         on all monitors or only for windows on the primary monitor.
-      </_description>
+      </description>
     </key>
 
     <key name="no-tab-popup" type="b">
       <default>false</default>
-      <_summary>No tab popup</_summary>
-      <_description>
+      <summary>No tab popup</summary>
+      <description>
         Determines whether the use of popup and highlight frame should
         be disabled for window cycling.
-      </_description>
+      </description>
     </key>
 
     <key name="focus-change-on-pointer-rest" type="b">
       <default>false</default>
-      <_summary>Delay focus changes until the pointer stops moving</_summary>
-      <_description>
+      <summary>Delay focus changes until the pointer stops moving</summary>
+      <description>
         If set to true, and the focus mode is either "sloppy" or "mouse"
         then the focus will not be changed immediately when entering a
         window, but only after the pointer stops moving.
-      </_description>
+      </description>
     </key>
 
     <key name="draggable-border-width" type="i">
       <default>10</default>
       <range min="0" max="64"/>
-      <_summary>Draggable border width</_summary>
-      <_description>
+      <summary>Draggable border width</summary>
+      <description>
           The amount of total draggable borders. If the theme's visible
           borders are not enough, invisible borders will be added to meet
           this value.
-      </_description>
+      </description>
     </key>
 
     <key name="auto-maximize" type="b">
       <default>true</default>
-      <_summary>Auto maximize nearly monitor sized windows</_summary>
-      <_description>
+      <summary>Auto maximize nearly monitor sized windows</summary>
+      <description>
         If enabled, new windows that are initially the size of the monitor
         automatically get maximized.
-      </_description>
+      </description>
     </key>
 
     <key name="center-new-windows" type="b">
       <default>false</default>
-      <_summary>Place new windows in the center</_summary>
-      <_description>
+      <summary>Place new windows in the center</summary>
+      <description>
         When true, the new windows will always be put in the center of the
         active screen of the monitor.
-      </_description>
+      </description>
     </key>
 
     <child name="keybindings" schema="org.gnome.mutter.keybindings"/>
@@ -117,12 +117,12 @@
 
     <key name="tab-popup-select" type="as">
       <default>[]</default>
-      <_summary>Select window from tab popup</_summary>
+      <summary>Select window from tab popup</summary>
     </key>
 
     <key name="tab-popup-cancel" type="as">
       <default>[]</default>
-      <_summary>Cancel tab popup</_summary>
+      <summary>Cancel tab popup</summary>
     </key>
 
   </schema>
diff --git a/data/org.gnome.mutter.wayland.gschema.xml.in b/data/org.gnome.mutter.wayland.gschema.xml.in
index d7c9ed4a0..44334d664 100644
--- a/data/org.gnome.mutter.wayland.gschema.xml.in
+++ b/data/org.gnome.mutter.wayland.gschema.xml.in
@@ -3,51 +3,51 @@
 	  gettext-domain="@GETTEXT_DOMAIN@">
     <key name="switch-to-session-1" type="as">
       <default><![CDATA[['<Primary><Alt>F1']]]></default>
-      <_summary>Switch to VT 1</_summary>
+      <summary>Switch to VT 1</summary>
     </key>
     <key name="switch-to-session-2" type="as">
       <default><![CDATA[['<Primary><Alt>F2']]]></default>
-      <_summary>Switch to VT 2</_summary>
+      <summary>Switch to VT 2</summary>
     </key>
     <key name="switch-to-session-3" type="as">
       <default><![CDATA[['<Primary><Alt>F3']]]></default>
-      <_summary>Switch to VT 3</_summary>
+      <summary>Switch to VT 3</summary>
     </key>
     <key name="switch-to-session-4" type="as">
       <default><![CDATA[['<Primary><Alt>F4']]]></default>
-      <_summary>Switch to VT 4</_summary>
+      <summary>Switch to VT 4</summary>
     </key>
     <key name="switch-to-session-5" type="as">
       <default><![CDATA[['<Primary><Alt>F5']]]></default>
-      <_summary>Switch to VT 5</_summary>
+      <summary>Switch to VT 5</summary>
     </key>
     <key name="switch-to-session-6" type="as">
       <default><![CDATA[['<Primary><Alt>F6']]]></default>
-      <_summary>Switch to VT 6</_summary>
+      <summary>Switch to VT 6</summary>
     </key>
     <key name="switch-to-session-7" type="as">
       <default><![CDATA[['<Primary><Alt>F7']]]></default>
-      <_summary>Switch to VT 7</_summary>
+      <summary>Switch to VT 7</summary>
     </key>
     <key name="switch-to-session-8" type="as">
       <default><![CDATA[['<Primary><Alt>F8']]]></default>
-      <_summary>Switch to VT 8</_summary>
+      <summary>Switch to VT 8</summary>
     </key>
     <key name="switch-to-session-9" type="as">
       <default><![CDATA[['<Primary><Alt>F9']]]></default>
-      <_summary>Switch to VT 9</_summary>
+      <summary>Switch to VT 9</summary>
     </key>
     <key name="switch-to-session-10" type="as">
       <default><![CDATA[['<Primary><Alt>F10']]]></default>
-      <_summary>Switch to VT 10</_summary>
+      <summary>Switch to VT 10</summary>
     </key>
     <key name="switch-to-session-11" type="as">
       <default><![CDATA[['<Primary><Alt>F11']]]></default>
-      <_summary>Switch to VT 11</_summary>
+      <summary>Switch to VT 11</summary>
     </key>
     <key name="switch-to-session-12" type="as">
       <default><![CDATA[['<Primary><Alt>F12']]]></default>
-      <_summary>Switch to VT 12</_summary>
+      <summary>Switch to VT 12</summary>
     </key>
   </schema>
 </schemalist>