8 files changed, 54 insertions, 47 deletions
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 3b390974..fb06adb1 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -125,8 +125,8 @@ BUILT_SOURCES =					\
 	clock-typebuiltins.h
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.ClockApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.ClockApplet.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 \
@@ -135,7 +135,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+$(applet_DATA): $(applet_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
 
 if !CLOCK_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
@@ -161,11 +162,10 @@ clock-resources.h: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc
 clock_gschemas_in = org.mate.panel.applet.clock.gschema.xml.in
 gsettings_SCHEMAS = $(clock_gschemas_in:.xml.in=.xml)
 
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =						\
-	org.mate.panel.ClockApplet.mate-panel-applet.in.in	\
+	org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in	\
 	$(clock_gschemas_in)				\
 	$(ui_FILES)					\
 	clock.gresource.xml				\
@@ -175,7 +175,7 @@ EXTRA_DIST =						\
 CLEANFILES =			\
 	$(BUILT_SOURCES)	\
 	$(applet_DATA) 		\
-	$(applet_DATA).in	\
+	$(applet_in_files) 	\
 	$(service_DATA)		\
 	$(polkit_DATA)		\
 	$(dbus_services_DATA)	\
diff --git a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in
index 5eaf19d1..cc8a191f 100644
--- a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in
+++ b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in
@@ -2,12 +2,13 @@
 Id=ClockAppletFactory
 InProcess=@IN_PROCESS@
 Location=@LOCATION@
-_Name=Clock Applet Factory
-_Description=Factory for clock applet
+Name=Clock Applet Factory
+Description=Factory for clock applet
 
 [ClockApplet]
-_Name=Clock
-_Description=Get the current time and date
+Name=Clock
+Description=Get the current time and date
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-clock
 MateComponentId=OAFIID:MATE_ClockApplet;
 Platforms=X11;Wayland;
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index d9a894f5..6b823e09 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -40,8 +40,8 @@ fish_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.FishApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.FishApplet.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 \
@@ -50,7 +50,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+$(applet_DATA): $(applet_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
 
 if !FISH_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
@@ -87,18 +88,17 @@ BUILT_SOURCES = 		\
 
 fish_gschemas_in = org.mate.panel.applet.fish.gschema.xml.in
 gsettings_SCHEMAS = $(fish_gschemas_in:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
 	wanda.svg \
 	$(fishbitmaps_DATA) \
-	org.mate.panel.FishApplet.mate-panel-applet.in.in \
+	org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in \
 	$(service_in_files) \
 	$(ui_FILES)	\
 	fish.gresource.xml \
 	$(fish_gschemas_in)
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
+CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in
index 92b07c69..1df3717e 100644
--- a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in
+++ b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in
@@ -2,12 +2,13 @@
 Id=FishAppletFactory
 InProcess=@IN_PROCESS@
 Location=@LOCATION@
-_Name=Wanda Factory
-_Description=From Whence That Stupid Fish Came
+Name=Wanda Factory
+Description=From Whence That Stupid Fish Came
 
 [FishApplet]
-_Name=Fish
-_Description=Display a swimming fish or another animated creature
+Name=Fish
+Description=Display a swimming fish or another animated creature
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-fish
 MateComponentId=OAFIID:MATE_FishApplet;
 Platforms=X11;Wayland;
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 57ee0a3b..f7b68110 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -70,8 +70,11 @@ notification_area_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_DATA): $(applet_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
@@ -80,8 +83,6 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
-
 if !NOTIFICATION_AREA_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.NotificationAreaAppletFactory.service.in
@@ -110,11 +111,10 @@ BUILT_SOURCES = 		\
 	na-resources.c	\
 	na-resources.h
 
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =								\
-	org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in	\
+	org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in	\
 	$(notification_area_gschemas_in)				\
 	$(ui_FILES)	\
 	na.gresource.xml \
@@ -122,7 +122,7 @@ EXTRA_DIST =								\
 
 CLEANFILES =			\
 	$(applet_DATA) 		\
-	$(applet_DATA).in	\
+	$(applet_in_files)	\
 	$(service_DATA)		\
 	$(gsettings_SCHEMAS)
 
diff --git a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in
index 9246ac9c..f7652db6 100644
--- a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in
+++ b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in
@@ -2,12 +2,13 @@
 Id=NotificationAreaAppletFactory
 InProcess=@IN_PROCESS@
 Location=@LOCATION@
-_Name=Notification Area Factory
-_Description=Factory for notification area
+Name=Notification Area Factory
+Description=Factory for notification area
 
 [NotificationArea]
-_Name=Notification Area
-_Description=Area where notification icons appear
+Name=Notification Area
+Description=Area where notification icons appear
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-notification-area
 MateComponentId=OAFIID:MATE_NotificationAreaApplet;OAFIID:MATE_SystemTrayApplet;
 Platforms=X11;
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index dc23143f..d9dc7f51 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -49,8 +49,8 @@ wnck_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.Wncklet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.Wncklet.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 \
@@ -59,7 +59,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 		-e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 		$< > $@
 
-@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@
+$(applet_DATA): $(applet_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@
 
 if !WNCKLET_INPROCESS
 servicedir       = $(datadir)/dbus-1/services
@@ -102,16 +103,15 @@ wncklet_gschemas_in = \
 endif
 gsettings_SCHEMAS = $(wncklet_gschemas_in:.xml.in=.xml)
 
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	org.mate.panel.Wncklet.mate-panel-applet.in.in \
+	org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in \
 	$(service_in_files) \
 	$(wncklet_gschemas_in) \
 	$(ui_FILES) \
 	wncklet.gresource.xml
 
-CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
+CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in b/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in
index b2ff20e7..490edcc1 100644
--- a/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in
+++ b/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in
@@ -2,12 +2,13 @@
 Id=WnckletFactory
 InProcess=@IN_PROCESS@
 Location=@LOCATION@
-_Name=Window Navigation Applet Factory
-_Description=Factory for the window navigation related applets
+Name=Window Navigation Applet Factory
+Description=Factory for the window navigation related applets
 
 [WindowMenuApplet]
-_Name=Window Selector
-_Description=Switch between open windows using a menu
+Name=Window Selector
+Description=Switch between open windows using a menu
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-window-menu
 MateComponentId=OAFIID:MATE_WindowMenuApplet;
 Platforms=X11;
@@ -18,8 +19,9 @@ X-MATE-Bugzilla-Version=@VERSION@
 X-MATE-Bugzilla-OtherBinaries=wnck-applet
 
 [WorkspaceSwitcherApplet]
-_Name=Workspace Switcher
-_Description=Switch between workspaces
+Name=Workspace Switcher
+Description=Switch between workspaces
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-workspace-switcher
 MateComponentId=OAFIID:MATE_WorkspaceSwitcherApplet;OAFIID:MATE_PagerApplet;
 Platforms=X11;
@@ -30,8 +32,9 @@ X-MATE-Bugzilla-Version=@VERSION@
 X-MATE-Bugzilla-OtherBinaries=wnck-applet
 
 [WindowListApplet]
-_Name=Window List
-_Description=Switch between open windows using buttons
+Name=Window List
+Description=Switch between open windows using buttons
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-panel-window-list
 MateComponentId=OAFIID:MATE_TasklistApplet;OAFIID:MATE_WindowListApplet;
 Platforms=X11;
@@ -42,8 +45,9 @@ X-MATE-Bugzilla-Version=@VERSION@
 X-MATE-Bugzilla-OtherBinaries=wnck-applet
 
 [ShowDesktopApplet]
-_Name=Show Desktop
-_Description=Hide application windows and show the desktop
+Name=Show Desktop
+Description=Hide application windows and show the desktop
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=user-desktop
 MateComponentId=OAFIID:MATE_ShowDesktopApplet;
 Platforms=X11;