From 3aa632a221074ae6f166b75631d1f3ab532f07db Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Fri, 24 Apr 2009 11:21:33 +0000
Subject: Make draklive-install desktop file translatable

---
 Makefile                             | 6 +++++-
 mandriva-draklive-install.desktop    | 9 ---------
 mandriva-draklive-install.desktop.in | 9 +++++++++
 po/Makefile                          | 5 ++++-
 po/POTFILES.in                       | 1 +
 5 files changed, 19 insertions(+), 11 deletions(-)
 delete mode 100644 mandriva-draklive-install.desktop
 create mode 100644 mandriva-draklive-install.desktop.in
 create mode 100644 po/POTFILES.in

diff --git a/Makefile b/Makefile
index 9e22588..6554523 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ VERSION = 1.17
 dli_confdir = ${sysconfdir}/$(NAME).d
 dli_sysconfigdir = $(dli_confdir)/sysconfig
 
-all:
+all: mandriva-draklive-install.desktop
 	make -C po
 
 install:
@@ -48,3 +48,7 @@ changelog: ChangeLog
 ChangeLog:
 	svn2cl --accum --authors ../../soft/common/username.xml
 	rm -f *.bak
+
+mandriva-draklive-install.desktop: mandriva-draklive-install.desktop.in
+	intltool-merge --utf8 po \$< \$@ -d -u -c intltool-merge-cache
+
diff --git a/mandriva-draklive-install.desktop b/mandriva-draklive-install.desktop
deleted file mode 100644
index 12e45b4..0000000
--- a/mandriva-draklive-install.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Live Install
-Comment=Install your Mandriva live system to disk
-Exec=/usr/bin/draklive-install-lock-storage
-Icon=MandrivaOne-install-icon
-Terminal=false
-Type=Application
-Categories=GTK;X-MandrivaLinux-CrossDesktop;Settings;
diff --git a/mandriva-draklive-install.desktop.in b/mandriva-draklive-install.desktop.in
new file mode 100644
index 0000000..c7ef147
--- /dev/null
+++ b/mandriva-draklive-install.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Live Install
+_Comment=Install your Mandriva live system to disk
+Exec=/usr/bin/draklive-install-lock-storage
+Icon=MandrivaOne-install-icon
+Terminal=false
+Type=Application
+Categories=GTK;X-MandrivaLinux-CrossDesktop;Settings;
diff --git a/po/Makefile b/po/Makefile
index f679b1a..0845f3d 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -22,7 +22,10 @@ merge:
 	done
 
 $(NAME).pot:
-	perl_checker -q --generate-pot $@ $(PL_FILES)
+	intltool-update --gettext-package desktopstuff --pot
+	perl_checker -q --generate-pot $(NAME)_tmp.pot $(PL_FILES)
+	[ ! -e $(NAME)_tmp.pot ] || msgcat --use-first $(NAME)_tmp.pot desktopstuff.pot > $@
+	rm -f desktopstuff.pot $(NAME)_tmp.pot 
 
 install: all
 	for l in $(LANGS); do \
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..8b43f84
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1 @@
+mandriva-draklive-install.desktop.in
-- 
cgit v1.2.1