1 diff --git a/RecordTimer.py b/RecordTimer.py
2 index d3ccd75..e1c9c58 100755
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
18 @@ -11,7 +11,7 @@ import Screens.Standby
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"))])
25 class SleepTimerEntry(timer.TimerEntry):
26 def __init__(self, begin):
27 @@ -31,7 +31,7 @@ class SleepTimerEntry(timer.TimerEntry):
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)
36 diff --git a/data/menu.xml b/data/menu.xml
37 index 03e582c..ccdd6d3 100755
40 @@ -96,10 +96,10 @@ self.session.openWithCallback(msgClosed, FactoryReset)
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>
53 diff --git a/data/setup.xml b/data/setup.xml
54 index 442fe13..719e94a 100755
58 <item level="2" text="Composition of the recording filenames">config.recording.filename_composition</item>
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>
64 <setup key="network" title="Network setup">
65 <item text="Use DHCP">config.network.dhcp</item>
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>
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
93 index b98be60..a00132d
94 --- a/lib/python/Components/UsageConfig.py
95 +++ b/lib/python/Components/UsageConfig.py
96 @@ -23,7 +23,7 @@ def InitUsageConfig():
97 config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
98 config.usage.show_infobar_on_event_change = ConfigYesNo(default = True)
99 config.usage.hdd_standby = ConfigSelection(default = "600", choices = [
100 - ("0", _("no standby")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")),
101 + ("0", _("no idle mode")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")),
102 ("60", "1 " + _("minute")), ("120", "2 " + _("minutes")),
103 ("300", "5 " + _("minutes")), ("600", "10 " + _("minutes")), ("1200", "20 " + _("minutes")),
104 ("1800", "30 " + _("minutes")), ("3600", "1 " + _("hour")), ("7200", "2 " + _("hours")),
105 @@ -56,12 +56,12 @@ def InitUsageConfig():
106 config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [
107 ("show_menu", _("show shutdown menu")),
108 ("shutdown", _("immediate shutdown")),
109 - ("standby", _("Standby")) ] )
110 + ("standby", _("Idle Server Mode")) ] )
112 config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
113 ("show_menu", _("show shutdown menu")),
114 ("shutdown", _("immediate shutdown")),
115 - ("standby", _("Standby")) ] )
116 + ("standby", _("Idle Server Mode")) ] )
119 config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
120 diff --git a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
121 index 86aa991..e702068 100755
122 --- a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
123 +++ b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py
124 @@ -85,7 +85,7 @@ class DeviceManagerConfiguration(Screen, ConfigListScreen):
125 def createConfigList(self):
127 self.list.append(getConfigListEntry(_("Enable mount check for HDD : "), config.plugins.devicemanager.mountcheck_enable))
128 - self.list.append(getConfigListEntry(_("Harddisk standby after : "), config.usage.hdd_standby))
129 + self.list.append(getConfigListEntry(_("Harddisk idle mode after : "), config.usage.hdd_standby))
130 self.list.append(getConfigListEntry(_("Mount known devices automatically : "), config.plugins.devicemanager.hotplug_enable))
133 diff --git a/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml b/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
134 index b766e34..f208ec0 100644
135 --- a/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
136 +++ b/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
138 <author>ikseong</author>
139 <name>Fancontrol</name>
140 <packagename>enigma2-plugin-systemplugins-fancontrol</packagename>
141 - <shortdescription>Fan Control setting in standbymode.</shortdescription>
142 - <description>The Fan control turn on, turn off, modify fan action time on standbymode.
143 + <shortdescription>Fan Control setting in idle server mode.</shortdescription>
144 + <description>The Fan control turn on, turn off, modify fan action time on idle server mode.
147 <files type="package"> <!-- without version, without .ipk -->
148 diff --git a/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
149 index d28fe8e..c90b6cd 100644
150 --- a/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
151 +++ b/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
152 @@ -19,7 +19,7 @@ config.plugins.fancontrols.fanofftime = ConfigInteger(default = 60, limits = (1,
154 class FancontrolConfiguration(Screen, ConfigListScreen):
156 - <screen position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
157 + <screen position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
158 <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
159 <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
161 diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py b/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
162 index e73d9a2..8deddf1 100755
163 --- a/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
164 +++ b/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
165 @@ -46,8 +46,8 @@ class HdmiCec:
166 default = "wakeup,active,activevu")
167 config.hdmicec.vustandby_message = ConfigSelection(
169 - "vustandby": _("VU standby"),
170 - "vudeepstandby": _("VU DeepStandby"),
171 + "vustandby": _("VU Idle Server Mode"),
172 + "vudeepstandby": _("VU Standby"),
173 "vunothing": _("Nothing"),
175 default = "vustandby")
176 diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
177 index 1151ec4..3db01e8 100755
178 --- a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
179 +++ b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
180 @@ -77,8 +77,8 @@ class HdmiCecPlugin(Screen,ConfigListScreen):
182 self.hdmienabled = getConfigListEntry(_(_("HDMI CEC enabled:")), config.hdmicec.enabled)
183 self.hdmiactivesourcereply = getConfigListEntry(_(_("Active Source Reply On:")), config.hdmicec.active_source_reply)
184 - self.hdmitvstandby = getConfigListEntry(_("VU standby => TV activity:"), config.hdmicec.standby_message)
185 - self.hdmitvdeepstandby = getConfigListEntry(_("VU deepstandby => TV activity:"), config.hdmicec.deepstandby_message)
186 + self.hdmitvstandby = getConfigListEntry(_("VU idle server mode => TV activity:"), config.hdmicec.standby_message)
187 + self.hdmitvdeepstandby = getConfigListEntry(_("VU standby => TV activity:"), config.hdmicec.deepstandby_message)
188 self.hdmitvwakeup = getConfigListEntry(_("VU on => TV activity:"), config.hdmicec.wakeup_message)
189 self.hdmivustandby = getConfigListEntry(_("TV standby => VU+ activity:"), config.hdmicec.vustandby_message)
190 self.hdmivuwakeup = getConfigListEntry(_("TV on => VU+ activity:"), config.hdmicec.vuwakeup_message)
191 diff --git a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
192 index 9d29a46..a9bc2a2 100755
193 --- a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
194 +++ b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
195 @@ -100,7 +100,7 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
196 if self["config"].getCurrent() == self.brightness:
197 self["current_entry"].setText("Touch LED Brightness at Normal state")
198 elif self["config"].getCurrent() == self.brightness_deepstandby:
199 - self["current_entry"].setText("Touch LED Brightness at Deep Standby")
200 + self["current_entry"].setText("Touch LED Brightness at Standby")
201 elif self["config"].getCurrent() == self.blinkingtime:
202 self["current_entry"].setText("Touch LED Blinking time")
203 self.setCurrentValue()
204 @@ -127,7 +127,7 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
205 def createSetup(self):
207 self.brightness = getConfigListEntry(_("Normal state"), config.plugins.brightnesssetup.brightness)
208 - self.brightness_deepstandby = getConfigListEntry(_("Deep Standby"), config.plugins.brightnesssetup.brightnessdeepstandby)
209 + self.brightness_deepstandby = getConfigListEntry(_("Standby"), config.plugins.brightnesssetup.brightnessdeepstandby)
210 self.blinkingtime = getConfigListEntry(_("Blinking time"), config.plugins.brightnesssetup.blinkingtime)
211 self.list.append( self.brightness )
212 self.list.append( self.brightness_deepstandby )
213 diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml b/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
214 index c4e814e..7327053 100755
215 --- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
216 +++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
218 <author>hschang</author>
219 <name>ManualFancontrol</name>
220 <packagename>enigma2-plugin-systemplugins-manualfancontrol</packagename>
221 - <shortdescription>Fancontrol Settings inStandby Mode</shortdescription>
222 - <description>Fancontrol Settings inStandby Mode</description>
223 + <shortdescription>Fancontrol Settings in Idle Server Mode</shortdescription>
224 + <description>Fancontrol Settings in Idle Server Mode</description>
227 <files type="package"> <!-- without version, without .ipk -->
228 diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
229 index f2da601..61ffa88 100755
230 --- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
231 +++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
232 @@ -11,7 +11,7 @@ from enigma import eTimer
234 class ManualFancontrol(Screen,ConfigListScreen):
236 - <screen position="center,center" size="400,270" title="Fancontrol Settings in Standby mode" >
237 + <screen position="center,center" size="400,270" title="Fancontrol Settings in Idle Server Mode" >
238 <ePixmap pixmap="skin_default/buttons/red.png" position="30,10" size="140,40" alphatest="on" />
239 <ePixmap pixmap="skin_default/buttons/green.png" position="230,10" size="140,40" alphatest="on" />
241 @@ -92,7 +92,7 @@ class ManualFancontrol(Screen,ConfigListScreen):
242 self["config"].l.setList(self.list)
244 def configSetup(self):
245 - self.standbyEntry = getConfigListEntry(_("FanOFF InStanby"), config.plugins.manualfancontrols.standbymode)
246 + self.standbyEntry = getConfigListEntry(_("FanOFF in Idle Server Mode"), config.plugins.manualfancontrols.standbymode)
247 self.pwmEntry = getConfigListEntry(_("PWM value"), config.plugins.manualfancontrols.pwmvalue)
248 self.periodEntry = getConfigListEntry(_("Status Check Period"), config.plugins.manualfancontrols.checkperiod)
249 if not self.displayCurrentValue in self["config"].onSelectionChanged:
250 @@ -139,4 +139,4 @@ def main(session, **kwargs):
251 session.open(ManualFancontrol)
253 def Plugins(**kwargs):
254 - return [PluginDescriptor(name=_("Manual Fan control"), description="setup Fancontol inStandby mode", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main)]
255 + return [PluginDescriptor(name=_("Manual Fan control"), description="setup Fancontol in idle server mode", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main)]
256 diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
257 index 48f871f..d2588ec 100644
258 --- a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
259 +++ b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
260 @@ -125,8 +125,8 @@ class TempFanControl(Screen, ConfigListScreen):
261 for count in range(fancontrol.getFanCount()):
262 self.list.append(getConfigListEntry(_("Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt))
263 self.list.append(getConfigListEntry(_("Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm))
264 - self.list.append(getConfigListEntry(_("Standby Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
265 - self.list.append(getConfigListEntry(_("Standby Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
266 + self.list.append(getConfigListEntry(_("Idle Server Mode Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
267 + self.list.append(getConfigListEntry(_("Idle Server Mode Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
269 ConfigListScreen.__init__(self, self.list, session = self.session)
270 #self["config"].list = self.list
271 diff --git a/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py b/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
272 index bf29218..1acc43d 100644
273 --- a/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
274 +++ b/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
275 @@ -27,7 +27,7 @@ _ethDevice = "eth0"
277 config.plugins.wolconfig = ConfigSubsection()
278 config.plugins.wolconfig.activate = ConfigYesNo(default = False)
279 -config.plugins.wolconfig.location = ConfigSelection(default = "menu", choices = [("menu", _("Show on the Standby Menu")), ("deepstandby", _("Run at the Deep Standby"))])
280 +config.plugins.wolconfig.location = ConfigSelection(default = "menu", choices = [("menu", _("Show on the Standby Menu")), ("deepstandby", _("Run at the Standby"))])
284 @@ -189,7 +189,7 @@ def MenuSelected(selected, **kwargs):
285 if selected == "system":
286 return [(_("WakeOnLan Setup"), PluginMain, "wolconfig", 80)]
287 if selected == "shutdown" and config.plugins.wolconfig.activate.value and config.plugins.wolconfig.location.value == "menu":
288 - return [(_("Deep Standby with WOL"), DeepStandbyWOLMain, "deep_standby_wol", 80)]
289 + return [(_("Standby with WOL"), DeepStandbyWOLMain, "deep_standby_wol", 80)]
292 def Plugins(**kwargs):
293 diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py
294 index 1305b62..9f30c2d 100755
295 --- a/lib/python/Screens/SleepTimerEdit.py
296 +++ b/lib/python/Screens/SleepTimerEdit.py
297 @@ -79,12 +79,12 @@ class SleepTimerEdit(Screen):
299 if config.SleepTimer.action.value == "shutdown":
300 if SystemInfo["DeepstandbySupport"]:
301 - shutdownString = _("Deep Standby")
302 + shutdownString = _("Standby")
304 shutdownString = _("Shutdown")
305 self["green_text"].setText(_("Sleep timer action:") + " " + shutdownString)
306 elif config.SleepTimer.action.value == "standby":
307 - self["green_text"].setText(_("Sleep timer action:") + " " + _("Standby"))
308 + self["green_text"].setText(_("Sleep timer action:") + " " + _("Idle Server Mode"))
310 if config.SleepTimer.ask.value:
311 self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("yes"))
312 diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
313 index dafc263..ad0157c 100755
314 --- a/lib/python/Screens/TaskView.py
315 +++ b/lib/python/Screens/TaskView.py
316 @@ -46,10 +46,10 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
318 self.settings = ConfigSubsection()
319 if SystemInfo["DeepstandbySupport"]:
320 - shutdownString = _("go to deep standby")
321 + shutdownString = _("go to standby")
323 shutdownString = _("shut down")
324 - self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
325 + self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to idle server mode")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
326 self.job.afterEvent = self.settings.afterEvent.getValue()
327 self.afterEventChangeable = afterEventChangeable
329 @@ -129,7 +129,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
330 Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour STB. Shutdown now?"), timeout = 20)
331 elif self.settings.afterEvent.getValue() == "standby":
332 if not Screens.Standby.inStandby:
333 - Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSTB to standby. Do that now?"), timeout = 20)
334 + Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSTB to idle server mode. Do that now?"), timeout = 20)
336 def checkNotifications(self):
337 InfoBarNotifications.checkNotifications(self)
338 diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
339 index 9885e70..c3e71c7 100644
340 --- a/lib/python/Screens/TimerEntry.py
341 +++ b/lib/python/Screens/TimerEntry.py
342 @@ -96,10 +96,10 @@ class TimerEntry(Screen, ConfigListScreen):
344 self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
345 if SystemInfo["DeepstandbySupport"]:
346 - shutdownString = _("go to deep standby")
347 + shutdownString = _("go to standby")
349 shutdownString = _("shut down")
350 - self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to standby")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent)
351 + self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to idle server mode")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent)
352 self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type)
353 self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False)
354 self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False)
355 diff --git a/po/en.po b/po/en.po
356 index 6937349..4ce5bad 100755
359 @@ -445,6 +445,14 @@ msgstr ""
363 +"A finished record timer wants to set your\n"
364 +"Dreambox to idle server mode. Do that now?"
366 +"A finished record timer wants to set your\n"
367 +"Dreambox to idle server mode. Do that now?"
371 "A finished record timer wants to shut down\n"
372 "your Dreambox. Shutdown now?"
374 @@ -549,6 +557,22 @@ msgstr ""
378 +"A sleep timer wants to set your\n"
379 +"Dreambox to idle server mode. Do that now?"
381 +"A sleep timer wants to set your\n"
382 +"Dreambox to idle server mode. Do that now?"
386 +"A sleep timer wants to set your\n"
387 +"Dreambox to idle server mode.. Do that now?"
389 +"A sleep timer wants to set your\n"
390 +"Dreambox to idle server mode.. Do that now?"
394 "A sleep timer wants to shut down\n"
395 "your Dreambox. Shutdown now?"
397 @@ -3392,6 +3416,21 @@ msgstr "ISO path"
402 +msgid "Idle Server Mode"
403 +msgstr "Idle Server Mode"
407 +msgid "Idle Server Mode Fan %d PWM"
408 +msgstr "Idle Server Mode Fan %d PWM"
412 +msgid "Idle Server Mode Fan %d Voltage"
413 +msgstr "Idle Server Mode Fan %d Voltage"
417 "If a timer conflict occurs, AutoTimer will search outside the timespan for a "
418 "similar event and add it."
419 @@ -9935,6 +9974,10 @@ msgid "go to standby"
420 msgstr "go to standby"
423 +msgid "go to idle server mode"
424 +msgstr "go to idle server mode"
427 msgid "grab this frame as bitmap"
428 msgstr "grab this frame as bitmap"
430 @@ -10648,6 +10691,10 @@ msgid "until standby/restart"
431 msgstr "until standby/restart"
434 +msgid "until idle server mode/restart"
435 +msgstr "until idle server mode/restart"
438 msgid "use as HDD replacement"
439 msgstr "use as HDD replacement"