X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=po%2FMakefile;h=2f169a246ce569c74b4caba4bd54b107801d71c0;hb=3ebb2698eec3fae7d277550f7cd19d18f10e8aab;hp=38fc9c3adaa1d596f4a39d7a94360dd66650abda;hpb=c8da97052d1d98b1a9b5c59a38877867ff0f80c3;p=vuplus_dvbapp

diff --git a/po/Makefile b/po/Makefile
index 38fc9c3..2f169a2 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,25 +1,57 @@
 #GETTEXT=./pygettext.py
 GETTEXT=xgettext
 
+#MSGFMT = ./msgfmt.py
+MSGFMT = msgfmt
+
 LANGS := de en
 LANGPO := $(foreach LANG, $(LANGS),$(LANG).po)
 LANGMO := $(foreach LANG, $(LANGS),$(LANG).mo)
 
 default: enigma2.pot $(LANGPO) merge $(LANGMO)
+	-mkdir -p de/LC_MESSAGES
+	cp de.mo de/LC_MESSAGES/enigma2.mo
+
+	-mkdir -p en/LC_MESSAGES
+	cp en.mo en/LC_MESSAGES/enigma2.mo
 
 merge:
-	msgmerge -U en.po enigma2.pot
-	msgmerge -U de.po enigma2.pot
+#	msgmerge -N -U enigma2.pot menu.pot
+#	msgmerge -N -U enigma2.pot setup.pot
+	msguniq -o enigma2uniq.pot enigma2.pot
+	rm enigma2.pot
+	mv enigma2uniq.pot enigma2.pot
+	msgmerge -N -U de.po enigma2.pot
 
 enigma2.pot:
 	$(GETTEXT)	-d enigma2 -s -o enigma2.pot \
 			../lib/python/Screens/ScanSetup.py \
-			../lib/python/Screens/NetworkSetup.py
+			../lib/python/Screens/NetworkSetup.py \
+			../lib/python/Screens/Satconfig.py \
+			../lib/python/Screens/EventView.py \
+			../lib/python/Screens/Ci.py \
+			../lib/python/Screens/About.py \
+			../lib/python/Screens/HarddiskSetup.py \
+			../lib/python/Screens/InfoBar.py \
+			../lib/python/Screens/TimerEdit.py \
+			../lib/python/Screens/Wizard.py \
+			../lib/python/Screens/ServiceScan.py \
+			../lib/python/Components/ServiceScan.py \
+			../lib/python/Components/Lcd.py \
+			../lib/python/Components/SetupDevices.py \
+			../lib/python/Components/Language.py \
+			../lib/python/Components/NimManager.py \
+			../lib/python/Components/EventInfo.py \
+			../lib/python/Components/Network.py 
+	./xml2po.py	../data/ >> enigma2.pot
 
 
 %.mo: %.po
-	msgfmt $< -o $@
+	$(MSGFMT) -o $@ $<
 
 %.po:
 	msginit -l $@ -o $@ -i enigma2.pot --no-translator
 	
+
+clean:
+	rm *.mo *.pot