Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files

28 files changed, 404 insertions, 388 deletions

diff --git a/configure.ac b/configure.ac
index 27efa0a..80c52b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_SUBST(VERSION)
 
 AC_CONFIG_HEADERS([config.h])
 
-IT_PROG_INTLTOOL([0.37.1])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=mate-settings-daemon
 AC_SUBST(GETTEXT_PACKAGE)
@@ -510,6 +510,27 @@ data/Makefile
 data/mate-settings-daemon.desktop.in
 data/mate-settings-daemon.pc
 data/mate-settings-daemon-uninstalled.pc
+data/org.mate.applications-at.gschema.xml
+data/org.mate.font-rendering.gschema.xml
+data/org.mate.peripherals-smartcard.gschema.xml
+data/org.mate.peripherals-touchpad.gschema.xml
+data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml
+data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml
+data/org.mate.SettingsDaemon.plugins.background.gschema.xml
+data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml
+data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml
+data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml
+data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml
+data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml
+data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml
+data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml
+data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml
+data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml
+data/org.mate.SettingsDaemon.plugins.sound.gschema.xml
+data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml
+data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml
+data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml
+data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml
 po/Makefile.in
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index e564600..9ee0f0f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,37 +1,33 @@
 NULL =
 
-msd_gschemas_in_in = \
-	org.mate.applications-at.gschema.xml.in.in \
-	org.mate.font-rendering.gschema.xml.in.in \
-	org.mate.peripherals-smartcard.gschema.xml.in.in \
-	org.mate.peripherals-touchpad.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in \
-	org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in \
+msd_gschemas_in = \
+	org.mate.applications-at.gschema.xml.in \
+	org.mate.font-rendering.gschema.xml.in \
+	org.mate.peripherals-smartcard.gschema.xml.in \
+	org.mate.peripherals-touchpad.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.background.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.sound.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in \
+	org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in \
 	$(NULL)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
-msd_gschemas_in = $(msd_gschemas_in_in:.xml.in.in=.xml.in)
 gsettings_SCHEMAS = $(msd_gschemas_in:.xml.in=.xml)
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/MateConf/gsettings
@@ -65,7 +61,7 @@ xml_in_files = 50-accessibility.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
 EXTRA_DIST = 				\
-	$(msd_gschemas_in_in)		\
+	$(msd_gschemas_in)		\
 	$(convert_DATA)			\
 	$(service_in_files)		\
 	$(desktop_in_files)		\
@@ -76,7 +72,6 @@ EXTRA_DIST = 				\
 
 DISTCLEANFILES = 			\
 	$(gsettings_SCHEMAS)			\
-	$(msd_gschemas_in)		\
 	$(service_DATA)			\
 	$(desktop_DATA)			\
 	$(xml_DATA)			\
diff --git a/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in
index 84bfb9f..368aa8b 100644
--- a/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.a11y-keyboard" path="/org/mate/settings-daemon/plugins/a11y-keyboard/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>7</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in
index 26f97bc..9723d50 100644
--- a/data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.a11y-settings" path="/org/mate/settings-daemon/plugins/a11y-settings/">
     <key name="active" type="b">
       <default>false</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>7</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in
index 64332ad..bf1be28 100644
--- a/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.background" path="/org/mate/settings-daemon/plugins/background/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>97</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in
index 9ad216b..beb2999 100644
--- a/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.clipboard" path="/org/mate/settings-daemon/plugins/clipboard/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>99</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in
index 1ba1bb0..5606c89 100644
--- a/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.datetime" path="/org/mate/settings-daemon/plugins/datetime/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>99</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in
new file mode 100644
index 0000000..8710d47
--- /dev/null
+++ b/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in
@@ -0,0 +1,39 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.housekeeping" path="/org/mate/settings-daemon/plugins/housekeeping/">
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
+    </key>
+    <key name="priority" type="i">
+      <default>99</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
+    </key>
+    <key name="free-percent-notify" type="d">
+      <default>0.05</default>
+      <summary>Free percentage notify threshold</summary>
+      <description>Percentage free space threshold for initial warning of low disk space. If the percentage free space drops below this, a warning will be shown.</description>
+    </key>
+    <key name="free-percent-notify-again" type="d">
+      <default>0.01</default>
+      <summary>Subsequent free percentage notify threshold</summary>
+      <description>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</description>
+    </key>
+    <key name="free-size-gb-no-notify" type="i">
+      <default>2</default>
+      <summary>Free space no notify threshold</summary>
+      <description>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</description>
+    </key>
+    <key name="min-notify-period" type="i">
+      <default>10</default>
+      <summary>Minimum notify period for repeated warnings</summary>
+      <description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often than this period.</description>
+    </key>
+    <key name="ignore-paths" type="as">
+      <default>[]</default>
+      <summary>Mount paths to ignore</summary>
+      <description>Specify a list of mount paths to ignore when they run low on space.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in
deleted file mode 100644
index 24882cb..0000000
--- a/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in
+++ /dev/null
@@ -1,39 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.housekeeping" path="/org/mate/settings-daemon/plugins/housekeeping/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
-    </key>
-    <key name="priority" type="i">
-      <default>99</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
-    </key>
-    <key name="free-percent-notify" type="d">
-      <default>0.05</default>
-      <_summary>Free percentage notify threshold</_summary>
-      <_description>Percentage free space threshold for initial warning of low disk space. If the percentage free space drops below this, a warning will be shown.</_description>
-    </key>
-    <key name="free-percent-notify-again" type="d">
-      <default>0.01</default>
-      <_summary>Subsequent free percentage notify threshold</_summary>
-      <_description>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</_description>
-    </key>
-    <key name="free-size-gb-no-notify" type="i">
-      <default>2</default>
-      <_summary>Free space no notify threshold</_summary>
-      <_description>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</_description>
-    </key>
-    <key name="min-notify-period" type="i">
-      <default>10</default>
-      <_summary>Minimum notify period for repeated warnings</_summary>
-      <_description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often than this period.</_description>
-    </key>
-    <key name="ignore-paths" type="as">
-      <default>[]</default>
-      <_summary>Mount paths to ignore</_summary>
-      <_description>Specify a list of mount paths to ignore when they run low on space.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in
index a371b84..c440c89 100644
--- a/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.keybindings" path="/org/mate/settings-daemon/plugins/keybindings/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>6</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in
index d12afb2..61531b7 100644
--- a/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.keyboard" path="/org/mate/settings-daemon/plugins/keyboard/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>6</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in
new file mode 100644
index 0000000..1ce1038
--- /dev/null
+++ b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in
@@ -0,0 +1,129 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.media-keys" path="/org/mate/settings-daemon/plugins/media-keys/">
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
+    </key>
+    <key name="priority" type="i">
+      <default>98</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
+    </key>
+    <key name="volume-step" type="i">
+      <default>6</default>
+      <summary>Volume step</summary>
+      <description>Volume step as percentage of volume.</description>
+    </key>
+    <key name="touchpad" type="s">
+      <default>'XF86TouchpadToggle'</default>
+      <summary>Toggle touchpad</summary>
+      <description>Binding to enable or disable the touchpad.</description>
+    </key>
+    <key name="volume-mute" type="s">
+      <default>'XF86AudioMute'</default>
+      <summary>Volume mute</summary>
+      <description>Binding to mute the system volume.</description>
+    </key>
+    <key name="volume-down" type="s">
+      <default>'XF86AudioLowerVolume'</default>
+      <summary>Volume down</summary>
+      <description>Binding to lower the system volume.</description>
+    </key>
+    <key name="volume-up" type="s">
+      <default>'XF86AudioRaiseVolume'</default>
+      <summary>Volume up</summary>
+      <description>Binding to raise the system volume.</description>
+    </key>
+    <key name="power" type="s">
+      <default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
+      <summary>Log out</summary>
+      <description>Binding to log out.</description>
+    </key>
+    <key name="eject" type="s">
+      <default>'XF86Eject'</default>
+      <summary>Eject</summary>
+      <description>Binding to eject an optical disc.</description>
+    </key>
+    <key name="home" type="s">
+      <default>'XF86Explorer'</default>
+      <summary>Home folder</summary>
+      <description>Binding to open the Home folder.</description>
+    </key>
+    <key name="search" type="s">
+      <default>'XF86Search'</default>
+      <summary>Search</summary>
+      <description>Binding to launch the search tool.</description>
+    </key>
+    <key name="email" type="s">
+      <default>'XF86Mail'</default>
+      <summary>Launch email client</summary>
+      <description>Binding to launch the email client.</description>
+    </key>
+    <key name="screensaver" type="s">
+      <default>'&lt;Control&gt;&lt;Alt&gt;l'</default>
+      <summary>Lock screen</summary>
+      <description>Binding to lock the screen.</description>
+    </key>
+    <key name="help" type="s">
+      <default>''</default>
+      <summary>Launch help browser</summary>
+      <description>Binding to launch the help browser.</description>
+    </key>
+    <key name="calculator" type="s">
+      <default>'XF86Calculator'</default>
+      <summary>Launch calculator</summary>
+      <description>Binding to launch the calculator.</description>
+    </key>
+    <key name="www" type="s">
+      <default>'XF86WWW'</default>
+      <summary>Launch web browser</summary>
+      <description>Binding to launch the web browser.</description>
+    </key>
+    <key name="media" type="s">
+      <default>'XF86AudioMedia'</default>
+      <summary>Launch media player</summary>
+      <description>Binding to launch the media player.</description>
+    </key>
+    <key name="play" type="s">
+      <default>'XF86AudioPlay'</default>
+      <summary>Play (or play/pause)</summary>
+      <description>Binding to start playback (or toggle play/pause).</description>
+    </key>
+    <key name="pause" type="s">
+      <default>'XF86AudioPause'</default>
+      <summary>Pause playback</summary>
+      <description>Binding to pause playback.</description>
+    </key>
+    <key name="stop" type="s">
+      <default>'XF86AudioStop'</default>
+      <summary>Stop playback</summary>
+      <description>Binding to stop playback.</description>
+    </key>
+    <key name="previous" type="s">
+      <default>'XF86AudioPrev'</default>
+      <summary>Previous track</summary>
+      <description>Binding to skip to previous track.</description>
+    </key>
+    <key name="next" type="s">
+      <default>'XF86AudioNext'</default>
+      <summary>Next track</summary>
+      <description>Binding to skip to next track.</description>
+    </key>
+    <key name="magnifier" type="s">
+      <default>''</default>
+      <summary>Toggle magnifier</summary>
+      <description>Binding to show the screen magnifier</description>
+    </key>
+    <key name="screenreader" type="s">
+      <default>''</default>
+      <summary>Toggle screen reader</summary>
+      <description>Binding to start the screen reader</description>
+    </key>
+    <key name="on-screen-keyboard" type="s">
+      <default>''</default>
+      <summary>Toggle on-screen keyboard</summary>
+      <description>Binding to show the on-screen keyboard</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in
deleted file mode 100644
index 3e0ee2c..0000000
--- a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in
+++ /dev/null
@@ -1,129 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.media-keys" path="/org/mate/settings-daemon/plugins/media-keys/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
-    </key>
-    <key name="priority" type="i">
-      <default>98</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
-    </key>
-    <key name="volume-step" type="i">
-      <default>6</default>
-      <_summary>Volume step</_summary>
-      <_description>Volume step as percentage of volume.</_description>
-    </key>
-    <key name="touchpad" type="s">
-      <default>'XF86TouchpadToggle'</default>
-      <_summary>Toggle touchpad</_summary>
-      <_description>Binding to enable or disable the touchpad.</_description>
-    </key>
-    <key name="volume-mute" type="s">
-      <default>'XF86AudioMute'</default>
-      <_summary>Volume mute</_summary>
-      <_description>Binding to mute the system volume.</_description>
-    </key>
-    <key name="volume-down" type="s">
-      <default>'XF86AudioLowerVolume'</default>
-      <_summary>Volume down</_summary>
-      <_description>Binding to lower the system volume.</_description>
-    </key>
-    <key name="volume-up" type="s">
-      <default>'XF86AudioRaiseVolume'</default>
-      <_summary>Volume up</_summary>
-      <_description>Binding to raise the system volume.</_description>
-    </key>
-    <key name="power" type="s">
-      <default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
-      <_summary>Log out</_summary>
-      <_description>Binding to log out.</_description>
-    </key>
-    <key name="eject" type="s">
-      <default>'XF86Eject'</default>
-      <_summary>Eject</_summary>
-      <_description>Binding to eject an optical disc.</_description>
-    </key>
-    <key name="home" type="s">
-      <default>'XF86Explorer'</default>
-      <_summary>Home folder</_summary>
-      <_description>Binding to open the Home folder.</_description>
-    </key>
-    <key name="search" type="s">
-      <default>'XF86Search'</default>
-      <_summary>Search</_summary>
-      <_description>Binding to launch the search tool.</_description>
-    </key>
-    <key name="email" type="s">
-      <default>'XF86Mail'</default>
-      <_summary>Launch email client</_summary>
-      <_description>Binding to launch the email client.</_description>
-    </key>
-    <key name="screensaver" type="s">
-      <default>'&lt;Control&gt;&lt;Alt&gt;l'</default>
-      <_summary>Lock screen</_summary>
-      <_description>Binding to lock the screen.</_description>
-    </key>
-    <key name="help" type="s">
-      <default>''</default>
-      <_summary>Launch help browser</_summary>
-      <_description>Binding to launch the help browser.</_description>
-    </key>
-    <key name="calculator" type="s">
-      <default>'XF86Calculator'</default>
-      <_summary>Launch calculator</_summary>
-      <_description>Binding to launch the calculator.</_description>
-    </key>
-    <key name="www" type="s">
-      <default>'XF86WWW'</default>
-      <_summary>Launch web browser</_summary>
-      <_description>Binding to launch the web browser.</_description>
-    </key>
-    <key name="media" type="s">
-      <default>'XF86AudioMedia'</default>
-      <_summary>Launch media player</_summary>
-      <_description>Binding to launch the media player.</_description>
-    </key>
-    <key name="play" type="s">
-      <default>'XF86AudioPlay'</default>
-      <_summary>Play (or play/pause)</_summary>
-      <_description>Binding to start playback (or toggle play/pause).</_description>
-    </key>
-    <key name="pause" type="s">
-      <default>'XF86AudioPause'</default>
-      <_summary>Pause playback</_summary>
-      <_description>Binding to pause playback.</_description>
-    </key>
-    <key name="stop" type="s">
-      <default>'XF86AudioStop'</default>
-      <_summary>Stop playback</_summary>
-      <_description>Binding to stop playback.</_description>
-    </key>
-    <key name="previous" type="s">
-      <default>'XF86AudioPrev'</default>
-      <_summary>Previous track</_summary>
-      <_description>Binding to skip to previous track.</_description>
-    </key>
-    <key name="next" type="s">
-      <default>'XF86AudioNext'</default>
-      <_summary>Next track</_summary>
-      <_description>Binding to skip to next track.</_description>
-    </key>
-    <key name="magnifier" type="s">
-      <default>''</default>
-      <_summary>Toggle magnifier</_summary>
-      <_description>Binding to show the screen magnifier</_description>
-    </key>
-    <key name="screenreader" type="s">
-      <default>''</default>
-      <_summary>Toggle screen reader</_summary>
-      <_description>Binding to start the screen reader</_description>
-    </key>
-    <key name="on-screen-keyboard" type="s">
-      <default>''</default>
-      <_summary>Toggle on-screen keyboard</_summary>
-      <_description>Binding to show the on-screen keyboard</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in
index 6778873..be3251e 100644
--- a/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.mouse" path="/org/mate/settings-daemon/plugins/mouse/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>7</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in
index f398d27..f16aa17 100644
--- a/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.mpris" path="/org/mate/settings-daemon/plugins/mpris/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>99</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in
index 33883e2..240b4c2 100644
--- a/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.smartcard" path="/org/mate/settings-daemon/plugins/smartcard/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>8</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in
index 597e6bc..f014df5 100644
--- a/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.sound" path="/org/mate/settings-daemon/plugins/sound/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>5</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in
index e3eb93d..0489b75 100644
--- a/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.typing-break" path="/org/mate/settings-daemon/plugins/typing-break/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>99</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in
new file mode 100644
index 0000000..2691635
--- /dev/null
+++ b/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in
@@ -0,0 +1,39 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.xrandr" path="/org/mate/settings-daemon/plugins/xrandr/">
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
+    </key>
+    <key name="priority" type="i">
+      <default>1</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
+    </key>
+    <key name="show-notification-icon" type="b">
+      <default>false</default>
+      <summary>Show Displays in Notification Area</summary>
+      <description>Whether a notification icon with display-related things should be shown in the panel.</description>
+    </key>
+    <key name="use-xorg-monitor-settings" type="b">
+      <default>true</default>
+      <summary>Do not touch monitor configuration</summary>
+      <description>Usually, mate-settings-daemon configures internal and external monitors according to the turn_on_external_monitors_at_startup and turn_on_laptop_monitor_at_startup settings and determines an appropriate cloning/side-by-side mode. Setting this key to True disables this, and the monitor settings are not touched at all (unless there is an explicit user configuration).</description>
+    </key>
+    <key name="turn-on-external-monitors-at-startup" type="b">
+      <default>false</default>
+      <summary>Turn on external monitor after system boot</summary>
+      <description>Turn on external monitor after system boot if user plugs in external monitor on system boot.</description>
+    </key>
+    <key name="turn-on-laptop-monitor-at-startup" type="b">
+      <default>true</default>
+      <summary>Turn on laptop monitor after system boot</summary>
+      <description>Turn on laptop monitor after system boot if user plugs in external monitor on system boot.</description>
+    </key>
+    <key name="default-configuration-file" type="s">
+      <default>'/etc/mate-settings-daemon/xrandr/monitors.xml'</default>
+      <summary>File for default configuration for RandR</summary>
+      <description>The XRandR plugin will look for a default configuration in the file specified by this key.  This is similar to the ~/.config/monitors.xml that normally gets stored in users' home directories.  If a user does not have such a file, or has one that does not match the user's setup of monitors, then the file specified by this key will be used instead.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in
deleted file mode 100644
index 3b55e09..0000000
--- a/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in
+++ /dev/null
@@ -1,39 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.xrandr" path="/org/mate/settings-daemon/plugins/xrandr/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
-    </key>
-    <key name="priority" type="i">
-      <default>1</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
-    </key>
-    <key name="show-notification-icon" type="b">
-      <default>false</default>
-      <_summary>Show Displays in Notification Area</_summary>
-      <_description>Whether a notification icon with display-related things should be shown in the panel.</_description>
-    </key>
-    <key name="use-xorg-monitor-settings" type="b">
-      <default>true</default>
-      <_summary>Do not touch monitor configuration</_summary>
-      <_description>Usually, mate-settings-daemon configures internal and external monitors according to the turn_on_external_monitors_at_startup and turn_on_laptop_monitor_at_startup settings and determines an appropriate cloning/side-by-side mode. Setting this key to True disables this, and the monitor settings are not touched at all (unless there is an explicit user configuration).</_description>
-    </key>
-    <key name="turn-on-external-monitors-at-startup" type="b">
-      <default>false</default>
-      <_summary>Turn on external monitor after system boot</_summary>
-      <_description>Turn on external monitor after system boot if user plugs in external monitor on system boot.</_description>
-    </key>
-    <key name="turn-on-laptop-monitor-at-startup" type="b">
-      <default>true</default>
-      <_summary>Turn on laptop monitor after system boot</_summary>
-      <_description>Turn on laptop monitor after system boot if user plugs in external monitor on system boot.</_description>
-    </key>
-    <key name="default-configuration-file" type="s">
-      <default>'/etc/mate-settings-daemon/xrandr/monitors.xml'</default>
-      <_summary>File for default configuration for RandR</_summary>
-      <_description>The XRandR plugin will look for a default configuration in the file specified by this key.  This is similar to the ~/.config/monitors.xml that normally gets stored in users' home directories.  If a user does not have such a file, or has one that does not match the user's setup of monitors, then the file specified by this key will be used instead.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in
index d83cc68..ad5d798 100644
--- a/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.xrdb" path="/org/mate/settings-daemon/plugins/xrdb/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>90</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in b/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in
index d636862..ae4721a 100644
--- a/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in
+++ b/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in
@@ -2,13 +2,13 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.SettingsDaemon.plugins.xsettings" path="/org/mate/settings-daemon/plugins/xsettings/">
     <key name="active" type="b">
       <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by mate-settings-daemon or not</_description>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by mate-settings-daemon or not</description>
     </key>
     <key name="priority" type="i">
       <default>2</default>
-      <_summary>Priority to use for this plugin</_summary>
-      <_description>Priority to use for this plugin in mate-settings-daemon startup queue</_description>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in mate-settings-daemon startup queue</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.applications-at.gschema.xml.in.in b/data/org.mate.applications-at.gschema.xml.in
index 94edc9c..79e9e3d 100644
--- a/data/org.mate.applications-at.gschema.xml.in.in
+++ b/data/org.mate.applications-at.gschema.xml.in
@@ -2,18 +2,18 @@
   <schema id="org.mate.applications-at" path="/org/mate/desktop/applications/at/">
     <key name="screen-keyboard-enabled" type="b">
       <default>false</default>
-      <_summary>On-screen keyboard</_summary>
-      <_description>Whether the on-screen keyboard is turned on.</_description>
+      <summary>On-screen keyboard</summary>
+      <description>Whether the on-screen keyboard is turned on.</description>
     </key>
     <key name="screen-magnifier-enabled" type="b">
       <default>false</default>
-      <_summary>Screen magnifier</_summary>
-      <_description>Whether the screen magnifier is turned on.</_description>
+      <summary>Screen magnifier</summary>
+      <description>Whether the screen magnifier is turned on.</description>
     </key>
     <key name="screen-reader-enabled" type="b">
       <default>false</default>
-      <_summary>Screen reader</_summary>
-      <_description>Whether the screen reader is turned on.</_description>
+      <summary>Screen reader</summary>
+      <description>Whether the screen reader is turned on.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.font-rendering.gschema.xml.in.in b/data/org.mate.font-rendering.gschema.xml.in
index 2d9f84b..3c292a1 100644
--- a/data/org.mate.font-rendering.gschema.xml.in.in
+++ b/data/org.mate.font-rendering.gschema.xml.in
@@ -19,23 +19,23 @@
   <schema id="org.mate.font-rendering" path="/org/mate/desktop/font-rendering/">
     <key name="dpi" type="d">
       <default>0.0</default>
-      <_summary>DPI</_summary>
-      <_description>The resolution used for converting font sizes to pixel sizes,  in dots per inch.</_description>
+      <summary>DPI</summary>
+      <description>The resolution used for converting font sizes to pixel sizes,  in dots per inch.</description>
     </key>
     <key name="antialiasing" enum="org.mate.font-rendering.Antialiasing">
       <default>'grayscale'</default>
-      <_summary>Antialiasing</_summary>
-      <_description>The type of antialiasing to use when rendering fonts. Possible values are: "none" for no antialiasing, "grayscale" for standard grayscale antialiasing, and "rgba" for subpixel antialiasing (LCD screens only).</_description>
+      <summary>Antialiasing</summary>
+      <description>The type of antialiasing to use when rendering fonts. Possible values are: "none" for no antialiasing, "grayscale" for standard grayscale antialiasing, and "rgba" for subpixel antialiasing (LCD screens only).</description>
     </key>
     <key name="hinting" enum="org.mate.font-rendering.Hinting">
       <default>'medium'</default>
-      <_summary>Hinting</_summary>
-      <_description>The type of hinting to use when rendering fonts. Possible values are: "none" for no hinting,  "slight" for basic, "medium" for moderate, and "full" for maximum hinting (may cause distortion of letter forms).</_description>
+      <summary>Hinting</summary>
+      <description>The type of hinting to use when rendering fonts. Possible values are: "none" for no hinting,  "slight" for basic, "medium" for moderate, and "full" for maximum hinting (may cause distortion of letter forms).</description>
     </key>
     <key name="rgba-order" enum="org.mate.font-rendering.RgbaOrder">
       <default>'rgb'</default>
-      <_summary>RGBA order</_summary>
-      <_description>The order of subpixel elements on an LCD screen; only used when antialiasing is set to "rgba". Possible values are: "rgb" for red on left (most common), "bgr" for blue on left, "vrgb" for red on top, "vbgr" for red on bottom.</_description>
+      <summary>RGBA order</summary>
+      <description>The order of subpixel elements on an LCD screen; only used when antialiasing is set to "rgba". Possible values are: "rgb" for red on left (most common), "bgr" for blue on left, "vrgb" for red on top, "vbgr" for red on bottom.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.peripherals-smartcard.gschema.xml.in.in b/data/org.mate.peripherals-smartcard.gschema.xml.in
index 8b6cfd6..0f27082 100644
--- a/data/org.mate.peripherals-smartcard.gschema.xml.in.in
+++ b/data/org.mate.peripherals-smartcard.gschema.xml.in
@@ -3,8 +3,8 @@
   <schema id="org.mate.peripherals-smartcard" path="/org/mate/desktop/peripherals/smartcard/">
     <key name="removal-action" type="s">
       <default>'none'</default>
-      <_summary>Smartcard removal action</_summary>
-      <_description>Set this to one of "none", "lock_screen", or "force_logout".  The action will get performed when the smartcard used for log in is removed.</_description>
+      <summary>Smartcard removal action</summary>
+      <description>Set this to one of "none", "lock_screen", or "force_logout".  The action will get performed when the smartcard used for log in is removed.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in b/data/org.mate.peripherals-touchpad.gschema.xml.in
new file mode 100644
index 0000000..db72e42
--- /dev/null
+++ b/data/org.mate.peripherals-touchpad.gschema.xml.in
@@ -0,0 +1,59 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.peripherals-touchpad" path="/org/mate/desktop/peripherals/touchpad/">
+    <key name="disable-while-typing" type="b">
+      <default>false</default>
+      <summary>Disable touchpad while typing</summary>
+      <description>Set this to TRUE if you have problems with accidentally hitting the touchpad while typing.</description>
+    </key>
+    <key name="tap-to-click" type="b">
+      <default>false</default>
+      <summary>Enable mouse clicks with touchpad</summary>
+      <description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</description>
+    </key>
+    <key name="scroll-method" type="i">
+      <default>1</default>
+      <summary>Select the touchpad scroll method</summary>
+      <description>Select the touchpad scroll method. Supported values are: 0: disabled, 1: edge scrolling, and 2: two-finger scrolling</description>
+    </key>
+    <key name="horiz-scroll-enabled" type="b">
+      <default>false</default>
+      <summary>Enable horizontal scrolling</summary>
+      <description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</description>
+    </key>
+    <key name="natural-scroll" type="b">
+      <default>false</default>
+      <summary>Natural scrolling</summary>
+      <description>Set this to true to enable natural (reverse) scrolling for touchpads</description>
+    </key>
+    <key name="touchpad-enabled" type="b">
+      <default>true</default>
+      <summary>Enable touchpad</summary>
+      <description>Set this to TRUE to enable all touchpads.</description>
+    </key>
+    <key name="two-finger-click" type="i">
+      <default>3</default>
+      <summary>Enabled two-finger button-click emulation</summary>
+      <description>0 thru 3, 0 is inactive, 1-3 is button to emulate</description>
+    </key>
+    <key name="three-finger-click" type="i">
+      <default>2</default>
+      <summary>Enable three-finger button-click emulation</summary>
+      <description>0 thru 3, 0 is inactive, 1-3 is button to emulate</description>
+    </key>
+    <key name="tap-button-one-finger" type="i">
+      <default>1</default>
+      <summary>One finger tap button</summary>
+      <description>Select the button mapping for one-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</description>
+    </key>
+        <key name="tap-button-two-finger" type="i">
+      <default>3</default>
+      <summary>Two finger tap button</summary>
+      <description>Select the button mapping for two-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</description>
+    </key>
+    <key name="tap-button-three-finger" type="i">
+      <default>2</default>
+      <summary>Three finger tap button</summary>
+      <description>Select the button mapping for three-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in.in b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
deleted file mode 100644
index 8cfe8d4..0000000
--- a/data/org.mate.peripherals-touchpad.gschema.xml.in.in
+++ /dev/null
@@ -1,59 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.peripherals-touchpad" path="/org/mate/desktop/peripherals/touchpad/">
-    <key name="disable-while-typing" type="b">
-      <default>false</default>
-      <_summary>Disable touchpad while typing</_summary>
-      <_description>Set this to TRUE if you have problems with accidentally hitting the touchpad while typing.</_description>
-    </key>
-    <key name="tap-to-click" type="b">
-      <default>false</default>
-      <_summary>Enable mouse clicks with touchpad</_summary>
-      <_description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</_description>
-    </key>
-    <key name="scroll-method" type="i">
-      <default>1</default>
-      <_summary>Select the touchpad scroll method</_summary>
-      <_description>Select the touchpad scroll method. Supported values are: 0: disabled, 1: edge scrolling, and 2: two-finger scrolling</_description>
-    </key>
-    <key name="horiz-scroll-enabled" type="b">
-      <default>false</default>
-      <_summary>Enable horizontal scrolling</_summary>
-      <_description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</_description>
-    </key>
-    <key name="natural-scroll" type="b">
-      <default>false</default>
-      <_summary>Natural scrolling</_summary>
-      <_description>Set this to true to enable natural (reverse) scrolling for touchpads</_description>
-    </key>
-    <key name="touchpad-enabled" type="b">
-      <default>true</default>
-      <_summary>Enable touchpad</_summary>
-      <_description>Set this to TRUE to enable all touchpads.</_description>
-    </key>
-    <key name="two-finger-click" type="i">
-      <default>3</default>
-      <_summary>Enabled two-finger button-click emulation</_summary>
-      <_description>0 thru 3, 0 is inactive, 1-3 is button to emulate</_description>
-    </key>
-    <key name="three-finger-click" type="i">
-      <default>2</default>
-      <_summary>Enable three-finger button-click emulation</_summary>
-      <_description>0 thru 3, 0 is inactive, 1-3 is button to emulate</_description>
-    </key>
-    <key name="tap-button-one-finger" type="i">
-      <default>1</default>
-      <_summary>One finger tap button</_summary>
-      <_description>Select the button mapping for one-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
-    </key>
-        <key name="tap-button-two-finger" type="i">
-      <default>3</default>
-      <_summary>Two finger tap button</_summary>
-      <_description>Select the button mapping for two-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
-    </key>
-    <key name="tap-button-three-finger" type="i">
-      <default>2</default>
-      <_summary>Three finger tap button</_summary>
-      <_description>Select the button mapping for three-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 27080da..db8c45e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,27 +1,27 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
 data/50-accessibility.xml.in
-data/org.mate.applications-at.gschema.xml.in.in
-data/org.mate.font-rendering.gschema.xml.in.in
-data/org.mate.peripherals-smartcard.gschema.xml.in.in
-data/org.mate.peripherals-touchpad.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in
-data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in
+[type: gettext/gsettings]data/org.mate.applications-at.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.font-rendering.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.peripherals-smartcard.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.peripherals-touchpad.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in
 data/mate-settings-daemon.desktop.in.in
 mate-settings-daemon/main.c
 [type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.in