fix translation of startwizard

translate the window-title in the languageselection window when choosing a language
translate some missing stuff

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 2bda3a1c8b0c0022396e5a1981de7cd10020db32..9d537f52c9a6fc86621a8008ad623621b838b282 100644 (file)
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,6 +1,6 @@
 <wizard>
                <step number="1">
-                       <text value="Welcome.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\n\nPress the OK button on your remote control to move to the next step." />
+                       <text value="Welcome.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\nPress the OK button on your remote control to move to the next step." />
                        <code>
 self["arrowdown"].moveTo(557, 232, 1)
 self["arrowdown"].startMoving()

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 79cd25fcb3bb0a304a8228bdd34aa6da4ad570df..399e20ec6509ad82b5056b7932ec077b7c42deb8 100644 (file)
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -31,6 +31,7 @@ class LanguageSelection(Screen):
                language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
                config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
                config.osd.language.save()
+               self.session.currentDialog.instance.setTitle(_("Language selection"))
 
        def updateList(self):
                self.list = []
@@ -41,7 +42,7 @@ class LanguageSelection(Screen):
                                self.list.append(LanguageEntryComponent(x[2], _(x[0])))
                
                self["list"].l.setList(self.list)
-               
+
        def up(self):
                self["list"].instance.moveSelection(self["list"].instance.moveUp)
                self.run()

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 7eda9b0b828ffc96fb5194ff0d83909989ed2c6f..0f8f1998f98c9ec1b37980453f3a1b4a5606416a 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -1,5 +1,7 @@
 from Screen import Screen
 
+import string
+
 from Screens.HelpMenu import HelpableScreen
 from Components.Label import Label
 from Components.Slider import Slider
@@ -29,7 +31,7 @@ class Wizard(Screen, HelpableScreen):
                                self.lastStep = int(attrs.get('number'))
                                self.wizard[self.lastStep] = {"text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": ""}
                        elif (name == "text"):
-                               self.wizard[self.lastStep]["text"] = _(str(attrs.get('value')))
+                               self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
                        elif (name == "listentry"):
                                self.wizard[self.lastStep]["list"].append((str(attrs.get('caption')), str(attrs.get('step'))))
                        elif (name == "config"):

diff --git a/po/Makefile.am b/po/Makefile.am
index dddac3ac2a6434d52ecfb1bb3a082cc2020ff588..9067c2a7342ad8f5ca5c4dc6ad1206e50b2be1ce 100644 (file)
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -30,6 +30,7 @@ enigma2.pot:
                        ../lib/python/Screens/Satconfig.py \
                        ../lib/python/Screens/EventView.py \
                        ../lib/python/Screens/Ci.py \
+                       ../lib/python/Screens/LanguageSelection.py \
                        ../lib/python/Screens/About.py \
                        ../lib/python/Screens/HarddiskSetup.py \
                        ../lib/python/Screens/InfoBar.py \

diff --git a/po/de.po b/po/de.po
index 092bc69abbf395974abee61ab226e2a7dc7d9110..9ce86d542473c9cb5ddc2a8fd1b3ef0b34be49ca 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:43+0100\n"
+"POT-Creation-Date: 2005-12-15 00:08+0100\n"
 "PO-Revision-Date: 2005-12-14 03:29+0100\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"
@@ -191,6 +191,7 @@ msgstr "Ende"
 msgid "EndTime"
 msgstr "Endzeit"
 
+#: ../lib/python/Screens/LanguageSelection.py:38
 #: ../lib/python/Components/SetupDevices.py:24
 #: ../lib/python/Components/Language.py:12
 msgid "English"
@@ -253,6 +254,10 @@ msgstr "Initialisiere Festplatte..."
 msgid "Inversion"
 msgstr ""
 
+#: ../lib/python/Screens/LanguageSelection.py:44 ../data/
+msgid "Language selection"
+msgstr "Sprachauswahl"
+
 #: ../lib/python/Screens/Satconfig.py:28 ../data/
 msgid "Latitude"
 msgstr "Breitengrad"
@@ -404,9 +409,9 @@ msgstr "Aufnahme beginnen?"
 msgid "StartTime"
 msgstr "Startzeit"
 
-#: ../lib/python/Screens/Wizard.py:166
+#: ../lib/python/Screens/Wizard.py:168
 msgid "Step "
-msgstr ""
+msgstr "Schritt"
 
 #: ../lib/python/Screens/InfoBar.py:77
 msgid "Stop playing this movie?"
@@ -619,7 +624,7 @@ msgstr "Status"
 msgid "show EPG..."
 msgstr "zeige EPG..."
 
-#: ../lib/python/Screens/Wizard.py:169 ../lib/python/Screens/Wizard.py:170
+#: ../lib/python/Screens/Wizard.py:171 ../lib/python/Screens/Wizard.py:172
 msgid "text"
 msgstr ""
 
@@ -710,6 +715,19 @@ msgstr ""
 msgid "Use wizard to set up basic features"
 msgstr "Grundeinstellungen jetzt vornehmen"
 
+#: ../data/
+msgid ""
+"Welcome.\n"
+"\n"
+"This start-wizard will guide you through the basic setup of your Dreambox.\n"
+"Press the OK button on your remote control to move to the next step."
+msgstr ""
+"Willkommen.\n"
+"\n"
+"Der Startassistent wird Sie durch die Grundeinstellungen Ihrer Dreambox "
+"führen.\n"
+"Drücken Sie OK auf Ihrer Fernbedienung, um zum nächsten Schritt zu gelangen."
+
 #: ../data/
 msgid "Sat / Dish Setup"
 msgstr "Sat-/Schüsseleinstellungen"
@@ -858,20 +876,6 @@ msgstr "Farbformat"
 msgid "LCD"
 msgstr ""
 
-#: ../data/
-msgid ""
-"Welcome.\n"
-"\n"
-"This start-wizard will guide you through the basic setup of your Dreambox.\n"
-"\n"
-"Press the OK button on your remote control to move to the next step."
-msgstr ""
-"Willkommen.\n"
-"\n"
-"This start-wizard will guide you through the basic setup of your Dreambox.\n"
-"\n"
-"Press the OK button on your remote control to move to the next step."
-
 #: ../data/
 msgid "Timezone"
 msgstr "Zeitzone"
@@ -920,10 +924,6 @@ msgstr "Tonträger"
 msgid "#0000ff"
 msgstr ""
 
-#: ../data/
-msgid "Language selection"
-msgstr ""
-
 #: ../data/
 msgid "Contrast"
 msgstr "Kontrast"

diff --git a/po/xml2po.py b/po/xml2po.py
index bf277987442def52ee7ff1f82e1772d2b134869e..a8b626668b7b729336c1b6df7f411a7a50b3a849 100755 (executable)
--- a/po/xml2po.py
+++ b/po/xml2po.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 import sys
 import os
+import string
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
 
@@ -36,6 +37,7 @@ for x in dir:
 for k, v in attrlist.items():
        print
        print '#: ' + sys.argv[1]
+       string.replace(k, "\\n", "\"\n\"")
        print 'msgid "' + str(k) + '"'
        print 'msgstr ""'