fix typos

fix async callback
translation update

2 files changed, 71 insertions, 52 deletions

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 887e1674..580673e4 100755
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -50,8 +50,8 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
 		Screen.__init__(self, session)
 		HelpableScreen.__init__(self)
 		
-		self.wlan_errortext = _("No working wireless networkadapter found.\nPlease verify that you have attached a compatible WLAN USB Stick and your Network is configured correctly.")
-		self.lan_errortext = _("No working local networkadapter found.\nPlease verify that you have attached a network cable and your Network is configured correctly.")
+		self.wlan_errortext = _("No working wireless network adapter found.\nPlease verify that you have attached a compatible WLAN device and your network is configured correctly.")
+		self.lan_errortext = _("No working local network adapter found.\nPlease verify that you have attached a network cable and your network is configured correctly.")
 		self.oktext = _("Press OK on your remote control to continue.")
 		self.restartLanRef = None
 		
@@ -67,18 +67,18 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
 			
 		self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
 			{
-			"cancel": (self.close, _("exit networkinterface list")),
+			"cancel": (self.close, _("exit network interface list")),
 			"ok": (self.okbuttonClick, _("select interface")),
 			})
 
 		self["ColorActions"] = HelpableActionMap(self, "ColorActions",
 			{
-			"red": (self.close, _("exit networkinterface list")),	
+			"red": (self.close, _("exit network interface list")),	
 			})
 		
 		self["DefaultInterfaceAction"] = HelpableActionMap(self, "ColorActions",
 			{
-			"blue": (self.setDefaultInterface, [_("Set interface as default Interface"),_("* Only available if more then one interface is active.")] ),	
+			"blue": (self.setDefaultInterface, [_("Set interface as default Interface"),_("* Only available if more than one interface is active.")] ),	
 			})
 		
 		self.list = []
@@ -273,13 +273,18 @@ class NameserverSetup(Screen, ConfigListScreen, HelpableScreen):
 			self.createSetup()
 	
 class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
-	def __init__(self, session, iface,essid=None, aplist=None):
+	def __init__(self, session, networkinfo, essid=None, aplist=None):
 		Screen.__init__(self, session)
 		HelpableScreen.__init__(self)
 		self.session = session
-		self.iface = iface
-		self.essid = essid
-		self.aplist = aplist
+		if isinstance(networkinfo, (list, tuple)):
+			self.iface = networkinfo[0]
+			self.essid = networkinfo[1]
+			self.aplist = networkinfo[2]
+		else:
+			self.iface = networkinfo
+			self.essid = essid
+			self.aplist = aplist
 		self.extended = None
 		self.applyConfigRef = None
 		self.finished_cb = None
@@ -290,19 +295,19 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 
 		self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
 			{
-			"cancel": (self.cancel, _("exit networkadapter setup menu")),
+			"cancel": (self.cancel, _("exit network adapter setup menu")),
 			"ok": (self.ok, _("select menu entry")),
 			})
 
 		self["ColorActions"] = HelpableActionMap(self, "ColorActions",
 			{
-			"red": (self.cancel, _("exit networkadapter configuration")),
+			"red": (self.cancel, _("exit network adapter configuration")),
 			"blue": (self.KeyBlue, _("open nameserver configuration")),
 			})
 
 		self["VirtualKB"] = HelpableActionMap(self, "ColorActions",
 			{
-			"green": (self.KeyGreen, [_("open virtual keyboard input help"),_("* Only available when entering hidden ssid or network key")] ),					
+			"green": (self.KeyGreen, [_("open virtual keyboard input help"),_("* Only available when entering hidden SSID or network key")] ),					
 			})
 
 		self["actions"] = NumberActionMap(["SetupActions"],
@@ -516,7 +521,7 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 		if self.iface == "wlan0" or self.iface == "ath0" :	
 			if self["config"].getCurrent() == self.hiddenSSID:
 				if config.plugins.wlan.essid.value == 'hidden...':
-					self.session.openWithCallback(self.VirtualKeyBoardSSIDCallback, VirtualKeyBoard, title = (_("Enter WLAN networkname/SSID:")), text = config.plugins.wlan.essid.value)
+					self.session.openWithCallback(self.VirtualKeyBoardSSIDCallback, VirtualKeyBoard, title = (_("Enter WLAN network name/SSID:")), text = config.plugins.wlan.essid.value)
 			if self["config"].getCurrent() == self.encryptionKey:
 				self.session.openWithCallback(self.VirtualKeyBoardKeyCallback, VirtualKeyBoard, title = (_("Enter WLAN passphrase/key:")), text = config.plugins.wlan.encryption.psk.value)
 	
@@ -600,7 +605,7 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 				iNetwork.deactivateInterface(self.iface)
 			iNetwork.writeNetworkConfig()			
 			iNetwork.restartNetwork(self.applyConfigDataAvail)
-			self.applyConfigRef = self.session.openWithCallback(self.applyConfigfinishedCB, MessageBox, _("Please wait while activating your network configuration..."), type = MessageBox.TYPE_INFO, enable_input = False)
+			self.applyConfigRef = self.session.openWithCallback(self.applyConfigfinishedCB, MessageBox, _("Please wait for activation of your network configuration..."), type = MessageBox.TYPE_INFO, enable_input = False)
 		else:
 			self.cancel()
 			
@@ -616,10 +621,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
 		if data is True:
 			num_configured_if = len(iNetwork.getConfiguredAdapters())
 			if num_configured_if >= 2:
-				self.session.openWithCallback(self.secondIfaceFoundCB, MessageBox, _("Your network configuration has been activated.\nA second configured interface has been found.\n\nDo you want to disable the second networkinterface?"), default = True)
+				self.session.openWithCallback(self.secondIfaceFoundCB, MessageBox, _("Your network configuration has been activated.\nA second configured interface has been found.\n\nDo you want to disable the second network interface?"), default = True)
 			else:
 				if self.finished_cb:
-					self.session.openWithCallback(self.finished_cb, MessageBox, _("Your network configuration has been activated."), type = MessageBox.TYPE_INFO, timeout = 10)
+					self.session.openWithCallback(lambda x : self.finished_cb(), MessageBox, _("Your network configuration has been activated."), type = MessageBox.TYPE_INFO, timeout = 10)
 				else:
 					self.session.openWithCallback(self.ConfigfinishedCB, MessageBox, _("Your network configuration has been activated."), type = MessageBox.TYPE_INFO, timeout = 10)
 	
@@ -695,7 +700,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 		
 		self.oktext = _("Press OK on your remote control to continue.")
 		self.reboottext = _("Your Dreambox will restart after pressing OK on your remote control.")
-		self.errortext = _("No working wireless interface found.\n Please verify that you have attached a compatible WLAN device or enable you local network interface.")	
+		self.errortext = _("No working wireless network interface found.\n Please verify that you have attached a compatible WLAN device or enable your local network interface.")	
 		
 		self["WizardActions"] = HelpableActionMap(self, "WizardActions",
 			{
@@ -1404,4 +1409,5 @@ class NetworkAdapterTest(Screen):
 		except ImportError:
 			pass
 		else:
-			iStatus.stopWlanConsole()						
\ No newline at end of file
+			iStatus.stopWlanConsole()
+			
diff --git a/po/de.po b/po/de.po
index eb38d378..e5f33eec 100755
--- 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: 2008-11-07 09:36+0100\n"
+"POT-Creation-Date: 2008-11-07 21:18+0100\n"
 "PO-Revision-Date: 2008-10-15 12:10+0100\n"
 "Last-Translator: Andreas Frisch <andreas.frisch@multimedia-labs.de>\n"
 "Language-Team: none\n"
@@ -98,13 +98,11 @@ msgstr "(leer)"
 msgid "(show optional DVD audio menu)"
 msgstr ""
 
-msgid "* Only available if more then one interface is active."
+msgid "* Only available if more than one interface is active."
 msgstr "* Nur verfügbar wenn mehr als ein Netzwerkadapter aktiv ist."
 
-msgid "* Only available when entering hidden ssid or network key"
-msgstr ""
-"* Nur verfügbar während der eingabe einer versteckten Netzwerk SSID oder "
-"WLAN Passwortes"
+msgid "* Only available when entering hidden SSID or network key"
+msgstr "* Verfügbar für die Eingabe der Netzwerk SSID oder Passwortes"
 
 msgid ".NFI Download failed:"
 msgstr ""
@@ -596,7 +594,7 @@ msgid "Change bouquets in quickzap"
 msgstr "Bouquet wechseln beim Quickzap"
 
 msgid "Change dir."
-msgstr "Verzeichniss wechseln"
+msgstr "Verzeichnis wechseln"
 
 msgid "Change pin code"
 msgstr "Pincode ändern"
@@ -1163,8 +1161,8 @@ msgstr "Anfängliche Vorlaufgeschwindigkeit eingeben"
 msgid "Enter Rewind at speed"
 msgstr "Anfängliche Rücklaufgeschwindigkeit eingeben"
 
-msgid "Enter WLAN networkname/SSID:"
-msgstr "WLAN Netzwerkname/SSID eingeben:"
+msgid "Enter WLAN network name/SSID:"
+msgstr ""
 
 msgid "Enter WLAN passphrase/key:"
 msgstr "WLAN Schlüssel/Passwort eingeben:"
@@ -1262,10 +1260,10 @@ msgid "Finished"
 msgstr "Beendet"
 
 msgid "Finished configuring your network"
-msgstr ""
+msgstr "Netzwerkkonfiguration abgeschlossen"
 
 msgid "Finished restarting your network"
-msgstr ""
+msgstr "Netzwerkneustart abgeschlossen"
 
 msgid "Finnish"
 msgstr "Finnisch"
@@ -1499,7 +1497,7 @@ msgid "Integrated Ethernet"
 msgstr "Eingebaute Netzwerkschnittstelle"
 
 msgid "Integrated Wireless"
-msgstr "Integriertes Funknetzwerk"
+msgstr "Integriertes WLAN"
 
 msgid "Intermediate"
 msgstr "Fortgeschritten"
@@ -1885,22 +1883,31 @@ msgstr ""
 "Wenn Sie 'NEIN' wählen, bleibt der Einstellungen-Schutz deaktiviert!"
 
 msgid ""
-"No working local networkadapter found.\n"
-"Please verify that you have attached a network cable and your Network is "
+"No working local network adapter found.\n"
+"Please verify that you have attached a network cable and your network is "
 "configured correctly."
 msgstr ""
+"Kein funktionierender Netzwerkadapter gefunden.\n"
+"Stellen Sie sicher, dass Sie ein Netzwerkkabel angeschlossen haben und das "
+"Ihr Netzwerk richtig konfiguriert ist."
 
 msgid ""
-"No working wireless interface found.\n"
-" Please verify that you have attached a compatible WLAN device or enable you "
-"local network interface."
+"No working wireless network adapter found.\n"
+"Please verify that you have attached a compatible WLAN device and your "
+"network is configured correctly."
 msgstr ""
+"Kein funktionierende WLAN Netzwerkadapter gefunden.\n"
+"Stellen Sie sicher, dass Sie ein kompatibles Gerät angeschlossen haben oder "
+"aktivieren Sie den internen Netzwerkadapter."
 
 msgid ""
-"No working wireless networkadapter found.\n"
-"Please verify that you have attached a compatible WLAN USB Stick and your "
-"Network is configured correctly."
+"No working wireless network interface found.\n"
+"Please verify that you have attached a compatible WLAN device or enable your "
+"local network interface."
 msgstr ""
+"Kein funktionierender WLAN Netzwerkadapter gefunden.\n"
+"Stellen Sie sicher, dass Sie ein kompatibles Gerät angeschlossen haben und "
+"das Ihr Netzwerk richtig konfiguriert ist."
 
 msgid "No, but restart from begin"
 msgstr "Nein, aber von Anfang an neu beginnen"
@@ -2166,12 +2173,12 @@ msgstr ""
 "Bitte benutzen Sie die Hoch/Runter-Tasten, um Ihre Sprache auszuwählen. "
 "Danach drücken Sie bitte OK."
 
+msgid "Please wait for activation of your network configuration..."
+msgstr "Bitte warten während die Netzwerkkonfiguration aktiviert wird..."
+
 msgid "Please wait for md5 signature verification..."
 msgstr ""
 
-msgid "Please wait while activating your network configuration..."
-msgstr "Bitte warten während die Netzwerkkonfiguration aktiviert wird..."
-
 msgid "Please wait while we configure your network..."
 msgstr "Bitte warten während das Netzwerk konfiguriert wird..."
 
@@ -2693,7 +2700,7 @@ msgid "Set as default Interface"
 msgstr "Netzwerkadapter als Standard definieren"
 
 msgid "Set interface as default Interface"
-msgstr "Setze Netzwerkadapter als Standardad"
+msgstr "Setze Netzwerkadapter als Standardd"
 
 msgid "Set limits"
 msgstr "Limits setzen"
@@ -3751,7 +3758,7 @@ msgid ""
 "Your network configuration has been activated.\n"
 "A second configured interface has been found.\n"
 "\n"
-"Do you want to disable the second networkinterface?"
+"Do you want to disable the second network interface?"
 msgstr ""
 "Ihre Netzwerkkonfiguration wurde aktiviert.\n"
 "Ein zweiter konfigurierter Netzwerkadapter wurde gefunden.\n"
@@ -3881,7 +3888,7 @@ msgid "chapters"
 msgstr "Kapitel"
 
 msgid "choose destination directory"
-msgstr "Wähle Zielverzeichniss"
+msgstr "Wähle Zielverzeichnis"
 
 msgid "circular left"
 msgstr "links-zirkulär"
@@ -3914,7 +3921,7 @@ msgid "copy to bouquets"
 msgstr "in Bouquets kopieren"
 
 msgid "create directory"
-msgstr "Verzeichniss erstellen"
+msgstr "Verzeichnis erstellen"
 
 msgid "daily"
 msgstr "täglich"
@@ -4015,15 +4022,18 @@ msgstr "Verlasse Filmliste"
 msgid "exit nameserver configuration"
 msgstr "DNS Serverkonfiguration verlassen"
 
-msgid "exit networkadapter configuration"
+msgid "exit network adapter configuration"
 msgstr "Netzwerkadapterkonfiguration verlassen"
 
-msgid "exit networkadapter setup menu"
+msgid "exit network adapter setup menu"
 msgstr "Netzwerkadaptermenu verlassen"
 
-msgid "exit networkinterface list"
+msgid "exit network interface list"
 msgstr "Netzwerkadapterübersicht verlassen"
 
+msgid "exit networkadapter setup menu"
+msgstr ""
+
 msgid "failed"
 msgstr ""
 
@@ -4252,7 +4262,7 @@ msgid "open servicelist(up)"
 msgstr "Kanalliste öffnen(nach oben)"
 
 msgid "open virtual keyboard input help"
-msgstr "Virtuelle Tastatur Eingabehilfe öffnen"
+msgstr "Virtuelle Tastatureingabehilfe öffnen"
 
 msgid "pass"
 msgstr "Durchgang"
@@ -4309,7 +4319,7 @@ msgid "remove bookmark"
 msgstr "Bookmark entfernen"
 
 msgid "remove directory"
-msgstr "Verzeichniss entfernen"
+msgstr "Verzeichnis entfernen"
 
 msgid "remove entry"
 msgstr "Eintrag entfernen"
@@ -4370,10 +4380,10 @@ msgid "select image from server"
 msgstr "Wähle ein Image vom Server"
 
 msgid "select interface"
-msgstr "Wähle einen Ntzwerkadapter"
+msgstr "Wähle einen Netzwerkadapter"
 
 msgid "select menu entry"
-msgstr "Wähle einen Menupunkt"
+msgstr "Wähle einen Menüpunkt"
 
 msgid "select movie"
 msgstr "Wähle Film"
@@ -4616,6 +4626,9 @@ msgstr "umgeschaltet"
 #~ msgid "Enable WLAN Support"
 #~ msgstr "Aktiviere WLAN Unterstützung"
 
+#~ msgid "Enter WLAN networ kname/SSID:"
+#~ msgstr "WLAN Netzwerkname/SSID eingeben:"
+
 #~ msgid "Games / Plugins"
 #~ msgstr "Spiele / Erweiterungen"