fix standby name (Standby -> Server Idle Mode, Deep Standby -> Standby)
authorhschang <chang@dev3>
Fri, 18 Apr 2014 13:03:01 +0000 (22:03 +0900)
committerhschang <chang@dev3>
Fri, 18 Apr 2014 13:03:01 +0000 (22:03 +0900)
meta-bsp/vuduo2/recipes/vuplus/vuplus-manual.bbappend
meta-bsp/vusolo2/recipes/vuplus/vuplus-manual.bbappend
meta-openvuplus/recipes-vuplus/duo2lcd4linux/duo2lcd4linux_0.1.bb
meta-openvuplus/recipes-vuplus/duo2lcd4linux/files/duo2lcd4linux-fix-standby.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-fix-standby_20140407.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name_skin.patch [new file with mode: 0644]

index 1de719e..48ab90b 100644 (file)
@@ -1,6 +1,6 @@
-SRC_DATE = "20140328_p0"
+SRC_DATE = "20140409_p0"
 IMAGE_DIR = "Vu+-Duo2-User-Manual_english_D0610-web-images"
 
-SRC_URI[md5sum] = "45e345a3d8112ff6e4f2156c04a6fc33"
-SRC_URI[sha256sum] = "74cfc8f65e3108c921872246cf631728f5bc70f84cec1a9f769e5a7a2fc453b1"
+SRC_URI[md5sum] = "8e7887f012e1cc88cac9338032dadc2e"
+SRC_URI[sha256sum] = "21a65be9be096bf02e4658b2dfbbd9d8adb724da164f234dc5f6055ed0eae5cc"
 
index 490635d..03ff611 100644 (file)
@@ -1,6 +1,6 @@
-SRC_DATE = "20140328_p0"
+SRC_DATE = "20140409_p0"
 IMAGE_DIR = "image"
 
-SRC_URI[md5sum] = "6fc4d9015f790f57b37220c088961b5a"
-SRC_URI[sha256sum] = "ec99a9d9777e9a692089eb7d198bfd3298b70db0778d90dfc6b8262ab59cc68d"
+SRC_URI[md5sum] = "98a97b56af2b689484dbf713bd6b6eb0"
+SRC_URI[sha256sum] = "96c30240b8fdc8741b76fa21d72033bae7cc0a2da0b568a0c268793eecf1cb9d"
 
index 1a9bbf6..b6efa2a 100644 (file)
@@ -5,14 +5,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 SRC_URI = " \
         file://LCD4linux.tar.gz \
         file://wetter.tar.gz \
-       file://duo2lcd4linux.patch;patch=1;pnum=1 \
+       file://duo2lcd4linux.patch \
+       file://duo2lcd4linux-fix-standby.patch \
 "
 
 RDEPENDS_${PN} = "enigma2 python-codecs python-datetime python-imaging python-textutils python-shell python-ctypes python-pyusb lcd4linux"
 
 S = "${WORKDIR}/LCD4linux"
 
-PR = "r5"
+PR = "r6"
 
 PLUGINPATH = "/usr/lib/enigma2/python/Plugins/Extensions/LCD4linux"
 
diff --git a/meta-openvuplus/recipes-vuplus/duo2lcd4linux/files/duo2lcd4linux-fix-standby.patch b/meta-openvuplus/recipes-vuplus/duo2lcd4linux/files/duo2lcd4linux-fix-standby.patch
new file mode 100644 (file)
index 0000000..15ba634
--- /dev/null
@@ -0,0 +1,83 @@
+diff --git a/plugin.py b/plugin.py
+index 6fed789..a2a46cb 100644
+--- a/plugin.py
++++ b/plugin.py
+@@ -839,12 +839,12 @@ class LCDdisplayConfig(ConfigListScreen,Screen):
+                       self["config"].setList(self.list3)
+               elif self.mode == "standby":
+                       self.list4 = []
+-                      self.list4.append(getConfigListEntry(_("Standby - LCD Display"), config.plugins.LCD4linux.Standby))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - LCD Display"), config.plugins.LCD4linux.Standby))
+                       self.list4.append(getConfigListEntry(_("- Screens used for Changing"), config.plugins.LCD4linux.StandbyScreenMax))
+                       self.list4.append(getConfigListEntry(_("- Brightnes"), config.plugins.LCD4linux.StandbyHelligkeit))
+                       self.list4.append(getConfigListEntry(_("- Backlight Off (disable set Off=On)"), config.plugins.LCD4linux.StandbyLCDoff))
+                       self.list4.append(getConfigListEntry(_("- Backlight On"), config.plugins.LCD4linux.StandbyLCDon))
+-                      self.list4.append(getConfigListEntry(_("Standby - Clock"), config.plugins.LCD4linux.StandbyClock))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Clock"), config.plugins.LCD4linux.StandbyClock))
+                       if config.plugins.LCD4linux.StandbyClock.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyClockLCD))
+                               self.list4.append(getConfigListEntry(_("- Type"), config.plugins.LCD4linux.StandbyClockType))
+@@ -853,19 +853,19 @@ class LCDdisplayConfig(ConfigListScreen,Screen):
+                               self.list4.append(getConfigListEntry(_("- Alignment"), config.plugins.LCD4linux.StandbyClockAlign))
+                               self.list4.append(getConfigListEntry(_("- Split Screen"), config.plugins.LCD4linux.StandbyClockSplit))
+                               self.list4.append(getConfigListEntry(_("- Color"), config.plugins.LCD4linux.StandbyClockColor))
+-                      self.list4.append(getConfigListEntry(_("Standby - Show next Timer Event"), config.plugins.LCD4linux.StandbyTimer))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Show next Timer Event"), config.plugins.LCD4linux.StandbyTimer))
+                       if config.plugins.LCD4linux.StandbyTimer.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyTimerLCD))
+                               self.list4.append(getConfigListEntry(_("- Font Size"), config.plugins.LCD4linux.StandbyTimerSize))
+                               self.list4.append(getConfigListEntry(_("- Position"), config.plugins.LCD4linux.StandbyTimerPos))
+                               self.list4.append(getConfigListEntry(_("- Color"), config.plugins.LCD4linux.StandbyTimerColor))
+-                      self.list4.append(getConfigListEntry(_("Standby - Weather"), config.plugins.LCD4linux.StandbyWetter))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Weather"), config.plugins.LCD4linux.StandbyWetter))
+                       if config.plugins.LCD4linux.StandbyWetter.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyWetterLCD))
+                               self.list4.append(getConfigListEntry(_("- Position X"), config.plugins.LCD4linux.StandbyWetterPosX))
+                               self.list4.append(getConfigListEntry(_("- Position Y"), config.plugins.LCD4linux.StandbyWetterPosY))
+                               self.list4.append(getConfigListEntry(_("- Weather Type"), config.plugins.LCD4linux.StandbyWetterType))
+-                      self.list4.append(getConfigListEntry(_("Standby - Show Textfile"), config.plugins.LCD4linux.StandbyText))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Show Textfile"), config.plugins.LCD4linux.StandbyText))
+                       if config.plugins.LCD4linux.StandbyText.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyTextLCD))
+                               self.list4.append(getConfigListEntry(_("- File"), config.plugins.LCD4linux.StandbyTextFile))
+@@ -874,7 +874,7 @@ class LCDdisplayConfig(ConfigListScreen,Screen):
+                               self.list4.append(getConfigListEntry(_("- Alignment"), config.plugins.LCD4linux.StandbyTextAlign))
+                               self.list4.append(getConfigListEntry(_("- Color"), config.plugins.LCD4linux.StandbyTextColor))
+                               self.list4.append(getConfigListEntry(_("- Background Color"), config.plugins.LCD4linux.StandbyTextBackColor))
+-                      self.list4.append(getConfigListEntry(_("Standby - Show Textfile 2"), config.plugins.LCD4linux.StandbyText2))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Show Textfile 2"), config.plugins.LCD4linux.StandbyText2))
+                       if config.plugins.LCD4linux.StandbyText2.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyText2LCD))
+                               self.list4.append(getConfigListEntry(_("- File"), config.plugins.LCD4linux.StandbyText2File))
+@@ -883,7 +883,7 @@ class LCDdisplayConfig(ConfigListScreen,Screen):
+                               self.list4.append(getConfigListEntry(_("- Alignment"), config.plugins.LCD4linux.StandbyText2Align))
+                               self.list4.append(getConfigListEntry(_("- Color"), config.plugins.LCD4linux.StandbyText2Color))
+                               self.list4.append(getConfigListEntry(_("- Background Color"), config.plugins.LCD4linux.StandbyText2BackColor))
+-                      self.list4.append(getConfigListEntry(_("Standby - Show HTTP Text") , config.plugins.LCD4linux.StandbyHTTP))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Show HTTP Text") , config.plugins.LCD4linux.StandbyHTTP))
+                       if config.plugins.LCD4linux.StandbyHTTP.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyHTTPLCD))
+                               self.list4.append(getConfigListEntry(_("- URL"), config.plugins.LCD4linux.StandbyHTTPURL))
+@@ -892,7 +892,7 @@ class LCDdisplayConfig(ConfigListScreen,Screen):
+                               self.list4.append(getConfigListEntry(_("- Alignment"), config.plugins.LCD4linux.StandbyHTTPAlign))
+                               self.list4.append(getConfigListEntry(_("- Color"), config.plugins.LCD4linux.StandbyHTTPColor))
+                               self.list4.append(getConfigListEntry(_("- Background Color"), config.plugins.LCD4linux.StandbyHTTPBackColor))
+-                      self.list4.append(getConfigListEntry(_("Standby - Show Picture") , config.plugins.LCD4linux.StandbyBild))
++                      self.list4.append(getConfigListEntry(_("Idle Server Mode - Show Picture") , config.plugins.LCD4linux.StandbyBild))
+                       if config.plugins.LCD4linux.StandbyBild.value != "0":
+                               self.list4.append(getConfigListEntry(_("- which LCD"), config.plugins.LCD4linux.StandbyBildLCD))
+                               self.list4.append(getConfigListEntry(_("- File or Path"), config.plugins.LCD4linux.StandbyBildFile))
+@@ -913,11 +913,11 @@ class LCDdisplayConfig(ConfigListScreen,Screen):
+                       self.mode = "media"
+                       self.setTitle("LCD4linux Display-Mode MediaPlayer")
+ #                     self["config"].setList(self.list3)
+-                      self["key_blue"].setText("Set Standby >>")
++                      self["key_blue"].setText("Set Idle Mode >>")
+                       self.SetList()
+               elif self.mode == "media":
+                       self.mode = "standby"
+-                      self.setTitle("LCD4linux Display-Mode Standby")
++                      self.setTitle("LCD4linux Display-Mode Idle Server Mode")
+ #                     self["config"].setList(self.list4)
+                       self["key_blue"].setText("Set Global >>")
+                       self.SetList()
index e7ae673..223ef3c 100644 (file)
@@ -6,13 +6,14 @@ inherit gitpkgv
 SRCREV = ""
 PV = "0.3+git${SRCPV}"
 PKGV = "0.3+git${GITPKGV}"
-PR = "r2"
+PR = "r3"
 
 require openplugins.inc
 
 SRC_REV = "406e54cb250fecb5040dba844098140982186668"
 SRC_URI = "git://github.com/E2OpenPlugins/e2openplugin-${MODULE}.git;protocol=git;tag=${SRC_REV} \
-          file://autoshutdown-default-time_20121207.patch;patch=1;pnum=1 \
+          file://autoshutdown-default-time_20121207.patch \
+           file://autoshutdown-fix-standby_20140407.patch \
          "
 
 inherit autotools
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-fix-standby_20140407.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-fix-standby_20140407.patch
new file mode 100644 (file)
index 0000000..d0ef227
--- /dev/null
@@ -0,0 +1,31 @@
+diff --git a/src/plugin.py b/src/plugin.py
+index 4bb7533..61ba253 100644
+--- a/src/plugin.py
++++ b/src/plugin.py
+@@ -30,7 +30,7 @@ config.autoshutdown.time = ConfigInteger(default = 120, limits = (1, 1440))
+ config.autoshutdown.inactivetime = ConfigInteger(default = 60, limits = (1, 1440))
+ config.autoshutdown.autostart = ConfigEnableDisable(default=True)
+ config.autoshutdown.enableinactivity = ConfigEnableDisable(default=True)
+-config.autoshutdown.inactivityaction = ConfigSelection(default = "standby", choices = [("standby", _("Standby")), ("deepstandby", _("Deepstandby"))])
++config.autoshutdown.inactivityaction = ConfigSelection(default = "standby", choices = [("standby", _("Idle Server Mode")), ("deepstandby", _("Standby"))])
+ config.autoshutdown.inactivitymessage = ConfigYesNo(default=True)
+ config.autoshutdown.messagetimeout = ConfigInteger(default = 5, limits = (1, 60))
+ config.autoshutdown.epgrefresh = ConfigYesNo(default=True)
+@@ -99,7 +99,7 @@ class AutoShutDownActions:
+               if config.autoshutdown.inactivitymessage.value == True:
+                       self.asdkeyaction = None
+                       if config.autoshutdown.inactivityaction.value == "standby":
+-                              self.asdkeyaction = _("Go to standby")
++                              self.asdkeyaction = _("Go to idle server mode")
+                       elif config.autoshutdown.inactivityaction.value == "deepstandby":
+                               self.asdkeyaction = _("Power off STB")
+                       session.openWithCallback(shutdownactions.actionEndKeyTimer, MessageBox, _("AutoShutDown: %s ?") % self.asdkeyaction, MessageBox.TYPE_YESNO, timeout=config.autoshutdown.messagetimeout.value)
+@@ -207,7 +207,7 @@ class AutoShutDownConfiguration(Screen, ConfigListScreen):
+               self.list = []
+               self.list.append(getConfigListEntry(_("Enable AutoShutDown:"), config.autoshutdown.autostart))
+               if config.autoshutdown.autostart.value == True:
+-                      self.list.append(getConfigListEntry(_("Time in standby for power off (min):"), config.autoshutdown.time))
++                      self.list.append(getConfigListEntry(_("Time in idle server mode for power off (min):"), config.autoshutdown.time))
+               self.list.append(getConfigListEntry(_("Enable action after inactivity:"), config.autoshutdown.enableinactivity))
+               if config.autoshutdown.enableinactivity.value == True:
+                       self.list.append(getConfigListEntry(_("Time for inactivity (min):"), config.autoshutdown.inactivetime))
index fe8b3e4..0a932e7 100644 (file)
@@ -89,7 +89,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r67"
+PR = "r68"
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
@@ -114,6 +114,8 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t
            file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \
           file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \
            file://enigma2_vuplus_proc_oom_score_adj.patch;striplevel=1 \
+           file://enigma2_vuplus_fix_standby_name.patch \
+           file://enigma2_vuplus_fix_standby_name_skin.patch \
            file://MyriadPro-Regular.otf \
            file://MyriadPro-Semibold.otf \
            file://MyriadPro-SemiboldIt.otf \
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name.patch
new file mode 100644 (file)
index 0000000..ad6272c
--- /dev/null
@@ -0,0 +1,407 @@
+diff --git a/RecordTimer.py b/RecordTimer.py
+index d3ccd75..e1c9c58 100755
+--- a/RecordTimer.py
++++ b/RecordTimer.py
+@@ -297,7 +297,7 @@ 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\nSTB to standby. Do that now?"), timeout = 20)
++                                      Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A finished record timer wants to set your\nSTB to idle server mode. 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
+diff --git a/SleepTimer.py b/SleepTimer.py
+index a6f39ef..bb12b6d 100755
+--- a/SleepTimer.py
++++ b/SleepTimer.py
+@@ -11,7 +11,7 @@ import Screens.Standby
+ config.SleepTimer = ConfigSubsection()
+ config.SleepTimer.ask = ConfigYesNo(default = True)
+-config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("standby"))])
++config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("idle server mode"))])
+ class SleepTimerEntry(timer.TimerEntry):
+       def __init__(self, begin):
+@@ -31,7 +31,7 @@ class SleepTimerEntry(timer.TimerEntry):
+                                       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\nSTB to standby. Do that now?"), timeout = 20)
++                                      Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nSTB to idle server mode. Do that now?"), timeout = 20)
+                               else:
+                                       self.standby(True)
+diff --git a/data/menu.xml b/data/menu.xml
+index 03e582c..ccdd6d3 100755
+--- a/data/menu.xml
++++ b/data/menu.xml
+@@ -96,10 +96,10 @@ self.session.openWithCallback(msgClosed, FactoryReset)
+                       <id val="shutdown" />
+                       <!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
+                       <item text="Sleep Timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item>
+-                      <item text="Standby" entryID="standby"><screen module="Standby" screen="Standby"/></item>
++                      <item text="Idle Server Mode" entryID="standby"><screen module="Standby" screen="Standby"/></item>
+                       <item text="Restart" entryID="restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
+                       <item level="2" text="Restart GUI" entryID="restart_enigma"><screen module="Standby" screen="TryQuitMainloop">3</screen></item>
+-                      <item text="Deep Standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
++                      <item text="Standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
+                       <item text="Shutdown" requires="!DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
+               </menu>
+ </menu>
+diff --git a/data/setup.xml b/data/setup.xml
+index 442fe13..0c25644 100755
+--- a/data/setup.xml
++++ b/data/setup.xml
+@@ -93,7 +93,7 @@
+               <setup key="lcd" title="Display Setup" requires="FrontpanelDisplay">
+                       <item level="0" text="Brightness">config.lcd.bright</item>
+                       <item level="0" text="Contrast">config.lcd.contrast</item>
+-                      <item level="0" text="Standby">config.lcd.standby</item>
++                      <item level="0" text="Idle Server Mode">config.lcd.standby</item>
+               </setup>
+               <setup key="satconfig" title="Sat / Dish Setup">
+                       <item text="Tuner Slot">config.sat.tunerslot</item>
+diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
+index 0ea65cd..2baadf9 100644
+--- a/lib/python/Components/ParentalControl.py
++++ b/lib/python/Components/ParentalControl.py
+@@ -26,8 +26,8 @@ def InitParentalControl():
+       config.ParentalControl = ConfigSubsection()
+       config.ParentalControl.configured = ConfigYesNo(default = False)
+       config.ParentalControl.mode = ConfigSelection(default = "simple", choices = [("simple", _("simple")), ("complex", _("complex"))])
+-      config.ParentalControl.storeservicepin = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until standby/restart"))])
+-      config.ParentalControl.storeservicepincancel = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until standby/restart"))])
++      config.ParentalControl.storeservicepin = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until idle server mode/restart"))])
++      config.ParentalControl.storeservicepincancel = ConfigSelection(default = "never", choices = [("never", _("never")), ("5", _("5 minutes")), ("30", _("30 minutes")), ("60", _("60 minutes")), ("standby", _("until idle server mode/restart"))])
+       config.ParentalControl.servicepinactive = ConfigYesNo(default = False)
+       config.ParentalControl.setuppinactive = ConfigYesNo(default = False)
+       config.ParentalControl.type = ConfigSelection(default = "blacklist", choices = [(LIST_WHITELIST, _("whitelist")), (LIST_BLACKLIST, _("blacklist"))])
+diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
+index b98be60..6584b7c 100644
+--- a/lib/python/Components/UsageConfig.py
++++ b/lib/python/Components/UsageConfig.py
+@@ -56,12 +56,12 @@ def InitUsageConfig():
+       config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [
+               ("show_menu", _("show shutdown menu")),
+               ("shutdown", _("immediate shutdown")),
+-              ("standby", _("Standby")) ] )
++              ("standby", _("Idle Server Mode")) ] )
+       
+       config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
+               ("show_menu", _("show shutdown menu")),
+               ("shutdown", _("immediate shutdown")),
+-              ("standby", _("Standby")) ] )
++              ("standby", _("Idle Server Mode")) ] )
+       config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
+diff --git a/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml b/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
+index b766e34..f208ec0 100644
+--- a/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
++++ b/lib/python/Plugins/SystemPlugins/Fancontrol/meta/plugin_fancontrol.xml
+@@ -6,8 +6,8 @@
+                     <author>ikseong</author>
+                     <name>Fancontrol</name>
+                     <packagename>enigma2-plugin-systemplugins-fancontrol</packagename>
+-                    <shortdescription>Fan Control setting in standbymode.</shortdescription>
+-                    <description>The Fan control turn on, turn off, modify fan action time on standbymode.
++                    <shortdescription>Fan Control setting in idle server mode.</shortdescription>
++                    <description>The Fan control turn on, turn off, modify fan action time on idle server mode.
+                     </description>
+           </info>
+         <files type="package"> <!-- without version, without .ipk -->
+diff --git a/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
+index d28fe8e..c90b6cd 100644
+--- a/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
++++ b/lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
+@@ -19,7 +19,7 @@ config.plugins.fancontrols.fanofftime = ConfigInteger(default = 60, limits = (1,
+ class FancontrolConfiguration(Screen, ConfigListScreen):
+       skin =  """
+-              <screen position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
++              <screen position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py b/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
+index e73d9a2..8deddf1 100755
+--- a/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
++++ b/lib/python/Plugins/SystemPlugins/HDMICEC/components/HdmiCec.py
+@@ -46,8 +46,8 @@ class HdmiCec:
+                       default = "wakeup,active,activevu")
+               config.hdmicec.vustandby_message = ConfigSelection(
+                       choices = {
+-                      "vustandby": _("VU standby"),
+-                      "vudeepstandby": _("VU DeepStandby"),
++                      "vustandby": _("VU Idle Server Mode"),
++                      "vudeepstandby": _("VU Standby"),
+                       "vunothing": _("Nothing"),
+                       },
+                       default = "vustandby")
+diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
+index 1151ec4..3db01e8 100755
+--- a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
++++ b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
+@@ -77,8 +77,8 @@ class HdmiCecPlugin(Screen,ConfigListScreen):
+               self.list = []
+               self.hdmienabled = getConfigListEntry(_(_("HDMI CEC enabled:")), config.hdmicec.enabled)
+               self.hdmiactivesourcereply = getConfigListEntry(_(_("Active Source Reply On:")), config.hdmicec.active_source_reply)
+-              self.hdmitvstandby = getConfigListEntry(_("VU standby => TV activity:"), config.hdmicec.standby_message)
+-              self.hdmitvdeepstandby = getConfigListEntry(_("VU deepstandby => TV activity:"), config.hdmicec.deepstandby_message)
++              self.hdmitvstandby = getConfigListEntry(_("VU idle server mode => TV activity:"), config.hdmicec.standby_message)
++              self.hdmitvdeepstandby = getConfigListEntry(_("VU standby => TV activity:"), config.hdmicec.deepstandby_message)
+               self.hdmitvwakeup = getConfigListEntry(_("VU on => TV activity:"), config.hdmicec.wakeup_message)
+               self.hdmivustandby = getConfigListEntry(_("TV standby => VU+ activity:"), config.hdmicec.vustandby_message)
+               self.hdmivuwakeup = getConfigListEntry(_("TV on => VU+ activity:"), config.hdmicec.vuwakeup_message)
+diff --git a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
+index 9d29a46..a9bc2a2 100755
+--- a/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
++++ b/lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
+@@ -100,7 +100,7 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
+               if self["config"].getCurrent() == self.brightness:
+                       self["current_entry"].setText("Touch LED Brightness at Normal state")
+               elif self["config"].getCurrent() == self.brightness_deepstandby:
+-                      self["current_entry"].setText("Touch LED Brightness at Deep Standby")
++                      self["current_entry"].setText("Touch LED Brightness at Standby")
+               elif self["config"].getCurrent() == self.blinkingtime:
+                       self["current_entry"].setText("Touch LED Blinking time")
+               self.setCurrentValue()
+@@ -127,7 +127,7 @@ class LEDBrightnessSetup(Screen,ConfigListScreen):
+       def createSetup(self):
+               self.list = []
+               self.brightness = getConfigListEntry(_("Normal state"), config.plugins.brightnesssetup.brightness)
+-              self.brightness_deepstandby = getConfigListEntry(_("Deep Standby"), config.plugins.brightnesssetup.brightnessdeepstandby)
++              self.brightness_deepstandby = getConfigListEntry(_("Standby"), config.plugins.brightnesssetup.brightnessdeepstandby)
+               self.blinkingtime = getConfigListEntry(_("Blinking time"), config.plugins.brightnesssetup.blinkingtime)
+               self.list.append( self.brightness )
+               self.list.append( self.brightness_deepstandby )
+diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml b/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
+index c4e814e..7327053 100755
+--- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
++++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/plugin_manualfancontrol.xml
+@@ -6,8 +6,8 @@
+                     <author>hschang</author>
+                     <name>ManualFancontrol</name>
+                     <packagename>enigma2-plugin-systemplugins-manualfancontrol</packagename>
+-                    <shortdescription>Fancontrol Settings inStandby Mode</shortdescription>
+-                    <description>Fancontrol Settings inStandby Mode</description>
++                    <shortdescription>Fancontrol Settings in Idle Server Mode</shortdescription>
++                    <description>Fancontrol Settings in Idle Server Mode</description>
+           </info>
+         <files type="package"> <!-- without version, without .ipk -->
+diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
+index f2da601..61ffa88 100755
+--- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
++++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
+@@ -11,7 +11,7 @@ from enigma import eTimer
+ class ManualFancontrol(Screen,ConfigListScreen):
+       skin =  """
+-              <screen position="center,center" size="400,270" title="Fancontrol Settings in Standby mode" >
++              <screen position="center,center" size="400,270" title="Fancontrol Settings in Idle Server Mode" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="30,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="230,10" size="140,40" alphatest="on" />
+@@ -92,7 +92,7 @@ class ManualFancontrol(Screen,ConfigListScreen):
+               self["config"].l.setList(self.list)
+       def configSetup(self):
+-              self.standbyEntry = getConfigListEntry(_("FanOFF InStanby"), config.plugins.manualfancontrols.standbymode)
++              self.standbyEntry = getConfigListEntry(_("FanOFF in Idle Server Mode"), config.plugins.manualfancontrols.standbymode)
+               self.pwmEntry = getConfigListEntry(_("PWM value"), config.plugins.manualfancontrols.pwmvalue)
+               self.periodEntry = getConfigListEntry(_("Status Check Period"), config.plugins.manualfancontrols.checkperiod)
+               if not self.displayCurrentValue in self["config"].onSelectionChanged:
+@@ -139,4 +139,4 @@ def main(session, **kwargs):
+       session.open(ManualFancontrol)
+ def Plugins(**kwargs):
+-      return [PluginDescriptor(name=_("Manual Fan control"), description="setup Fancontol inStandby mode", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main)]
++      return [PluginDescriptor(name=_("Manual Fan control"), description="setup Fancontol in idle server mode", where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main)]
+diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
+index 48f871f..d2588ec 100644
+--- a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
++++ b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
+@@ -125,8 +125,8 @@ class TempFanControl(Screen, ConfigListScreen):
+               for count in range(fancontrol.getFanCount()):
+                       self.list.append(getConfigListEntry(_("Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt))
+                       self.list.append(getConfigListEntry(_("Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm))
+-                      self.list.append(getConfigListEntry(_("Standby Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
+-                      self.list.append(getConfigListEntry(_("Standby Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
++                      self.list.append(getConfigListEntry(_("Idle Server Mode Fan %d Voltage") % (count + 1), fancontrol.getConfig(count).vlt_standby))
++                      self.list.append(getConfigListEntry(_("Idle Server Mode Fan %d PWM") % (count + 1), fancontrol.getConfig(count).pwm_standby))
+               
+               ConfigListScreen.__init__(self, self.list, session = self.session)
+               #self["config"].list = self.list
+diff --git a/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py b/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
+index bf29218..1acc43d 100644
+--- a/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
++++ b/lib/python/Plugins/SystemPlugins/WOLSetup/plugin.py
+@@ -27,7 +27,7 @@ _ethDevice = "eth0"
+ config.plugins.wolconfig = ConfigSubsection()
+ config.plugins.wolconfig.activate = ConfigYesNo(default = False)
+-config.plugins.wolconfig.location = ConfigSelection(default = "menu", choices = [("menu", _("Show on the Standby Menu")), ("deepstandby", _("Run at the Deep Standby"))])
++config.plugins.wolconfig.location = ConfigSelection(default = "menu", choices = [("menu", _("Show on the Standby Menu")), ("deepstandby", _("Run at the Standby"))])
+ import socket
+ class NetTool:
+@@ -189,7 +189,7 @@ def MenuSelected(selected, **kwargs):
+       if selected == "system":
+               return [(_("WakeOnLan Setup"), PluginMain, "wolconfig", 80)]
+       if selected == "shutdown" and config.plugins.wolconfig.activate.value and config.plugins.wolconfig.location.value == "menu":
+-              return [(_("Deep Standby with WOL"), DeepStandbyWOLMain, "deep_standby_wol", 80)]
++              return [(_("Standby with WOL"), DeepStandbyWOLMain, "deep_standby_wol", 80)]
+       return []
+ def Plugins(**kwargs):
+diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py
+index 1305b62..9f30c2d 100755
+--- a/lib/python/Screens/SleepTimerEdit.py
++++ b/lib/python/Screens/SleepTimerEdit.py
+@@ -79,12 +79,12 @@ class SleepTimerEdit(Screen):
+               
+               if config.SleepTimer.action.value == "shutdown":
+                       if SystemInfo["DeepstandbySupport"]:
+-                              shutdownString = _("Deep Standby")
++                              shutdownString = _("Standby")
+                       else:
+                               shutdownString = _("Shutdown")
+                       self["green_text"].setText(_("Sleep timer action:") + " " + shutdownString)
+               elif config.SleepTimer.action.value == "standby":
+-                      self["green_text"].setText(_("Sleep timer action:") + " " + _("Standby"))
++                      self["green_text"].setText(_("Sleep timer action:") + " " + _("Idle Server Mode"))
+               
+               if config.SleepTimer.ask.value:
+                       self["yellow_text"].setText(_("Ask before shutdown:") + " " + _("yes"))
+diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
+index dafc263..ad0157c 100755
+--- a/lib/python/Screens/TaskView.py
++++ b/lib/python/Screens/TaskView.py
+@@ -46,10 +46,10 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
+               self.settings = ConfigSubsection()
+               if SystemInfo["DeepstandbySupport"]:
+-                      shutdownString = _("go to deep standby")
++                      shutdownString = _("go to standby")
+               else:
+                       shutdownString = _("shut down")
+-              self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
++              self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to idle server mode")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
+               self.job.afterEvent = self.settings.afterEvent.getValue()
+               self.afterEventChangeable = afterEventChangeable
+               self.setupList()
+@@ -129,7 +129,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
+                               Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour STB. 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\nSTB to standby. Do that now?"), timeout = 20)
++                              Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSTB to idle server mode. Do that now?"), timeout = 20)
+       def checkNotifications(self):
+               InfoBarNotifications.checkNotifications(self)
+diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
+index 9885e70..c3e71c7 100644
+--- a/lib/python/Screens/TimerEntry.py
++++ b/lib/python/Screens/TimerEntry.py
+@@ -96,10 +96,10 @@ class TimerEntry(Screen, ConfigListScreen):
+                       self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
+                       if SystemInfo["DeepstandbySupport"]:
+-                              shutdownString = _("go to deep standby")
++                              shutdownString = _("go to standby")
+                       else:
+                               shutdownString = _("shut down")
+-                      self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to standby")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent)
++                      self.timerentry_afterevent = ConfigSelection(choices = [("nothing", _("do nothing")), ("standby", _("go to idle server mode")), ("deepstandby", shutdownString), ("auto", _("auto"))], default = afterevent)
+                       self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type)
+                       self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False)
+                       self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False)
+diff --git a/po/en.po b/po/en.po
+index 6937349..4ce5bad 100755
+--- a/po/en.po
++++ b/po/en.po
+@@ -445,6 +445,14 @@ msgstr ""
+ #
+ msgid ""
++"A finished record timer wants to set your\n"
++"Dreambox to idle server mode. Do that now?"
++msgstr ""
++"A finished record timer wants to set your\n"
++"Dreambox to idle server mode. Do that now?"
++
++#
++msgid ""
+ "A finished record timer wants to shut down\n"
+ "your Dreambox. Shutdown now?"
+ msgstr ""
+@@ -549,6 +557,22 @@ msgstr ""
+ #
+ msgid ""
++"A sleep timer wants to set your\n"
++"Dreambox to idle server mode. Do that now?"
++msgstr ""
++"A sleep timer wants to set your\n"
++"Dreambox to idle server mode. Do that now?"
++
++#
++msgid ""
++"A sleep timer wants to set your\n"
++"Dreambox to idle server mode.. Do that now?"
++msgstr ""
++"A sleep timer wants to set your\n"
++"Dreambox to idle server mode.. Do that now?"
++
++#
++msgid ""
+ "A sleep timer wants to shut down\n"
+ "your Dreambox. Shutdown now?"
+ msgstr ""
+@@ -3392,6 +3416,21 @@ msgstr "ISO path"
+ msgid "Icelandic"
+ msgstr "Icelandic"
++#
++msgid "Idle Server Mode"
++msgstr "Idle Server Mode"
++
++#
++#, python-format
++msgid "Idle Server Mode Fan %d PWM"
++msgstr "Idle Server Mode Fan %d PWM"
++
++#
++#, python-format
++msgid "Idle Server Mode Fan %d Voltage"
++msgstr "Idle Server Mode Fan %d Voltage"
++
++
+ msgid ""
+ "If a timer conflict occurs, AutoTimer will search outside the timespan for a "
+ "similar event and add it."
+@@ -9935,6 +9974,10 @@ msgid "go to standby"
+ msgstr "go to standby"
+ #
++msgid "go to idle server mode"
++msgstr "go to idle server mode"
++
++#
+ msgid "grab this frame as bitmap"
+ msgstr "grab this frame as bitmap"
+@@ -10648,6 +10691,10 @@ msgid "until standby/restart"
+ msgstr "until standby/restart"
+ #
++msgid "until idle server mode/restart"
++msgstr "until idle server mode/restart"
++
++#
+ msgid "use as HDD replacement"
+ msgstr "use as HDD replacement"
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name_skin.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_fix_standby_name_skin.patch
new file mode 100644 (file)
index 0000000..efb90a0
--- /dev/null
@@ -0,0 +1,62 @@
+diff --git a/data/750S/skin.xml b/data/750S/skin.xml
+index 541df3d..3be2f88 100644
+--- a/data/750S/skin.xml
++++ b/data/750S/skin.xml
+@@ -370,7 +370,7 @@
+                       <convert type="MenuEntryCompare">setup_selection</convert>
+                       <convert type="ConditionalShowHide"/>
+               </widget> 
+-              <widget source="menu" render="FixedLabel" text="-Standby" position="410,324" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
++              <widget source="menu" render="FixedLabel" text="-Idle Server Mode" position="410,324" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
+                       <convert type="MenuEntryCompare">standby_restart_list</convert>
+                       <convert type="ConditionalShowHide"/>
+               </widget>
+@@ -378,7 +378,7 @@
+                       <convert type="MenuEntryCompare">standby_restart_list</convert>
+                       <convert type="ConditionalShowHide"/>
+               </widget>
+-              <widget source="menu" render="FixedLabel" text="-Deep Standby" position="410,374" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
++              <widget source="menu" render="FixedLabel" text="-Standby" position="410,374" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
+                       <convert type="MenuEntryCompare">standby_restart_list</convert>
+                       <convert type="ConditionalShowHide"/>
+               </widget>
+@@ -2612,7 +2612,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+       </screen>
+       <!-- Fancontrol Plugin -->
+-      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
++      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
+               <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+               <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+@@ -2678,7 +2678,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
+       </screen>
+       <!-- Manual Fancontrol Plugin -->
+-      <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
++      <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Idle Server Mode" >
+               <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+               <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
+index 3e35405..a29a177 100644
+--- a/data/Vu_HD/skin.xml
++++ b/data/Vu_HD/skin.xml
+@@ -3135,7 +3135,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+       </screen>
+       <!-- Fancontrol Plugin -->
+-      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
++      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
+               <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="30,40" alphatest="on" />
+               <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="30,40" alphatest="on" />
+@@ -3202,7 +3202,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
+       </screen>
+       <!-- Manual Fancontrol Plugin -->
+-      <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
++      <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Idle Server Mode" >
+               <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+               <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="140,40" alphatest="on" />