26 files changed, 81 insertions, 69 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index c532027..c34c585 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,6 +27,9 @@ gsettings_SCHEMAS = \
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
+
 convertdir = $(datadir)/MateConf/gsettings
 convert_DATA = mate-settings-daemon.convert
 
diff --git a/data/org.mate.SettingsDaemon.gschema.xml.in b/data/org.mate.SettingsDaemon.gschema.xml.in
deleted file mode 100644
index 8b13789..0000000
--- a/data/org.mate.SettingsDaemon.gschema.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in
index 84bfb9f..84bfb9f 100644
--- a/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in
index 64332ad..64332ad 100644
--- a/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in
index 9ad216b..9ad216b 100644
--- a/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in
index 1ba1bb0..1ba1bb0 100644
--- a/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in
index 24882cb..24882cb 100644
--- a/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in
index a371b84..a371b84 100644
--- a/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in
index d12afb2..d12afb2 100644
--- a/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in
index f855cfd..f855cfd 100644
--- a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in
index 6778873..6778873 100644
--- a/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in
index f398d27..f398d27 100644
--- a/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in
index 33883e2..33883e2 100644
--- a/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in
index 597e6bc..597e6bc 100644
--- a/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in
index e3eb93d..e3eb93d 100644
--- a/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in
index 3b55e09..3b55e09 100644
--- a/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in
index d83cc68..d83cc68 100644
--- a/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in.in
diff --git a/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in
index d636862..d636862 100644
--- a/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in
+++ b/data/org.mate.SettingsDaemon.plugins.xsettings.gschema.xml.in.in
diff --git a/data/org.mate.applications-at.gschema.xml.in b/data/org.mate.applications-at.gschema.xml.in.in
index 94edc9c..94edc9c 100644
--- a/data/org.mate.applications-at.gschema.xml.in
+++ b/data/org.mate.applications-at.gschema.xml.in.in
diff --git a/data/org.mate.font-rendering.gschema.xml.in b/data/org.mate.font-rendering.gschema.xml.in.in
index 2d9f84b..2d9f84b 100644
--- a/data/org.mate.font-rendering.gschema.xml.in
+++ b/data/org.mate.font-rendering.gschema.xml.in.in
diff --git a/data/org.mate.keybindings.gschema.xml.in b/data/org.mate.keybindings.gschema.xml.in.in
index 7d1b7e3..954e309 100644
--- a/data/org.mate.keybindings.gschema.xml.in
+++ b/data/org.mate.keybindings.gschema.xml.in.in
@@ -7,52 +7,52 @@
   <schema id="org.mate.keybindings.magnifier" path="/org/mate/desktop/keybindings/magnifier/">
     <key name="binding" type="s">
       <default>''</default>
-      <summary>Toggle magnifier</summary>
-      <description>Binding to toggle the magnifier.</description>
+      <_summary>Toggle magnifier</_summary>
+      <_description>Binding to toggle the magnifier.</_description>
     </key>
     <key name="name" type="s">
       <default context="name" l10n="messages">'Toggle magnifier'</default>
-      <summary>The name of the keyboard shortcut to toggle the magnifier</summary>
-      <description>This is the name of the keyboard shortcut to toggle the magnifier. This name will be shown in the keyboard shortcut preferences dialog.</description>
+      <_summary>The name of the keyboard shortcut to toggle the magnifier</_summary>
+      <_description>This is the name of the keyboard shortcut to toggle the magnifier. This name will be shown in the keyboard shortcut preferences dialog.</_description>
     </key>
     <key name="action" type="s">
       <default>'mateconftool-2 --toggle /desktop/mate/applications/at/screen_magnifier_enabled'</default>
-      <summary>Toggle magnifier</summary>
-      <description>Command used to turn the magnifier on or off.</description>
+      <_summary>Toggle magnifier</_summary>
+      <_description>Command used to turn the magnifier on or off.</_description>
     </key>
   </schema>
   <schema id="org.mate.keybindings.screenreader" path="/org/mate/desktop/keybindings/screenreader/">
     <key name="binding" type="s">
       <default>''</default>
-      <summary>Toggle screen reader</summary>
-      <description>Binding to toggle the screen reader.</description>
+      <_summary>Toggle screen reader</_summary>
+      <_description>Binding to toggle the screen reader.</_description>
     </key>
     <key name="name" type="s">
       <default context="name" l10n="messages">'Toggle screen reader'</default>
-      <summary>The name of the keyboard shortcut to toggle the screen reader</summary>
-      <description>This is the name of the keyboard shortcut to toggle the screen reader. This name will be shown in the keyboard shortcut preferences dialog.</description>
+      <_summary>The name of the keyboard shortcut to toggle the screen reader</_summary>
+      <_description>This is the name of the keyboard shortcut to toggle the screen reader. This name will be shown in the keyboard shortcut preferences dialog.</_description>
     </key>
     <key name="action" type="s">
       <default>'mateconftool-2 --toggle /desktop/mate/applications/at/screen_reader_enabled'</default>
-      <summary>Toggle screen reader</summary>
-      <description>Command used to turn the screen reader on or off.</description>
+      <_summary>Toggle screen reader</_summary>
+      <_description>Command used to turn the screen reader on or off.</_description>
     </key>
   </schema>
   <schema id="org.mate.keybindings.onscreenkeyboard" path="/org/mate/desktop/keybindings/onscreenkeyboard/">
     <key name="name" type="s">
       <default context="name" l10n="messages">'Toggle on-screen keyboard'</default>
-      <summary>The name of the keyboard shortcut to toggle the on-screen keyboard</summary>
-      <description>This is the name of the keyboard shortcut to toggle the on-screen keyboard. This name will be shown in the keyboard shortcut preferences dialog.</description>
+      <_summary>The name of the keyboard shortcut to toggle the on-screen keyboard</_summary>
+      <_description>This is the name of the keyboard shortcut to toggle the on-screen keyboard. This name will be shown in the keyboard shortcut preferences dialog.</_description>
     </key>
     <key name="binding" type="s">
       <default>''</default>
-      <summary>Toggle on-screen keyboard</summary>
-      <description>Binding to toggle the on-screen keyboard.</description>
+      <_summary>Toggle on-screen keyboard</_summary>
+      <_description>Binding to toggle the on-screen keyboard.</_description>
     </key>
     <key name="action" type="s">
       <default>'mateconftool-2 --toggle /desktop/mate/applications/at/screen_keyboard_enabled'</default>
-      <summary>Toggle on-screen keyboard</summary>
-      <description>Command used to turn the on-screen keyboard on or off.</description>
+      <_summary>Toggle on-screen keyboard</_summary>
+      <_description>Command used to turn the on-screen keyboard on or off.</_description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/org.mate.peripherals-smartcard.gschema.xml.in b/data/org.mate.peripherals-smartcard.gschema.xml.in
deleted file mode 100644
index 8ed910d..0000000
--- a/data/org.mate.peripherals-smartcard.gschema.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<schemalist>
-  <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>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.peripherals-smartcard.gschema.xml.in.in b/data/org.mate.peripherals-smartcard.gschema.xml.in.in
new file mode 100644
index 0000000..8b6cfd6
--- /dev/null
+++ b/data/org.mate.peripherals-smartcard.gschema.xml.in.in
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <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>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in b/data/org.mate.peripherals-touchpad.gschema.xml.in
deleted file mode 100644
index 0b2d7d1..0000000
--- a/data/org.mate.peripherals-touchpad.gschema.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<schemalist>
-  <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="touchpad-enabled" type="b">
-      <default>true</default>
-      <summary>Enable touchpad</summary>
-      <description>Set this to TRUE to enable all touchpads.</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
new file mode 100644
index 0000000..8a30d1f
--- /dev/null
+++ b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
@@ -0,0 +1,29 @@
+<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="touchpad-enabled" type="b">
+      <default>true</default>
+      <_summary>Enable touchpad</_summary>
+      <_description>Set this to TRUE to enable all touchpads.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 579daee..6275da4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,15 +1,28 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
 data/50-accessibility.xml.in
-data/apps_mate_settings_daemon_housekeeping.schemas.in
-data/apps_mate_settings_daemon_keybindings.schemas.in
-data/apps_mate_settings_daemon_xrandr.schemas.in
-data/desktop_mate_font_rendering.schemas.in
-data/desktop_mate_keybindings.schemas.in
-data/desktop_mate_peripherals_touchpad.schemas.in
+data/org.mate.applications-at.gschema.xml.in.in
+data/org.mate.font-rendering.gschema.xml.in.in
+data/org.mate.keybindings.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.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
 data/mate-settings-daemon.desktop.in.in
-data/mate-settings-daemon.schemas.in
-data/desktop_mate_peripherals_smartcard.schemas.in
 mate-settings-daemon/main.c
 [type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.in
 plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
@@ -18,8 +31,6 @@ plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
 [type: gettext/ini]plugins/background/background.mate-settings-plugin.in
 [type: gettext/ini]plugins/clipboard/clipboard.mate-settings-plugin.in
 [type: gettext/ini]plugins/dummy/dummy.mate-settings-plugin.in
-[type: gettext/ini]plugins/font/font.mate-settings-plugin.in
-plugins/font/msd-font-manager.c
 plugins/housekeeping/msd-disk-space.c
 plugins/housekeeping/msd-ldsm-dialog.c
 plugins/housekeeping/msd-ldsm-trash-empty.c
@@ -27,7 +38,6 @@ plugins/keybindings/msd-keybindings-manager.c
 [type: gettext/ini]plugins/keybindings/keybindings.mate-settings-plugin.in
 [type: gettext/ini]plugins/keyboard/keyboard.mate-settings-plugin.in
 plugins/keyboard/msd-keyboard-xkb.c
-[type: gettext/glade]plugins/keyboard/modmap-dialog.ui
 plugins/media-keys/msd-media-keys-manager.c
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c
 [type: gettext/ini]plugins/media-keys/media-keys.mate-settings-plugin.in