switch to use gettext

45 files changed, 257 insertions, 156 deletions

diff --git a/Makefile.am b/Makefile.am
index 3088c25..6a1095e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,10 @@ NULL =
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = 			\
+	po 			\
 	mate-settings-daemon	\
 	plugins			\
 	data			\
-	po 			\
 	$(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
diff --git a/configure.ac b/configure.ac
index e75359a..2b847d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,14 +29,13 @@ AC_SUBST(VERSION)
 
 AC_CONFIG_HEADERS([config.h])
 
-IT_PROG_INTLTOOL([0.50.1])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=mate-settings-daemon
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain])
 
-AM_GLIB_GNU_GETTEXT
-
 AS_AC_EXPAND(LIBEXECDIR, "$libexecdir")
 
 MSD_INTLTOOL_PLUGIN_RULE='%.mate-settings-plugin:   %.mate-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
diff --git a/data/50-accessibility.xml.in b/data/50-accessibility.xml.in
index 89a9e6b..65efaa8 100644
--- a/data/50-accessibility.xml.in
+++ b/data/50-accessibility.xml.in
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries group="system" _name="Accessibility" schema="org.mate.SettingsDaemon.plugins.media-keys">
+<KeyListEntries group="system" name="Accessibility" schema="org.mate.SettingsDaemon.plugins.media-keys">
 
-	<KeyListEntry name="magnifier" _description="Toggle magnifier"/>
-	<KeyListEntry name="screenreader" _description="Toggle screen reader"/>
-	<KeyListEntry name="on-screen-keyboard" _description="Toggle on-screen keyboard"/>
+	<KeyListEntry name="magnifier" description="Toggle magnifier"/>
+	<KeyListEntry name="screenreader" description="Toggle screen reader"/>
+	<KeyListEntry name="on-screen-keyboard" description="Toggle on-screen keyboard"/>
 
 </KeyListEntries>
diff --git a/data/Makefile.am b/data/Makefile.am
index 3fad838..7c6f03f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,17 +28,17 @@ msd_gschemas_in = \
 	org.mate.SettingsDaemon.plugins.gschema.xml.in \
 	$(NULL)
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 gsettings_SCHEMAS = $(msd_gschemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-@INTLTOOL_DESKTOP_RULE@
 desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = mate-settings-daemon.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.mate.SettingsDaemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)
@@ -54,13 +54,14 @@ man_MANS = \
 	msd-datetime-mechanism.1 \
 	msd-locate-pointer.1
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 #disabled until we support it
 xmldir = @MATE_KEYBINDINGS_KEYSDIR@
 xml_in_files = 50-accessibility.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
+$(xml_DATA): $(xml_in_files)
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 EXTRA_DIST = 				\
 	$(msd_gschemas_in)		\
 	$(service_in_files)		\
diff --git a/data/mate-settings-daemon.desktop.in.in b/data/mate-settings-daemon.desktop.in.in
index 9a2aca7..4284b3e 100644
--- a/data/mate-settings-daemon.desktop.in.in
+++ b/data/mate-settings-daemon.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=MATE Settings Daemon
+Name=MATE Settings Daemon
 Exec=@LIBEXECDIR@/mate-settings-daemon
 OnlyShowIn=MATE;
 X-MATE-Autostart-Phase=Initialization
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index d4d69e5..75acaa0 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -65,10 +65,10 @@ liba11y_keyboard_la_LIBADD  = 		\
 	$(NULL)
 
 plugin_in_files = 		\
-	a11y-keyboard.mate-settings-plugin.in	\
+	a11y-keyboard.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -83,4 +83,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.in b/plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.desktop.in
index 4909948..51a59a2 100644
--- a/plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.in
+++ b/plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=a11y-keyboard
 IAge=0
-_Name=Accessibility Keyboard
-_Description=Accessibility keyboard plugin
+Name=Accessibility Keyboard
+Description=Accessibility keyboard plugin
 Authors=Jody Goldberg
 Copyright=Copyright © 2001 Ximian, Inc.
 Website=
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index f557b0f..6794dcc 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -26,9 +26,9 @@ liba11y_settings_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)
 
 plugin_in_files = 		\
-	a11y-settings.mate-settings-plugin.in
+	a11y-settings.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)
@@ -39,4 +39,5 @@ CLEANFILES = 			\
 DISTCLEANFILES =		\
 	$(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/a11y-settings/a11y-settings.mate-settings-plugin.in b/plugins/a11y-settings/a11y-settings.mate-settings-plugin.desktop.in
index ecdd80d..04c8828 100644
--- a/plugins/a11y-settings/a11y-settings.mate-settings-plugin.in
+++ b/plugins/a11y-settings/a11y-settings.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=a11y-settings
 IAge=0
-_Name=Accessibility settings
-_Description=Accessibility settings plugin
+Name=Accessibility settings
+Description=Accessibility settings plugin
 Authors=Bastien Nocera <[email protected]>
 Copyright=Copyright © 2011 Red Hat Inc.
 Website=
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index 01f0fc5..e25f26b 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -59,10 +59,10 @@ libbackground_la_LIBADD  = 		\
 	$(NULL)
 
 plugin_in_files = 		\
-	background.mate-settings-plugin.in	\
+	background.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -76,4 +76,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/background/background.mate-settings-plugin.in b/plugins/background/background.mate-settings-plugin.desktop.in
index 73d27b4..3c7a6a2 100644
--- a/plugins/background/background.mate-settings-plugin.in
+++ b/plugins/background/background.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=background
 IAge=0
-_Name=Background
-_Description=Background plugin
+Name=Background
+Description=Background plugin
 Authors=
 Copyright=Copyright © 2007
 Website=
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index 4b1fdca..bdf49ae 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -33,10 +33,10 @@ libclipboard_la_LIBADD  = 	\
 	$(NULL)
 
 plugin_in_files = 		\
-	clipboard.mate-settings-plugin.in	\
+	clipboard.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -50,4 +50,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/clipboard/clipboard.mate-settings-plugin.in b/plugins/clipboard/clipboard.mate-settings-plugin.desktop.in
index 3a5536f..3b81564 100644
--- a/plugins/clipboard/clipboard.mate-settings-plugin.in
+++ b/plugins/clipboard/clipboard.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=clipboard
 IAge=0
-_Name=Clipboard
-_Description=Clipboard plugin
+Name=Clipboard
+Description=Clipboard plugin
 Authors=Matthias Clasen
 Copyright=Copyright © 2007 Matthias Clasen
 Website=
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 7c3b76a..d705b60 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -39,9 +39,9 @@ $(dbus_services_DATA): $(dbus_services_in_files)
 
 dbus_conf_DATA = org.mate.SettingsDaemon.DateTimeMechanism.conf
 
-@INTLTOOL_POLICY_RULE@
 polkit_DATA = $(polkit_in_files:.policy.in=.policy)
-
+$(polkit_DATA): $(polkit_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 else
 dbus_services_DATA =
 dbus_conf_DATA =
diff --git a/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in b/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
index 4e064b3..caf54d7 100644
--- a/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
+++ b/plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
@@ -9,8 +9,8 @@
   <icon_name>mate-panel-clock</icon_name>
 
   <action id="org.mate.settingsdaemon.datetimemechanism.settimezone">
-    <_description>Change system time zone</_description>
-    <_message>Privileges are required to change the system time zone.</_message>
+    <description>Change system time zone</description>
+    <message>Privileges are required to change the system time zone.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -18,8 +18,8 @@
   </action>
 
   <action id="org.mate.settingsdaemon.datetimemechanism.settime">
-    <_description>Change system time</_description>
-    <_message>Privileges are required to change the system time.</_message>
+    <description>Change system time</description>
+    <message>Privileges are required to change the system time.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
@@ -27,8 +27,8 @@
   </action>
 
   <action id="org.mate.settingsdaemon.datetimemechanism.configurehwclock">
-    <_description>Configure hardware clock</_description>
-    <_message>Privileges are required to configure the hardware clock.</_message>
+    <description>Configure hardware clock</description>
+    <message>Privileges are required to configure the hardware clock.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index c578fd8..0aaaf74 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -23,9 +23,9 @@ libdummy_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)
 
 plugin_in_files = 		\
-	dummy.mate-settings-plugin.in
+	dummy.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)
@@ -36,7 +36,8 @@ CLEANFILES = 			\
 DISTCLEANFILES =		\
 	$(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 # override to _not_ install the test plugin
 # do not copy into your plugin
diff --git a/plugins/dummy/dummy.mate-settings-plugin.in b/plugins/dummy/dummy.mate-settings-plugin.desktop.in
index c9f8838..8740146 100644
--- a/plugins/dummy/dummy.mate-settings-plugin.in
+++ b/plugins/dummy/dummy.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=dummy
 IAge=0
-_Name=Dummy
-_Description=Dummy plugin
+Name=Dummy
+Description=Dummy plugin
 Authors=AUTHOR
 Copyright=Copyright © 2007 AUTHOR
 Website=
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index 9c37d01..fa422cf 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -27,9 +27,9 @@ libhousekeeping_la_LDFLAGS = $(MSD_PLUGIN_LDFLAGS)
 
 libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
 
-plugin_in_files = housekeeping.mate-settings-plugin.in
+plugin_in_files = housekeeping.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = $(plugin_in_files)
 
@@ -37,4 +37,5 @@ CLEANFILES = $(plugin_DATA)
 
 DISTCLEANFILES = $(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/housekeeping/housekeeping.mate-settings-plugin.in b/plugins/housekeeping/housekeeping.mate-settings-plugin.desktop.in
index d10c36c..01509ca 100644
--- a/plugins/housekeeping/housekeeping.mate-settings-plugin.in
+++ b/plugins/housekeeping/housekeeping.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=housekeeping
 IAge=0
-_Name=Housekeeping
-_Description=Automatically prunes thumbnail caches and other transient files, and warns about low disk space
+Name=Housekeeping
+Description=Automatically prunes thumbnail caches and other transient files, and warns about low disk space
 Authors=Michael J. Chudobiak
 Copyright=Copyright © 2008 Michael J. Chudobiak
 Website=
diff --git a/plugins/keybindings/Makefile.am b/plugins/keybindings/Makefile.am
index 4106e22..5bef006 100644
--- a/plugins/keybindings/Makefile.am
+++ b/plugins/keybindings/Makefile.am
@@ -35,10 +35,10 @@ libkeybindings_la_LIBADD  = 		\
 	$(NULL)
 
 plugin_in_files = 		\
-	keybindings.mate-settings-plugin.in	\
+	keybindings.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -52,4 +52,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/keybindings/keybindings.mate-settings-plugin.in b/plugins/keybindings/keybindings.mate-settings-plugin.desktop.in
index f9c7208..c668e3f 100644
--- a/plugins/keybindings/keybindings.mate-settings-plugin.in
+++ b/plugins/keybindings/keybindings.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=keybindings
 IAge=0
-_Name=Keybindings
-_Description=Keybindings plugin
+Name=Keybindings
+Description=Keybindings plugin
 Authors=AUTHOR
 Copyright=Copyright © 2007 AUTHOR
 Website=
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index bffab68..62786b2 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -45,10 +45,10 @@ libkeyboard_la_LIBADD  = 	\
 	$(NULL)
 
 plugin_in_files = 		\
-	keyboard.mate-settings-plugin.in	\
+	keyboard.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(icons_DATA)		\
@@ -64,4 +64,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/keyboard/keyboard.mate-settings-plugin.in b/plugins/keyboard/keyboard.mate-settings-plugin.desktop.in
index 2ced59c..00bd1d9 100644
--- a/plugins/keyboard/keyboard.mate-settings-plugin.in
+++ b/plugins/keyboard/keyboard.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=keyboard
 IAge=0
-_Name=Keyboard
-_Description=Keyboard plugin
+Name=Keyboard
+Description=Keyboard plugin
 Authors=
 Copyright=Copyright © 2007
 Website=
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 80e9f22..155a253 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -58,9 +58,9 @@ libmedia_keys_la_LIBADD  = \
 	-lm
 
 plugin_in_files = 		\
-	media-keys.mate-settings-plugin.in
+	media-keys.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 noinst_PROGRAMS =				\
 	test-media-keys				\
@@ -143,4 +143,5 @@ CLEANFILES = 			\
 DISTCLEANFILES =		\
 	$(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/media-keys/media-keys.mate-settings-plugin.in b/plugins/media-keys/media-keys.mate-settings-plugin.desktop.in
index fdaf931..733bd10 100644
--- a/plugins/media-keys/media-keys.mate-settings-plugin.in
+++ b/plugins/media-keys/media-keys.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=media-keys
 IAge=0
-_Name=Media keys
-_Description=Media keys plugin
+Name=Media keys
+Description=Media keys plugin
 Authors=
 Copyright=Copyright © 2007
 Website=
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 01a1f43..e10c68a 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -26,9 +26,9 @@ libmouse_la_LIBADD  =							\
 	$(X11_LIBS)							\
 	$(XINPUT_LIBS)
 
-plugin_in_files = mouse.mate-settings-plugin.in
+plugin_in_files = mouse.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 libexec_PROGRAMS = msd-locate-pointer
 
@@ -51,4 +51,5 @@ EXTRA_DIST = $(plugin_in_files)
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/mouse/mouse.mate-settings-plugin.in b/plugins/mouse/mouse.mate-settings-plugin.desktop.in
index 8cf5272..ae66d36 100644
--- a/plugins/mouse/mouse.mate-settings-plugin.in
+++ b/plugins/mouse/mouse.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=mouse
 IAge=0
-_Name=Mouse
-_Description=Mouse plugin
+Name=Mouse
+Description=Mouse plugin
 Authors=
 Copyright=Copyright © 2007 
 Website=
diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am
index a3d4d4b..8603ed5 100644
--- a/plugins/mpris/Makefile.am
+++ b/plugins/mpris/Makefile.am
@@ -23,9 +23,9 @@ libmpris_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)
 
 plugin_in_files = 		\
-	mpris.mate-settings-plugin.in
+	mpris.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)
@@ -36,5 +36,6 @@ CLEANFILES = 			\
 DISTCLEANFILES =		\
 	$(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
diff --git a/plugins/mpris/mpris.mate-settings-plugin.in b/plugins/mpris/mpris.mate-settings-plugin.desktop.in
index c7edcf9..6f61573 100644
--- a/plugins/mpris/mpris.mate-settings-plugin.in
+++ b/plugins/mpris/mpris.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=mpris
 IAge=0
-_Name=Mpris
-_Description=Mpris plugin
+Name=Mpris
+Description=Mpris plugin
 Authors=Stefano Karapetsas
 Copyright=Copyright © 2013 Stefano Karapetsas
 Website=
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index e1b8f11..f78606a 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -29,9 +29,12 @@ librfkill_la_LIBADD  =						\
 	$(RFKILL_LIBS)						\
 	$(SETTINGS_PLUGIN_LIBS)
 
-plugin_in_files = rfkill.mate-settings-plugin.in
+plugin_in_files = rfkill.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
+
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 udevrulesdir = $(prefix)/lib/udev/rules.d
 udevrules_DATA = 61-mate-settings-daemon-rfkill.rules
@@ -39,5 +42,3 @@ udevrules_DATA = 61-mate-settings-daemon-rfkill.rules
 EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA)
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
-
-@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/rfkill/rfkill.mate-settings-plugin.in b/plugins/rfkill/rfkill.mate-settings-plugin.desktop.in
index 579b106..1d37c3c 100644
--- a/plugins/rfkill/rfkill.mate-settings-plugin.in
+++ b/plugins/rfkill/rfkill.mate-settings-plugin.desktop.in
@@ -3,8 +3,8 @@ Module=rfkill
 IAge=0
 # Default Priority
 # Priority=100
-_Name=Rfkill
-_Description=Rfkill plugin
+Name=Rfkill
+Description=Rfkill plugin
 Authors=Bastien Nocera
 Copyright=Copyright © 2013
 Website=
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 4e01be4..e9daad7 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -30,12 +30,13 @@ libsmartcard_la_LIBADD = \
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NSS_LIBS)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
-
 plugin_in_files = \
-	smartcard.mate-settings-plugin.in
+	smartcard.mate-settings-plugin.desktop.in
+
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = \
 	$(plugin_in_files)
diff --git a/plugins/smartcard/smartcard.mate-settings-plugin.in b/plugins/smartcard/smartcard.mate-settings-plugin.desktop.in
index dd75784..a15a007 100644
--- a/plugins/smartcard/smartcard.mate-settings-plugin.in
+++ b/plugins/smartcard/smartcard.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=smartcard
 IAge=0
-_Name=Smartcard
-_Description=Smartcard plugin
+Name=Smartcard
+Description=Smartcard plugin
 Authors=Ray Strode
 Copyright=Copyright © 2010 Red Hat, Inc.
 Website=
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index 3e93c7c..fea7b9f 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -26,9 +26,9 @@ libsound_la_LIBADD = \
 	$(PULSE_LIBS)
 
 plugin_in_files = \
-	sound.mate-settings-plugin.in
+	sound.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = \
 	$(plugin_in_files)
@@ -39,4 +39,5 @@ CLEANFILES = \
 DISTCLEANFILES = \
 	$(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/sound/sound.mate-settings-plugin.in b/plugins/sound/sound.mate-settings-plugin.desktop.in
index fb7e57b..c478099 100644
--- a/plugins/sound/sound.mate-settings-plugin.in
+++ b/plugins/sound/sound.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=sound
 IAge=0
-_Name=Sound
-_Description=Sound Sample Cache plugin
+Name=Sound
+Description=Sound Sample Cache plugin
 Authors=Lennart Poettering
 Copyright=Copyright © 2008
 Website=
diff --git a/plugins/typing-break/Makefile.am b/plugins/typing-break/Makefile.am
index 334d03c..a903b43 100644
--- a/plugins/typing-break/Makefile.am
+++ b/plugins/typing-break/Makefile.am
@@ -29,10 +29,10 @@ libtyping_break_la_LIBADD  = 		\
 	$(NULL)
 
 plugin_in_files = 		\
-	typing-break.mate-settings-plugin.in	\
+	typing-break.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -46,4 +46,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/typing-break/typing-break.mate-settings-plugin.in b/plugins/typing-break/typing-break.mate-settings-plugin.desktop.in
index 22b722f..5f65f03 100644
--- a/plugins/typing-break/typing-break.mate-settings-plugin.in
+++ b/plugins/typing-break/typing-break.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=typing-break
 IAge=0
-_Name=Typing Break
-_Description=Typing break plugin
+Name=Typing Break
+Description=Typing break plugin
 Authors=
 Copyright=Copyright © 2007
 Website=
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index f5d7341..16c67ca 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -67,12 +67,13 @@ libxrandr_la_LIBADD  =			\
 	$(MATE_DESKTOP_LIBS)
 
 plugin_in_files =			\
-	xrandr.mate-settings-plugin.in
+	xrandr.mate-settings-plugin.desktop.in
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = $(plugin_in_files) $(ICON_FILES) msd-xrandr-manager.xml
 CLEANFILES = $(plugin_DATA) $(BUILT_SOURCES)
 DISTCLEANFILES = $(plugin_DATA)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/xrandr/xrandr.mate-settings-plugin.in b/plugins/xrandr/xrandr.mate-settings-plugin.desktop.in
index a07305c..1c49e42 100644
--- a/plugins/xrandr/xrandr.mate-settings-plugin.in
+++ b/plugins/xrandr/xrandr.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=xrandr
 IAge=0
-_Name=XRandR
-_Description=Set up screen size and rotation settings
+Name=XRandR
+Description=Set up screen size and rotation settings
 Authors=Various
 Copyright=Copyright © 2007 Novell
 Website=
diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am
index 35d4413..88745ae 100644
--- a/plugins/xrdb/Makefile.am
+++ b/plugins/xrdb/Makefile.am
@@ -34,10 +34,10 @@ libxrdb_la_LIBADD  = 		\
 	$(NULL)
 
 plugin_in_files = 		\
-	xrdb.mate-settings-plugin.in	\
+	xrdb.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -51,4 +51,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/xrdb/xrdb.mate-settings-plugin.in b/plugins/xrdb/xrdb.mate-settings-plugin.desktop.in
index e21a4c2..d374ccb 100644
--- a/plugins/xrdb/xrdb.mate-settings-plugin.in
+++ b/plugins/xrdb/xrdb.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=xrdb
 IAge=0
-_Name=X Resource Database
-_Description=Manage the X resource database
+Name=X Resource Database
+Description=Manage the X resource database
 Authors=Ross Burton
 Copyright=Copyright © 2007 Ross Burton
 Website=
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index c4b821f..6f8e00d 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -39,10 +39,10 @@ libxsettings_la_LIBADD  = 	\
 	$(NULL)
 
 plugin_in_files = 		\
-	xsettings.mate-settings-plugin.in	\
+	xsettings.mate-settings-plugin.desktop.in	\
 	$(NULL)
 
-plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.desktop.in=.mate-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -56,4 +56,5 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@MSD_INTLTOOL_PLUGIN_RULE@
+$(plugin_DATA): $(plugin_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
diff --git a/plugins/xsettings/xsettings.mate-settings-plugin.in b/plugins/xsettings/xsettings.mate-settings-plugin.desktop.in
index 6747dc1..bfc1997 100644
--- a/plugins/xsettings/xsettings.mate-settings-plugin.in
+++ b/plugins/xsettings/xsettings.mate-settings-plugin.desktop.in
@@ -1,8 +1,8 @@
 [MATE Settings Plugin]
 Module=xsettings
 IAge=0
-_Name=X Settings
-_Description=Manage X Settings
+Name=X Settings
+Description=Manage X Settings
 Authors=William Jon McCann
 Copyright=Copyright © 2007 William Jon McCann
 Website=
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..03c1139
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,79 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Description --add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = MATE Desktop Environment team
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
+$(DOMAIN).pot-update: export GETTEXTDATADIR = $(top_srcdir)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cbdac2..3a965df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,60 +1,64 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
 data/50-accessibility.xml.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-keyboard.gschema.xml.in
-[type: gettext/gsettings]data/org.mate.peripherals-mouse.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.rfkill.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/org.mate.applications-at.gschema.xml.in
+data/org.mate.font-rendering.gschema.xml.in
+data/org.mate.peripherals-keyboard.gschema.xml.in
+data/org.mate.peripherals-mouse.gschema.xml.in
+data/org.mate.peripherals-smartcard.gschema.xml.in
+data/org.mate.peripherals-touchpad.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.a11y-keyboard.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.a11y-settings.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.background.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.clipboard.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.datetime.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.housekeeping.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.keybindings.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.keyboard.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.mouse.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.mpris.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.rfkill.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.smartcard.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.sound.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.typing-break.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.xrandr.gschema.xml.in
+data/org.mate.SettingsDaemon.plugins.xrdb.gschema.xml.in
+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
+plugins/a11y-keyboard/a11y-keyboard.mate-settings-plugin.desktop.in
 plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
 plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
-[type: gettext/glade]plugins/a11y-keyboard/msd-a11y-preferences-dialog.ui
-[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
+plugins/a11y-keyboard/msd-a11y-preferences-dialog.ui
+plugins/a11y-settings/a11y-settings.mate-settings-plugin.desktop.in
+plugins/background/background.mate-settings-plugin.desktop.in
+plugins/clipboard/clipboard.mate-settings-plugin.desktop.in
+plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
+plugins/dummy/dummy.mate-settings-plugin.desktop.in
+plugins/housekeeping/housekeeping.mate-settings-plugin.desktop.in
 plugins/housekeeping/msd-disk-space.c
 plugins/housekeeping/msd-ldsm-dialog.c
 plugins/housekeeping/msd-ldsm-trash-empty.c
+plugins/keybindings/keybindings.mate-settings-plugin.desktop.in
 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/keyboard.mate-settings-plugin.desktop.in
 plugins/keyboard/msd-keyboard-xkb.c
+plugins/media-keys/media-keys.mate-settings-plugin.desktop.in
 plugins/media-keys/msd-media-keys-manager.c
-[type: gettext/ini]plugins/media-keys/media-keys.mate-settings-plugin.in
 plugins/media-keys/test-media-window.c
+plugins/mouse/mouse.mate-settings-plugin.desktop.in
 plugins/mouse/msd-mouse-manager.c
-[type: gettext/ini]plugins/mouse/mouse.mate-settings-plugin.in
-[type: gettext/ini]plugins/mpris/mpris.mate-settings-plugin.in
-[type: gettext/ini]plugins/typing-break/typing-break.mate-settings-plugin.in
-[type: gettext/ini]plugins/xrandr/xrandr.mate-settings-plugin.in
+plugins/mpris/mpris.mate-settings-plugin.desktop.in
+plugins/rfkill/rfkill.mate-settings-plugin.desktop.in
+plugins/smartcard/msd-smartcard-manager.c
+plugins/smartcard/msd-smartcard.c
+plugins/smartcard/smartcard.mate-settings-plugin.desktop.in
+plugins/sound/sound.mate-settings-plugin.desktop.in
+plugins/typing-break/typing-break.mate-settings-plugin.desktop.in
 plugins/xrandr/msd-xrandr-manager.c
+plugins/xrandr/xrandr.mate-settings-plugin.desktop.in
 plugins/xrdb/msd-xrdb-manager.c
-[type: gettext/ini]plugins/xrdb/xrdb.mate-settings-plugin.in
+plugins/xrdb/xrdb.mate-settings-plugin.desktop.in
 plugins/xsettings/msd-xsettings-manager.c
-[type: gettext/ini]plugins/xsettings/xsettings.mate-settings-plugin.in
-[type: gettext/ini]plugins/rfkill/rfkill.mate-settings-plugin.in
-plugins/smartcard/msd-smartcard-manager.c
-plugins/smartcard/msd-smartcard.c
-plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in
+plugins/xsettings/xsettings.mate-settings-plugin.desktop.in