migrate from intltool to gettext

4 files changed, 26 insertions, 23 deletions

diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index bcc28d2..4560164 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -39,17 +39,18 @@ mate_brightness_applet_LDADD =					\
 	$(PANEL_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.BrightnessApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.BrightnessApplet.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 \
+$(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
+	$(AM_V_GEN) sed \
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             -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
-
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.BrightnessAppletFactory.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
@@ -62,7 +63,7 @@ org.mate.panel.applet.BrightnessAppletFactory.service: $(service_in_files)
 uidir   = $(datadir)/mate-power-manager/ui
 ui_DATA = brightness-applet-menu.xml
 
-EXTRA_DIST = org.mate.BrightnessApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
+EXTRA_DIST = $(applet_in_files).in $(ui_DATA) $(service_in_files)
 
 DISTCLEANFILES =						\
 	$(applet_DATA) $(applet_DATA).in $(service_DATA)
diff --git a/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.in.in b/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in
index 3a3a0a8..bddc939 100644
--- a/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.in.in
+++ b/applets/brightness/org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=BrightnessAppletFactory
 Location=@LIBEXECDIR@/mate-brightness-applet
-_Name=Brightness Applet Factory
-_Description=Factory for Brightness Applet
+Name=Brightness Applet Factory
+Description=Factory for Brightness Applet
 
 [BrightnessApplet]
-_Name=Brightness Applet
-_Description=Adjusts Laptop panel brightness
+Name=Brightness Applet
+Description=Adjusts Laptop panel brightness
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-brightness-applet
 MateComponentId=OAFIID:MATE_BrightnessApplet
 X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am
index 1b10447..3ec2f90 100644
--- a/applets/inhibit/Makefile.am
+++ b/applets/inhibit/Makefile.am
@@ -39,16 +39,17 @@ mate_inhibit_applet_LDADD =					\
 	$(PANEL_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.InhibitApplet.mate-panel-applet.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.InhibitApplet.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 \
+$(applet_in_files): $(applet_in_files).in
+	$(AM_V_GEN) sed \
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             -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)
+	$(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.InhibitAppletFactory.service.in
@@ -62,7 +63,6 @@ org.mate.panel.applet.InhibitAppletFactory.service: $(service_in_files)
 uidir   = $(datadir)/mate-power-manager/ui
 ui_DATA = inhibit-applet-menu.xml
 
-EXTRA_DIST = org.mate.InhibitApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
+EXTRA_DIST = $(applet_in_files).in $(ui_DATA) $(service_in_files)
 
-DISTCLEANFILES =						\
-	$(applet_DATA) $(applet_DATA).in $(service_DATA)
+DISTCLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
diff --git a/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in b/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.desktop.in.in
index d65060b..645fc21 100644
--- a/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in
+++ b/applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.desktop.in.in
@@ -1,12 +1,13 @@
 [Applet Factory]
 Id=InhibitAppletFactory
 Location=@LIBEXECDIR@/mate-inhibit-applet
-_Name=Inhibit Applet Factory
-_Description=Factory for Inhibit Applet
+Name=Inhibit Applet Factory
+Description=Factory for Inhibit Applet
 
 [InhibitApplet]
-_Name=Inhibit Applet
-_Description=Allows user to inhibit automatic power saving
+Name=Inhibit Applet
+Description=Allows user to inhibit automatic power saving
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-inhibit-applet
 MateComponentId=OAFIID:MATE_InhibitApplet
 X-MATE-Bugzilla-Bugzilla=MATE