migrate from intltool to gettext

4 files changed, 17 insertions, 9 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 436cdf7..1092440 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,18 @@
 SUBDIRS = icons
 
 
-@INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-power-preferences.desktop.in \
 		   mate-power-statistics.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 $@
 
-@INTLTOOL_DESKTOP_RULE@
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = mate-power-manager.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+$(autostart_DATA): $(autostart_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 servicedir       = $(DBUS_SERVICES_DIR)
 service_in_files = org.mate.PowerManager.service.in
@@ -20,7 +22,6 @@ $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\@servicedir\@|$(bindir)|" $< > $@
 
 @GSETTINGS_RULES@
-@INTLTOOL_XML_NOMERGE_RULE@
 gsettings_schemas_in_files = org.mate.power-manager.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_schemas_in_files:.xml.in=.xml)
 
diff --git a/data/mate-power-manager.desktop.in.in b/data/mate-power-manager.desktop.in.in
index 601d565..79ff3f1 100644
--- a/data/mate-power-manager.desktop.in.in
+++ b/data/mate-power-manager.desktop.in.in
@@ -1,10 +1,12 @@
 [Desktop Entry]
-_Name=Power Manager
-_Comment=Power management daemon
+Name=Power Manager
+Comment=Power management daemon
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-power-manager
 Exec=mate-power-manager
 Terminal=false
 Type=Application
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Categories=
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/data/mate-power-preferences.desktop.in.in b/data/mate-power-preferences.desktop.in.in
index c5823bc..d827568 100644
--- a/data/mate-power-preferences.desktop.in.in
+++ b/data/mate-power-preferences.desktop.in.in
@@ -1,11 +1,14 @@
 [Desktop Entry]
-_Name=Power Management
-_Comment=Configure power management
+Name=Power Management
+Comment=Configure power management
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-power-manager
 Exec=mate-power-preferences
 Terminal=false
 Type=Application
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Categories=Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;power;management;preferences;settings;
 OnlyShowIn=MATE;
 StartupNotify=true
diff --git a/data/mate-power-statistics.desktop.in.in b/data/mate-power-statistics.desktop.in.in
index ec6c7c6..2a9db3c 100644
--- a/data/mate-power-statistics.desktop.in.in
+++ b/data/mate-power-statistics.desktop.in.in
@@ -1,10 +1,12 @@
 [Desktop Entry]
-_Name=Power Statistics
-_Comment=Observe power management
+Name=Power Statistics
+Comment=Observe power management
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-power-statistics
 Exec=mate-power-statistics
 Terminal=false
 Type=Application
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Categories=GTK;System;Monitor;
 OnlyShowIn=MATE;
 NoDisplay=false