Make code general by renaming references to dreambox
authorMirakels <mirakels@users.sourceforge.net>
Thu, 2 Aug 2012 21:20:59 +0000 (23:20 +0200)
committerMirakels <mirakels@users.sourceforge.net>
Sun, 5 Aug 2012 07:51:41 +0000 (09:51 +0200)
A first round to make the openpli code as general as possible.
Most textual references to dreambox or dream multimedia are
renamed.

31 files changed:
RecordTimer.py
SleepTimer.py
data/startwizard.xml
data/tutorialwizard.xml
lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
lib/python/Plugins/Extensions/DVDBurn/TitleList.py
lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml
lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Plugins/SystemPlugins/CleanupWizard/cleanupwizard.xml
lib/python/Plugins/SystemPlugins/CleanupWizard/meta/plugin_cleanupwizard.xml
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/plugin_commoninterfaceassignment.xml
lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/plugin_crashlogautosubmit.xml
lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
lib/python/Plugins/SystemPlugins/SkinSelector/meta/plugin_skinselector.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/meta/plugin_softwaremanager.xml
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
lib/python/Screens/DefaultWizard.py
lib/python/Screens/NetworkSetup.py
lib/python/Screens/SleepTimerEdit.py
lib/python/Screens/SoftwareUpdate.py
lib/python/Screens/TaskView.py
lib/python/Tools/Downloader.py
lib/service/servicemp3.cpp
tools/enigma2.sh.in

index 7ea3f28..716c41a 100644 (file)
@@ -337,13 +337,13 @@ class RecordTimerEntry(timer.TimerEntry, object):
                                self.record_service = None
                        if self.afterEvent == AFTEREVENT.STANDBY:
                                if not Screens.Standby.inStandby: # not already in standby
-                                       Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
+                                       Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nSatellite receiver to standby. Do that now?"), timeout = 20)
                        elif self.afterEvent == AFTEREVENT.DEEPSTANDBY:
                                if not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open
                                        if Screens.Standby.inStandby: # in standby
                                                RecordTimerEntry.TryQuitMainloop() # start shutdown handling without screen
                                        else:
-                                               Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A finished record timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
+                                               Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A finished record timer wants to shut down\nyour Satellite receiver. Shutdown now?"), timeout = 20)
                        return True
 
        def setAutoincreaseEnd(self, entry = None):
index 221e8f0..8a0096d 100644 (file)
@@ -26,12 +26,12 @@ class SleepTimerEntry(timer.TimerEntry):
                if self.state == self.StateRunning:
                        if config.SleepTimer.action.value == "shutdown":
                                if config.SleepTimer.ask.value and not Screens.Standby.inTryQuitMainloop:
-                                       Notifications.AddNotificationWithCallback(self.shutdown, MessageBox, _("A sleep timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
+                                       Notifications.AddNotificationWithCallback(self.shutdown, MessageBox, _("A sleep timer wants to shut down\nyour Satellite receiver. Shutdown now?"), timeout = 20)
                                else:
                                        self.shutdown(True)
                        elif config.SleepTimer.action.value == "standby":
                                if config.SleepTimer.ask.value and not Screens.Standby.inStandby:
-                                       Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
+                                       Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nSatellite receiver to standby. Do that now?"), timeout = 20)
                                else:
                                        self.standby(True)
 
index 531bf13..cf529a1 100644 (file)
@@ -1,6 +1,6 @@
 <wizard>
                <step id="start" nextstep="introduction">
-                       <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." />
+                       <text value="Welcome.\n\nThis start wizard will guide you through the basic setup of your Satellite receiver.\nPress the OK button on your remote control to move to the next step." />
                        <code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -113,7 +113,7 @@ self.condition = config.misc.startwizard.doservicescan.value and nimmanager.some
                        </list>
                </step>
                <step id="finisheddefaultsatlists">
-                       <text value="Do you want to enable the parental control feature on your dreambox?" />
+                       <text value="Do you want to enable the parental control feature on your receiver?" />
                        <list>
                                <listentry caption="No" step="end" />
                                <listentry caption="Yes" step="parentalsetup" />
@@ -154,12 +154,12 @@ config.ParentalControl.setuppin.value = config.ParentalControl.servicepin[0].val
 config.ParentalControl.setuppin.save()
                        </code>
 
-                       <text value="After the start wizard is completed, you need to protect single services. Refer to your dreambox's manual on how to do that." />
+                       <text value="After the start wizard is completed, you need to protect single services. Refer to your receiver's manual on how to do that." />
                </step>
                <step id="end" laststep="true">
                        <condition>
 self.condition = self.isLastWizard
                        </condition>
-                       <text value="Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using your Dreambox." />
+                       <text value="Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using your Satellite receiver." />
                </step>
 </wizard>
index ec65cd0..02ec782 100644 (file)
@@ -2,7 +2,7 @@
                <step number="1">
                        <text value="Do you want to view a tutorial?" />
                        <list>
-                               <listentry caption="No, just start my dreambox" step="end" />
+                               <listentry caption="No, just start my receiver" step="end" />
                                <listentry caption="Yes, view the tutorial" step="next" />
                        </list>
                </step>
index 4ef4a87..d79510c 100644 (file)
@@ -74,7 +74,7 @@ class Test(Screen):
 def main(session, **kwargs):
        session.open(Test)
        #session.openWithCallback(test, MessageBox, _("Test-Messagebox?"), timeout = 10)
-       #session.openWithCallback(test, ChoiceBox, title="Delete everything on this Dreambox?", list=[(_("yes"), "yes"), (_("no"), "no"), (_("perhaps"), "perhaps"), (_("ask me tomorrow"), "ask me tomorrow"), (_("leave me alone with this!"), "yes")])
+       #session.openWithCallback(test, ChoiceBox, title="Delete everything on this receiver?", list=[(_("yes"), "yes"), (_("no"), "no"), (_("perhaps"), "perhaps"), (_("ask me tomorrow"), "ask me tomorrow"), (_("leave me alone with this!"), "yes")])
        
 def test(returnValue):
        print "You entered", returnValue
index 6dbcd49..51c823c 100644 (file)
@@ -31,7 +31,7 @@ class DVDProject:
                self.target = None
                self.settings = ConfigSubsection()
                self.settings.name = ConfigText(fixed_size = False, visible_width = 40)
-               self.settings.authormode = ConfigSelection(choices = [("menu_linked", _("Linked titles with a DVD menu")), ("just_linked", _("Direct playback of linked titles without menu")), ("menu_seperate", _("Seperate titles with a main menu")), ("data_ts", _("Dreambox format data DVD (HDTV compatible)"))])
+               self.settings.authormode = ConfigSelection(choices = [("menu_linked", _("Linked titles with a DVD menu")), ("just_linked", _("Direct playback of linked titles without menu")), ("menu_seperate", _("Seperate titles with a main menu")), ("data_ts", _("special format data DVD (HDTV compatible)"))])
                self.settings.titlesetmode = ConfigSelection(choices = [("single", _("Simple titleset (compatibility for legacy players)")), ("multi", _("Complex (allows mixing audio tracks and aspects)"))], default="multi")
                self.settings.output = ConfigSelection(choices = [("iso", _("Create DVD-ISO")), ("dvd", _("Burn DVD"))])
                self.settings.isopath = ConfigText(fixed_size = False, visible_width = 40)
index 4645260..595186e 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <DreamDVDBurnProject>
        <settings
-               name="Dreambox DVD record"
+               name="DVD record"
                authormode="menu_linked"
                menutemplate="Thumbs_menu_clouds.ddvdm.xml"
                titlesetmode="multi"
index 892aaee..aff1ab9 100644 (file)
@@ -215,7 +215,7 @@ class TitleList(Screen, HelpableScreen):
                if source is None:
                        return None
                if not source.getPath().endswith(".ts"):
-                       self.session.open(MessageBox,text = _("You can only burn Dreambox recordings!"), type = MessageBox.TYPE_ERROR)
+                       self.session.open(MessageBox,text = _("You can only burn receiver recordings!"), type = MessageBox.TYPE_ERROR)
                        return None
                t = self.project.addService(source)
                try:
@@ -353,7 +353,7 @@ class TitleList(Screen, HelpableScreen):
                t = self.current_edit_title
                t.titleEditDone(cutlist)
                if t.VideoType != 0:
-                       self.session.openWithCallback(self.DVDformatCB,MessageBox,text = _("The DVD standard doesn't support H.264 (HDTV) video streams. Do you want to create a Dreambox format data DVD (which will not play in stand-alone DVD players) instead?"), type = MessageBox.TYPE_YESNO)
+                       self.session.openWithCallback(self.DVDformatCB,MessageBox,text = _("The DVD standard doesn't support H.264 (HDTV) video streams. Do you want to create a special format data DVD (which will not play in stand-alone DVD players) instead?"), type = MessageBox.TYPE_YESNO)
                else:
                        self.updateTitleList()
 
@@ -381,4 +381,4 @@ class TitleList(Screen, HelpableScreen):
        def exitCB(self, answer):
                print "exitCB", answer
                if answer is not None and answer:
-                       self.close()
\ No newline at end of file
+                       self.close()
index c1e202a..9abe8a2 100755 (executable)
@@ -8,9 +8,9 @@
                     <name>DVDBurn</name>
                     <packagename>enigma2-plugin-extensions-dvdburn</packagename>
                     <shortdescription>Burn your recordings to DVD</shortdescription>
-                    <description>With DVDBurn you can make compilations of records from your Dreambox hard drive.\n
+                    <description>With DVDBurn you can make compilations of records from your receivers hard drive.\n
                    Optionally you can add customizable menus. You can record the compilation to a standard-compliant DVD that can be played on conventinal DVD players.\n
-                   HDTV recordings can only be burned in proprietary dreambox format.</description>
+                   HDTV recordings can only be burned in proprietary format.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdburn_en.jpg" />
           </info>
 
index 6fc5a6f..4896407 100755 (executable)
@@ -6,8 +6,8 @@
                     <author>Dream Multimedia</author>
                     <name>DVDPlayer</name>
                     <packagename>enigma2-plugin-extensions-dvdplayer</packagename>
-                    <shortdescription>DVDPlayer plays your DVDs on your Dreambox</shortdescription>
-                    <description>DVDPlayer plays your DVDs on your Dreambox.\nWith the DVDPlayer you can play your DVDs on your Dreambox from a DVD or even from an iso file or video_ts folder on your harddisc or network.</description>
+                    <shortdescription>DVDPlayer plays your DVDs on your receiver</shortdescription>
+                    <description>DVDPlayer plays your DVDs on your receiver.\nWith the DVDPlayer you can play your DVDs on your receiver from a DVD or even from an iso file or video_ts folder on your harddisc or network.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_dvdplayer.jpg" />
           </info>
          <files type="package"> <!-- without version, without .ipk -->
index 941d42f..6be940a 100644 (file)
@@ -284,13 +284,13 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
                currPlay = self.session.nav.getCurrentService()
                sTagAudioCodec = currPlay.info().getInfoString(iServiceInformation.sTagAudioCodec)
                print "[__evAudioDecodeError] audio-codec %s can't be decoded by hardware" % (sTagAudioCodec)
-               self.session.open(MessageBox, _("This Dreambox can't decode %s streams!") % sTagAudioCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
+               self.session.open(MessageBox, _("This receiver can't decode %s streams!") % sTagAudioCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
 
        def __evVideoDecodeError(self):
                currPlay = self.session.nav.getCurrentService()
                sTagVideoCodec = currPlay.info().getInfoString(iServiceInformation.sTagVideoCodec)
                print "[__evVideoDecodeError] video-codec %s can't be decoded by hardware" % (sTagVideoCodec)
-               self.session.open(MessageBox, _("This Dreambox can't decode %s streams!") % sTagVideoCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
+               self.session.open(MessageBox, _("This receiver can't decode %s streams!") % sTagVideoCodec, type = MessageBox.TYPE_INFO,timeout = 20 )
 
        def __evPluginError(self):
                currPlay = self.session.nav.getCurrentService()
index 0241dec..988c79f 100755 (executable)
@@ -1,6 +1,6 @@
 <wizard>
        <step id="welcome">
-               <text value="Welcome to the cleanup wizard.\n\nWe have detected that your available internal memory has dropped below 2MB.\nTo ensure stable operation of your Dreambox, the internal memory should be cleaned up.\nYou can use this wizard to remove some extensions.\n" />
+               <text value="Welcome to the cleanup wizard.\n\nWe have detected that your available internal memory has dropped below 2MB.\nTo ensure stable operation of your receiver, the internal memory should be cleaned up.\nYou can use this wizard to remove some extensions.\n" />
                <displaytext value="Cleanup Wizard" />
                <list type="dynamic" source="listAction" evaluation="ActionSelectionMade" onselect="ActionSelectionMoved" />
                <code>
index d0781af..42964a0 100755 (executable)
@@ -7,7 +7,7 @@
                     <name>CleanupWizard</name>
                     <packagename>enigma2-plugin-systemplugins-cleanupwizard</packagename>
                     <shortdescription>Automatically informs you on low internal memory</shortdescription>
-                    <description>The CleanupWizard informs you when the internal free memory of your dreambox has dropped below a definable threshold.
+                    <description>The CleanupWizard informs you when the internal free memory of your reveiver has dropped below a definable threshold.
                    You can use this wizard to remove some plugins. </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_cleanupwizard_en.jpg" />
           </info>
index f34f0a3..f8fe900 100755 (executable)
@@ -10,7 +10,7 @@
                     <packagename>enigma2-plugin-systemplugins-commoninterfaceassignment</packagename>
                     <shortdescription>Assigning providers/services/caids to a CI module</shortdescription>
                     <description>With the CommonInterfaceAssignment plugin it is possible to use different
-                   CI modules in your Dreambox and assign dedicated providers/services or caids to each of them.\n
+                   CI modules in your Satellite receiver and assign dedicated providers/services or caids to each of them.\n
                    This allows watching a scrambled service while recording another one.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_ciassignment.jpg" />
           </info>
index 3140b15..36365df 100755 (executable)
@@ -6,9 +6,9 @@
                     <author>Dream Multimedia</author>
                     <name>CrashlogAutoSubmit</name>
                     <packagename>enigma2-plugin-systemplugins-crashlogautosubmit</packagename>
-                    <shortdescription>Automatically send crashlogs to Dream Multimedia</shortdescription>
+                    <shortdescription>Automatically send crashlogs to your Image developper</shortdescription>
                     <description>With the CrashlogAutoSubmit plugin it is possible to automatically
-                   mail crashlogs found on your hard drive to Dream Multimedia.
+                   mail crashlogs found on your hard drive to your Image developper.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_crashlogautosubmit_en.jpg" />
           </info>
index 3608bd3..5d66267 100644 (file)
@@ -23,7 +23,7 @@ config.plugins.crashlogautosubmit.sendlog = ConfigSelection(default = "rename",
        ("delete", _("Delete crashlogs")), ("rename", _("Rename crashlogs"))])
 config.plugins.crashlogautosubmit.attachemail = ConfigYesNo(default = False)
 config.plugins.crashlogautosubmit.email = ConfigText(default = "myemail@home.com", fixed_size = False)
-config.plugins.crashlogautosubmit.name = ConfigText(default = "Dreambox User", fixed_size = False)
+config.plugins.crashlogautosubmit.name = ConfigText(default = "Receiver User", fixed_size = False)
 config.plugins.crashlogautosubmit.sendAnonCrashlog = ConfigYesNo(default = True)
 config.plugins.crashlogautosubmit.addNetwork = ConfigYesNo(default = False)
 config.plugins.crashlogautosubmit.addWlan = ConfigYesNo(default = False)
@@ -176,7 +176,7 @@ class CrashlogAutoSubmitConfiguration(Screen, ConfigListScreen):
                        self.enableVKeyIcon()
                        self.showKeypad()
                elif current == self.AnonCrashlogEntry:
-                       self["status"].setText(_("Adds enigma2 settings and dreambox model informations like SN, rev... if enabled."))
+                       self["status"].setText(_("Adds enigma2 settings and receiver model informations like SN, rev... if enabled."))
                        self.disableVKeyIcon()
                elif current == self.NetworkEntry:
                        self["status"].setText(_("Adds network configuration if enabled."))
@@ -264,7 +264,7 @@ def mxServerFound(mxServer,session):
                user_email = ""
        else:
                user_email = "\nUser supplied email address: " + str(config.plugins.crashlogautosubmit.email.value)
-       if str(config.plugins.crashlogautosubmit.name.value) ==  "Dreambox User":
+       if str(config.plugins.crashlogautosubmit.name.value) ==  "Receiver User":
                user_name = ""
        else:
                user_name = "\n\nOptional supplied name: " + str(config.plugins.crashlogautosubmit.name.value)
@@ -336,7 +336,7 @@ def mxServerFound(mxServer,session):
 
        if len(crashLogFilelist):
                if config.plugins.crashlogautosubmit.sendmail.value == "send":
-                       Notifications.AddNotificationWithCallback(handleAnswer, ChoiceBox, title=_("Crashlogs found!\nSend them to Dream Multimedia?"), list = list)
+                       Notifications.AddNotificationWithCallback(handleAnswer, ChoiceBox, title=_("Crashlogs found!\nSend them to the Image Developper?"), list = list)
                elif config.plugins.crashlogautosubmit.sendmail.value == "send_always":
                        send_mail()
        else:
index 85ecc92..91707a2 100644 (file)
@@ -631,7 +631,7 @@ class NFIDownload(Screen):
                        self.showHint()
 
        def showHint(self, ret=None):
-               self.session.open(MessageBox, _("To update your Dreambox firmware, please follow these steps:\n1) Turn off your box with the rear power switch and make sure the bootable USB stick is plugged in.\n2) Turn mains back on and hold the DOWN button on the front panel pressed for 10 seconds.\n3) Wait for bootup and follow instructions of the wizard."), type = MessageBox.TYPE_INFO)
+               self.session.open(MessageBox, _("To update your receiver firmware, please follow these steps:\n1) Turn off your box with the rear power switch and make sure the bootable USB stick is plugged in.\n2) Turn mains back on and hold the DOWN button on the front panel pressed for 10 seconds.\n3) Wait for bootup and follow instructions of the wizard."), type = MessageBox.TYPE_INFO)
                self.umountCallback = self.keyRed
                self.umount()
 
@@ -643,7 +643,7 @@ class NFIDownload(Screen):
                self.feedDownloader16.getList(self.gotFeed, self.feed_failed)
                
        def feed_failed(self, message=""):
-               self["status"].text = _("Could not connect to Dreambox .NFI Image Feed Server:") + "\n" + str(message) + "\n" + _("Please check your network settings!")
+               self["status"].text = _("Could not connect to receiver .NFI Image Feed Server:") + "\n" + str(message) + "\n" + _("Please check your network settings!")
 
        def gotFeed(self, feedlist, OE_vers):
                print "[gotFeed]", OE_vers
@@ -690,7 +690,7 @@ class NFIDownload(Screen):
 
        def askStartWizard(self):
                self.branch = STICK_WIZARD
-               message = _("""This plugin creates a USB stick which can be used to update the firmware of your Dreambox without the need for a network or WLAN connection.
+               message = _("""This plugin creates a USB stick which can be used to update the firmware of your receiver without the need for a network or WLAN connection.
 First, a USB stick needs to be prepared so that it becomes bootable.
 In the next step, an NFI image file can be downloaded from the update server and saved on the USB stick.
 If you already have a prepared bootable USB stick, please insert it now. Otherwise plug in a USB stick with a minimum size of 64 MB!""")
index 0b3a298..09005f3 100755 (executable)
@@ -1,6 +1,6 @@
 <wizard>
         <step id="welcome">
-                <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" />
+                <text value="Welcome.\n\nIf you want to connect your Satellite receiver to the Internet, this wizard will guide you through the basic network setup of your receiver.\n\nPress OK to start configuring your network" />
                 <displaytext value="Network Wizard" />
                <code>
 self.clearSelectedKeys()
@@ -57,7 +57,7 @@ self.checkNetwork()
                <condition>
 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." />
+                <text value="Your Satellite receiver 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()
@@ -175,7 +175,7 @@ self.AdapterSetupEnd(self.selectedInterface)
                <condition>
 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." />
+                <text value="Your Satellite receiver 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()
index 73544a5..6ff5e97 100755 (executable)
@@ -9,7 +9,7 @@
                     <packagename>enigma2-plugin-systemplugins-skinselector</packagename>
                     <shortdescription>SkinSelector shows a menu with selectable skins</shortdescription>
                     <description>The SkinSelector shows a menu with selectable skins.\n
-                    It's now easy to change the look and feel of your Dreambox.
+                    It's now easy to change the look and feel of your Satellite receiver.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_skinselector_en.jpg" />
           </info>
index 34302ec..4f5245c 100755 (executable)
@@ -8,7 +8,7 @@ self.condition = (self.backuppath is not None and config.misc.firstrun.value)
                <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" />
+                       <listentry caption="No, just start my receiver" step="end" />
                </list>
                <code>
 self.clearSelectedKeys()
@@ -17,7 +17,7 @@ self.selectKey("OK")
        </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." />
+               <text value="Welcome to the Image upgrade wizard. The wizard will assist you in upgrading the firmware of your Satellite receiver 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" />
@@ -78,7 +78,7 @@ self.condition = (self.backuppath is False)
        </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." />
+               <text value="You need a PC connected to your receiver. If you need further instructions, please visit the website http://www.dm7025.de.\nYour receiver 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" />
@@ -90,7 +90,7 @@ self.condition = (self.backuppath is False)
 from enigma import quitMainloop
 quitMainloop(1)
                </code>
-               <text value="Your dreambox is shutting down. Please stand by..." />
+               <text value="Your receiver is shutting down. Please stand by..." />
        </step>
 
        <step id="end" laststep="true">
index 4135a21..f65bdf5 100755 (executable)
@@ -7,8 +7,8 @@
                     <author>Dream Multimedia</author>
                     <name>SoftwareManager</name>
                     <packagename>enigma2-plugin-systemplugins-softwaremanager</packagename>
-                    <shortdescription>SoftwareManager manages your Dreambox software</shortdescription>
-                    <description>The SoftwareManager manages your Dreambox software.\n
+                    <shortdescription>SoftwareManager manages your Satellite receiver software</shortdescription>
+                    <description>The SoftwareManager manages your receiver's software.\n
                    It's easy to update your receiver's software, install or remove plugins or even backup and restore your system settings.
                     </description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_softwaremanager_en.jpg" />
index d0f09cc..1265992 100644 (file)
@@ -129,11 +129,11 @@ class UpdatePluginMenu(Screen):
                self.backupdirs = ' '.join( config.plugins.configurationbackup.backupdirs.value )
                if self.menu == 0:
                        print "building menu entries"
-                       self.list.append(("install-extensions", _("Manage extensions"), _("\nManage extensions or plugins for your Dreambox" ) + self.oktext, None))
-                       self.list.append(("software-update", _("Software update"), _("\nOnline update of your Dreambox software." ) + self.oktext, None))
-                       self.list.append(("software-restore", _("Software restore"), _("\nRestore your Dreambox with a new firmware." ) + self.oktext, None))
-                       self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your Dreambox settings." ) + self.oktext + "\n\n" + self.infotext, None))
-                       self.list.append(("system-restore",_("Restore system settings"), _("\nRestore your Dreambox settings." ) + self.oktext, None))
+                       self.list.append(("install-extensions", _("Manage extensions"), _("\nManage extensions or plugins for your receiver" ) + self.oktext, None))
+                       self.list.append(("software-update", _("Software update"), _("\nOnline update of your receiver software." ) + self.oktext, None))
+                       self.list.append(("software-restore", _("Software restore"), _("\nRestore your receiver with a new firmware." ) + self.oktext, None))
+                       self.list.append(("system-backup", _("Backup system settings"), _("\nBackup your receiver settings." ) + self.oktext + "\n\n" + self.infotext, None))
+                       self.list.append(("system-restore",_("Restore system settings"), _("\nRestore your receiver settings." ) + self.oktext, None))
                        self.list.append(("ipkg-install", _("Install local extension"),  _("\nScan for local extensions and install them." ) + self.oktext, None))
                        for p in plugins.getPlugins(PluginDescriptor.WHERE_SOFTWAREMANAGER):
                                if p.__call__.has_key("SoftwareSupported"):
@@ -957,7 +957,7 @@ class PluginManager(Screen, DreamInfoHandler):
        def runExecuteFinished(self):
                self.reloadPluginlist()
                if plugins.restartRequired or self.restartRequired:
-                       self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
+                       self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your receiver?"), MessageBox.TYPE_YESNO)
                else:
                        self.selectedFiles = []
                        self.restartRequired = False
@@ -1044,7 +1044,7 @@ class PluginManagerInfo(Screen):
                                elif cmd == 2:
                                        info = args['package']
                                else:
-                                       info = _("Dreambox software because updates are available.")
+                                       info = _("receiver software because updates are available.")
 
                                self.list.append(self.buildEntryComponent(action,info))
                        self['list'].setList(self.list)
@@ -1329,7 +1329,7 @@ class PluginDetails(Screen, DreamInfoHandler):
        def runUpgradeFinished(self):
                self.reloadPluginlist()
                if plugins.restartRequired or self.restartRequired:
-                       self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
+                       self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your receiver?"), MessageBox.TYPE_YESNO)
                else:
                        self.close(True)
        def UpgradeReboot(self, result):
@@ -1692,7 +1692,7 @@ class PacketManager(Screen, NumericalTextInput):
                        self.session.openWithCallback(self.runRemoveFinished, Ipkg, cmdList = self.cmdList)
 
        def runRemoveFinished(self):
-               self.session.openWithCallback(self.RemoveReboot, MessageBox, _("Remove finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
+               self.session.openWithCallback(self.RemoveReboot, MessageBox, _("Remove finished.") +" "+_("Do you want to reboot your receiver?"), MessageBox.TYPE_YESNO)
 
        def RemoveReboot(self, result):
                if result is None:
@@ -1714,7 +1714,7 @@ class PacketManager(Screen, NumericalTextInput):
                        self.session.openWithCallback(self.runUpgradeFinished, Ipkg, cmdList = self.cmdList)
 
        def runUpgradeFinished(self):
-               self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Upgrade finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
+               self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Upgrade finished.") +" "+_("Do you want to reboot your receiver?"), MessageBox.TYPE_YESNO)
                
        def UpgradeReboot(self, result):
                if result is None:
index a68d6c1..e798099 100644 (file)
@@ -30,7 +30,7 @@ class UpdatePlugin(Screen):
                self["slider"] = self.slider
                self.activityslider = Slider(0, 100)
                self["activityslider"] = self.activityslider
-               self.status = StaticText(_("Upgrading Dreambox... Please wait"))
+               self.status = StaticText(_("Upgrading Satellite receiver... Please wait"))
                self["status"] = self.status
                self.package = StaticText()
                self["package"] = self.package
@@ -113,11 +113,11 @@ class UpdatePlugin(Screen):
                        else:
                                self.activityTimer.stop()
                                self.activityslider.setValue(0)
-                               error = _("your dreambox might be unusable now. Please consult the manual for further assistance before rebooting your dreambox.")
+                               error = _("your receiver might be unusable now. Please consult the manual for further assistance before rebooting your receiver.")
                                if self.packages == 0:
                                        error = _("No packages were upgraded yet. So you can check your network and try again.")
                                if self.updating:
-                                       error = _("Your dreambox isn't connected to the internet properly. Please check it and try again.")
+                                       error = _("Your receiver isn't connected to the internet properly. Please check it and try again.")
                                self.status.setText(_("Error") +  " - " + error)
                #print event, "-", param
                pass
@@ -128,7 +128,7 @@ class UpdatePlugin(Screen):
        def exit(self):
                if not self.ipkg.isRunning():
                        if self.packages != 0 and self.error == 0:
-                               self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished. Do you want to reboot your Dreambox?"))
+                               self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished. Do you want to reboot your Satellite receiver?"))
                        else:
                                self.close()
                        
index 54e241d..6f379ed 100644 (file)
@@ -38,7 +38,7 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler):
        def statusCallback(self, status, progress):
                print "statusCallback:", status, progress
                if status == DreamInfoHandler.STATUS_DONE:
-                       self["text"].setText(_("The installation of the default settings is finished. You can now continue configuring your Dreambox by pressing the OK button on the remote control."))
+                       self["text"].setText(_("The installation of the default settings is finished. You can now continue configuring your receiver by pressing the OK button on the remote control."))
                        self.markDone()
                        self.disableKeys = False
 
index 0890dc2..718e229 100644 (file)
@@ -667,7 +667,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
                self["statuspic"].hide()
                
                self.oktext = _("Press OK on your remote control to continue.")
-               self.reboottext = _("Your Dreambox will restart after pressing OK on your remote control.")
+               self.reboottext = _("Your receiver will restart after pressing OK on your remote control.")
                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.missingwlanplugintxt = _("The wireless LAN plugin is not installed!\nPlease install it.")
                
@@ -796,11 +796,11 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 
        def loadDescription(self):
                if self["menulist"].getCurrent()[1] == 'edit':
-                       self["description"].setText(_("Edit the network configuration of your Dreambox.\n" ) + self.oktext )
+                       self["description"].setText(_("Edit the network configuration of your receiver.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'test':
-                       self["description"].setText(_("Test the network configuration of your Dreambox.\n" ) + self.oktext )
+                       self["description"].setText(_("Test the network configuration of your receiver.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'dns':
-                       self["description"].setText(_("Edit the Nameserver configuration of your Dreambox.\n" ) + self.oktext )
+                       self["description"].setText(_("Edit the Nameserver configuration of your receiver.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'scanwlan':
                        self["description"].setText(_("Scan your network for wireless access points and connect to them using your selected wireless device.\n" ) + self.oktext )
                if self["menulist"].getCurrent()[1] == 'wlanstatus':
index d11a99c..0909149 100644 (file)
@@ -41,7 +41,7 @@ class SleepTimerEdit(Screen):
                self.status = True
                self.updateColors()
                
-               self["pretext"] = Label(_("Shutdown Dreambox after"))
+               self["pretext"] = Label(_("Shutdown receiver after"))
                self["aftertext"] = Label(_("minutes"))
                
                self["actions"] = NumberActionMap(["SleepTimerEditorActions", "TextEntryActions", "KeyboardInputActions"], 
index 8827221..5755d9c 100644 (file)
@@ -89,7 +89,7 @@ class UpdatePlugin(Screen):
                if default:
                        self.startActualUpdate(True)
                else:
-                       message += _("Do you want to update your Dreambox?")+"\n"+_("After pressing OK, please wait!")
+                       message += _("Do you want to update your Satellite receiver?")+"\n"+_("After pressing OK, please wait!")
                        self.session.openWithCallback(self.startActualUpdate, MessageBox, message, default = default, picon = picon)
 
        def startActualUpdate(self,answer):
@@ -149,7 +149,7 @@ class UpdatePlugin(Screen):
                        elif self.ipkg.currentCommand == IpkgComponent.CMD_UPGRADE_LIST:
                                self.total_packages = len(self.ipkg.getFetchedList())
                                if self.total_packages:
-                                       message = _("Do you want to update your Dreambox?") + "\n(%s " % self.total_packages + _("Packages") + ")"
+                                       message = _("Do you want to update your Satellite receiver?") + "\n(%s " % self.total_packages + _("Packages") + ")"
                                        choices = [(_("Unattended upgrade without GUI and reboot system"), "cold"),
                                                (_("Upgrade and ask to reboot"), "hot"),
                                                (_("Cancel"), "")]
@@ -165,11 +165,11 @@ class UpdatePlugin(Screen):
                        else:
                                self.activityTimer.stop()
                                self.activityslider.setValue(0)
-                               error = _("your dreambox might be unusable now. Please consult the manual for further assistance before rebooting your dreambox.")
+                               error = _("your receiver might be unusable now. Please consult the manual for further assistance before rebooting your receiver.")
                                if self.packages == 0:
                                        error = _("No packages were upgraded yet. So you can check your network and try again.")
                                if self.updating:
-                                       error = _("Your dreambox isn't connected to the internet properly. Please check it and try again.")
+                                       error = _("Your receiver isn't connected to the internet properly. Please check it and try again.")
                                self.status.setText(_("Error") +  " - " + error)
                #print event, "-", param
                pass
@@ -190,7 +190,7 @@ class UpdatePlugin(Screen):
        def exit(self):
                if not self.ipkg.isRunning():
                        if self.packages != 0 and self.error == 0:
-                               self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished.") +" "+_("Do you want to reboot your Dreambox?"))
+                               self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished.") +" "+_("Do you want to reboot your Satellite receiver?"))
                        else:
                                self.close()
                else:
@@ -203,4 +203,4 @@ class UpdatePlugin(Screen):
                self.close()
 
        def __close(self):
-               self.ipkg.removeCallback(self.ipkgCallback)
\ No newline at end of file
+               self.ipkg.removeCallback(self.ipkgCallback)
index 5dd744f..5b6796f 100644 (file)
@@ -126,10 +126,10 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
                from Screens.MessageBox import MessageBox
                if self.settings.afterEvent.getValue() == "deepstandby":
                        if not Screens.Standby.inTryQuitMainloop:
-                               Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
+                               Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour Satellite receiver. Shutdown now?"), timeout = 20)
                elif self.settings.afterEvent.getValue() == "standby":
                        if not Screens.Standby.inStandby:
-                               Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
+                               Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSatellite receiver to standby. Do that now?"), timeout = 20)
 
        def checkNotifications(self):
                InfoBarNotifications.checkNotifications(self)
index ffc24c1..7649cf9 100644 (file)
@@ -4,7 +4,7 @@ from twisted.python import failure
 
 class HTTPProgressDownloader(client.HTTPDownloader):
        def __init__(self, url, outfile, headers=None):
-               client.HTTPDownloader.__init__(self, url, outfile, headers=headers, agent="Dreambox HTTP Downloader")
+               client.HTTPDownloader.__init__(self, url, outfile, headers=headers, agent="STB HTTP Downloader")
                self.status = None
                self.progress_callback = None
                self.deferred = defer.Deferred()
index 66ac589..5483c90 100644 (file)
@@ -339,7 +339,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
                                ePythonConfigQuery::getConfigValue("config.mediaplayer.alternateUserAgent", m_useragent);
                }
                if ( m_useragent.length() == 0 )
-                       m_useragent = "Dream Multimedia Dreambox Enigma2 Mediaplayer";
+                       m_useragent = "Enigma2 Mediaplayer";
        }
        else if ( m_sourceinfo.containertype == ctCDA )
        {
index e1d1146..ae4cd64 100755 (executable)
@@ -25,7 +25,7 @@ fi
 
 LIBS=@libdir@/libopen.so.0.0.0
 
-#check for dreambox specific passthrough helper lib
+#check for receiver specific passthrough helper lib
 if [ -e @libdir@/libpassthrough.so ]; then
        LIBS="$LIBS @libdir@/libpassthrough.so"
 fi