3 files changed, 16 insertions, 15 deletions
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