6 files changed, 15 insertions, 12 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 157ed16..eda2d4f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = icons
 
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = mate-user-share-properties.desktop.in
@@ -18,7 +20,8 @@ gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml
 extensiondir = $(datadir)/caja/extensions
 extension_in_files = libcaja-user-share.caja-extension.in
 extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension)
-%.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+%.caja-extension: %.caja-extension.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST = $(gsettings_SCHEMAS) \
 	$(app_DATA)		\
diff --git a/data/libcaja-user-share.caja-extension.in.in b/data/libcaja-user-share.caja-extension.in.in
index 543c968..a5942da 100644
--- a/data/libcaja-user-share.caja-extension.in.in
+++ b/data/libcaja-user-share.caja-extension.in.in
@@ -1,7 +1,7 @@
 [Caja Extension]
 Icon=user-share
-_Name=User Share
-_Description=Integrates with user-share
+Name=User Share
+Description=Integrates with user-share
 Copyright=Copyright (C) 2005 William Jon McCann <[email protected]>
 Version=@VERSION@
 Website=https://mate-desktop.org/
diff --git a/data/mate-user-share-obexftp.desktop.in.in b/data/mate-user-share-obexftp.desktop.in.in
index 1cafcad..844c758 100644
--- a/data/mate-user-share-obexftp.desktop.in.in
+++ b/data/mate-user-share-obexftp.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Personal File Sharing obexftp
-_Comment=Launch Personal File Sharing if enabled
+Name=Personal File Sharing obexftp
+Comment=Launch Personal File Sharing if enabled
 Keywords=share;files;bluetooth;obex;http;network;copy;send;
 AutostartCondition=GSettings org.mate.FileSharing bluetooth-enabled
 Icon=folder-remote
diff --git a/data/mate-user-share-obexpush.desktop.in.in b/data/mate-user-share-obexpush.desktop.in.in
index 7436c28..b6066f4 100644
--- a/data/mate-user-share-obexpush.desktop.in.in
+++ b/data/mate-user-share-obexpush.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Personal File Sharing obexpush
-_Comment=Launch Personal File Sharing if enabled
+Name=Personal File Sharing obexpush
+Comment=Launch Personal File Sharing if enabled
 Keywords=share;files;bluetooth;obex;http;network;copy;send;
 AutostartCondition=GSettings org.mate.FileSharing bluetooth-obexpush-enabled
 Icon=folder-remote
diff --git a/data/mate-user-share-properties.desktop.in b/data/mate-user-share-properties.desktop.in
index 858afa3..317a60f 100644
--- a/data/mate-user-share-properties.desktop.in
+++ b/data/mate-user-share-properties.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Personal File Sharing
-_Comment=Preferences for sharing of files
+Name=Personal File Sharing
+Comment=Preferences for sharing of files
 Exec=mate-file-share-properties
 Icon=folder-remote
 StartupNotify=true
diff --git a/data/mate-user-share-webdav.desktop.in.in b/data/mate-user-share-webdav.desktop.in.in
index feb3cd9..9384c58 100644
--- a/data/mate-user-share-webdav.desktop.in.in
+++ b/data/mate-user-share-webdav.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Personal File Sharing webdav
-_Comment=Launch Personal File Sharing if enabled
+Name=Personal File Sharing webdav
+Comment=Launch Personal File Sharing if enabled
 Keywords=share;files;bluetooth;obex;http;network;copy;send;
 AutostartCondition=GSettings org.mate.FileSharing enabled
 Icon=folder-remote