code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name.patch

   1 diff --git a/RecordTimer.py b/RecordTimer.py
   2 index 32fb923..58ef5b3 100755
   3 --- a/RecordTimer.py
   4 +++ b/RecordTimer.py
   5 @@ -307,7 +307,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
   6                                 self.record_service = None
   7                         if self.afterEvent == AFTEREVENT.STANDBY:
   8                                 if not Screens.Standby.inStandby: # not already in standby
   9 -                                       Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nSTB to standby. Do that now?"), timeout = 20)
  10 +                                       Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nSTB to idle server mode. Do that now?"), timeout = 20)
  11                         elif self.afterEvent == AFTEREVENT.DEEPSTANDBY:
  12                                 if not Screens.Standby.inTryQuitMainloop: # not a shutdown messagebox is open
  13                                         if Screens.Standby.inStandby: # in standby
  14 diff --git a/SleepTimer.py b/SleepTimer.py
  15 index a6f39ef..bb12b6d 100755
  16 --- a/SleepTimer.py
  17 +++ b/SleepTimer.py
  18 @@ -11,7 +11,7 @@ import Screens.Standby
  19
  20  config.SleepTimer = ConfigSubsection()
  21  config.SleepTimer.ask = ConfigYesNo(default = True)
  22 -config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("standby"))])
  23 +config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("idle server mode"))])
  24
  25  class SleepTimerEntry(timer.TimerEntry):
  26         def __init__(self, begin):
  27 @@ -31,7 +31,7 @@ class SleepTimerEntry(timer.TimerEntry):
  28                                         self.shutdown(True)
  29                         elif config.SleepTimer.action.value == "standby":
  30                                 if config.SleepTimer.ask.value and not Screens.Standby.inStandby:
  31 -                                       Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nSTB to standby. Do that now?"), timeout = 20)
  32 +                                       Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nSTB to idle server mode. Do that now?"), timeout = 20)
  33                                 else:
  34                                         self.standby(True)
  35
  36 diff --git a/data/menu.xml b/data/menu.xml
  37 index 5c8cbb2..a71c036 100755
  38 --- a/data/menu.xml
  39 +++ b/data/menu.xml
  40 @@ -97,10 +97,10 @@ self.session.openWithCallback(msgClosed, FactoryReset)
  41                         <id val="shutdown" />
  42                         <!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
  43                         <item text="Sleep Timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item>
  44 -                       <item text="Standby" entryID="standby"><screen module="Standby" screen="Standby"/></item>
  45 +                       <item text="Idle Server Mode" entryID="standby"><screen module="Standby" screen="Standby"/></item>
  46                         <item text="Restart" entryID="restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
  47                         <item level="2" text="Restart GUI" entryID="restart_enigma"><screen module="Standby" screen="TryQuitMainloop">3</screen></item>
  48 -                       <item text="Deep Standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
  49 +                       <item text="Standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
  50                         <item text="Shutdown" requires="!DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
  51                 </menu>
  52  </menu>
  53 diff --git a/data/setup.xml b/data/setup.xml
  54 index 9613440..8e42c57 100755
  55 --- a/data/setup.xml
  56 +++ b/data/setup.xml
  57 @@ -86,7 +86,7 @@
  58                         <item level="2" text="Automatically turn on external subtitles" description="When enabled, external subtitles will be always turned on for playback movie.">config.subtitles.pango_autoturnon</item>
  59                 </setup>
  60                 <setup key="harddisk" title="Harddisk setup" >
  61 -                       <item level="0" text="Harddisk standby after">config.usage.hdd_standby</item>
  62 +                       <item level="0" text="Harddisk idle mode after">config.usage.hdd_standby</item>
  63                 </setup>
  64                 <setup key="network" title="Network setup">
  65                         <item text="Use DHCP">config.network.dhcp</item>
  66 @@ -116,7 +116,7 @@
  67                 <setup key="lcd" title="Display Setup" requires="FrontpanelDisplay">
  68                         <item level="0" text="Brightness">config.lcd.bright</item>
  69                         <item level="0" text="Contrast">config.lcd.contrast</item>
  70 -                       <item level="0" text="Standby">config.lcd.standby</item>
  71 +                       <item level="0" text="Idle Server Mode">config.lcd.standby</item>
  72                 </setup>
  73                 <setup key="satconfig" title="Sat / Dish Setup">
  74                         <item text="Tuner Slot">config.sat.tunerslot</item>
  75 diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
  76 index 0ea65cd..2baadf9 100644
  77 --- a/lib/python/Components/ParentalControl.py
  78 +++ b/lib/python/Components/ParentalControl.py
  79 @@ -26,8 +26,8 @@ def InitParentalControl():
  80         config.ParentalControl = ConfigSubsection()
  81         config.ParentalControl.configured = ConfigYesNo(default = False)
  82         config.ParentalControl.mode = ConfigSelection(default = "simple", choices = [("simple", _("simple")), ("complex", _("complex"))])
  83 -       config.ParentalControl.storeservicepin = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until standby/restart"))])
  84 -       config.ParentalControl.storeservicepincancel = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until standby/restart"))])
  85 +       config.ParentalControl.storeservicepin = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until idle server mode/restart"))])
  86 +       config.ParentalControl.storeservicepincancel = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until idle server mode/restart"))])
  87         config.ParentalControl.servicepinactive = ConfigYesNo(default = False)
  88         config.ParentalControl.setuppinactive = ConfigYesNo(default = False)
  89         config.ParentalControl.type = ConfigSelection(default = "blacklist", choices = [(LIST_WHITELIST, _("whitelist")), (LIST_BLACKLIST, _("blacklist"))])
  90 diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
  91 index d262448..26eac19 100644
  92 --- a/lib/python/Components/UsageConfig.py
  93 +++ b/lib/python/Components/UsageConfig.py
  94 @@ -23,7 +23,7 @@ def InitUsageConfig():
  95         config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
  96         config.usage.show_infobar_on_event_change = ConfigYesNo(default = True)
  97         config.usage.hdd_standby = ConfigSelection(default = "600", choices = [
  98 -               ("0", _("no standby")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")),
  99 +               ("0", _("no idle mode")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")),
 100                 ("60", "1 " + _("minute")), ("120", "2 " + _("minutes")),
 101                 ("300", "5 " + _("minutes")), ("600", "10 " + _("minutes")), ("1200", "20 " + _("minutes")),
 102                 ("1800", "30 " + _("minutes")), ("3600", "1 " + _("hour")), ("7200", "2 " + _("hours")),
 103 @@ -56,12 +56,12 @@ def InitUsageConfig():
 104         config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [
 105                 ("show_menu", _("show shutdown menu")),
 106                 ("shutdown", _("immediate shutdown")),
 107 -               ("standby", _("Standby")) ] )
 108 +               ("standby", _("Idle Server Mode")) ] )
 109
 110         config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
 111                 ("show_menu", _("show shutdown menu")),
 112                 ("shutdown", _("immediate shutdown")),
 113 -               ("standby", _("Standby")) ] )
 114 +               ("standby", _("Idle Server Mode")) ] )
 115
 116
 117         config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
 118 diff --git a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
 119 index 5922fde..06dbd74 100755
 120 --- a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
 121 +++ b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
 122 @@ -84,7 +84,7 @@ class DeviceManagerConfiguration(Screen, ConfigListScreen):
 123         def createConfigList(self):
 124                 self.list = []
 125                 self.list.append(getConfigListEntry(_("Enable mount check for HDD : "), config.plugins.devicemanager.mountcheck_enable))
 126 -               self.list.append(getConfigListEntry(_("Harddisk standby after : "), config.usage.hdd_standby))
 127 +               self.list.append(getConfigListEntry(_("Harddisk idle mode after : "), config.usage.hdd_standby))
 128
 129  class DeviceManager(Screen):
 130         skin = """
 131 diff --git a/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml b/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
 132 index b766e34..f208ec0 100644
 133 --- a/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
 134 +++ b/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
 135 @@ -6,8 +6,8 @@
 136                      <author>ikseong</author>
 137                      <name>Fancontrol</name>
 138                      <packagename>enigma2-plugin-systemplugins-fancontrol</packagename>
 139 -                    <shortdescription>Fan Control setting in standbymode.</shortdescription>
 140 -                    <description>The Fan control turn on, turn off, modify fan action time on standbymode.
 141 +                    <shortdescription>Fan Control setting in idle server mode.</shortdescription>
 142 +                    <description>The Fan control turn on, turn off, modify fan action time on idle server mode.
 143                      </description>
 144            </info>
 145           <files type="package"> <!-- without version, without .ipk -->
 146 diff --git a/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
 147 index d28fe8e..c90b6cd 100644
 148 --- a/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
 149 +++ b/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
 150 @@ -19,7 +19,7 @@ config.plugins.fancontrols.fanofftime = ConfigInteger(default = 60, limits = (1,
 151
 152  class FancontrolConfiguration(Screen, ConfigListScreen):
 153         skin =  """
 154 -               <screen position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
 155 +               <screen position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
 156                         <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
 157                         <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
 158
 159 diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py b/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
 160 index bd93f4d..826c1b1 100755
 161 --- a/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
 162 +++ b/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
 163 @@ -46,8 +46,8 @@ class HdmiCec:
 164                         default = "wakeup,active,activevu")
 165                 config.hdmicec.vustandby_message = ConfigSelection(
 166                         choices = {
 167 -                       "vustandby": _("VU standby"),
 168 -                       "vudeepstandby": _("VU DeepStandby"),
 169 +                       "vustandby": _("VU Idle Server Mode"),
 170 +                       "vudeepstandby": _("VU Standby"),
 171                         "vunothing": _("Nothing"),
 172                         },
 173                         default = "vustandby")
 174 diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
 175 index 1151ec4..3db01e8 100755
 176 --- a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
 177 +++ b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
 178 @@ -77,8 +77,8 @@ class HdmiCecPlugin(Screen,ConfigListScreen):
 179                 self.list = []
 180                 self.hdmienabled = getConfigListEntry(_(_("HDMI CEC enabled:")), config.hdmicec.enabled)
 181                 self.hdmiactivesourcereply = getConfigListEntry(_(_("Active Source Reply On:")), config.hdmicec.active_source_reply)
 182 -               self.hdmitvstandby = getConfigListEntry(_("VU standby => TV activity:"), config.hdmicec.standby_message)
 183 -               self.hdmitvdeepstandby = getConfigListEntry(_("VU deepstandby => TV activity:"), config.hdmicec.deepstandby_message)
 184 +               self.hdmitvstandby = getConfigListEntry(_("VU idle server mode => TV activity:"), config.hdmicec.standby_message)
 185 +               self.hdmitvdeepstandby = getConfigListEntry(_("VU standby => TV activity:"), config.hdmicec.deepstandby_message)
 186                 self.hdmitvwakeup = getConfigListEntry(_("VU on => TV activity:"), config.hdmicec.wakeup_message)
 187                 self.hdmivustandby = getConfigListEntry(_("TV standby => VU+ activity:"), config.hdmicec.vustandby_message)
 188                 self.hdmivuwakeup = getConfigListEntry(_("TV on => VU+ activity:"), config.hdmicec.vuwakeup_message)
 189 diff --git a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
 190 index 9d29a46..a9bc2a2 100755
 191 --- a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
 192 +++ b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
 193 @@ -100,7 +100,7 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
 194                 if self["config"].getCurrent() == self.brightness:
 195                         self["current_entry"].setText("Touch LED Brightness at Normal state")
 196                 elif self["config"].getCurrent() == self.brightness_deepstandby:
 197 -                       self["current_entry"].setText("Touch LED Brightness at Deep Standby")
 198 +                       self["current_entry"].setText("Touch LED Brightness at Standby")
 199                 elif self["config"].getCurrent() == self.blinkingtime:
 200                         self["current_entry"].setText("Touch LED Blinking time")
 201                 self.setCurrentValue()
 202 @@ -127,7 +127,7 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
 203         def createSetup(self):
 204                 self.list = []
 205                 self.brightness = getConfigListEntry(_("Normal state"), config.plugins.brightnesssetup.brightness)
 206 -               self.brightness_deepstandby = getConfigListEntry(_("Deep Standby"), config.plugins.brightnesssetup.brightnessdeepstandby)
 207 +               self.brightness_deepstandby = getConfigListEntry(_("Standby"), config.plugins.brightnesssetup.brightnessdeepstandby)
 208                 self.blinkingtime = getConfigListEntry(_("Blinking time"), config.plugins.brightnesssetup.blinkingtime)
 209                 self.list.append( self.brightness )
 210                 self.list.append( self.brightness_deepstandby )
 211 diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml b/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
 212 index c4e814e..7327053 100755
 213 --- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
 214 +++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
 215 @@ -6,8 +6,8 @@
 216                      <author>hschang</author>
 217                      <name>ManualFancontrol</name>
 218                      <packagename>enigma2-plugin-systemplugins-manualfancontrol</packagename>
 219 -                    <shortdescription>Fancontrol Settings inStandby Mode</shortdescription>
 220 -                    <description>Fancontrol Settings inStandby Mode</description>
 221 +                    <shortdescription>Fancontrol Settings in Idle Server Mode</shortdescription>
 222 +                    <description>Fancontrol Settings in Idle Server Mode</description>
 223            </info>
 224
 225           <files type="package"> <!-- without version, without .ipk -->
 226 diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
 227 index f2da601..61ffa88 100755
 228 --- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
 229 +++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
 230 @@ -11,7 +11,7 @@ from enigma import eTimer
 231
 232  class ManualFancontrol(Screen,ConfigListScreen):
 233         skin =  """
 234 -               <screen position="center,center" size="400,270" title="Fancontrol Settings in Standby mode" >
 235 +               <screen position="center,center" size="400,270" title="Fancontrol Settings in Idle Server Mode" >
 236                         <ePixmap pixmap="skin_default/buttons/red.png" position="30,10" size="140,40" alphatest="on" />
 237                         <ePixmap pixmap="skin_default/buttons/green.png" position="230,10" size="140,40" alphatest="on" />
 238
 239 @@ -92,7 +92,7 @@ class ManualFancontrol(Screen,ConfigListScreen):
 240                 self["config"].l.setList(self.list)
 241
 242         def configSetup(self):
 243 -               self.standbyEntry = getConfigListEntry(_("FanOFF InStanby"), config.plugins.manualfancontrols.standbymode)
 244 +               self.standbyEntry = getConfigListEntry(_("FanOFF in Idle Server Mode"), config.plugins.manualfancontrols.standbymode)
 245                 self.pwmEntry = getConfigListEntry(_("PWM value"), config.plugins.manualfancontrols.pwmvalue)
 246                 self.periodEntry = getConfigListEntry(_("Status Check Period"), config.plugins.manualfancontrols.checkperiod)
 247                 if not self.displayCurrentValue in self["config"].onSelectionChanged:
 248 @@ -139,4 +139,4 @@ def main(session, **kwargs):
 249         session.open(ManualFancontrol)
 250
 251  def Plugins(**kwargs):
 252 -       return [PluginDescriptor(name=_("Manual Fan control"), description="setup Fancontol inStandby mode", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main)]
 253 +       return [PluginDescriptor(name=_("Manual Fan control"), description="setup Fancontol in idle server mode", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main)]
 254 diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
 255 index 48f871f..d2588ec 100644
 256 --- a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
 257 +++ b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
 258 @@ -125,8 +125,8 @@ class TempFanControl(Screen, ConfigListScreen):
 259                 for count in range(fancontrol.getFanCount()):
 260                         self.list.append(getConfigListEntry(_("Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt))
 261                         self.list.append(getConfigListEntry(_("Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm))
 262 -                       self.list.append(getConfigListEntry(_("Standby Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
 263 -                       self.list.append(getConfigListEntry(_("Standby Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
 264 +                       self.list.append(getConfigListEntry(_("Idle Server Mode Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
 265 +                       self.list.append(getConfigListEntry(_("Idle Server Mode Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
 266
 267                 ConfigListScreen.__init__(self, self.list, session = self.session)
 268                 #self["config"].list = self.list
 269 diff --git a/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py b/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
 270 index 6d285fd..956b108 100644
 271 --- a/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
 272 +++ b/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
 273 @@ -31,7 +31,7 @@ if SystemInfo.get("WOWLSupport", False):
 274
 275  config.plugins.wolconfig = ConfigSubsection()
 276  config.plugins.wolconfig.activate = ConfigYesNo(default = False)
 277 -config.plugins.wolconfig.location = ConfigSelection(default = "menu", choices = [("menu", _("Show on the Standby Menu")), ("deepstandby", _("Run at the Deep Standby"))])
 278 +config.plugins.wolconfig.location = ConfigSelection(default = "menu", choices = [("menu", _("Show on the Standby Menu")), ("deepstandby", _("Run at the Standby"))])
 279
 280  import socket
 281  class NetTool:
 282 @@ -199,7 +199,7 @@ def MenuSelected(selected, **kwargs):
 283         if selected == "system":
 284                 return [(_("WakeOnLan Setup"), PluginMain, "wolconfig", 80)]
 285         if selected == "shutdown" and config.plugins.wolconfig.activate.value and config.plugins.wolconfig.location.value == "menu":
 286 -               return [(_("Deep Standby with WOL"), DeepStandbyWOLMain, "deep_standby_wol", 80)]
 287 +               return [(_("Standby with WOL"), DeepStandbyWOLMain, "deep_standby_wol", 80)]
 288         return []
 289
 290  def Plugins(**kwargs):
 291 diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py
 292 index 4945df8..bbc8365 100755
 293 --- a/lib/python/Screens/SleepTimerEdit.py
 294 +++ b/lib/python/Screens/SleepTimerEdit.py
 295 @@ -79,12 +79,12 @@ class SleepTimerEdit(Screen):
 296
 297                 if config.SleepTimer.action.value == "shutdown":
 298                         if SystemInfo["DeepstandbySupport"]:
 299 -                               shutdownString = _("Deep Standby")
 300 +                               shutdownString = _("Standby")
 301                         else:
 302                                 shutdownString = _("Shutdown")
 303                         self["green_text"].setText(_("Sleep timer action:") + " " + shutdownString)
 304                 elif config.SleepTimer.action.value == "standby":
 305 -                       self["green_text"].setText(_("Sleep timer action:") + " " + _("Standby"))
 306 +                       self["green_text"].setText(_("Sleep timer action:") + " " + _("Idle Server Mode"))
 307
 308                 if config.SleepTimer.ask.value:
 309                         self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("yes"))
 310 diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
 311 index dafc263..ad0157c 100755
 312 --- a/lib/python/Screens/TaskView.py
 313 +++ b/lib/python/Screens/TaskView.py
 314 @@ -46,10 +46,10 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 315
 316                 self.settings = ConfigSubsection()
 317                 if SystemInfo["DeepstandbySupport"]:
 318 -                       shutdownString = _("go to deep standby")
 319 +                       shutdownString = _("go to standby")
 320                 else:
 321                         shutdownString = _("shut down")
 322 -               self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
 323 +               self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to idle server mode")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
 324                 self.job.afterEvent = self.settings.afterEvent.getValue()
 325                 self.afterEventChangeable = afterEventChangeable
 326                 self.setupList()
 327 @@ -129,7 +129,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 328                                 Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour STB. Shutdown now?"), timeout = 20)
 329                 elif self.settings.afterEvent.getValue() == "standby":
 330                         if not Screens.Standby.inStandby:
 331 -                               Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSTB to standby. Do that now?"), timeout = 20)
 332 +                               Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSTB to idle server mode. Do that now?"), timeout = 20)
 333
 334         def checkNotifications(self):
 335                 InfoBarNotifications.checkNotifications(self)
 336 diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
 337 index 9885e70..c3e71c7 100644
 338 --- a/lib/python/Screens/TimerEntry.py
 339 +++ b/lib/python/Screens/TimerEntry.py
 340 @@ -96,10 +96,10 @@ class TimerEntry(Screen, ConfigListScreen):
 341
 342                         self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
 343                         if SystemInfo["DeepstandbySupport"]:
 344 -                               shutdownString = _("go to deep standby")
 345 +                               shutdownString = _("go to standby")
 346                         else:
 347                                 shutdownString = _("shut down")
 348 -                       self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to standby")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent)
 349 +                       self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to idle server mode")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent)
 350                         self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type)
 351                         self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False)
 352                         self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False)
 353 diff --git a/po/en.po b/po/en.po
 354 index 5acb840..6aa7f7b 100644
 355 --- a/po/en.po
 356 +++ b/po/en.po
 357 @@ -445,6 +445,14 @@ msgstr ""
 358
 359  #
 360  msgid ""
 361 +"A finished record timer wants to set your\n"
 362 +"Dreambox to idle server mode. Do that now?"
 363 +msgstr ""
 364 +"A finished record timer wants to set your\n"
 365 +"Dreambox to idle server mode. Do that now?"
 366 +
 367 +#
 368 +msgid ""
 369  "A finished record timer wants to shut down\n"
 370  "your STB. Shutdown now?"
 371  msgstr ""
 372 @@ -549,6 +557,22 @@ msgstr ""
 373
 374  #
 375  msgid ""
 376 +"A sleep timer wants to set your\n"
 377 +"Dreambox to idle server mode. Do that now?"
 378 +msgstr ""
 379 +"A sleep timer wants to set your\n"
 380 +"Dreambox to idle server mode. Do that now?"
 381 +
 382 +#
 383 +msgid ""
 384 +"A sleep timer wants to set your\n"
 385 +"Dreambox to idle server mode.. Do that now?"
 386 +msgstr ""
 387 +"A sleep timer wants to set your\n"
 388 +"Dreambox to idle server mode.. Do that now?"
 389 +
 390 +#
 391 +msgid ""
 392  "A sleep timer wants to shut down\n"
 393  "your STB. Shutdown now?"
 394  msgstr ""
 395 @@ -3392,6 +3416,21 @@ msgstr "ISO path"
 396  msgid "Icelandic"
 397  msgstr "Icelandic"
 398
 399 +#
 400 +msgid "Idle Server Mode"
 401 +msgstr "Idle Server Mode"
 402 +
 403 +#
 404 +#, python-format
 405 +msgid "Idle Server Mode Fan %d PWM"
 406 +msgstr "Idle Server Mode Fan %d PWM"
 407 +
 408 +#
 409 +#, python-format
 410 +msgid "Idle Server Mode Fan %d Voltage"
 411 +msgstr "Idle Server Mode Fan %d Voltage"
 412 +
 413 +
 414  msgid ""
 415  "If a timer conflict occurs, AutoTimer will search outside the timespan for a "
 416  "similar event and add it."
 417 @@ -9935,6 +9974,10 @@ msgid "go to standby"
 418  msgstr "go to standby"
 419
 420  #
 421 +msgid "go to idle server mode"
 422 +msgstr "go to idle server mode"
 423 +
 424 +#
 425  msgid "grab this frame as bitmap"
 426  msgstr "grab this frame as bitmap"
 427
 428 @@ -10648,6 +10691,10 @@ msgid "until standby/restart"
 429  msgstr "until standby/restart"
 430
 431  #
 432 +msgid "until idle server mode/restart"
 433 +msgstr "until idle server mode/restart"
 434 +
 435 +#
 436  msgid "use as HDD replacement"
 437  msgstr "use as HDD replacement"
 438