migrate from intltools to gettext

38 files changed, 285 insertions, 199 deletions

diff --git a/Makefile.am b/Makefile.am
index cf3866c2..e308d41d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,9 +70,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 EXTRA_DIST = \
 	m4/ac-define-dir.m4 \
 	COPYING-DOCS \
-	intltool-update.in \
-	intltool-extract.in \
-	intltool-merge.in \
 	xmldocs.make \
 	omf.make \
 	autogen.sh
@@ -89,9 +86,7 @@ dist: ChangeLog
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DISTCLEANFILES = intltool-extract \
-	intltool-merge \
-	intltool-update
+DISTCLEANFILES =
 
 -include $(top_srcdir)/git.mk
 
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 90fa8f4b..688c94d5 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -20,8 +20,8 @@ accessx_status_applet_LDADD = \
 	$(X_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -29,7 +29,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in
@@ -43,10 +44,10 @@ org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files)
 uidir   = $(datadir)/mate/ui
 ui_DATA = accessx-status-applet-menu.xml
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
 
 EXTRA_DIST = \
-	org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in \
 	$(service_in_files) \
 	$(ui_DATA)
 
diff --git a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
index 76ea1c44..9d9200a7 100644
--- a/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
+++ b/accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=AccessxStatusAppletFactory
 Location=@LIBEXECDIR@/accessx-status-applet
-_Name=AccessX Status Applet Factory
-_Description=Keyboard Accessibility Status Applet Factory
+Name=AccessX Status Applet Factory
+Description=Keyboard Accessibility Status Applet Factory
 
 [AccessxStatusApplet]
-_Name=Keyboard Accessibility Status
-_Description=Shows the status of keyboard accessibility features
+Name=Keyboard Accessibility Status
+Description=Shows the status of keyboard accessibility features
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-accessibility
 MateComponentId=OAFIID:MATE_AccessxStatusApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index cc3e09c3..884252e3 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -58,14 +58,13 @@ battstat_applet_LDADD = \
 			 $(UPOWER_LIBS) \
 			 -lm
 
-@INTLTOOL_XML_NOMERGE_RULE@
 batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in
 gsettings_SCHEMAS = $(batstat_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -73,7 +72,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.BattstatAppletFactory.service.in
@@ -84,7 +84,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 uidir = $(datadir)/mate/ui
 ui_DATA = battstat-applet-menu.xml
@@ -92,7 +92,7 @@ ui_DATA = battstat-applet-menu.xml
 EXTRA_DIST = 							\
 	$(builder_DATA)						\
 	$(ui_DATA)						\
-	org.mate.applets.BattstatApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(batstat_gschema_in_files)
 
diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
index 9600dfc7..39103f79 100644
--- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
+++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=BattstatAppletFactory
 Location=@LIBEXECDIR@/battstat-applet
-_Name=Battstat Factory
-_Description=Battstat Factory
+Name=Battstat Factory
+Description=Battstat Factory
 
 [BattstatApplet]
-_Name=Battery Charge Monitor
-_Description=Monitor a laptop's remaining power
+Name=Battery Charge Monitor
+Description=Monitor a laptop's remaining power
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=battery
 MateComponentId=OAFIID:MATE_BattstatApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/battstat/sounds/Makefile.am b/battstat/sounds/Makefile.am
index df677219..5b591d0c 100644
--- a/battstat/sounds/Makefile.am
+++ b/battstat/sounds/Makefile.am
@@ -1,9 +1,10 @@
 
 soundlistdir = $(sysconfdir)/sound/events
-soundlist_in_files = mate-battstat_applet.soundlist.in
-soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+soundlist_in_files = mate-battstat_applet.soundlist.desktop.in
+soundlist_DATA = $(soundlist_in_files:.soundlist.desktop.in=.soundlist)
 
-@INTLTOOL_SOUNDLIST_RULE@
+$(soundlist_DATA): $(soundlist_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=description --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(soundlist_DATA) $(soundlist_in_files)
 
diff --git a/battstat/sounds/mate-battstat_applet.soundlist.desktop.in b/battstat/sounds/mate-battstat_applet.soundlist.desktop.in
new file mode 100644
index 00000000..891fd6ac
--- /dev/null
+++ b/battstat/sounds/mate-battstat_applet.soundlist.desktop.in
@@ -0,0 +1,10 @@
+[__section_info__]
+description=Battery Status Utility
+
+[LowBattery]
+file=
+description=Battery power low
+
+[BatteryFull]
+file=
+description=Battery fully re-charged
diff --git a/battstat/sounds/mate-battstat_applet.soundlist.in b/battstat/sounds/mate-battstat_applet.soundlist.in
deleted file mode 100644
index a5387709..00000000
--- a/battstat/sounds/mate-battstat_applet.soundlist.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[__section_info__]
-_description=Battery Status Utility
-
-[LowBattery]
-file=
-_description=Battery power low
-
-[BatteryFull]
-file=
-_description=Battery fully re-charged
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index d1c6abda..ee1728cd 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -20,8 +20,8 @@ mate_charpick_applet_LDADD = \
 		       $(GUCHARMAP_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -29,7 +29,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.CharpickerAppletFactory.service.in
@@ -40,7 +41,6 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-@INTLTOOL_XML_NOMERGE_RULE@
 charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in
 gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -48,10 +48,10 @@ gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml)
 uidir = $(datadir)/mate/ui
 ui_DATA = charpick-applet-menu.xml
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA)  $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 EXTRA_DIST =							\
-	org.mate.applets.CharpickerApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(ui_DATA)						\
 	$(charpick_gschema_in_files)
diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
index 3642f058..65a3c76d 100644
--- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
+++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=CharpickerAppletFactory
 Location=@LIBEXECDIR@/mate-charpick-applet
-_Name=Charpicker Applet Factory
-_Description=Charpicker Applet Factory
+Name=Charpicker Applet Factory
+Description=Charpicker Applet Factory
 
 [CharpickerApplet]
-_Name=Character Palette
-_Description=Insert characters
+Name=Character Palette
+Description=Insert characters
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=accessories-character-map
 MateComponentId=OAFIID:MATE_CharpickerApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/command/Makefile.am b/command/Makefile.am
index 2a9115d9..4bc5b4e3 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
 	$(MATE_APPLETS4_CFLAGS) \
 	$(MATEDESKTOP_CFLAGS) \
 	-I$(srcdir) \
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	$(DISABLE_DEPRECATED_CFLAGS)
 
 APPLET_LOCATION = $(libexecdir)/command-applet
@@ -13,14 +12,16 @@ command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS)
 command_applet_CFLAGS = $(WARN_CFLAGS)
 
 appletsdir       = $(datadir)/mate-panel/applets
-applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.in
-applets_DATA     = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in
+applets_DATA     = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applets_in_files): $(applets_in_files).in Makefile
 	$(AM_V_GEN)sed \
 		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 		$< > $@
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+$(applets_DATA): $(applets_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.CommandAppletFactory.service.in
@@ -31,7 +32,6 @@ org.mate.panel.applet.CommandAppletFactory.service: $(service_in_files)
 		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 		$< > $@
 
-@INTLTOOL_XML_NOMERGE_RULE@
 command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in
 gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -41,6 +41,6 @@ EXTRA_DIST = \
 	$(service_in_files) \
 	$(command_gschema_in_files)
 
-CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applets_DATA) $(applets_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in b/command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..04f76f4a
--- /dev/null
+++ b/command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,11 @@
+[Applet Factory]
+Id=CommandAppletFactory
+Location=@LOCATION@
+Name=Command Factory
+Description=Command Factory
+
+[CommandApplet]
+Name=Command
+Description=Shows the output of a command
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=utilities-terminal
diff --git a/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in b/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
deleted file mode 100644
index 1e860ce2..00000000
--- a/command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Applet Factory]
-Id=CommandAppletFactory
-Location=@LOCATION@
-_Name=Command Factory
-_Description=Command Factory
-
-[CommandApplet]
-_Name=Command
-_Description=Shows the output of a command
-Icon=utilities-terminal
diff --git a/configure.ac b/configure.ac
index da3806f4..1709f512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,6 @@ dnl ***************************************************************************
 
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.50.1])
 PKG_PROG_PKG_CONFIG([0.19])
 
 AC_PROG_CC
@@ -226,11 +225,13 @@ dnl ***************************************************************************
 dnl *** Set up gettext                                                      ***
 dnl ***************************************************************************
 
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=mate-applets
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
 AC_DEFINE_DIR(MATELOCALEDIR, "${datadir}/locale", [locale directory])
-AM_GLIB_GNU_GETTEXT
 
 # this is the directory where the *.{mo,gmo} files are installed
 matelocaledir='${prefix}/${DATADIRNAME}/locale'
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index af18f188..f8136efc 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -1,13 +1,12 @@
 SUBDIRS = help pixmaps src
 
-@INTLTOOL_XML_NOMERGE_RULE@
 cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
 gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -15,7 +14,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
@@ -33,7 +33,7 @@ ui_DATA = cpufreq-applet-menu.xml
 
 CLEANFILES = \
              $(applet_DATA)			\
-             $(applet_DATA).in			\
+               $(applet_in_files)			\
              $(service_DATA)			\
 	     $(gsettings_SCHEMAS)               \
 	     *.gschema.valid                    \
@@ -41,13 +41,10 @@ CLEANFILES = \
 	     *.gladep
 
 EXTRA_DIST = \
-             org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in	\
-             $(service_in_files)				\
-	     $(cpufreq_gschema_in_files)			\
-	     $(builder_DATA)                 			\
-	     $(ui_DATA)
-	     
-					
-
+		$(applet_in_files).in	\
+		$(service_in_files)				\
+		$(cpufreq_gschema_in_files)			\
+		$(builder_DATA)                 			\
+		$(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in b/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
index 45a9f5ad..168c6317 100644
--- a/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in
+++ b/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=CPUFreqAppletFactory
 Location=@LIBEXECDIR@/mate-cpufreq-applet
-_Name=CPU Frequency Scaling Monitor
-_Description=Monitor the CPU Frequency Scaling
+Name=CPU Frequency Scaling Monitor
+Description=Monitor the CPU Frequency Scaling
 
 [CPUFreqApplet]
-_Name=CPU Frequency Scaling Monitor
-_Description=Monitor the CPU Frequency Scaling
+Name=CPU Frequency Scaling Monitor
+Description=Monitor the CPU Frequency Scaling
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-cpu-frequency-applet
 MateComponentId=OAFIID:MATE_CPUFreqApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index fa8b8040..40d7c01c 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -35,6 +35,4 @@ mate_cpufreq_applet_LDADD =  \
 	$(LIBCPUFREQ_LIBS)		\
 	$(DBUS_LIBS)
 
-	
-
 -include $(top_srcdir)/git.mk
diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am
index 27dfac69..dc913c70 100644
--- a/cpufreq/src/cpufreq-selector/Makefile.am
+++ b/cpufreq/src/cpufreq-selector/Makefile.am
@@ -66,9 +66,9 @@ $(dbus_services_DATA): $(dbus_services_in_files)
 	sed -e "s|\@BINDIR\@|$(DESTDIR)$(bindir)|" $< > $@
 dbus_conf_DATA = org.mate.CPUFreqSelector.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/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in
index 6864e82b..d2afd81b 100644
--- a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in
+++ b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in
@@ -11,8 +11,8 @@
   <icon_name>mate-cpu-frequency-applet</icon_name>
 
   <action id="org.mate.cpufreqselector">
-    <_description>Change CPU Frequency scaling</_description>
-    <_message>Privileges are required to change the CPU Frequency scaling.</_message>
+    <description>Change CPU Frequency scaling</description>
+    <message>Privileges are required to change the CPU Frequency scaling.</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 328f08f1..7656efd2 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -23,21 +23,20 @@ mate_drivemount_applet_LDADD =	\
 uidir           = $(datadir)/mate/ui
 ui_DATA         = drivemount-applet-menu.xml
 
-@INTLTOOL_XML_NOMERGE_RULE@
 drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in
 gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                                                    \
-        org.mate.applets.DriveMountApplet.mate-panel-applet.in.in        \
+        $(applet_in_files).in                                   \
         $(service_in_files)                                     \
-        $(drivemount_gschema_in_files)                           \
+        $(drivemount_gschema_in_files)                          \
         $(ui_DATA)
 
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -45,7 +44,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.DriveMountAppletFactory.service.in
@@ -56,6 +56,6 @@ org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
index 39bae82b..637628d2 100644
--- a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
+++ b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=DriveMountAppletFactory
 Location=@LIBEXECDIR@/mate-drivemount-applet
-_Name=Drive Mount Applet Factory
-_Description=Factory for drive mount applet
+Name=Drive Mount Applet Factory
+Description=Factory for drive mount applet
 
 [DriveMountApplet]
-_Name=Disk Mounter
-_Description=Mount local disks and devices
+Name=Disk Mounter
+Description=Mount local disks and devices
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=media-floppy
 MateComponentId=OAFIID:MATE_DriveMountApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index f8bb8c28..38921e31 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -22,8 +22,8 @@ mate_geyes_applet_LDADD = 		\
 	-lm
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.GeyesApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -31,7 +31,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.GeyesAppletFactory.service.in
@@ -45,7 +46,6 @@ org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files)
 uidir = $(datadir)/mate/ui
 ui_DATA = geyes-applet-menu.xml
 
-@INTLTOOL_XML_NOMERGE_RULE@
 geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in
 gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -59,12 +59,12 @@ icons =	\
 	mate-eyes-applet.22.png \
 	mate-eyes-applet.16.png
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 EXTRA_DIST = \
 	     README.themes					\
-	     org.mate.applets.GeyesApplet.mate-panel-applet.in.in 	\
-             $(service_in_files)				\
+		 $(applet_in_files).in	\
+		 $(service_in_files)				\
 	     $(geyes_gschema_in_files)				\
 	     $(ui_DATA)						\
 	     $(icons)
diff --git a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
index dd2296fb..eaadb5f3 100644
--- a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
+++ b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=GeyesAppletFactory
 Location=@LIBEXECDIR@/mate-geyes-applet
-_Name=Eyes Applet Factory
-_Description=Eyes Applet Factory
+Name=Eyes Applet Factory
+Description=Eyes Applet Factory
 
 [GeyesApplet]
-_Name=Eyes
-_Description=A set of eyeballs for your panel
+Name=Eyes
+Description=A set of eyeballs for your panel
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-eyes-applet
 MateComponentId=OAFIID:MATE_GeyesApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index c8ec98e5..37ce65ce 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -34,8 +34,8 @@ uidir = $(datadir)/mate/ui
 ui_DATA = mateweather-applet-menu.xml
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.MateWeatherApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -43,7 +43,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.MateWeatherAppletFactory.service.in
@@ -54,10 +55,10 @@ org.mate.panel.applet.MateWeatherAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA)
 
 EXTRA_DIST = \
-	org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(ui_DATA)
 
diff --git a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
index c0a1a4f6..03d2b621 100644
--- a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
+++ b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=MateWeatherAppletFactory
 Location=@LIBEXECDIR@/mateweather-applet
-_Name=Mateweather Applet Factory
-_Description=Factory for creating the weather applet.
+Name=Mateweather Applet Factory
+Description=Factory for creating the weather applet.
 
 [MateWeatherApplet]
-_Name=Weather Report
-_Description=Monitor the current weather conditions, and forecasts
+Name=Weather Report
+Description=Monitor the current weather conditions, and forecasts
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=weather-storm
 MateComponentId=OAFIID:MATE_MateWeatherApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 2cad698c..da30c8da 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -29,13 +29,12 @@ mate_multiload_applet_LDADD = \
 				$(GIO_LIBS)				\
 				-lm
 
-@INTLTOOL_XML_NOMERGE_RULE@
 multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
 gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST =							\
-	org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in	\
+	$(applet_in_files).in	\
 	$(service_in_files)					\
 	$(multiload_gschema_in_files)				\
 	$(ui_DATA)
@@ -44,8 +43,8 @@ uidir		= $(datadir)/mate/ui
 ui_DATA		= multiload-applet-menu.xml
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -53,7 +52,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in
@@ -64,6 +64,6 @@ org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
index ad17fffe..3eacb2fb 100644
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
+++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
@@ -5,8 +5,9 @@ Name=MultiLoad Applet Factory
 Description=Factory for creating the load applet.
 
 [MultiLoadApplet]
-_Name=System Monitor
-_Description=A system load indicator
+Name=System Monitor
+Description=A system load indicator
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=utilities-system-monitor
 MateComponentId=OAFIID:MATE_MultiLoadApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am
index 5bc783cf..7875af7d 100644
--- a/netspeed/data/Makefile.am
+++ b/netspeed/data/Makefile.am
@@ -1,14 +1,16 @@
 APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
 		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 		$< > $@
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 xmluidir   = $(datadir)/mate/ui
 xmlui_DATA = netspeed-menu.xml
@@ -24,11 +26,10 @@ org.mate.panel.applet.NetspeedAppletFactory.service: $(service_in_files)
 
 netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in
 gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	org.mate.applets.NetspeedApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in	\
 	$(xmlui_DATA) \
 	$(service_in_files) \
 	$(netspeed_gschema_in_files)
@@ -37,7 +38,7 @@ CLEANFILES = \
 	$(gsettings_SCHEMAS) \
 	$(service_DATA) \
 	$(applet_in_files) \
-	org.mate.applets.NetspeedApplet.mate-panel-applet
+	$(applet_DATA)
 
 
 -include $(top_srcdir)/git.mk
diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
index 7563a229..fdc64666 100644
--- a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in
+++ b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=NetspeedAppletFactory
 Location=@LOCATION@
-_Name=Netspeed Applet Factory
-_Description=Netspeed Applet
- 
+Name=Netspeed Applet Factory
+Description=Netspeed Applet
+
 [NetspeedApplet]
-_Name=Network Monitor
-_Description=Netspeed Applet
+Name=Network Monitor
+Description=Netspeed Applet
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-netspeed-applet
 MateComponentId=OAFIID:MATE_NetspeedApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..e163cf5e
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# 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 --keyword=description --add-comments=Translators:
+
+# 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 = https://www.transifex.com/mate/MATE/
+
+# 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8005d795..a971cd6a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,25 +1,24 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 #
-[encoding: UTF-8]
 accessx-status/applet.c
-[type: gettext/ini]accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in
+accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in
 battstat/battstat_applet.c
-[type: gettext/glade]battstat/battstat_applet.ui
-[type: gettext/ini]battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]battstat/org.mate.panel.applet.battstat.gschema.xml.in
+battstat/battstat_applet.ui
+battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
+battstat/org.mate.panel.applet.battstat.gschema.xml.in
 battstat/properties.c
-battstat/sounds/mate-battstat_applet.soundlist.in
+battstat/sounds/mate-battstat_applet.soundlist.desktop.in
 charpick/charpick.c
-[type: gettext/ini]charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]charpick/org.mate.panel.applet.charpick.gschema.xml.in
+charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.desktop.in.in
+charpick/org.mate.panel.applet.charpick.gschema.xml.in
 charpick/properties.c
 command/command.c
-[type: gettext/ini]command/org.mate.applets.CommandApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]command/org.mate.panel.applet.command.gschema.xml.in
-[type: gettext/glade]cpufreq/cpufreq-preferences.ui
-[type: gettext/ini]cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
+command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
+command/org.mate.panel.applet.command.gschema.xml.in
+cpufreq/cpufreq-preferences.ui
+cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in
+cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in
 cpufreq/src/cpufreq-applet.c
 cpufreq/src/cpufreq-prefs.c
 cpufreq/src/cpufreq-monitor-cpuinfo.c
@@ -29,40 +28,40 @@ cpufreq/src/cpufreq-popup.c
 cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in
 drivemount/drive-button.c
 drivemount/drivemount.c
-[type: gettext/ini]drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
+drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
 geyes/geyes.c
-[type: gettext/ini]geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]geyes/org.mate.panel.applet.geyes.gschema.xml.in
+geyes/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
+geyes/org.mate.panel.applet.geyes.gschema.xml.in
 geyes/themes.c
 mateweather/mateweather-about.c
 mateweather/mateweather-applet.c
 mateweather/mateweather-dialog.c
 mateweather/mateweather-pref.c
 mateweather/main.c
-[type: gettext/ini]mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
+mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
 # NB. these are actually separate files
 multiload/linux-proc.c
 multiload/load-graph.c
 multiload/main.c
 multiload/netspeed.c
-[type: gettext/ini]multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]multiload/org.mate.panel.applet.multiload.gschema.xml.in
+multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+multiload/org.mate.panel.applet.multiload.gschema.xml.in
 multiload/properties.c
-[type: gettext/gsettings]netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
-[type: gettext/ini]netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in
+netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
+netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
 netspeed/src/netspeed.c
 # NB. these are actually separate files
-[type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
+stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
 stickynotes/stickynotes.c
-[type: gettext/glade]stickynotes/stickynotes.ui
-[type: gettext/gsettings]stickynotes/org.mate.stickynotes.gschema.xml.in
+stickynotes/stickynotes.ui
+stickynotes/org.mate.stickynotes.gschema.xml.in
 stickynotes/stickynotes_applet.c
 stickynotes/stickynotes_applet_callbacks.c
 stickynotes/stickynotes_callbacks.c
-[type: gettext/ini]timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.in.in
-[type: gettext/gsettings]timerapplet/org.mate.panel.applet.timer.gschema.xml.in
+timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
+timerapplet/org.mate.panel.applet.timer.gschema.xml.in
 timerapplet/timerapplet.c
-[type: gettext/ini]trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in
+trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
 trashapplet/src/trashapplet.c
 trashapplet/src/trash-empty.c
-[type: gettext/glade]trashapplet/trashapplet-empty-progress.ui
+trashapplet/trashapplet-empty-progress.ui
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 8ab9f7d0..04e79144 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = pixmaps docs
 
 ui_files = stickynotes-applet-menu.xml
 builder_files = stickynotes.ui
-applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.in
+applet_in_files = org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in
 service_in_files = org.mate.panel.applet.StickyNotesAppletFactory.service.in
 schemas_in_files = stickynotes.schemas.in
 
@@ -46,13 +46,12 @@ builder_DATA = $(builder_files)
 uidir = $(datadir)/mate/ui
 ui_DATA = $(ui_files)
 
-@INTLTOOL_XML_NOMERGE_RULE@
 stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in
 gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir   = $(datadir)/mate-panel/applets
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -60,7 +59,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir   = $(datadir)/dbus-1/services
 service_DATA = $(service_in_files:.service.in=.service)
@@ -70,7 +70,7 @@ org.mate.panel.applet.StickyNotesAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 endif
 
@@ -79,7 +79,7 @@ EXTRA_DIST = \
 	     $(ui_files) \
 	     $(stickynotes_gschema_in_files) \
              $(service_in_files) \
-	     org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
+			 $(applet_in_files).in
 
 
 -include $(top_srcdir)/git.mk
diff --git a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
index 4bdf2b36..7e0725cf 100644
--- a/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in
+++ b/stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=StickyNotesAppletFactory
 Location=@LIBEXECDIR@/stickynotes-applet
-_Name=Sticky Notes Applet Factory
-_Description=Sticky Notes Applet Factory
+Name=Sticky Notes Applet Factory
+Description=Sticky Notes Applet Factory
 
 [StickyNotesApplet]
-_Name=Sticky Notes
-_Description=Create, view, and manage sticky notes on the desktop
+Name=Sticky Notes
+Description=Create, view, and manage sticky notes on the desktop
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-sticky-notes-applet
 MateComponentId=OAFIID:MATE_StickyNotesApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am
index 72f4ebc8..c4b0ac16 100644
--- a/timerapplet/Makefile.am
+++ b/timerapplet/Makefile.am
@@ -14,14 +14,15 @@ timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS)
 timer_applet_CFLAGS = $(WARN_CFLAGS)
 
 appletsdir       = $(datadir)/mate-panel/applets
-applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.in
-applets_DATA     = $(applets_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applets_in_files = org.mate.applets.TimerApplet.mate-panel-applet.desktop.in
+applets_DATA     = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applets_in_files): $(applets_in_files).in Makefile
 	$(AM_V_GEN)sed \
 		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 		$< > $@
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applets_DATA): $(applets_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.TimerAppletFactory.service.in
@@ -32,7 +33,6 @@ org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files)
 		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 		$< > $@
 
-@INTLTOOL_XML_NOMERGE_RULE@
 timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
 gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
@@ -42,6 +42,6 @@ EXTRA_DIST = \
 	$(service_in_files) \
 	$(timer_gschema_in_files)
 
-CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applets_DATA) $(applets_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in b/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..a111eb28
--- /dev/null
+++ b/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,11 @@
+[Applet Factory]
+Id=TimerAppletFactory
+Location=@LOCATION@
+Name=Timer Factory
+Description=Timer Factory
+
+[TimerApplet]
+Name=Timer
+Description=Start a timer and receive a notification when it is finished
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-panel-clock
diff --git a/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.in.in b/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.in.in
deleted file mode 100644
index f354ce35..00000000
--- a/timerapplet/org.mate.applets.TimerApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Applet Factory]
-Id=TimerAppletFactory
-Location=@LOCATION@
-_Name=Timer Factory
-_Description=Timer Factory
-
-[TimerApplet]
-_Name=Timer
-_Description=Start a timer and receive a notification when it is finished
-Icon=mate-panel-clock
diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index 27160254..7941dba2 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = src docs
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -10,7 +10,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
             -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
             $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in
@@ -28,10 +29,10 @@ builder_DATA = trashapplet-empty-progress.ui
 
 EXTRA_DIST = \
 	$(ui_DATA) \
-	org.mate.applets.TrashApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in	\
 	$(service_in_files) \
 	$(builder_DATA)
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in b/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
index 028de62e..77161ccc 100644
--- a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in
+++ b/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in
@@ -5,8 +5,9 @@ Name=Trash Applet Factory
 Description=Trash Applet Factory
 
 [TrashApplet]
-_Name=Trash
-_Description=Go to Trash
+Name=Trash
+Description=Go to Trash
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=user-trash-full
 MateComponentId=OAFIID:MATE_Panel_TrashApplet
 X-MATE-Bugzilla-Bugzilla=MATE