migrate from intltool to gettext

2 files changed, 20 insertions, 16 deletions

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;