TVSpielfilm] 1.2 tiny bugfixes

TVSpielfilm/src/db/tvs_mapping.txt

@@ -36,9 +36,32 @@ k1cla: kabel.*? c.*?,
 k1doku: kabel.*? d.*?,
 k1: kabel.*?,
 n24doku: n24 d.*?,
-welt: n24 .*?,
-sky1: sky 1.*?,
-sky1: sky one.*?,
+fln: Fine Living Network.*?,
+travelxp: travelxp.*?,
+rbtv: Rocket Beans TV.*?,
+cnn-m: CNN Money.*?,
+cnn-t: CNN Türk.*?,
+engb: euronews (en).*?,
+nhk: NHK World TV.*?,
+123tv: 123.tv.*?,
+atv-a: ATV Avrupa.*?,
+cplus: Canal+.*?,
+cplusc: Canal+ Cinéma.*?,
+cplusd: Canal+ Décalé.*?,
+cpluss: Canal+ Sport.*?,
+c5: Canale 5.*?,
+oe24tv: oe24.TV.*?,
+puls8: PULS acht.*?,
+shot: Show Turk.*?,
+tmax: Turkmax Gurme.*?,
+k7i: Kanal 7 Int.*?,
+euro-d: Euro D.*?,
+euro-s: Euro Star.*?,
+blum: Blue Movie.*?,
+blum2: Blue Movie 2.*?,
+blum3: Blue Movie 3.*?,
+mtv-n: MTV Brand New.*?,
+nowus: NOW US.*?,
 sky-a: sky .*?action.*?,
 skyat: sky .*?atlantic.*?,
 sky-c: sky .*?fun.*?,
@@ -53,22 +76,13 @@ sky-k: sky .*?krimi.*?,
 sky-cr: sky .*?crime.*?,
 sky-n: sky .*?classics.*?,
 sky-s: sky .*?select.*?,
-skyrp: sky .*?replay.*?,
+sky1: sky 1.*?,
+sky1: sky one.*?,
 cin24: sky .*?premieren.*?24.*?,
 cin: sky .*?premiere.*?,
 skyth: sky .*?thriller.*?,
 skycs: sky .*?special.*?,
-skych: sky .*?highlights.*?,
-skysh: sky .*?showcase.*?,
-xmas: sky .*?xmas.*?,
-xmas: sky .*?christmas.*?,
 sky-co: sky .*?comedy.*?,
-skysg: sky .*?sport.*? golf.*?,
-skysm: sky .*?sport.*? mix.*?,
-skysg: sky .*?sport.*? golf.*?,
-skyste: sky .*?sport.*? top.*?event.*?,
-skyspl: sky .*?sport.*? premier.*?league.*?,
-skyst: sky .*?sport.*? tennis.*?,
 skyf1: sky .*?sport.*? f1.*?,
 spo-a: sky .*?sport.*? austria.*?,
 hdspo: sky .*?sport.*? hd 1.*?,
@@ -97,8 +111,6 @@ unive: universal.*?,
 toggo: toggo.*?,
 rom: romance.*?tv.*?,
 heima: heimatkanal.*?,
-bio: biography.*?,
-bio: bio channel,
 tele5: tele 5.*?,
 anixe: anixe.*?,
 13th: 13th.*?,
@@ -109,7 +121,11 @@ arte: arte.*?,
 ntv: ntv.*?,
 cnn: cnn.*?,
 bbc: bbc w.*?,
+bbc1: BBC One.*?,
+bbc2: BBC Two.*?,
+bbc4: BBC Four.*?,
 bbc-e: bbc e.*?,
+bbc-n: BBC News.*?,
 dmax: dmax.*?,
 sp-ge: spiegel .*?geschichte.*?,
 sp-ge: spiegel .*?history.*?,
@@ -121,7 +137,6 @@ aplan: animal planet.*?,
 crin: crime \+ investigation.*?,
 plane: planet.*?,
 hddis: discovery.*?,
-disco: discovery channel.*?,
 n-gw: natgeo wild.*?,
 n-ghd: natgeo.*?,
 gusto: bon.*?gusto.*?,
@@ -135,14 +150,11 @@ sf2: srf.*?,
 sf2: srf2.*?,
 sf2: srf zwei.*?,
 hh1: hamburg 1,
-mue2: m.*?nchen2,
 tvm: m.*?nchen.tv,
 tvb: tv.berlin,
 leitv: leipzig fernsehen.*?,
-nrwtv: nrw.tv.*?,
 rmtv: rheinmain tv.*?,
 rnf: rnf.*?,
-sach: sachsen fernsehen.*?,
 orf1: orf 1.*?,
 orf1: orf1.*?,
 orf1: orf eins.*?,
@@ -159,17 +171,14 @@ atv2: atv2.*?,
 atv2: atv ii.*?,
 atv: atv .*?,
 puls4: puls 4.*?,
-boom: boomerang.*?,
 nickj: nick jr.*?,
 nick: nick.*?,
 nickt: nicktoons.*?,
 cc: comedy central.*?,
 c-net: cartoonnet.*?,
 c-net: cartoon net.*?,
-dcm: disney cinema.*?,
 disne: disney channel.*?,
 djun: disney junior.*?,
-dxd: disney xd.*?,
 disne: disney hd,
 junio: junior.*?,
 kika: kika.*?,
@@ -183,8 +192,6 @@ mtv-d: mtv da.*?.*?,
 mtv-d: club mtv.*?,
 mtv-h: mtv hi.*?.*?,
 mtv-l: mtv li.*?,
-viva: viva.*?,
-imt: im1,
 rck: rock tv.*?,
 juke: jukebox.*?,
 trace: trace.*?,
@@ -198,39 +205,30 @@ blm: bloomberg.*?,
 euron: euronews.*?,
 bibel: bibel tv.*?,
 ktv: kirchen tv.*?,
-timm: timm.*?,
 sklar: sonnenklar.*?,
 gold: goldstar tv,
-amax: animax,
 adult: adult channel.*?,
-dntv: das neue tv.*?,
-dwf: deutsches wetter.*?,
 e!: e!.*?,
 fatv: fashion tv.*?,
-famtv: family tv.*?,
 mezzo: mezzo.*?,
 nauch: nautical.*?,
-nl1: nl 1.*?,
-nl2: nl 2.*?,
-nl3: nl 3.*?,
-dr1: dr1.*?,
 be1: belgien.*?,
 fr24f: france24.*?fr.*?,
 fr24e: france24.*?en.*?,
 fra2: france 2.*?,
 fra3: france 3.*?,
+fra4: France 4.*?,
 fra5: france 5.*?,
-tv5: tv 2.*?,
-tv5: tv 5.*?,
+frao: France Ô.*?,
+tv2: TV2.*?,
+tv5: TV5.*?,
 ric: ric.*?,
 tlc: tlc.*?,
 sttv: star tv.*?,
-cente: center.tv.*?,
 sony: sony.*?,
 3plus: 3 plus.*?,
 3plus: 3\+.*?,
 mapo: marco polo.*?,
-trch: travel channel.*?,
 hgtv: home.*?garden.*?,
 hgtv: hgtv.*?,
 ch21: channel21.*?,
@@ -261,5 +259,10 @@ tnt-s: tnt .*?serie.*?,
 hse: hse .*?,
 qvc: qvc.*?,
 health: health.*?,
-df1: df1.*?,
 dmf: dmf.*?
+eotv: eoTV.*?,
+dr1: dr1.*?,
+dr2: DR2.*?,
+cnbc: CNBC.*?,
+qvcp: QVC2.*?,
+welt: n24 .*?