fix po/Makefile.am to copy .mo files instead of .po

update languages in realtime in LanguageSelection

5 files changed, 18 insertions, 73 deletions

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 1a82a313..79cd25fc 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -15,13 +15,13 @@ class LanguageSelection(Screen):
 		self["list"] = LanguageList(self.list)
 		self.updateList()
 		
-		self["actions"] = ActionMap(["ListboxActions", "OkCancelActions"], 
+		self["actions"] = ActionMap(["WizardActions"], 
 		{
 			"ok": self.save,
-			"cancel": self.close,
-			"moveUp": self.up,
-			"moveDown": self.down
-		})
+			"back": self.close,
+			"up": self.up,
+			"down": self.down
+		}, -1)
 		
 	def save(self):
 		self.run()
@@ -43,7 +43,11 @@ class LanguageSelection(Screen):
 		self["list"].l.setList(self.list)
 		
 	def up(self):
-		print "up"
+		self["list"].instance.moveSelection(self["list"].instance.moveUp)
+		self.run()
+		self.updateList()
 		
 	def down(self):
-		print "down"
\ No newline at end of file
+		self["list"].instance.moveSelection(self["list"].instance.moveDown)
+		self.run()
+		self.updateList()
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index a5726f6f..5b59d2c0 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -151,14 +151,14 @@ class Wizard(Screen, HelpableScreen):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self["config"].instance.moveSelection(self["config"].instance.moveUp)
 		elif (len(self.wizard[self.currStep]["list"]) > 0):
-			self["list"].instance.moveSelection(self["config"].instance.moveUp)
+			self["list"].instance.moveSelection(self["list"].instance.moveUp)
 		print "up"
 		
 	def down(self):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self["config"].instance.moveSelection(self["config"].instance.moveDown)
 		elif (len(self.wizard[self.currStep]["list"]) > 0):
-			self["list"].instance.moveSelection(self["config"].instance.moveDown)
+			self["list"].instance.moveSelection(self["list"].instance.moveDown)
 		print "down"
 		
 	def updateValues(self):
diff --git a/po/Makefile b/po/Makefile
index 9aabdeb1..e69de29b 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,59 +0,0 @@
-#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 -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/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/TimerEntry.py \
-			../lib/python/Screens/Wizard.py \
-			../lib/python/Screens/ServiceScan.py \
-			../lib/python/Screens/InfoBarGenerics.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 $@ $<
-
-%.po:
-	msginit -l $@ -o $@ -i enigma2.pot --no-translator
-	
-
-clean:
-	rm *.mo *.pot
diff --git a/po/Makefile.am b/po/Makefile.am
index a7709e4c..355a343c 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -60,5 +60,5 @@ clean:
 install-data-am: default
 	for lang in $(LANGS); do \
 		mkdir -p $(DESTDIR)$(DATADIR)/enigma2/po/$$lang/LC_MESSAGES; \
-		cp $$lang.po $(DESTDIR)$(DATADIR)/enigma2/po/$$lang/LC_MESSAGES/$(DOMAIN).po; \
+		cp $$lang.mo $(DESTDIR)$(DATADIR)/enigma2/po/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
 	done
diff --git a/po/de.po b/po/de.po
index 83ec4c95..16dd5124 100644
--- a/po/de.po
+++ b/po/de.po
@@ -845,7 +845,7 @@ msgstr "LCD Einstellung"
 
 #: ../data/
 msgid "No, scan later manually"
-msgstr ""
+msgstr "Nein, spaeter suchen."
 
 #: ../data/
 msgid "Soundcarrier"
@@ -929,7 +929,7 @@ msgstr "Erweiterungen"
 
 #: ../data/
 msgid "Yes, scan now"
-msgstr ""
+msgstr "Ja, jetzt suchen."
 
 #: ../data/
 msgid "Information"
@@ -1053,11 +1053,11 @@ msgstr ""
 
 #: ../data/
 msgid "Do you want to do a service scan?"
-msgstr ""
+msgstr "Jetzt nach Kanaelen suchen?"
 
 #: ../data/
 msgid "Thanx for using the wizard. Your box is now ready to use."
-msgstr ""
+msgstr "Der Assistent ist hiermit beendet. Ihre Dreambox kann nun benutzt werden."
 
 #: ../data/
 msgid "Satelliteconfig"