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