From a6c3c2fb5652dc29076b333c85ab6459f8645a79 Mon Sep 17 00:00:00 2001
From: Mladen Horvat <acid-burn@opendreambox.org>
Date: Tue, 29 Jul 2008 10:19:57 +0000
Subject: [PATCH] -add LCD Text

---
 networkwizard/po/de.po              | 32 +++++++++++++++++++++-----------
 networkwizard/po/en.po              | 19 +++++++++++++++++--
 networkwizard/src/networkwizard.xml | 18 ++++++++++++++++--
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/networkwizard/po/de.po b/networkwizard/po/de.po
index 6e1f0b8..8769d04 100755
--- a/networkwizard/po/de.po
+++ b/networkwizard/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: 2008-07-15 22:49+0200\n"
+"POT-Creation-Date: 2008-07-29 08:23+0200\n"
 "PO-Revision-Date: 2008-05-16 17:15+0100\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"
@@ -19,6 +19,12 @@ msgstr ""
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: iso-8859-15\n"
 
+msgid "Configure interface"
+msgstr "Netzwerkkarte konfigurieren"
+
+msgid "Configure nameservers"
+msgstr "DNS-Server konfigurieren"
+
 msgid "Configure your internal LAN"
 msgstr "Internes Netzwerk konfigurieren"
 
@@ -42,8 +48,7 @@ msgid ""
 "values.\n"
 "When you are ready press OK to continue."
 msgstr ""
-"Konfigurieren Sie Ihre DNS-Server durch ausfüllen der entsprechenden "
-"Werte.\n"
+"Konfigurieren Sie Ihre DNS-Server durch ausfüllen der entsprechenden Werte.\n"
 "Drücken Sie OK zum fortfahren"
 
 msgid ""
@@ -51,10 +56,11 @@ msgid ""
 "values.\n"
 "When you are ready press OK to continue."
 msgstr ""
-"Konfigurieren Sie Ihr Netzwerk durch ausfüllen der entsprechenden "
-"Werte.\n"
+"Konfigurieren Sie Ihr Netzwerk durch ausfüllen der entsprechenden Werte.\n"
 "Drücken Sie OK zum fortfahren"
 
+msgid "Please follow the instructions on the TV"
+msgstr "Bitte folgen Sie den Angaben auf Ihrem Fernseher."
 
 msgid ""
 "Please select the network interface that you want to use for your internet "
@@ -62,8 +68,8 @@ msgid ""
 "\n"
 "Please press OK to continue."
 msgstr ""
-"Bitte wählen Sie die Netzwerkschnitstelle welche Sie für Ihren Internetzugang"
-"nutzen möchten.\n"
+"Bitte wählen Sie die Netzwerkschnitstelle welche Sie für Ihren "
+"Internetzugangnutzen möchten.\n"
 "\n"
 "Drücken Sie OK zum fortfahren"
 
@@ -76,12 +82,17 @@ msgstr ""
 "\n"
 "Drücken Sie OK zum fortfahren."
 
+msgid "Select interface"
+msgstr "Netzwerkkarte auswählen"
+
+msgid "Select wireless network"
+msgstr "Funknetzwerk auswählen"
+
 msgid ""
-"Thank you for using the wizard. Your Network is now ready to use.\n"
+"Thank you for using the wizard.\n"
 "Please press OK to continue."
 msgstr ""
-"Vielen Dank das Sie den Assisten benutzt haben. Ihr Netzwerk ist nun "
-"fertig konfiguriert.\n"
+"Vielen Dank das Sie den Assisten benutzt haben.\n"
 "Drücken Sie OK zum fortfahren."
 
 msgid ""
@@ -148,4 +159,3 @@ msgstr ""
 
 msgid "unavailable"
 msgstr "nicht verfügbar"
-
diff --git a/networkwizard/po/en.po b/networkwizard/po/en.po
index 1c16f0a..36a35e9 100755
--- a/networkwizard/po/en.po
+++ b/networkwizard/po/en.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-15 22:49+0200\n"
+"POT-Creation-Date: 2008-07-29 08:23+0200\n"
 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,6 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Configure interface"
+msgstr ""
+
+msgid "Configure nameservers"
+msgstr ""
+
 msgid "Configure your internal LAN"
 msgstr ""
 
@@ -46,6 +52,9 @@ msgid ""
 "When you are ready press OK to continue."
 msgstr ""
 
+msgid "Please follow the instructions on the TV"
+msgstr ""
+
 msgid ""
 "Please select the network interface that you want to use for your internet "
 "connection.\n"
@@ -59,8 +68,14 @@ msgid ""
 "Please press OK to continue."
 msgstr ""
 
+msgid "Select interface"
+msgstr ""
+
+msgid "Select wireless network"
+msgstr ""
+
 msgid ""
-"Thank you for using the wizard. Your Network is now ready to use.\n"
+"Thank you for using the wizard.\n"
 "Please press OK to continue."
 msgstr ""
 
diff --git a/networkwizard/src/networkwizard.xml b/networkwizard/src/networkwizard.xml
index 9b1f009..3bcbfa9 100755
--- a/networkwizard/src/networkwizard.xml
+++ b/networkwizard/src/networkwizard.xml
@@ -1,6 +1,7 @@
 <wizard>
 		<step id="welcome" nextstep="selectinterface">
 			<text value="Welcome.\n\nIf you want to connect your Dreambox to the Internet, this wizard will guide you through the basic network setup of your Dreambox.\n\nPress OK to start configuring your network" />
+			<displaytext value="Network Wizard" />
 			<code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -8,8 +9,8 @@ self.selectKey("OK")
 		</step>
 
 		<step id="selectinterface">
-
 			<text value="Please select the network interface that you want to use for your internet connection.\n\nPlease press OK to continue." />
+			<displaytext value="Select interface" />
 			<list type="dynamic" source="listInterfaces" evaluation="InterfaceSelectionMade" onselect="InterfaceSelectionMoved" />
 			<code>
 self.clearSelectedKeys()
@@ -25,6 +26,7 @@ self.currStep = self.getStepWithID(self.NextStep)
 
 		<step id="nwconfig" nextstep="confdns">
 			<text value="Please configure your internet connection by filling out the required values.\nWhen you are ready press OK to continue." />
+			<displaytext value="Configure interface" />
 			<config screen="AdapterSetup" module="NetworkSetup" args="self.selectedInterface" type="ConfigList" />
 			<code>
 self.clearSelectedKeys()
@@ -38,6 +40,7 @@ self.selectKey("RIGHT")
 
 		<step id="confdns" nextstep="checklanstatusend">
 			<text value="Please configure or verify your Nameservers by filling out the required values.\nWhen you are ready press OK to continue." />
+			<displaytext value="Configure nameservers" />
 			<config screen="NameserverSetup" module="NetworkSetup" type="ConfigList" />
 			<code>
 self.clearSelectedKeys()
@@ -53,10 +56,17 @@ self.checkNetwork()
 self.condition = (self.InterfaceState == True )
 		</condition>
 			<text value="Your Dreambox is now ready to use.\n\nYour internet connection is working now.\n\nPlease press OK to continue." />
+			<displaytext value="Please follow the instructions on the TV" />
 			<code>
 self.clearSelectedKeys()
 self.selectKey("OK")
 			</code>
+			<code pos="after">
+currStep = self.numSteps				
+self.wizard[currStep]["nextstep"] = None
+self.markDone()
+self.close()
+			</code>	
 		</step>
 
 		<step id="checklanstatusend">
@@ -64,6 +74,7 @@ self.selectKey("OK")
 self.condition = (self.InterfaceState == False )
 		</condition>
 			<text value="Your internet connection is not working!\nPlease choose what you want to do next." />
+			<displaytext value="Please follow the instructions on the TV" />
 			<code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -82,6 +93,7 @@ self.checkInterface(self.selectedInterface)
 self.condition = (self.isInterfaceUp == True and self.WlanPluginInstalled == True)
 		</condition>
 			<text value="Please select the wireless LAN network that you want to connect to.\n\nPlease press OK to continue." />
+			<displaytext value="Select wireless network" />
 			<list type="dynamic" source="listModes" evaluation="modeSelectionMade" onselect="modeSelectionMoved" />
 			<code>
 self.clearSelectedKeys()
@@ -102,6 +114,7 @@ self.checkInterface(self.selectedInterface)
 self.condition = (self.isInterfaceUp == False and self.WlanPluginInstalled == True)
 		</condition>
 			<text value="Your wireless LAN internet connection could not be started!\nHave you attached your USB WLAN Stick?\n\nPlease choose what you want to do next." />
+			<displaytext value="Please follow the instructions on the TV" />
 			<list>
 				<listentry caption="Configure your wireless LAN again" step="scanwlan" />
 				<listentry caption="Configure your internal LAN" step="selectinterface" />
@@ -121,6 +134,7 @@ self.checkInterface(self.selectedInterface)
 self.condition = (self.isInterfaceUp == True and self.WlanPluginInstalled == False)
 		</condition>
 			<text value="The wireless LAN plugin is not installed!\nPlease install it and choose what you want to do next." />
+			<displaytext value="Please follow the instructions on the TV" />
 			<list>
 				<listentry caption="Configure your internal LAN" step="selectinterface" />
 				<listentry caption="Exit wizard and configure later manually" step="end" />
@@ -134,7 +148,7 @@ self.selectKey("DOWN")
 		</step>
 
 		<step id="end">
-			<text value="Thank you for using the wizard. Your Network is now ready to use.\nPlease press OK to continue." />
+			<text value="Thank you for using the wizard.\nPlease press OK to continue." />
 			<code>
 self.clearSelectedKeys()
 self.selectKey("OK")
-- 
2.7.4