migrate from intltool to gettext

6 files changed, 28 insertions, 27 deletions

diff --git a/savers/Makefile.am b/savers/Makefile.am
index 4f590cf..267a44a 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -23,17 +23,15 @@ DESKTOP_IN_IN_FILES = 			 \
 	$(NULL)
 
 cosmos-slideshow.desktop.in: cosmos-slideshow.desktop.in.in Makefile
-	$(edit) $< >$@
+	@$(edit) $< >$@
 footlogo-floaters.desktop.in: footlogo-floaters.desktop.in.in Makefile
-	$(edit) $< >$@
+	@$(edit) $< >$@
 gnomelogo-floaters.desktop.in: gnomelogo-floaters.desktop.in.in Makefile
-	$(edit) $< >$@
+	@$(edit) $< >$@
 personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile
-	$(edit) $< >$@
+	@$(edit) $< >$@
 popsquares.desktop.in: popsquares.desktop.in.in Makefile
-	$(edit) $< >$@
-
-@INTLTOOL_DESKTOP_RULE@
+	@$(edit) $< >$@
 
 edit = sed \
 	-e 's|@SLIDESHOW_COSMOS_DIR[@]|$(SLIDESHOW_COSMOS_DIR)|g' \
@@ -41,6 +39,9 @@ edit = sed \
 	-e 's|@FLOATERS_FOOT_GNOME_LOGO_IMAGE[@]|$(FLOATERS_FOOT_GNOME_LOGO_IMAGE)|g' \
 	-e 's|@SAVERDIR[@]|$(privlibexecdir)|g'
 
+%.desktop: %.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 themesdir = $(datadir)/applications/screensavers
 themes_in_files = 			\
 	cosmos-slideshow.desktop.in	\
diff --git a/savers/cosmos-slideshow.desktop.in.in b/savers/cosmos-slideshow.desktop.in.in
index faf095d..4d43957 100644
--- a/savers/cosmos-slideshow.desktop.in.in
+++ b/savers/cosmos-slideshow.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
-_Name=Cosmos
-_Comment=Display a slideshow of pictures of the cosmos
+Name=Cosmos
+Comment=Display a slideshow of pictures of the cosmos
 Exec=@SAVERDIR@/slideshow --location=@SLIDESHOW_COSMOS_DIR@
 TryExec=@SAVERDIR@/slideshow
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=Screensaver;
-#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=MATE;screensaver;slideshow;cosmos;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=MATE;screensaver;slideshow;cosmos;
 OnlyShowIn=MATE;
diff --git a/savers/footlogo-floaters.desktop.in.in b/savers/footlogo-floaters.desktop.in.in
index d9ef513..dc3a4e2 100644
--- a/savers/footlogo-floaters.desktop.in.in
+++ b/savers/footlogo-floaters.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
-_Name=Floating MATE
-_Comment=Bubbles the MATE logo around the screen
+Name=Floating MATE
+Comment=Bubbles the MATE logo around the screen
 Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_LOGO_IMAGE@
 TryExec=@SAVERDIR@/floaters
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=Screensaver;
-#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=MATE;screensaver;logo;bubbles;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=MATE;screensaver;logo;bubbles;
 OnlyShowIn=MATE;
diff --git a/savers/gnomelogo-floaters.desktop.in.in b/savers/gnomelogo-floaters.desktop.in.in
index 7945a89..1ff1bf9 100644
--- a/savers/gnomelogo-floaters.desktop.in.in
+++ b/savers/gnomelogo-floaters.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
-_Name=Floating GNOME
-_Comment=Bubbles the GNOME logo around the screen
+Name=Floating GNOME
+Comment=Bubbles the GNOME logo around the screen
 Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_GNOME_LOGO_IMAGE@
 TryExec=@SAVERDIR@/floaters
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=Screensaver;
-#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=MATE;screensaver;GNOME;logo;bubbles;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=MATE;screensaver;GNOME;logo;bubbles;
 OnlyShowIn=MATE;
diff --git a/savers/personal-slideshow.desktop.in.in b/savers/personal-slideshow.desktop.in.in
index 5be0019..6e84034 100644
--- a/savers/personal-slideshow.desktop.in.in
+++ b/savers/personal-slideshow.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
-_Name=Pictures folder
-_Comment=Display a slideshow from your Pictures folder
+Name=Pictures folder
+Comment=Display a slideshow from your Pictures folder
 Exec=@SAVERDIR@/slideshow
 TryExec=@SAVERDIR@/slideshow
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=Screensaver;
-#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=MATE;screensaver;custom;slideshow;pictures;folder;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=MATE;screensaver;custom;slideshow;pictures;folder;
 OnlyShowIn=MATE;
diff --git a/savers/popsquares.desktop.in.in b/savers/popsquares.desktop.in.in
index 0c46df5..3a50f5b 100644
--- a/savers/popsquares.desktop.in.in
+++ b/savers/popsquares.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
-_Name=Pop art squares
-_Comment=A pop-art-ish grid of pulsing colors.
+Name=Pop art squares
+Comment=A pop-art-ish grid of pulsing colors.
 Exec=@SAVERDIR@/popsquares
 TryExec=@SAVERDIR@/popsquares
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=Screensaver;
-#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=MATE;screensaver;grid;pulsing;colors;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=MATE;screensaver;grid;pulsing;colors;
 OnlyShowIn=MATE;