Index: ipk/source/settings_19_matze70_1.0/etc/enigma2/bouquets.radio
===================================================================
--- ipk/source/settings_19_matze70_1.0/etc/enigma2/bouquets.radio	(revision 16979)
+++ ipk/source/settings_19_matze70_1.0/etc/enigma2/bouquets.radio	(revision 16980)
@@ -1,4 +1,3 @@
 #NAME User - bouquets (Radio)
-#SERVICE 1:7:2:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.dbe02.radio" ORDER BY bouquet
-#SERVICE 1:7:2:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.dbe03.radio" ORDER BY bouquet
+#SERVICE 1:7:2:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.radio_deutsch.radio" ORDER BY bouquet
 #SERVICE 1:7:2:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.favourites.radio" ORDER BY bouquet
Index: ipk/source/settings_19_matze70_1.0/etc/enigma2/lamedb
===================================================================
--- ipk/source/settings_19_matze70_1.0/etc/enigma2/lamedb	(revision 16979)
+++ ipk/source/settings_19_matze70_1.0/etc/enigma2/lamedb	(revision 16980)
@@ -500,5 +500,5 @@
 /
 00c00000:0455:0001
-	s 12574250:22000000:0:2:192:2:0:1:2:0:2
+	s 12574000:22000000:0:2:192:2:0:1:2:0:2
 /
 00c00000:0456:0001
@@ -572,8 +572,8 @@
 /
 00c00000:000d:0085
-	s 11992500:27500000:0:9:192:2:0:1:1:0:2
+	s 11992000:27500000:0:9:192:2:0:1:1:0:2
 /
 00c00000:000e:0085
-	s 11875500:27500000:0:9:192:2:0:1:1:0:2
+	s 11875000:27500000:0:9:192:2:0:1:1:0:2
 /
 00c00000:000f:0085
@@ -1100,5 +1100,5 @@
 0701:00c00000:0005:0085:1:0
 †D‡AS† VIERTE‡
-p:BetaDigital
+p:BetaDigital,c:0007ff,c:010800,c:020024,c:0307ff
 1101:00820000:1644:fbff:1:0
 Doctor's Life
@@ -1661,5 +1661,5 @@
 700a:00c00000:0436:0001:1:0
 Nicktoons (S)
-p:MTV Networks Europe
+p:MTV Networks Europe,c:001019,c:01101a,c:031ffe,C:0500,C:098c,C:09c4,C:0d00,C:1702,C:1833
 760a:00c00000:0408:0001:1:0
 CINEMAGIC HD
@@ -2378,5 +2378,5 @@
 001c:00c00000:0011:0085:1:0
 †Disney‡ †XD‡
-p:SKY,C:1861
+p:SKY,c:0004ff,c:010500,c:020020,c:0304ff,C:098c,C:09af,C:09c4,C:09c7,C:1702,C:1722,C:1833,C:1834,C:1861
 071c:0082acce:0578:013e:1:0
 La Nuova TV
@@ -2444,5 +2444,5 @@
 2f1d:00c00000:0441:0001:1:0
 RTLNITRO
-p:RTL
+p:RTL,c:0000ad,c:010092,c:020054,c:0300ad
 401d:eeee0000:2203:2114:1:0
 TELE 5
@@ -2765,5 +2765,5 @@
 0025:00c00000:000f:0085:1:0
 †AXN‡ Action
-p:SKY,C:1833,C:1830
+p:SKY,C:1830,C:1833
 0325:00820000:3bc4:013e:1:0
 JCTV
@@ -2804,5 +2804,5 @@
 0026:00c00000:000f:0085:1:0
 †Romance‡ TV
-p:SKY,C:1833,C:1830
+p:SKY,C:1830,C:1833
 0126:0082afc2:0065:0001:1:0
 Radio Farda 294
@@ -2861,5 +2861,5 @@
 0027:00c00000:000f:0085:1:0
 Cartoon Network (S)
-p:SKY,C:1833
+p:SKY,c:0004ff,c:010500,c:0304ff,C:098c,C:09c4,C:1702,C:1833
 0127:0082afc2:0065:0001:1:0
 VOA Radio 295 (HB89-92)
@@ -3227,5 +3227,5 @@
 6e2e:00c00000:0431:0001:1:0
 rbb Berlin
-p:ARD
+p:ARD,c:000259,c:01025a,c:02025c,c:030259
 772e:00c00000:0416:0001:1:0
 C+ YOMVI
@@ -3257,5 +3257,5 @@
 132f:00c00000:03ef:0001:1:0
 ORF1 HD
-p:ORF,C:09c4,C:1833,C:1702,C:0648,C:0d95,C:0d05
+p:ORF,c:000780,c:010781,c:020785,c:030780,c:050001,C:0d05,C:0d95,C:0648,C:1702,C:1833,C:09c4,C:098c
 132f:00820000:33f4:013e:1:0
 Mejugorie Tv
@@ -3317,5 +3317,5 @@
 1330:00c00000:03ef:0001:1:0
 ORF2 HD
-p:ORF,C:09c4,C:1833,C:1702,C:0648,C:0d95,C:0d05
+p:ORF,C:0d05,C:0d95,C:0648,C:1702,C:1833,C:09c4,C:098c
 1330:00820000:33f4:013e:1:0
 TEF CHANNEL
@@ -3410,5 +3410,5 @@
 7031:00c00000:041b:0001:1:0
 tagesschau24
-p:ARD
+p:ARD,c:000065,c:010066,c:030065
 7731:00c00000:0416:0001:1:0
 HISTORIA
@@ -3467,5 +3467,5 @@
 7032:00c00000:041b:0001:1:0
 Einsfestival
-p:ARD
+p:ARD,c:0000c9,c:0200cc,c:0300c9,c:0400ce
 7732:00c00000:0416:0001:1:0
 EUROSPORT
@@ -3492,4 +3492,7 @@
 Sky Premiere
 p:BSkyB
+1333:00c00000:03ef:0001:1:0
+PVoD
+p:ServusTV,f:40
 2333:00eb0000:0c8f:0003:1:0
 MGM
@@ -3515,5 +3518,5 @@
 7033:00c00000:041b:0001:1:0
 EinsPlus
-p:ARD
+p:ARD,c:00012d,c:020130,c:03012d,c:040132
 d333:011a0000:096c:0002:1:0
 Premier Sports +
@@ -3701,5 +3704,5 @@
 0038:00c00000:000f:0085:1:0
 Boomerang
-p:SKY,C:1833
+p:SKY,c:0006ff,c:010700,c:0306ff,C:1833
 0138:00820000:3e1c:013f:1:0
 NRJ12
@@ -3845,5 +3848,5 @@
 003b:00c00000:000f:0085:1:0
 sportdigital
-p:SKY,C:1861,C:1830
+p:SKY,C:1830,C:1861
 133b:00820000:33f4:013e:1:0
 CTV AP
@@ -4373,5 +4376,5 @@
 6f47:00c00000:0445:0001:1:0
 BR-alpha
-p:ARD
+p:ARD,c:000579,c:02057c,c:030579,c:04057e
 c747:011a0000:096b:0002:1:0
 LOVEWORLD TV
@@ -7637,5 +7640,5 @@
 2e9a:00c00000:0405:0001:1:0
 SUPER RTL HD
-p:CBC
+p:CBC,c:00012c,c:020140,c:03012c,c:040136,c:050001,C:098c,C:09c4,C:1830,C:1843,C:1860
 769a:00c00000:041e:0001:1:0
 MULTIDEP.1
@@ -10346,5 +10349,5 @@
 6ee1:00c00000:04b1:0001:1:0
 Radio Bremen TV
-p:ARD
+p:ARD,c:0004b1,c:0104b2,c:0204b4,c:0304b1
 75e1:00c00000:0422:0001:1:0
 TEST_CSD4
@@ -10486,5 +10489,5 @@
 p:BSkyB
 2ee4:00c00000:0441:0001:1:0
-RTL HH SH
+RTL Regional NRW
 p:RTL World
 31e4:00c00000:045f:0035:1:0
@@ -10913,5 +10916,5 @@
 6ff0:00c00000:042a:0001:1:0
 VH1
-p:MTV Networks Europe
+p:MTV Networks Europe,c:000bf5,c:010bf6,c:031ffe,C:0100,C:0500,C:0b00,C:0d00,C:0d05,C:1810,C:1817,C:1818,C:1819
 77f0:00c00000:0404:0001:1:0
 BOING
@@ -14291,5 +14294,5 @@
 ef10:00c00000:0421:0001:25:0
 RTL HD
-p:CBC,C:1860,C:1843
+p:CBC,c:0000ff,c:020020,c:0300ff,c:040103,c:050001,C:1830,C:1843,C:1860
 0f11:011a0000:07ed:0002:25:0
 ESPN America HD
@@ -14300,5 +14303,5 @@
 ef11:00c00000:0421:0001:25:0
 VOX HD
-p:CBC,C:1860,C:1843
+p:CBC,c:0001ff,c:020021,c:0301ff,c:040203,c:050001,C:1830,C:1843,C:1860
 0f12:011a0000:07ed:0002:25:0
 Five HD
@@ -14309,5 +14312,5 @@
 ef14:00c00000:0421:0001:25:0
 SPORT1 HD
-p:BetaDigital,C:1860,C:1843
+p:BetaDigital,c:0004ff,c:0304ff,c:040503,c:050001,C:1830,C:1843,C:1860
 0015:00820000:3200:013e:25:0
 MTV Live HD
@@ -14315,5 +14318,5 @@
 ef15:00c00000:0421:0001:25:0
 RTL2 HD
-p:BetaDigital,C:1860,C:1843
+p:BetaDigital,c:0005ff,c:020025,c:0305ff,c:040603,c:050001,C:0648,C:098c,C:09c4,C:1830,C:1843,C:1860
 2b16:00820000:1900:fbff:25:0
 Cinema Comedy HD
@@ -14333,8 +14336,11 @@
 1519:00c00000:0455:0001:25:0
 TELE 5 HD
-p:BetaDigital,C:1860,C:1843
+p:BetaDigital,c:0001ff,c:020021,c:0301ff,c:040203,c:050001,C:1830,C:1843,C:1860
+151a:00c00000:0455:0001:25:0
+DMAX HD
+p:BetaDigital,c:0002ff,c:020022,c:0302ff,c:040303,c:050001,C:1830,C:1843,C:1860
 151b:00c00000:0455:0001:25:0
 Juwelo HD
-p:BetaDigital
+p:BetaDigital,c:0003ff,c:0303ff,c:040403,c:050001
 2b1b:00820000:1900:fbff:25:0
 Sky Sport24 HD
@@ -14450,5 +14456,5 @@
 283d:00c00000:03fb:0001:25:0
 Das Erste HD
-p:ARD
+p:ARD,c:0013ed,c:0213f0,c:0313ed,c:0413f2,c:050001
 1c3e:00820000:206c:fbff:25:0
 Sky Supercalcio HD
@@ -14459,5 +14465,5 @@
 283e:00c00000:03fb:0001:25:0
 arte HD
-p:ARD
+p:ARD,c:0013f7,c:0113f8,c:0213fa,c:0313f7,c:050001
 1c3f:00820000:206c:fbff:25:0
 Cinema Passion HD
@@ -14468,5 +14474,5 @@
 283f:00c00000:03fb:0001:25:0
 SWR BW HD
-p:ARD
+p:ARD,c:001401,c:021404,c:031401,c:041406,c:050001
 2340:00c00000:0442:0001:25:0
 DISCOVERY HD
@@ -14558,5 +14564,5 @@
 2857:00c00000:0401:0001:25:0
 NDR FS NDS HD
-p:ARD
+p:ARD,c:001465,c:011466,c:021468,c:031465,c:050001
 7857:00c00000:041a:0001:25:0
 C+COMEDIA HD
@@ -14612,5 +14618,5 @@
 285b:00c00000:0401:0001:25:0
 PHOENIX HD
-p:ARD
+p:ARD,c:00148d,c:01148e,c:021490,c:03148d,c:050001
 1e5c:00820000:15e0:fbff:25:0
 Sky Calcio 8 HD
@@ -14681,5 +14687,5 @@
 2b66:00c00000:03f3:0001:25:0
 ZDF HD
-p:ZDFvision
+p:ZDFvision,c:0017de,c:0217f2,c:0317de,c:0417ea,c:050001
 0f67:00820000:2198:fbff:25:0
 Primafila 13 HD
@@ -14696,5 +14702,5 @@
 0069:00c00000:000c:0085:25:0
 Sky †Sport‡ †HD‡ †Extra‡
-p:SKY,C:1861
+p:SKY,c:0000ff,c:020020,c:0300ff,c:040103,c:050001,C:1861
 1969:00c00000:044e:0001:25:0
 SERIE CLUB HD
@@ -14705,5 +14711,5 @@
 006a:00c00000:000c:0085:25:0
 Sky †Action HD‡
-p:SKY,C:1861
+p:SKY,c:0001ff,c:020020,c:0301ff,c:040203,c:050001,C:1861
 106a:00820000:2008:fbff:25:0
 Cinema 1 HD
@@ -14714,5 +14720,5 @@
 006b:00c00000:000c:0085:25:0
 †Sky‡ †Hits‡ †HD‡
-p:SKY,C:1861
+p:SKY,c:0002ff,c:020020,c:0302ff,c:040303,c:050001,C:1861
 246b:00c00000:0440:0001:25:0
 DISNEY MAGIC HD
@@ -14720,5 +14726,5 @@
 006c:00c00000:000c:0085:25:0
 Sky †Sport‡ †News‡ †HD‡
-p:SKY,C:1861
+p:SKY,c:0003ff,c:020020,c:0303ff,c:040403,c:050001,C:098c,C:09af,C:09c4,C:09c7,C:1833,C:1834,C:1861
 106c:00820000:2008:fbff:25:0
 Cinema Hits HD
@@ -14736,4 +14742,7 @@
 DISNEY HD
 p:CSAT
+006e:00c00000:000d:0085:25:0
+Sky †Atlantic‡ †HD‡
+p:SKY,c:0004ff,c:020020,c:0304ff,c:040503,c:050001,C:1861
 106e:00820000:2008:fbff:25:0
 Cinema Max HD
@@ -14744,5 +14753,5 @@
 006f:00c00000:000d:0085:25:0
 †Disney‡ †Cin‡emagic †HD‡
-p:SKY,C:1861
+p:SKY,c:0000ff,c:020020,c:0300ff,c:040103,c:050001,C:1861
 006f:00eb0000:271b:0085:25:0
 †Disney‡ Cinemagic †HD‡
@@ -14753,5 +14762,5 @@
 0070:00c00000:000d:0085:25:0
 †NatGeo‡ †HD‡
-p:SKY,C:1861
+p:SKY,c:0001ff,c:020020,c:0301ff,c:040203,c:050001,C:1861
 0070:00eb0000:271b:0085:25:0
 †NatGeo‡ †HD‡
@@ -14768,5 +14777,5 @@
 0071:00c00000:000d:0085:25:0
 †Hist‡ory †HD‡
-p:SKY,C:1861
+p:SKY,c:0002ff,c:020020,c:0302ff,c:040303,c:050001,C:1861
 0071:00eb0000:271b:0085:25:0
 †Hist‡ory †HD‡
@@ -14780,5 +14789,5 @@
 0072:00c00000:000d:0085:25:0
 Sky †Sport‡ †HD 2‡
-p:SKY,C:1861
+p:SKY,c:0003ff,c:020020,c:0303ff,c:040403,c:050001,C:1861
 0072:00eb0000:271b:0085:25:0
 Sky †Sport‡ †HD 2‡
@@ -14792,14 +14801,14 @@
 5273:00c00000:041d:0001:25:0
 NICK/CC HD
-p:MTV Networks,C:1860,C:1843
+p:MTV Networks,c:0001ff,c:0301ff,c:040203,c:050001,C:1830,C:1843,C:1860
 0074:00c00000:000b:0085:25:0
 †Disney‡ Channel †HD‡
-p:SKY,C:1861
+p:SKY,c:0003ff,c:020020,c:0303ff,c:040403,c:050001,C:1861
 5274:00c00000:041d:0001:25:0
 N24 HD
-p:BetaDigital,C:1860,C:1843
+p:BetaDigital,c:0002ff,c:020022,c:0302ff,c:040303,c:050001,C:1830,C:1843,C:1860
 ef74:00c00000:03f9:0001:25:0
 SAT.1 HD
-p:ProSiebenSat.1,C:1860,C:1843
+p:ProSiebenSat.1,c:0000ff,c:020020,c:0300ff,c:040103,c:050001,C:1860,C:1843,C:1830
 0075:00c00000:000b:0085:25:0
 †Sky‡ †3D‡
@@ -14810,8 +14819,8 @@
 ef75:00c00000:03f9:0001:25:0
 ProSieben HD
-p:ProSiebenSat.1,C:1860,C:1843
+p:ProSiebenSat.1,c:0001ff,c:020021,c:0301ff,c:040203,c:050001,C:1860,C:1843,C:1830
 0076:00c00000:000b:0085:25:0
 †N‡at †G‡eo †Wild‡ †HD‡
-p:SKY,C:1861
+p:SKY,c:0001ff,c:020020,c:0301ff,c:040203,c:050001,C:1861
 1b76:00eb0000:0c88:0003:25:0
 VTM HD
@@ -14822,8 +14831,8 @@
 ef76:00c00000:03f9:0001:25:0
 kabel eins HD
-p:ProSiebenSat.1,C:1860,C:1843
+p:ProSiebenSat.1,c:0002ff,c:020022,c:0302ff,c:040303,c:050001,C:1860,C:1843,C:1830
 0077:00c00000:000b:0085:25:0
 †ESPN‡ America †HD‡
-p:SKY,C:1861
+p:SKY,c:0002ff,c:020020,c:0302ff,c:040303,c:050001,C:1861
 2277:00c00000:0438:0001:25:0
 CANAL+ CINEMA HD
@@ -14831,5 +14840,5 @@
 ef77:00c00000:03f9:0001:25:0
 SIXX HD
-p:ProSiebenSat.1,C:1860,C:1843
+p:ProSiebenSat.1,c:0003ff,c:020023,c:0303ff,c:040403,c:050001,C:1860,C:1843,C:1830
 0078:00c00000:000e:0085:25:0
 Sky †Select‡ †HD‡
@@ -14861,8 +14870,8 @@
 2b7a:00c00000:03f3:0001:25:0
 zdf_neo HD
-p:ZDFvision
+p:ZDFvision,c:0018a6,c:0218ba,c:0318a6,c:0418b2,c:050001
 007b:00c00000:000e:0085:25:0
-.
-p:SKY,C:1861
+†TNT‡ †Serie‡ †HD‡
+p:SKY,c:0000ff,c:020020,c:0300ff,c:040103,c:050001,C:1861
 197b:00c00000:044e:0001:25:0
 M6 MUSIC HITS HD
@@ -14873,5 +14882,5 @@
 007c:00c00000:000e:0085:25:0
 Fox HD
-p:SKY,C:1861
+p:SKY,c:0001ff,c:020020,c:0301ff,c:040203,c:050001,C:1861
 197c:00c00000:044e:0001:25:0
 TF6 HD
@@ -14900,5 +14909,5 @@
 0081:00c00000:0006:0085:25:0
 Sky †Sport‡ †HD 1‡
-p:SKY,C:1861
+p:SKY,c:0002ff,c:020020,c:0302ff,c:040302,c:050001,C:1861
 6f81:00c00000:0457:0001:25:0
 WDR HD Wuppertal
@@ -14906,5 +14915,5 @@
 0082:00c00000:0006:0085:25:0
 †Disc‡overy †HD‡
-p:SKY,C:1861
+p:SKY,c:0003ff,c:020020,c:0303ff,c:040403,c:050001,C:1861
 6f82:00c00000:0457:0001:25:0
 WDR HD Bonn
@@ -14915,5 +14924,5 @@
 0083:00c00000:0006:0085:25:0
 Sky †Cinema‡ †HD‡
-p:SKY,C:1861
+p:SKY,c:0004ff,c:020020,c:0304ff,c:040503,c:050001,C:1861
 6f83:00c00000:0457:0001:25:0
 WDR HD Duisburg
@@ -14924,8 +14933,8 @@
 0084:00c00000:0006:0085:25:0
 †Eurosp‡ort †HD‡
-p:SKY,C:1861
+p:SKY,c:0005ff,c:020020,c:0305ff,c:040603,c:050001,C:1861
 2b84:00c00000:03f3:0001:25:0
 zdf.kultur HD
-p:ZDFvision
+p:ZDFvision,c:00190a,c:02191e,c:03190a,c:041916,c:050001
 7884:00c00000:0414:0001:25:0
 NG WILD HD
@@ -14969,5 +14978,5 @@
 2b98:00c00000:03f2:0001:25:0
 KiKA HD
-p:ZDFvision
+p:ZDFvision,c:0019d2,c:0119dc,c:0219e6,c:0319d2,c:050001
 379c:00820000:14b4:fbff:25:0
 NationalGeo HD
@@ -14981,5 +14990,5 @@
 2ba2:00c00000:03f2:0001:25:0
 ZDFinfo HD
-p:ZDFvision
+p:ZDFvision,c:001a36,c:021a4a,c:031a36,c:041a42,c:050001
 6ea5:00c00000:04b1:0001:25:0
 WDR HD Köln
@@ -14993,5 +15002,5 @@
 6ea7:00c00000:04b1:0001:25:0
 WDR HD Dortmund
-p:ARD
+p:ARD,c:00157d,c:0201f8,c:03157d,c:041582,c:050001
 37a8:00820000:14b4:fbff:25:0
 Sky 3D
@@ -15083,5 +15092,5 @@
 6fb8:00c00000:042c:0001:25:0
 MTV Live HD
-p:MTV Networks Europe
+p:MTV Networks Europe,c:0007d0,c:0307d0,c:0407d2,c:050001,C:0100,C:0500,C:098c,C:09c4,C:0d00,C:1810,C:1811,C:1817,C:1818,C:1
 13b9:00eb0000:0c95:0003:25:0
 Eurosport HD DUT
@@ -15209,5 +15218,5 @@
 6eec:00c00000:04b1:0001:25:0
 Einsfestival HD
-p:ARD
+p:ARD,c:000641,c:010642,c:030641,c:050001
 0ef8:011a0000:07e4:0002:25:0
 National Geographic HD
@@ -16338,10 +16347,4 @@
 ikusi
 p:SkyItalia
-151a:00c00000:0455:0001:25:0
-DMAX HD
-p:BetaDigital,C:1860,C:1843
-006e:00c00000:000d:0085:25:0
-Sky Atlantic HD
-p:SKY,C:1861
 end
-Edited with DreamBoxEdit-IHAD Edition 4.1.0.1 on 16Mai2012 15:30:20
+Edited with DreamBoxEdit-IHAD Edition 4.1.0.1 on 17Jun2012 19:33:45
Index: ipk/source/settings_19_matze70_1.0/etc/enigma2/userbouquet.hdtv_sky_hd.tv
===================================================================
--- ipk/source/settings_19_matze70_1.0/etc/enigma2/userbouquet.hdtv_sky_hd.tv	(revision 16979)
+++ ipk/source/settings_19_matze70_1.0/etc/enigma2/userbouquet.hdtv_sky_hd.tv	(revision 16980)
@@ -17,8 +17,9 @@
 #SERVICE 1:0:19:6A:C:85:C00000:0:0:0:
 #SERVICE 1:0:19:6B:C:85:C00000:0:0:0:
+#SERVICE 1:0:19:6E:D:85:C00000:0:0:0:
 #SERVICE 1:0:19:74:B:85:C00000:0:0:0:
 #SERVICE 1:0:19:6F:D:85:C00000:0:0:0:
-#SERVICE 1:0:19:6E:D:85:C00000:0:0:0:
 #SERVICE 1:0:19:7C:E:85:C00000:0:0:0:
+#SERVICE 1:0:19:7B:E:85:C00000:0:0:0:
 #SERVICE 1:0:19:81:6:85:C00000:0:0:0:
 #SERVICE 1:0:19:72:D:85:C00000:0:0:0: