Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --combined data/skin_default.xml
index df07e4d7fcfc1af99a6bff9cefdb7cfd0d79c35a,1bf410c90a2cf55ee7b2d59c4f1946e16b7b36d5..582a169b0bb835a808940430d5913cf4946b92ab
--- 1/data/skin_default.xml
--- 2/data/skin_default.xml
+++ b/data/skin_default.xml
@@@ -109,7 -109,7 +109,7 @@@
                </widget>
        </screen>
        <!-- Channel selection - Radio -->
 -      <screen name="ChannelSelectionRadio" position="center,center" size="560,298" title="Channel Selection">
 +      <screen name="ChannelSelectionRadio" position="center,95" size="560,298" title="Channel Selection">
                <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
                <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
                <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
@@@ -700,7 -700,7 +700,7 @@@ self.instance.move(ePoint(orgpos.x() + 
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" />
        </screen>
        <!-- Radio infobar -->
 -      <screen name="RadioInfoBar" position="85,408" size="560,120" zPosition="-1" title="Radio">
 +      <screen name="RadioInfoBar" position="center,408" size="560,120" zPosition="-1" title="Radio">
                <widget source="session.CurrentService" render="Label" position="5,1" size="325,26" font="Regular;20" noWrap="1" transparent="1">
                        <convert type="ServiceName">Name</convert>
                </widget>
@@@ -893,16 -893,16 +893,16 @@@
                <widget source="introduction" render="Label" position="0,370" size="560,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
        </screen>
        <!-- Sleeptimer edit -->
-       <screen name="SleepTimerEdit" position="center,center" size="500,200" title="Sleep Timer">
+       <screen name="SleepTimerEdit" position="center,center" size="500,240" title="Sleep Timer">
                <widget name="current_status" position="40,40" size="400,30" valign="center" font="Regular;20" />
                <widget name="red" pixmap="skin_default/buttons/button_red.png" position="10,88" size="12,12" alphatest="on" />
                <widget name="green" pixmap="skin_default/buttons/button_green.png" position="10,128" size="12,12" alphatest="on" />
                <widget name="yellow" pixmap="skin_default/buttons/button_yellow.png" position="10,168" size="12,12" alphatest="on" />
-               <widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,168" size="12,12" alphatest="on" />
+               <widget name="blue" pixmap="skin_default/buttons/button_blue.png" position="10,208" size="12,12" alphatest="on" />
                <widget name="red_text" position="40,80" size="400,30" valign="center" font="Regular;20" />
                <widget name="green_text" position="40,120" size="400,30" valign="center" font="Regular;20" />
                <widget name="yellow_text" position="40,160" size="400,30" valign="center" font="Regular;20" />
-               <widget name="blue_text" position="40,200" size="400,30" valign="center" font="Regular;20" />
+               <widget name="blue_text" position="40,200" size="450,30" valign="center" font="Regular;20" />
                <widget name="pretext" position="15,10" size="235,25" font="Regular;19" />
                <widget name="input" position="260,10" size="40,25" font="Regular;19" />
                <widget name="aftertext" position="305,10" size="100,25" font="Regular;19" />