Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml b/lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
old mode 100644 (file)
new mode 100755 (executable)
index 98658b7..34302ec
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
@@ -1,100 +1,102 @@
-<wizard>\r
-       <step id="restorequestion">\r
-               <condition>\r
-from Plugins.SystemPlugins.SoftwareManager.ImageWizard import checkConfigBackup\r
-self.backuppath = checkConfigBackup()\r
-self.condition = (self.backuppath is not None and config.misc.firstrun.value)\r
-               </condition>\r
-               <text value="Do you want to restore your settings?" />\r
-               <list>\r
-                       <listentry caption="Yes, restore the settings now" step="restore" />\r
-                       <listentry caption="No, just start my dreambox" step="end" />\r
-               </list>\r
-               <code>\r
-self.clearSelectedKeys()\r
-self.selectKey("OK")\r
-               </code>\r
-       </step>\r
-\r
-       <step id="welcome">\r
-               <text value="Welcome to the Image upgrade wizard. The wizard will assist you in upgrading the firmware of your Dreambox by providing a backup facility for your current settings and a short explanation of how to upgrade your firmware." />\r
-               <list>\r
-                       <listentry caption="OK, guide me through the upgrade process" step="backupquestion" />\r
-                       <listentry caption="Exit the wizard" step="end" />\r
-               </list>\r
-       </step>\r
-\r
-       <step id="backupquestion">\r
-               <text value="The wizard can backup your current settings. Do you want to do a backup now?" />\r
-               <list>\r
-                       <listentry caption="Yes, backup my settings!" step="backupwhere" />\r
-                       <listentry caption="No backup needed" step="upgrade" />\r
-               </list>\r
-       </step>\r
-\r
-       <step id="backupwhere" nextstep="backup">\r
-               <text value="Where do you want to backup your settings?" />\r
-               <list type="dynamic" source="listDevices" evaluation="deviceSelectionMade" onselect="deviceSelectionMoved" />\r
-       </step>\r
-\r
-       <step id="backup" nextstep="backupresult">\r
-               <text value="You have chosen to backup your settings. Please press OK to start the backup now." />\r
-               <config screen="BackupScreen" module="Plugins.SystemPlugins.SoftwareManager.BackupRestore" type="ConfigList" />\r
-               <code pos="after" async="yes">\r
-self.currStep = self.getStepWithID('backupresult')\r
-self.afterAsyncCode()\r
-               </code> \r
-       </step>\r
-               \r
-       <step id="backupresult" nextstep="upgrade">\r
-               <condition>\r
-from Plugins.SystemPlugins.SoftwareManager.ImageWizard import checkBackupFile\r
-self.backuppath = checkBackupFile()\r
-self.condition = (self.backuppath is True)\r
-               </condition>\r
-               <text value="Your backup succeeded. We will now continue to explain the further upgrade process." />\r
-       </step>\r
-\r
-       <step id="backupresult" nextstep="backupwhere">\r
-               <condition>\r
-from Plugins.SystemPlugins.SoftwareManager.ImageWizard import checkBackupFile\r
-self.backuppath = checkBackupFile()\r
-self.condition = (self.backuppath is False)\r
-               </condition>\r
-               <text value="The backup failed. Please choose a different backup location." />\r
-       </step>\r
-\r
-       <step id="restore" nextstep="backupresult">\r
-               <text value="You have chosen to restore your settings. Enigma2 will restart after restore. Please press OK to start the restore now." />\r
-               <config screen="RestoreScreen" module="Plugins.SystemPlugins.SoftwareManager.BackupRestore" type="ConfigList" />\r
-       </step>\r
-               \r
-\r
-       <step id="upgradehow">\r
-               <text value="The wizard can backup your current settings. Do you want to do a backup now?" />\r
-               <list>\r
-                       <listentry caption="Install a new image with your web browser" step="upgrade" />\r
-                       <listentry caption="Install a new image with a USB stick" step="upgradeUSB" />\r
-               </list>\r
-       </step>\r
-               \r
-       <step id="upgrade">\r
-               <text value="You need a PC connected to your dreambox. If you need further instructions, please visit the website http://www.dm7025.de.\nYour dreambox will now be halted. After you have performed the update instructions from the website, your new firmware will ask you to restore your settings." />\r
-               <list>\r
-                       <listentry caption="Yes, perform a shutdown now." step="shutdown" />\r
-                       <listentry caption="No, do nothing." step="end" />\r
-               </list>\r
-       </step>\r
-\r
-       <step id="shutdown" nextstep="shutdown">\r
-               <code>\r
-from enigma import quitMainloop\r
-quitMainloop(1)\r
-               </code>\r
-               <text value="Your dreambox is shutting down. Please stand by..." />\r
-       </step>\r
-               \r
-       <step id="end">\r
-               <text value="The wizard is finished now." />\r
-       </step>\r
-</wizard>\r
+<wizard>
+       <step id="restorequestion">
+               <condition>
+from Plugins.SystemPlugins.SoftwareManager.ImageWizard import checkConfigBackup
+self.backuppath = checkConfigBackup()
+self.condition = (self.backuppath is not None and config.misc.firstrun.value)
+               </condition>
+               <text value="Do you want to restore your settings?" />
+               <list>
+                       <listentry caption="Yes, restore the settings now" step="restore" />
+                       <listentry caption="No, just start my dreambox" step="end" />
+               </list>
+               <code>
+self.clearSelectedKeys()
+self.selectKey("OK")
+               </code>
+       </step>
+
+       <step id="welcome">
+               <text value="Welcome to the Image upgrade wizard. The wizard will assist you in upgrading the firmware of your Dreambox by providing a backup facility for your current settings and a short explanation of how to upgrade your firmware." />
+               <list>
+                       <listentry caption="OK, guide me through the upgrade process" step="backupquestion" />
+                       <listentry caption="Exit the wizard" step="end" />
+               </list>
+       </step>
+
+       <step id="backupquestion">
+               <text value="The wizard can backup your current settings. Do you want to do a backup now?" />
+               <list>
+                       <listentry caption="Yes, backup my settings!" step="backupwhere" />
+                       <listentry caption="No backup needed" step="upgrade" />
+               </list>
+       </step>
+
+       <step id="backupwhere" nextstep="backup">
+               <text value="Where do you want to backup your settings?" />
+               <list type="dynamic" source="listDevices" evaluation="deviceSelectionMade" onselect="deviceSelectionMoved" />
+       </step>
+
+       <step id="backup" nextstep="backupresult">
+               <text value="You have chosen to backup your settings. Please press OK to start the backup now." />
+               <config screen="BackupScreen" module="Plugins.SystemPlugins.SoftwareManager.BackupRestore" type="ConfigList" />
+               <code pos="after" async="yes">
+self.currStep = self.getStepWithID('backupresult')
+self.afterAsyncCode()
+               </code>
+       </step>
+
+       <step id="backupresult" nextstep="upgrade">
+               <condition>
+from Plugins.SystemPlugins.SoftwareManager.ImageWizard import checkBackupFile
+self.backuppath = checkBackupFile()
+self.condition = (self.backuppath is True)
+               </condition>
+               <text value="Your backup succeeded. We will now continue to explain the further upgrade process." />
+       </step>
+
+       <step id="backupresult" nextstep="backupwhere">
+               <condition>
+from Plugins.SystemPlugins.SoftwareManager.ImageWizard import checkBackupFile
+self.backuppath = checkBackupFile()
+self.condition = (self.backuppath is False)
+               </condition>
+               <text value="The backup failed. Please choose a different backup location." />
+       </step>
+
+       <step id="restore" nextstep="backupresult">
+               <text value="You have chosen to restore your settings. Enigma2 will restart after restore. Please press OK to start the restore now." />
+               <config screen="RestoreScreen" module="Plugins.SystemPlugins.SoftwareManager.BackupRestore" type="ConfigList" />
+       </step>
+
+       <step id="upgradehow">
+               <text value="The wizard can backup your current settings. Do you want to do a backup now?" />
+               <list>
+                       <listentry caption="Install a new image with your web browser" step="upgrade" />
+                       <listentry caption="Install a new image with a USB stick" step="upgradeUSB" />
+               </list>
+       </step>
+
+       <step id="upgrade">
+               <text value="You need a PC connected to your dreambox. If you need further instructions, please visit the website http://www.dm7025.de.\nYour dreambox will now be halted. After you have performed the update instructions from the website, your new firmware will ask you to restore your settings." />
+               <list>
+                       <listentry caption="Yes, perform a shutdown now." step="shutdown" />
+                       <listentry caption="No, do nothing." step="end" />
+               </list>
+       </step>
+
+       <step id="shutdown" nextstep="shutdown">
+               <code>
+from enigma import quitMainloop
+quitMainloop(1)
+               </code>
+               <text value="Your dreambox is shutting down. Please stand by..." />
+       </step>
+
+       <step id="end" laststep="true">
+               <condition>
+self.condition = self.isLastWizard
+               </condition>
+               <text value="The wizard is finished now." />
+       </step>
+</wizard>

diff --git a/po/de.po b/po/de.po
index 6c02d378cd45b400d7a5c332af4332b250b9e4f9..c4a0fa78d95fd02dddefa10c0fd239b7533a8901 100755 (executable)
--- a/po/de.po
+++ b/po/de.po
@@ -95,7 +95,7 @@ msgid ""
 "Current device: "
 msgstr ""
 "\n"
-"Wählen Sie ihr Sicherungs-Laufwerk.\n"
+"Wählen Sie Ihr Sicherungs-Laufwerk.\n"
 "Aktuelles Laufwerk: "
 
 msgid ""
@@ -747,10 +747,10 @@ msgid "Choose Tuner"
 msgstr "Tuner wählen"
 
 msgid "Choose backup files"
-msgstr "Wähle zu sichernde Dateien"
+msgstr "Wählen Sie die zu sichernden Dateien"
 
 msgid "Choose backup location"
-msgstr "Wähle Sicherungsort"
+msgstr "Wählen Sie den Sicherungsort"
 
 msgid "Choose bouquet"
 msgstr "Bouquet wählen"
@@ -762,10 +762,10 @@ msgid "Choose target folder"
 msgstr "Zielverzeichnis wählen"
 
 msgid "Choose upgrade source"
-msgstr "Wähle Upgrade-Quelle"
+msgstr "Wählen Sie die Upgrade-Quelle"
 
 msgid "Choose your Skin"
-msgstr "Wähle das Aussehen der Bedienoberfläche"
+msgstr "Wählen Sie das Aussehen der Bedienoberfläche"
 
 msgid "Circular left"
 msgstr ""
@@ -2361,7 +2361,7 @@ msgid "Please change recording endtime"
 msgstr "Bitte Aufnahmeendzeit ändern"
 
 msgid "Please check your network settings!"
-msgstr "Bitte überprüfen Sie ihre Netzwerkeinstellungen"
+msgstr "Bitte überprüfen Sie Ihre Netzwerkeinstellungen"
 
 msgid "Please choose .NFI image file from feed server to download"
 msgstr "Bitte wählen Sie eine .NFI Image Datei zum Herunterladen vom Feed-Server"
@@ -2986,10 +2986,10 @@ msgid "Select a movie"
 msgstr "Filmauswahl"
 
 msgid "Select audio mode"
-msgstr "Wähle Ton-Modus"
+msgstr "Wählen Sie den Ton-Modus"
 
 msgid "Select audio track"
-msgstr "Tonspur auswählen"
+msgstr "Wählen Sie eine Tonspur"
 
 msgid "Select channel to record from"
 msgstr "Kanal auswählen, von dem aufgenommen werden soll"
@@ -3001,28 +3001,28 @@ msgid "Select files/folders to backup..."
 msgstr "Dateien/Verzeichnisse zum Sichern auswählen..."
 
 msgid "Select image"
-msgstr "Wähle Image"
+msgstr "Wählen Sie ein Image"
 
 msgid "Select provider to add..."
 msgstr ""
 
 msgid "Select refresh rate"
-msgstr "Wähle Bildwiederholrate"
+msgstr "Wählen Sie eine Bildwiederholrate"
 
 msgid "Select service to add..."
 msgstr ""
 
 msgid "Select video input"
-msgstr "Wähle Video-Eingang"
+msgstr "Wählen Sie den Video-Eingang"
 
 msgid "Select video input with up/down buttons"
 msgstr ""
 
 msgid "Select video mode"
-msgstr "Wähle Video-Modus"
+msgstr "Wählen Sie den Video-Modus"
 
 msgid "Selected source image"
-msgstr "Wähle Quell-Image"
+msgstr "Wählen Sie ein Quell-Image"
 
 msgid "Send DiSEqC"
 msgstr "DiSEqC senden"
@@ -3243,7 +3243,7 @@ msgid ""
 "Please choose an other one."
 msgstr ""
 "Entschuldigung, Ihr Sicherungsverzeichnis ist nicht beschreibbar.\n"
-"Bitte wählen Sie ein anderes."
+"Bitte wählen Sie ein anderes Verzeichnis."
 
 msgid "Sorry, no Details available!"
 msgstr ""
@@ -3255,7 +3255,7 @@ msgid ""
 msgstr ""
 "Entschuldigung, Ihr Sicherungsverzeichnis ist nicht beschreibbar.\n"
 "\n"
-"Bitte wählen Sie ein anderes."
+"Bitte wählen Sie ein anderes Verzeichnis."
 
 #. TRANSLATORS: This must fit into the header button in the EPG-List
 msgid "Sort A-Z"
@@ -4472,7 +4472,7 @@ msgid "chapters"
 msgstr "Kapitel"
 
 msgid "choose destination directory"
-msgstr "Wähle Zielverzeichnis"
+msgstr "Wählen Sie das Zielverzeichnis"
 
 msgid "circular left"
 msgstr "links-zirkulär"
@@ -4976,7 +4976,7 @@ msgid "select"
 msgstr "wähle"
 
 msgid "select .NFI flash file"
-msgstr "Wähle Sie eine .NFI Flashdatei"
+msgstr "Wählen Sie eine .NFI Flashdatei"
 
 msgid "select CAId"
 msgstr ""
@@ -4985,16 +4985,16 @@ msgid "select CAId's"
 msgstr ""
 
 msgid "select image from server"
-msgstr "Wähle Sie ein Image vom Server"
+msgstr "Wählen Sie ein Image vom Server"
 
 msgid "select interface"
-msgstr "Wähle einen Netzwerkadapter"
+msgstr "Wählen Sie einen Netzwerkadapter"
 
 msgid "select menu entry"
-msgstr "Wähle einen Menüpunkt"
+msgstr "Wählen Sie einen Menüpunkt"
 
 msgid "select movie"
-msgstr "Wähle Film"
+msgstr "Wählen Sie einen Film"
 
 msgid "select the movie path"
 msgstr "Den Filmpfad auswählen"