[PATCH][media] Remove channels-conf directory as no longer kept up to date

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The channels-conf diretory contained only a few channel listings.
The last change was in 2013 on one file, where as the rest were
last changed around 2004/2007.

These files are now wholly out of date and are best removed.

Signed-off-by: Bob Goddard <linuxtv@xxxxxxxxxxxxxxxxxxxxxx>
---
 channels-conf/atsc/us-Raleigh-Durham   |   8 -
 channels-conf/dvb-c/de-Berlin          | 171 -----------
 channels-conf/dvb-s/Astra-19.2E        | 226 --------------
 channels-conf/dvb-s/Astra-28.2E        | 522 ---------------------------------
 channels-conf/dvb-s/BrasilSat-B3-84.0W |  39 ---
 channels-conf/dvb-t/au-Adelaide        |  28 --
 channels-conf/dvb-t/au-Brisbane        |  29 --
 channels-conf/dvb-t/au-Hobart          |  18 --
 channels-conf/dvb-t/au-Melbourne       |  17 --
 channels-conf/dvb-t/au-Sydney          |  34 ---
 channels-conf/dvb-t/cz-Praha           |  16 -
 channels-conf/dvb-t/de-Berlin          |  47 ---
 channels-conf/dvb-t/de-Braunschweig    |  25 --
 channels-conf/dvb-t/de-Bremen          |  25 --
 channels-conf/dvb-t/de-Koeln-Bonn      |  23 --
 channels-conf/dvb-t/de-Leipzig         |   7 -
 channels-conf/dvb-t/de-Luebeck         |  22 --
 channels-conf/dvb-t/de-Rhein-Main      |   6 -
 channels-conf/dvb-t/de-Ruhrgebiet      |  46 ---
 channels-conf/dvb-t/es-Alpicat         |  19 --
 channels-conf/dvb-t/es-Collserola      |  19 --
 channels-conf/dvb-t/es-Madrid          |  26 --
 channels-conf/dvb-t/es-Mussara         |  19 --
 channels-conf/dvb-t/tw-All             |  21 --
 channels-conf/dvb-t/uk-Crystal-Palace  |  67 -----
 channels-conf/dvb-t/uk-Hannington      |  28 --
 channels-conf/dvb-t/uk-Oxford          |  41 ---
 channels-conf/dvb-t/uk-Reigate         |  51 ----
 channels-conf/dvb-t/uk-Sandy-Heath     |  12 -
 29 files changed, 1612 deletions(-)
 delete mode 100644 channels-conf/atsc/us-Raleigh-Durham
 delete mode 100644 channels-conf/dvb-c/de-Berlin
 delete mode 100644 channels-conf/dvb-s/Astra-19.2E
 delete mode 100644 channels-conf/dvb-s/Astra-28.2E
 delete mode 100644 channels-conf/dvb-s/BrasilSat-B3-84.0W
 delete mode 100644 channels-conf/dvb-t/au-Adelaide
 delete mode 100644 channels-conf/dvb-t/au-Brisbane
 delete mode 100644 channels-conf/dvb-t/au-Hobart
 delete mode 100644 channels-conf/dvb-t/au-Melbourne
 delete mode 100644 channels-conf/dvb-t/au-Sydney
 delete mode 100644 channels-conf/dvb-t/cz-Praha
 delete mode 100644 channels-conf/dvb-t/de-Berlin
 delete mode 100644 channels-conf/dvb-t/de-Braunschweig
 delete mode 100644 channels-conf/dvb-t/de-Bremen
 delete mode 100644 channels-conf/dvb-t/de-Koeln-Bonn
 delete mode 100644 channels-conf/dvb-t/de-Leipzig
 delete mode 100644 channels-conf/dvb-t/de-Luebeck
 delete mode 100644 channels-conf/dvb-t/de-Rhein-Main
 delete mode 100644 channels-conf/dvb-t/de-Ruhrgebiet
 delete mode 100644 channels-conf/dvb-t/es-Alpicat
 delete mode 100644 channels-conf/dvb-t/es-Collserola
 delete mode 100644 channels-conf/dvb-t/es-Madrid
 delete mode 100644 channels-conf/dvb-t/es-Mussara
 delete mode 100644 channels-conf/dvb-t/tw-All
 delete mode 100644 channels-conf/dvb-t/uk-Crystal-Palace
 delete mode 100644 channels-conf/dvb-t/uk-Hannington
 delete mode 100644 channels-conf/dvb-t/uk-Oxford
 delete mode 100644 channels-conf/dvb-t/uk-Reigate
 delete mode 100644 channels-conf/dvb-t/uk-Sandy-Heath

diff --git a/channels-conf/atsc/us-Raleigh-Durham b/channels-conf/atsc/us-Raleigh-Durham
deleted file mode 100644
index 48d14d2..0000000
--- a/channels-conf/atsc/us-Raleigh-Durham
+++ /dev/null
@@ -1,8 +0,0 @@
-# Most of the major channels in the Raleigh Durham Area.  Frequencies the NTSC center freq.
-WRAL:707000000:8VSB:33:36
-WNCN:719000000:8VSB:49:52
-WTVD:701000000:8VSB:49:52
-WRAZ:683000000:8VSB:49:52
-WUNC:743000000:8VSB:49:52
-WRDU:551000000:8VSB:33:36
-WLFL:731000000:8VSB:33:36
diff --git a/channels-conf/dvb-c/de-Berlin b/channels-conf/dvb-c/de-Berlin
deleted file mode 100644
index 0f2cafd..0000000
--- a/channels-conf/dvb-c/de-Berlin
+++ /dev/null
@@ -1,171 +0,0 @@
-3sat:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:210:220
-ARD-Online-Kanal:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1805
-CNBC:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:510:520
-DLF-Köln:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:810
-DLR-Berlin:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:710
-EinsExtra:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:101:102
-EinsFestival:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:201:202
-EinsMuXx:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:301:302
-EuroNews:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2221:2233
-Eurosport:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:410:420
-Fritz:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:901
-KiKa:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:310:320
-MDR FERNSEHEN:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:401:402
-MDR KULTUR:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:801
-MDR info:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1101
-MHP ARD Online-Kanal:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:102
-NDR Fernsehen:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2401:2402
-ORB-Fernsehen:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:501:502
-RADIOmultikulti:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1301
-Radio 3:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:701
-SFB1:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:601:602
-SWR2:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1401
-SÜDWEST BW:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:801:802
-SÜDWEST RP:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:3101:3102
-WDR 3:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1501
-WDR 5:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1601
-ZDF:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:110:120
-ZDFdigitext:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-ZDFdokukanal:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:660:670
-ZDFinfokanal:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:610:620
-ZDFtheaterkanal:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-JUMP:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1001
-SPUTNIK:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1201
-Österreich 1:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:169
-ATV 2:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:631:632
-ATV 2:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:631:632
-Adagio:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-All Jazz:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Avante:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:741:743
-B5 aktuell:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3101
-BBC Prime:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:761:762
-BData3:402000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-BData4:402000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-BData5:402000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-BR-alpha:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:701:702
-Barock Fantasie:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Bayerisches FS:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:201:202
-Bayern 1:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3601
-Bayern 4 Klassik:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3001
-BibelTV:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:731:732
-Bloomberg:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-CLASSICA:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:767:768
-COUNTRY:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:656
-Canal 24 Horas:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:991:992
-Club:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:711:713
-Cristal New Age:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-DANCE:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:304
-DW-tv:610000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:634:632
-Das Erste:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:101:102
-Detskij Mir:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:931:932
-ERT-Sat:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:691:692
-Einstein TV:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:701:702
-Euronews:610000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:597:596
-Eurosport News:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:771:772
-Extreme Sports:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:791:793
-Extreme Sports:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Fashion TV:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Fox Kids:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:671:672
-Fox Kids:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:671:673
-GOLD:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:320
-HITLISTE:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:784
-HR XXL:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3501
-JAZZ:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:640
-Jazz legends:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Kabel Wizard:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Kanal 7:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Kanal 7:610000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:49:52
-Kanal D:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:651:652
-Kanal D:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:651:652
-LATIN:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:368
-Landscape:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Leitseite:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2254:0
-Liberty TV:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:721:723
-MTV Base:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:781:782
-MV-Test:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Modem-Setup:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Movie Sounds:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Musica Antica:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-Musica Camerata:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-NDR Info:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3701
-NTV international:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-NTVI:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:611:612
-Nashe Kino:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:621:622
-NordwestRadio:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3801
-OLD GOLD:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:336
-Opernfestival:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-PCNE:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:681:682
-PREMIERE SPORT INTERACTIVE:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-PREMIERE DIREKT 1:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-PREMIERE DIREKT 2:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-PREMIERE DIREKT 3:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-PREMIERE DIREKT 4:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2815:2816
-PREMIERE EROTIK:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1279:1280
-PREMIERE NOSTALGIE:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2559:2560
-PREMIERE SERIE:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1023:1024
-PREMIERE SPORT 1:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:255:258
-PREMIERE SPORT 2:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:3839:3840
-PREMIERE START:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:255:256
-Parlamentsfernsehen:610000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:33:36
-Phoenix:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:901:902
-Portal:402000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-RTP Internacional:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:661:662
-Rai 1:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:951:952
-Rai 2:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:961:962
-Rai 3:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:971:972
-SCHLAGER:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:384
-SR 1:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3901
-SR Fernsehen Suedwest:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:501:502
-Show TV:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:911:912
-Sinfonica:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-TGRT:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:921:922
-TM V1.0:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-TV Polonia:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:641:642
-TVEi:121000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:981:982
-TW1:113000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:751:752
-Test-R:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:701:702
-Travel:610000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:595:594
-VCR-Setup:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-VH1 Classic:610000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:604:603
-Videotext:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-WDR FERNSEHEN:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:601:602
-ZEE TV:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-arte:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:401:403
-hessen fernsehen:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:301:302
-hr-chronos:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3201
-hr-klassik:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3401
-hr2:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:3301
-13 TH STREET:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2303:2304
-ALTERNATIVE ROCK:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:544
-BEATE-UHSE.TV:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1023:1024
-CHILLOUT:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:400
-CLASSIC ROCK:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:352
-DISCOVERY CHANNEL:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1791:1792
-DISNEY CHANNEL:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2559:2560
-DEUTSCHE HITS:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:800
-EASY LISTENING:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:608
-Einstein:346000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-FILM & MUSICAL:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:592
-FOX KIDS:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1279:1280
-GOLDSTAR TV:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:3839:3840
-HARD ROCK:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:816
-HEIMATKANAL:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1535:1536
-HIP HOP/R&B:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:576
-JUNIOR:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:255:256
-K-TOON:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-KLASSIK POPULÄR:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:624
-KRIMI &CO:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1535:1536
-LOVE SONGS:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:592
-NEW COUNTRY:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:384
-ORCHESTRALE WERKE:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:560
-PLANET:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1791:1792
-PREMIERE 1:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:511:512
-PREMIERE 2:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1791:1793
-PREMIERE 3:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2303:2304
-PREMIERE 4:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:767:768
-PREMIERE 5:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1279:1280
-PREMIERE 6:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1535:1536
-PREMIERE 7:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1023:1024
-SOUL CLASSICS:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:352
-STUDIO UNIVERSAL:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:2047:2048
-Sonnenklar TV:402000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
diff --git a/channels-conf/dvb-s/Astra-19.2E b/channels-conf/dvb-s/Astra-19.2E
deleted file mode 100644
index 6e634b9..0000000
--- a/channels-conf/dvb-s/Astra-19.2E
+++ /dev/null
@@ -1,226 +0,0 @@
-Das Erste:11837:h:0:27500:101:102:28106
-ZDF:11954:h:0:27500:110:120:28006
-3sat:11954:h:0:27500:210:220:28007
-EinsMuXx:12110:h:0:27500:301:302:28203
-EinsFestival:12110:h:0:27500:201:202:28202
-EinsExtra:12110:h:0:27500:101:102:28201
-MDR FERNSEHEN:12110:h:0:27500:401:402:28204
-ORB-Fernsehen:12110:h:0:27500:501:502:28205
-B1 Berlin:12110:h:0:27500:601:602:28206
-SWR Fernsehen:11837:h:0:27500:801:802:28113
-SR Fernsehen Suedwes:11837:h:0:27500:501:502:28110
-hessen fernsehen:11837:h:0:27500:301:302:28108
-WDR FERNSEHEN:11837:h:0:27500:601:602:28111
-Bayerisches FS:11837:h:0:27500:201:202:28107
-N3:12110:h:0:27500:2401:2402:28224
-BR-alpha:11837:h:0:27500:701:702:28112
-KiKa:11954:h:0:27500:310:320:28008
-arte:11836:h:0:27500:401:402:28109
-ZDF Theaterkanal:11954:h:0:27500:1110:1120:28016
-ZDF.info:11954:h:0:27500:610:620:28011
-ZDF.doku:11954:h:0:27500:660:670:28014
-Phoenix:11837:h:0:27500:901:902:28114
-DW-tv:10786:v:0:21997:305:306:9005
-RTL Television:12188:h:0:27500:163:104:12003
-SAT.1:12480:v:0:27500:1791:1792:46
-ProSieben:12480:v:0:27500:255:256:898
-RTL2:12188:h:0:27500:166:128:12020
-Super RTL:12188:h:0:27500:165:120:12040
-KABEL1:12480:v:0:27500:511:512:899
-VOX:12188:h:0:27500:167:136:12060
-tm3:12480:v:0:27500:767:768:897
-Bloomberg TV Germany:12552:v:0:22000:162:99:12160
-EuroNews:11954:h:0:27500:2221:2233:28015
-N24:12480:v:0:27500:2047:2048:47
-n-tv:12670:v:0:22000:162:96:12730
-DSF:12480:v:0:27500:1023:1024:900
-Eurosport:11954:h:0:27500:410:420:28009
-Via 1 - Sch ner Re:12148:h:0:27500:511:512:44
-Home Order Tel:12480:v:0:27500:1279:1280:40
-QVC GERMANY:12552:v:0:22000:165:166:12100
-TW 1:12692:h:0:22000:166:167:13013
-Canal Canarias:12441:v:0:27500:513:681:29700
-ProSieben A:12051:v:0:27500:161:84:20002
-ProSieben CH:12051:v:0:27500:289:290:20001
-Kabel 1 Austria:12051:v:0:27500:166:167:20004
-Kabel 1 Schweiz:12051:v:0:27500:162:163:20003
-CNN Int.:12168:v:0:27500:165:100:28512
-Sky News:12552:v:0:22000:305:306:3995
-Travel:12168:v:0:27500:163:92:28001
-AB SAT / XXL:12266:h:0:27500:164:96:17004
-MOTEURS:12266:h:0:27500:160:80:17000
-HOT GM:12148:h:0:27500:767:768:45
-KTO:12129:v:0:27500:170:120:8411
-LA CINQUIEME:12207:v:0:27500:160:80:8501
-LCP:12207:v:0:27500:165:100:8506
-LibertyTV.com:12611:v:0:22000:941:942:12280
-TV5 Europe:12611:v:0:22000:45:46:12240
-Motors TV:12611:v:0:22000:191:194:12300
-Wishline:12611:v:0:22000:214:216:12320
-TV 5:10786:v:0:21997:164:112:9001
-RTM - MAROC:10786:v:0:21997:162:96:9002
-ESC1 - EGYPTE:10786:v:0:21997:163:104:9003
-RAI 1:10786:v:0:21997:289:290:9004
-RTPI:10786:v:0:21997:300:301:9006
-TV7:10786:v:0:21997:166:128:9007
-ARTE:10786:v:0:21997:167:136:9009
-Colourbars:12611:v:0:22000:48:49:3982
-Alice:12611:v:0:22000:162:96:12200
-Video Italia:12611:v:0:22000:121:122:12220
-ANDALUCIA TV:11934:v:0:27500:166:104:29011
-TVC INT.:12441:v:0:27500:512:660:29701
-TV4:11992:h:0:27500:165:98:20365
-TV Niepokalanow:11876:h:0:27500:161:82:20601
-VIVA:12670:v:0:22000:309:310:12732
-VIVA ZWEI:12552:v:0:22000:171:172:12120
-MTV Central:12699:v:0:22000:3031:3032:28643
-ONYX:12692:h:1:27500:161:84:502
-VIVA polska:11603:h:1:27500:190:191:611
-DeeJay TV:11603:h:1:27500:160:161:602
-NBC:11053:h:1:27500:550:551:8008
-EWTN:10722:h:1:29900:1001:1201:4601
-MTA INTL:10722:h:1:29900:1004:1204:4604
-VOX:11053:h:1:27500:500:501:8002
-SAT.1 A:11053:h:1:27500:511:512:8003
-RTL2 AUSTRIA:11053:h:1:27500:520:521:8004
-ZDF:11053:h:1:27500:570:571:8011
-K-TV:11053:h:1:27500:580:581:8012
-RTL Television:11053:h:1:27500:160:80:8001
-ARTE:11059:v:1:6510:98:99:1
-HOT Italia:11095:h:1:27500:4194:4195:3714
-Olisat:11095:h:1:27500:33:34:3718
-VIVA-POLSKA:11128:h:1:4340:98:99:1
-DW-tv:11195:v:1:9099:101:102:5301
-Canal 24 Horas:11203:h:1:3999:4130:4131:5301
-TV5:11337:v:1:5631:512:640:1
-SAT.1 CH:11603:h:1:27500:101:102:601
-KurdSat:11603:h:1:27500:111:112:603
-ARD "Das Erste":11603:h:1:27500:172:173:606
-RTL 2 CH:11603:h:1:27500:175:176:609
-Super RTL A:11603:h:1:27500:180:181:610
-TV ROMANIA:11622:v:1:27500:227:247:10707
-MRTV:11622:v:1:27500:222:242:10702
-102.5 HIT Ch:11622:v:1:27500:224:244:10704
-TLC SAT:11622:v:1:27500:225:245:10705
-PRO-SAT:11622:v:1:27500:246:226:10706
-Channel SUN:11622:v:1:27500:229:249:10709
-Racing Channel:11622:v:1:27500:228:248:10708
-3 ABN:11622:v:1:27500:221:241:10701
-Bloom.Germany:11642:h:1:27500:1460:1420:4
-Bloomberg TV UK:11642:h:1:27500:1560:1520:4
-Sat 7:11642:h:1:27500:1660:1620:4
-EDTV 1:11746:h:1:27500:4130:4131:9501
-EDTV SPORT:11746:h:1:27500:4386:4387:9502
-EDTV BUSINESS:11746:h:1:27500:4642:4643:9503
-EDTV DRAMA:11746:h:1:27500:4898:4899:9504
-RAI1:11765:v:1:27499:160:80:3401
-RAI2:11765:v:1:27499:161:84:3402
-RAI3:11765:v:1:27499:162:88:3403
-RaiWayTEST2:11765:v:1:27499:516:654:3405
-RAIMOSAICO:11765:v:1:27499:518:8191:3407
-RAINews24:11803:v:1:27500:516:654:3301
-CAMERA DEPUTATI:11803:v:1:27500:517:655:3302
-TELEPACE:11803:v:1:27500:515:653:3304
-RAISPORTSAT:11803:v:1:27500:512:650:3305
-RAINettunoSAT2:11803:v:1:27500:513:651:3306
-RAIeducational:11803:v:1:27500:514:652:3307
-RAINettunoSAT1:11803:v:1:27500:519:657:3308
-SAT2000:11803:v:1:27500:518:656:3309
-I1:11918:v:1:27499:512:650:1
-C5:11918:v:1:27499:513:660:2
-R4:11918:v:1:27499:514:670:3
-Telesierra:12091:h:1:27500:4160:4161:8704
-C. Milagro:12091:h:1:27500:4368:4369:8711
-Italia Sat:12091:h:1:27500:4600:4601:8728
-TVE Internacional:12091:h:1:27500:4208:4209:8707
-Fiesta:12091:h:1:27500:4432:4433:8720
-Retelsat:12091:h:1:27500:4464:4465:8722
-ART EUROPE:12013:h:1:27495:164:96:450
-EGYPT SAT. CH. 2:12013:h:1:27495:166:104:470
-IQRA:12013:h:1:27495:168:112:474
-MAURITANIA TV:12110:v:1:27500:230:231:704
-ARMENIA TV:12110:v:1:27500:240:241:705
-SAILING CHANNEL:12110:v:1:27500:260:261:707
-AL JAZEERA:12110:v:1:27500:270:271:708
-Coming Soon TV:12110:v:1:27500:310:311:717
-SaluteBenessere:12110:v:1:27500:320:321:718
-AH-EDP1:12148:v:1:27499:96:97:7201
-AH-EDP2:12148:v:1:27499:112:113:7202
-Espresso:12148:v:1:27499:192:193:7203
-Alice:12148:v:1:27499:160:161:7220
-Nuvolari:12148:v:1:27499:176:177:7221
-Leonardo:12148:v:1:27499:128:129:7222
-AH-EDP3:12148:v:1:27499:36:37:7205
-OTE Promo:12187:v:1:27500:517:655:1001
-RTS SAT:12187:v:1:27500:519:657:1022
-ERT SAT:12187:v:1:27500:514:652:1102
-EXTRA:12187:v:1:27500:516:654:1106
-TRIAL:12187:v:1:27500:513:651:1108
-Minimax:11303:h:1:19540:300:301:3
-TVN1:12209:h:1:5631:4194:4195:1
-RR TEST:10978:v:1:8998:33:34:1
-TV 5 Thailand:10978:v:1:8998:1057:1058:2
-TEST-1:10978:v:1:8998:3105:3106:4
-FASHION:12244:h:1:27500:123:133:103
-AJARA TV:12244:h:1:27500:127:137:107
-SLO-TV1:12300:v:1:27495:200:201:3201
-POLONIA 1:12302:v:1:27500:205:206:3203
-SUPER 1:12302:v:1:27500:207:208:3207
-NAPOLI INT.:12302:v:1:27500:240:241:3210
-MAGIC:12302:v:1:27500:245:246:3211
-COUNTDOWN:12302:v:1:27500:235:236:3212
-TBNE:12302:v:1:27500:230:231:3213
-NAPOLI CHANNEL:12302:v:1:27500:227:228:3215
-KURDISTAN TV:12302:v:1:27500:225:226:3214
-ATLAS TV:12379:v:1:27500:3022:3032:3002
-TELE 24 SWITZERLAND:12379:v:1:27500:3023:3033:3003
-Abu Dhabi TV:12379:v:1:27500:3024:3034:3004
-RTV MONTENEGRO:12379:v:1:27500:3026:3036:3006
-JAAM-E-JAM 1:12436:h:1:27500:160:80:1
-JAAM-E-JAM 2:12436:h:1:27500:161:82:2
-SAHAR:12436:h:1:27500:162:84:3
-SAHAR 2:12436:h:1:27500:163:86:4
-IRINN:12436:h:1:27500:164:88:5
-Musicmax:11303:h:1:19540:500:501:6
-TEST:12474:h:1:27500:771:8191:10608
-EbS:12474:h:1:27500:101:201:10601
-MOU.2:12474:h:1:27500:42:43:10602
-PINK PLUS:12474:h:1:27500:308:256:10605
-LibertyTV.com:12474:h:1:27500:941:942:10603
-2M Maroc:12474:h:1:27500:601:602:10607
-ZEE TV:12474:h:1:27500:910:911:10604
-WorldNet Europe:12483:v:1:8299:4260:4220:1
-WorldNet:12483:v:1:8299:4560:4520:4
-SICILIA INTERNATIONA:12519:v:1:27499:501:502:8309
-SARDEGNA UNO:12519:v:1:27499:503:504:8310
-EuroMed:12519:v:1:27499:510:511:8312
-TGRT:12519:v:1:27499:505:506:8313
-VIDEOLINA:12519:v:1:27499:515:516:8318
-MEDIOLANUM:12538:h:1:27500:1131:1132:8987
-www.travel:12538:h:1:27500:1180:1183:8992
-MonteCarloSat:12538:h:1:27500:5126:5122:8877
-Bulgaria TV:12538:h:1:27500:4612:4613:8827
-TVN1:12571:h:1:5631:4194:4195:1
-JSTV 1:12595:v:1:27500:2000:2001:8213
-JSTV 2:12595:v:1:27500:2011:2013:8214
-MBC:12595:v:1:27500:160:80:8201
-ANN:12595:v:1:27500:161:84:8202
-BET:12595:v:1:27500:167:108:8208
-EuroNews:12595:v:1:27500:2221:2231:8211
-Sharjah        Arabs:12653:h:1:27500:1160:1120:1
-Qatar          Arabs:12653:h:1:27500:1260:1220:2
-Saudi 1        Arabs:12653:h:1:27500:1360:1320:3
-Kuwait         Arabs:12653:h:1:27500:1460:1420:4
-Libya          Arabs:12653:h:1:27500:1560:1520:5
-Sudan          Arabs:12653:h:1:27500:1660:1620:6
-Oman           Arabs:12653:h:1:27500:1760:1720:7
-Jordan         Arabs:12653:h:1:27500:1860:1820:8
-IRAQ TV:12653:h:1:27500:1960:1920:9
-Dubai Sport:12653:h:1:27500:1060:1020:10
-Digitaly:12672:v:1:27500:220:221:4203
-Telemarket:12672:v:1:27500:350:351:4211
-eVision:12672:v:1:27500:360:361:4214
-Thai TV5:12672:v:1:27500:200:201:4201
-Studio Europa:12672:v:1:27500:230:231:4204
-Video  Italia:12672:v:1:27500:340:341:4210
-GAME NETWORK:12672:v:1:27500:291:292:4213
diff --git a/channels-conf/dvb-s/Astra-28.2E b/channels-conf/dvb-s/Astra-28.2E
deleted file mode 100644
index cbba30a..0000000
--- a/channels-conf/dvb-s/Astra-28.2E
+++ /dev/null
@@ -1,522 +0,0 @@
-BBC 1 London:10773:h:0:22000:2304:2306:6301
-BBC 2 England:10773:h:0:22000:2320:2322:6302
-BBC NEWS 24:10773:h:0:22000:2329:2331:6304
-ETV:10773:h:0:22000:2333:2335:6306
-BBC TES 3:10773:h:0:22000:2325:2327:6315
-CBBC Channel:10773:h:0:22000:2325:2327:6317
-CBeebies:10773:h:0:22000:2333:2335:6318
-BBC 1 NI:10773:h:0:22000:2316:2318:6331
-BBC R Cymru:10773:h:0:22000:0:2340:6363
-BBC TES Test:10773:h:0:22000:0:0:6308
-BBC TES 2:10773:h:0:22000:0:0:6309
-BBC FOUR:10773:h:0:22000:0:0:6316
-BBC THREE:10773:h:0:22000:0:0:6319
-[1341]:11469:h:0:27500:521:649:4929
-[1342]:11469:h:0:27500:522:650:4930
-MMS 5:11469:h:0:27500:0:0:5044
-MMS 6:11469:h:0:27500:0:0:5045
-Sky Active:11469:h:0:27500:0:0:5107
-[140a]:11469:h:0:27500:518:646:5130
-[146b]:11469:h:0:27500:512:640:5227
-[146c]:11469:h:0:27500:513:641:5228
-[1016]:11469:h:0:27500:514:642:4118
-[10e9]:11469:h:0:27500:519:647:4329
-[1279]:11469:h:0:27500:520:648:4729
-Sky Customer Service:11469:h:0:27500:0:0:5240
-Directgov - Govt Info:11469:h:0:27500:0:0:5241
-[1596]:11469:h:0:27500:515:643:5526
-[1597]:11469:h:0:27500:516:644:5527
-[159a]:11469:h:0:27500:517:645:5530
-[15a4]:11469:h:0:27500:0:0:5540
-[05dc]:11469:h:0:27500:0:0:1500
-[1017]:11469:h:0:27500:0:0:4119
-Sky Box Office:11469:h:0:27500:0:0:4121
-Sky Box Office:11469:h:0:27500:0:0:4122
-Sky Box Office:11469:h:0:27500:0:0:4123
-Sky Box Office:11469:h:0:27500:0:0:4124
-Sky Box Office:11469:h:0:27500:0:0:4129
-POP:12285:v:0:27500:2311:2312:52500
-3751 PH:12285:v:0:27500:2311:2312:52501
-Chart Show TV:12285:v:0:27500:2309:2310:52505
-3761 PH:12285:v:0:27500:2313:2314:52512
-The Vault:12285:v:0:27500:2322:2323:52515
-Chase-it.tv:12285:v:0:27500:2318:2319:52520
-OBE:12285:v:0:27500:2307:2308:52525
-Tiny Pop:12285:v:0:27500:2316:2317:52530
-Spice Extreme:12285:v:0:27500:2320:2321:52561
-Climax3 - 1:12285:v:0:27500:2324:2325:52562
-Climax3 - 2:12285:v:0:27500:2326:2327:52563
-Climax3 - 3:12285:v:0:27500:2328:2329:52564
-Adult Channel:12285:v:0:27500:2330:2331:52565
-Playboy TV:12285:v:0:27500:2313:2314:52566
-52567:12285:v:0:27500:2330:2331:52567
-3911 PH:12285:v:0:27500:2320:2321:52581
-IDMT:12148:h:0:27500:2307:2308:52200
- Broadband UK:12148:h:0:27500:2305:2306:52210
-52220:12148:h:0:27500:2309:2310:52220
-Trouble Reload:12148:h:0:27500:2311:2312:52230
-Challenge+1:12148:h:0:27500:2314:2315:52232
-Ftn:12148:h:0:27500:0:0:52231
-[15ff]:10920:h:0:22000:516:644:5631
-D'covery H&L+:10920:h:0:22000:2305:2306:50003
-Eurosportnews:10920:h:0:22000:2307:2308:5009
-Hallmark:10920:h:0:22000:2310:2311:5010
-[13a2]:10920:h:0:22000:512:640:5026
-[13a4]:10920:h:0:22000:514:642:5028
-[13a5]:10920:h:0:22000:515:643:5029
-[05e6]:10920:h:0:22000:0:0:1510
-Sky Box Office:10920:h:0:22000:0:0:4122
-Sky Box Office:10920:h:0:22000:0:0:4123
-Sky Box Office:10920:h:0:22000:0:0:4124
-Sky Box Office:10920:h:0:22000:0:0:4129
-SportxxxBabes:10920:h:0:22000:0:0:4137
-[1393]:10920:h:0:22000:0:0:5011
-[15fb]:10920:h:0:22000:0:0:5627
-SAB TV:12226:h:0:27500:2310:2311:52401
-Performance:12226:h:0:27500:2312:2313:52402
-channel U:12226:h:0:27500:2314:2315:52403
-Gems.tv:12226:h:0:27500:2317:2318:52404
-Soundtrack ch.:12226:h:0:27500:2307:2308:52405
-HorrorChannel:12226:h:0:27500:2342:2343:52406
-Chat Box:12226:h:0:27500:2319:2320:52407
-Golf Channel:12226:h:0:27500:2321:2322:52408
-Ex&Mart TV:12226:h:0:27500:2323:2324:52409
-TVW Select:12226:h:0:27500:2305:2306:52412
-Game In TV:12226:h:0:27500:2335:2336:52414
-Majestic TV:12226:h:0:27500:2340:2341:52415
-18PlusXXX:12226:h:0:27500:0:0:52410
-XXXHousewive:12226:h:0:27500:0:0:52411
-52421:12226:h:0:27500:0:0:52421
-[10ea]:11603:v:0:27500:514:662:4330
-[114e]:11603:v:0:27500:515:663:4430
-[11b2]:11603:v:0:27500:516:664:4530
-[1215]:11603:v:0:27500:521:669:4629
-[1216]:11603:v:0:27500:517:665:4630
-[127a]:11603:v:0:27500:518:666:4730
-[12de]:11603:v:0:27500:519:667:4830
-[13a6]:11603:v:0:27500:512:660:5030
-[1409]:11603:v:0:27500:522:670:5129
-[146a]:11603:v:0:27500:520:668:5226
-[1599]:11603:v:0:27500:523:671:5529
-[15fa]:11603:v:0:27500:513:661:5626
-Sky Box Office:11603:v:0:27500:0:0:4124
-Sky Box Office:11603:v:0:27500:0:0:4129
-MMS 4:11603:v:0:27500:0:0:5043
-MMS 8:11603:v:0:27500:0:0:5047
-[1603]:11603:v:0:27500:0:0:5635
-[05e9]:11603:v:0:27500:0:0:1513
-Sky Box Office:11603:v:0:27500:0:0:4121
-Sky Box Office:11603:v:0:27500:0:0:4122
-Sky Box Office:11603:v:0:27500:0:0:4123
-1391:10935:v:0:22000:2321:2320:5421
-1392:10935:v:0:22000:2305:2320:5422
-1393:10935:v:0:22000:2306:2320:5423
-1394:10935:v:0:22000:2307:2320:5424
-1395:10935:v:0:22000:2308:2320:5425
-1396:10935:v:0:22000:2309:2320:5426
-1397:10935:v:0:22000:2310:2320:5427
-1398:10935:v:0:22000:2311:2320:5428
-1399:10935:v:0:22000:2312:2320:5429
-1471:10935:v:0:22000:2305:2313:5471
-1472:10935:v:0:22000:2306:2314:5472
-1473:10935:v:0:22000:2307:2315:5473
-1474:10935:v:0:22000:2308:2316:5474
-1475:10935:v:0:22000:2309:2317:5475
-1476:10935:v:0:22000:2310:2318:5476
-1477:10935:v:0:22000:2311:2319:5477
-1478:10935:v:0:22000:2312:2320:5478
-[05ea]:10935:v:0:22000:0:0:1514
-1326:10935:v:0:22000:0:0:5307
-1334:10935:v:0:22000:0:0:5310
-SPl:10935:v:0:22000:0:0:5404
-rc:10935:v:0:22000:0:0:5407
-nata:10935:v:0:22000:0:0:5466
-natd:10935:v:0:22000:0:0:5467
-ISM Sky News v6:11507:h:0:27500:2305:2306:9318
-ISM Movies v6:11507:h:0:27500:0:0:9319
-EIA2 Test:11507:h:0:27500:2305:2306:9322
-UK Online test:11507:h:0:27500:0:0:9323
-1784:11507:h:0:27500:2305:2306:9324
-1786:11507:h:0:27500:0:0:9325
-SCS:11507:h:0:27500:0:0:9326
-STT:11507:h:0:27500:2305:2306:9327
-1787:11507:h:0:27500:2305:2306:9329
-5ADT:11507:h:0:27500:2305:2306:9331
-EIA2 Test 6:11507:h:0:27500:2305:2306:9332
-8N2:11507:h:0:27500:0:0:9335
-EIA2 Test 5:11507:h:0:27500:2305:2306:9336
-[2479]:11507:h:0:27500:0:0:9337
-[247a]:11507:h:0:27500:0:0:9338
-7909:11507:h:0:27500:2305:2306:3909
-EIA2 Test 3:11507:h:0:27500:2305:2306:4909
-EIA2 Test 4:11507:h:0:27500:2305:2306:4912
-ISM Test1 v5:11507:h:0:27500:2305:2306:5902
-PlayJam:11507:h:0:27500:0:2445:9306
-PlayMonteCarlo & Roulette:11507:h:0:27500:0:2457:9308
-PlayJam test:11507:h:0:27500:0:2445:9310
-ISM Sky One v6:11507:h:0:27500:2305:2306:9316
-ISM Sports 1 v6:11507:h:0:27500:2305:2306:9317
-[05f3]:11507:h:0:27500:0:0:1523
-Playboy / Adult:11507:h:0:27500:0:0:4128
-Playboy TV:11507:h:0:27500:0:0:4131
-Private Girls:11507:h:0:27500:0:0:4133
-XXX TV:11507:h:0:27500:0:0:4134
-Amateur Babes:11507:h:0:27500:0:0:4135
-[1207]:11507:h:0:27500:0:0:4615
-[1209]:11507:h:0:27500:0:0:4617
-[232d]:11507:h:0:27500:0:0:9005
-YO-YO" test:11507:h:0:27500:0:0:9309
-UCB TV:12070:h:0:27500:2313:2314:52001
-ATN:12070:h:0:27500:2310:2311:52002
-Overload:12070:h:0:27500:2306:2307:52003
-Golf Pro-Shop:12070:h:0:27500:2315:2316:52004
-You TV:12070:h:0:27500:2336:2337:52005
-Escape:12070:h:0:27500:2317:2318:52006
-52007:12070:h:0:27500:2324:2325:52007
-Get Lucky TV:12070:h:0:27500:2319:2320:52008
-[fffe]:12070:h:0:27500:0:0:65534
-Wonderful:12070:h:0:27500:2308:2309:52009
-Musicians Chnl:12070:h:0:27500:2326:2327:52010
-Rangers TV:12070:h:0:27500:2328:2329:52011
-Celtic TV:12070:h:0:27500:2330:2331:52012
-Advert Channel:12070:h:0:27500:2332:2333:52013
-LONDON TV:12070:h:0:27500:2334:2335:52014
-Pure Dance:12070:h:0:27500:0:2312:52025
-Club Asia:12070:h:0:27500:0:2305:52026
-Setanta Sports:12070:h:0:27500:0:0:52021
-Setanta Sports:12070:h:0:27500:0:0:52022
-Setanta PPV2:12070:h:0:27500:0:0:52032
-FilmFour:11565:v:0:27500:2320:2321:50500
-FilmFour +1:11565:v:0:27500:2323:2324:50505
-Film4 Weekly:11565:v:0:27500:2326:2327:50510
-E4:11565:v:0:27500:2329:2330:50515
-Game 6:11565:v:0:27500:0:2336:50540
-Game 7:11565:v:0:27500:0:2342:50541
-Game 8:11565:v:0:27500:0:2344:50542
-FF TEST1:11565:v:0:27500:2320:2321:50543
-PCNE Chinese:11565:v:0:27500:6144:6145:50550
-Bloomberg:11565:v:0:27500:2316:2317:50555
-[05f5]:11565:v:0:27500:0:0:1525
-SCRD4:10861:h:0:22000:0:0:8009
-SBZP:10861:h:0:22000:0:0:8059
-LMIN:10861:h:0:22000:0:0:8108
-TRLN:10861:h:0:22000:0:0:8116
-SCD2:10861:h:0:22000:0:0:8126
-DOMI:10861:h:0:22000:0:0:8145
-WINC:10861:h:0:22000:2325:2326:8164
-The Betting Zone:10861:h:0:22000:0:0:8186
-TLM(Browser):10861:h:0:22000:2342:2344:8888
-Disney Chnl:10861:h:0:22000:2308:2309:9001
-Disney Chnl +1:10861:h:0:22000:2313:2314:9002
-Toon Disney:10861:h:0:22000:2317:2318:9003
-Playhse Disney:10861:h:0:22000:2320:2321:9004
-The Betting Zone:10861:h:0:22000:2336:2338:50008
-[05f6]:10861:h:0:22000:0:0:1526
-ALTU:10861:h:0:22000:0:0:8087
-DCT2 (t51):10861:h:0:22000:0:0:8999
-DCT (t51):10861:h:0:22000:0:0:9000
-Sky Travel +1:10876:v:0:22000:2310:2318:3905
-Sky Travel Active Dummy:10876:v:0:22000:0:0:4911
-Sky Travel:10876:v:0:22000:2308:2309:5005
-5006:10876:v:0:22000:2308:2309:5006
-Sky Trvl Extra:10876:v:0:22000:2305:2306:9312
-[0602]:10876:v:0:22000:0:0:1538
-Tel Sell:12460:h:0:27500:2319:2320:50832
-mSync:12460:h:0:27500:0:0:50837
-NASN:12460:h:0:27500:2322:2323:50839
-Classics TV:12460:h:0:27500:2324:2325:50840
-Information TV:12460:h:0:27500:2326:2327:50841
-Wrestling Chnl:12460:h:0:27500:2329:2330:50842
-TWC Reloaded:12460:h:0:27500:2331:2332:50843
-FRIENDLY TV:12460:h:0:27500:2333:2334:50848
-McColls:12460:h:0:27500:0:2335:50851
-Moto:12460:h:0:27500:0:2336:50852
-Teds FM:12460:h:0:27500:0:2337:50853
-Topps FM:12460:h:0:27500:0:2338:50855
-Kiss:12460:h:0:27500:0:2339:50856
-Smash Hits!:12460:h:0:27500:0:2340:50857
-Kerrang:12460:h:0:27500:0:2341:50858
-The Hits:12460:h:0:27500:0:2342:50859
-Magic:12460:h:0:27500:0:2343:50860
-Q:12460:h:0:27500:0:2344:50861
-MOJO:12460:h:0:27500:0:2345:50862
-Heat:12460:h:0:27500:0:2346:50863
-GlobeCast:12460:h:0:27500:0:2347:50864
-PTV Prime:12460:h:0:27500:2315:2316:50865
-Fashion TV:12460:h:0:27500:0:0:50850
-Best Direct:12246:v:0:27500:2314:2315:53500
-BestDirect+:12246:v:0:27500:2316:2317:53505
-Dating Channel:12246:v:0:27500:2320:2321:53515
-Wine TV:12246:v:0:27500:2323:2324:53520
-Flaunt:12246:v:0:27500:2326:2327:53525
-Scuzz:12246:v:0:27500:2328:2329:53530
-The Amp:12246:v:0:27500:2330:2331:53535
-Radio Caroline:12246:v:0:27500:0:2332:53550
-Amrit Bani:12246:v:0:27500:0:2333:53551
-Desi Radio:12246:v:0:27500:0:2334:53552
-CalvaryRadio:12246:v:0:27500:0:2335:53553
-Apple FM:12246:v:0:27500:0:2336:53554
-TWR:12246:v:0:27500:0:2337:53555
-Spectrum 1:12246:v:0:27500:0:2338:53556
-RTE Europe:12246:v:0:27500:0:2339:53557
-WRN Europe:12246:v:0:27500:0:2340:53558
-Raaj Radio:12246:v:0:27500:0:2341:53559
-On Air:12246:v:0:27500:0:2342:53560
-53561:12246:v:0:27500:0:2306:53561
-PulseUnsignd:12246:v:0:27500:0:2343:53564
-53581:12246:v:0:27500:0:0:53581
-RTE One:10743:h:0:22000:2306:2307:9601
-RTE TWO:10743:h:0:22000:2309:2310:9602
-TG4:10743:h:0:22000:2312:2313:9603
-TV3:10743:h:0:22000:2315:2316:9605
-DW-TV:10743:h:0:22000:2318:2319:9606
-TVEi:10743:h:0:22000:2320:2321:9607
-RTE Radio 1:10743:h:0:22000:0:2322:9611
-RTE 2FM:10743:h:0:22000:0:2323:9612
-RTE R na G:10743:h:0:22000:0:2324:9613
-RTE Lyric fm:10743:h:0:22000:0:2325:9614
-BBC R5 Live:10802:h:0:22000:0:2338:6401
-ETV2:10802:h:0:22000:2304:2306:6407
-BBC 1 Wales:10802:h:0:22000:2304:2306:6411
-BBC 2W:10802:h:0:22000:2321:2323:6412
-BBC 1 Scotland:10802:h:0:22000:2311:2313:6421
-BBC 2 Scotland:10802:h:0:22000:2325:2327:6422
-BBC 2 NI:10802:h:0:22000:2329:2331:6432
-BBC R1:10802:h:0:22000:0:2333:6451
-BBC R2:10802:h:0:22000:0:2334:6452
-BBC R3:10802:h:0:22000:0:2335:6453
-BBC R4 FM:10802:h:0:22000:0:2336:6454
-BBC R4 LW:10802:h:0:22000:0:2337:6455
-BBC R Scot.:10802:h:0:22000:0:2339:6457
-BBC R Wales:10802:h:0:22000:0:2340:6458
-BBC R Ulster:10802:h:0:22000:0:2341:6459
-BBC Asian Nt.:10802:h:0:22000:0:2342:6460
-BBC World Sv.:10802:h:0:22000:0:2343:6461
-ETV3:10802:h:0:22000:0:2333:6462
-BBC 5L SportX:10802:h:0:22000:0:2344:6464
-BBC WS Extra:10802:h:0:22000:0:2345:6465
-1Xtra BBC:10802:h:0:22000:0:2347:6466
-BBC 6 Music:10802:h:0:22000:0:2346:6467
-BBC 7:10802:h:0:22000:0:2348:6468
-BBC R n Gael:10802:h:0:22000:0:2349:6469
-T4 STRM-0:10847:v:0:22000:2305:2306:6900
-T4 STRM-1:10847:v:0:22000:2320:2321:6901
-BBC PARL'MNT:10847:v:0:22000:2327:2328:6902
-BBC 1 East (W):10847:v:0:22000:2338:2339:6903
-BBC 1 CI:10847:v:0:22000:2343:2344:6904
-T4 DEV-0:10847:v:0:22000:2305:2306:6990
-T4 DEV-1:10847:v:0:22000:2320:2321:6991
-T4 DEV-2:10847:v:0:22000:2327:2328:6992
-T4 DEV-3:10847:v:0:22000:2338:2339:6993
-T4 DEV-4:10847:v:0:22000:2343:2344:6994
-BBC 1 W Mids:10788:v:0:22000:2305:2306:10301
-BBC 1 N West:10788:v:0:22000:2318:2319:10302
-BBC 1 Yrks&Lin:10788:v:0:22000:2321:2322:10303
-BBC 1 Yorks:10788:v:0:22000:2324:2325:10304
-BBC 1 E Mids:10788:v:0:22000:2327:2328:10305
-BBC 1 East (E):10788:v:0:22000:2330:2331:10306
-ETV5:10788:v:0:22000:2305:2306:10321
-BBC 1 West:10817:v:0:22000:2305:2306:10351
-BBC 1 S East:10817:v:0:22000:2317:2318:10352
-BBC 1 South:10817:v:0:22000:2320:2321:10353
-BBC 1 S West:10817:v:0:22000:2323:2324:10354
-BBC 1 NE & C:10817:v:0:22000:2326:2327:10355
-BBC 1 Oxford:10817:v:0:22000:2329:2330:10356
-ETV6:10817:v:0:22000:2305:2306:10371
-POP:11426:v:0:27500:2311:2312:52500
-3751 PH:11426:v:0:27500:2311:2312:52501
-Chart Show TV:11426:v:0:27500:2309:2310:52505
-3761 PH:11426:v:0:27500:2313:2314:52512
-The Vault:11426:v:0:27500:2322:2323:52515
-Chase-it.tv:11426:v:0:27500:2318:2319:52520
-OBE:11426:v:0:27500:2307:2308:52525
-Tiny Pop:11426:v:0:27500:2316:2317:52530
-Spice Extreme:11426:v:0:27500:2320:2321:52561
-Climax3 - 1:11426:v:0:27500:2324:2325:52562
-Climax3 - 2:11426:v:0:27500:2326:2327:52563
-Climax3 - 3:11426:v:0:27500:2328:2329:52564
-Adult Channel:11426:v:0:27500:2330:2331:52565
-Playboy TV:11426:v:0:27500:2313:2314:52566
-52567:11426:v:0:27500:2330:2331:52567
-3911 PH:11426:v:0:27500:2320:2321:52581
-Simply Home:11488:v:0:27500:2364:2365:50102
-DTPCad4:11488:v:0:27500:2315:2316:50103
-Shop Vector:11488:v:0:27500:2322:2323:50105
-Simply Ideas:11488:v:0:27500:2324:2325:50115
-Simply Shop.:11488:v:0:27500:2353:2354:50120
-JobsTV:11488:v:0:27500:2366:2367:50125
-GayDateTV:11488:v:0:27500:2361:2362:50130
-Motors TV:11488:v:0:27500:3329:3330:50135
-nation217:11488:v:0:27500:2329:2330:50170
-52536:11488:v:0:27500:2353:2354:50176
-3786 PH:11488:v:0:27500:2342:2343:50177
-Avago Roulette:11488:v:0:27500:0:0:50180
-50181:11488:v:0:27500:2353:2354:50181
-XplicitXXX:11488:v:0:27500:0:0:50175
-3901 PH:11584:h:0:27500:2348:2349:50101
-50621:11584:h:0:27500:0:0:50621
-Gay TV:11584:h:0:27500:2333:2334:50671
-Red Hot Films:11584:h:0:27500:2338:2339:50672
-Red Hot Euro:11584:h:0:27500:2336:2337:50673
-Television X 2:11584:h:0:27500:2326:2327:50674
-Television X 3:11584:h:0:27500:2314:2315:50675
-Television X:11584:h:0:27500:2306:2307:50676
-RedHot All Girl:11584:h:0:27500:2340:2341:50677
-ExpressShop.:11584:h:0:27500:2331:2332:50678
-Real Estate TV:11584:h:0:27500:2329:2330:50679
-Red Hot Only 18:11584:h:0:27500:2311:2312:50680
-Red Hot Wives:11584:h:0:27500:2344:2345:50681
-RH 40+ Wives:11584:h:0:27500:2346:2347:50682
-redhot amateur:11584:h:0:27500:2342:2343:50683
-redhot uktalent:11584:h:0:27500:0:0:50100
-50686:11584:h:0:27500:0:0:50686
-AvaTest:11546:h:0:27500:2319:2320:50446
-SFI:11546:h:0:27500:0:0:50455
-Shop on TV:11546:h:0:27500:2315:2316:50400
-Thane Direct:11546:h:0:27500:2317:2318:50405
-AVAGO:11546:h:0:27500:2319:2320:50410
-SouthForYou:11546:h:0:27500:2313:2314:50420
-Stop + Shop:11546:h:0:27500:2324:2325:50430
-VHR:11546:h:0:27500:2326:2327:50435
-ditg:11546:h:0:27500:0:0:50439
-cso:11546:h:0:27500:2331:2332:50440
-Channel 425:11546:h:0:27500:2355:2357:50445
-Thomas Cook:11526:v:0:27500:2312:2313:50300
-B4:11526:v:0:27500:2361:2362:50305
-Al Jazeera:11526:v:0:27500:2310:2311:50325
-NHS 1:11526:v:0:27500:2314:2315:50370
-NHS 2:11526:v:0:27500:0:2329:50371
-NHS 2:11526:v:0:27500:0:2337:50372
-NHS Direct Interactive:11526:v:0:27500:0:0:50373
-NHS 4:11526:v:0:27500:2345:2347:50374
-SAB TV:11388:h:0:27500:2310:2311:52401
-Performance:11388:h:0:27500:2312:2313:52402
-channel U:11388:h:0:27500:2314:2315:52403
-Gems.tv:11388:h:0:27500:2317:2318:52404
-Soundtrack ch.:11388:h:0:27500:2307:2308:52405
-HorrorChannel:11388:h:0:27500:2342:2343:52406
-Chat Box:11388:h:0:27500:2319:2320:52407
-Golf Channel:11388:h:0:27500:2321:2322:52408
-Ex&Mart TV:11388:h:0:27500:2323:2324:52409
-TVW Select:11388:h:0:27500:2305:2306:52412
-Game In TV:11388:h:0:27500:2335:2336:52414
-Majestic TV:11388:h:0:27500:2340:2341:52415
-52421:11388:h:0:27500:0:0:52421
-18PlusXXX:11388:h:0:27500:0:0:52410
-XXXHousewive:11388:h:0:27500:0:0:52411
-Open Access 2:11642:v:0:27500:2312:2318:50152
-Unlimited TV:11642:v:0:27500:2319:2320:50153
-Racing UK:11642:v:0:27500:2306:2313:50951
-Vectone Bangla:11642:v:0:27500:2325:2326:50952
-VECTONE Urdu:11642:v:0:27500:2328:2329:50953
-VECTONE Tamil:11642:v:0:27500:2331:2332:50954
-VECTONE Bolly:11642:v:0:27500:2334:2335:50955
-Open Access:11642:v:0:27500:2356:2357:50956
-Classic FM TV:11642:v:0:27500:2358:2359:50957
-50959:11642:v:0:27500:2314:2315:50959
-Extreme Sports:11680:v:0:27500:2307:2308:51101
-EuroNews:11680:v:0:27500:2310:2311:51102
-GOD Channel:11680:v:0:27500:2319:2320:51103
-GOD REVIVAL:11680:v:0:27500:2321:2322:51104
-CrossRhythm:11680:v:0:27500:0:2306:51106
-Life TV:11680:v:0:27500:2323:2324:51108
-TBN Europe:11680:v:0:27500:2325:2326:51109
-HollywoodTV:11680:v:0:27500:2327:2328:51112
-GOD 2:11680:v:0:27500:2321:2322:51115
-revelation:11680:v:0:27500:2339:2340:51116
-Live XXX TV:11680:v:0:27500:0:0:51113
-51117:11680:v:0:27500:0:0:51117
-Alphameric1:11680:v:0:27500:0:0:51121
-Alphameric2:11680:v:0:27500:0:0:51122
-CFC TV:11680:v:0:27500:0:0:51105
-mta-muslim tv:11661:h:0:27500:2311:2312:51001
-BEN:11661:h:0:27500:2327:2328:51008
-Abu Dhabi TV:11661:h:0:27500:2329:2330:51009
-TV Travelshop 2:11661:h:0:27500:2370:2371:51010
-CCTV-9:11661:h:0:27500:2333:2334:51011
-Islam Channel:11661:h:0:27500:2337:2338:51014
-51020:11661:h:0:27500:0:2339:51020
-PlayMonteCarlo & Roulette:11661:h:0:27500:0:2319:51022
-2gbstp:11661:h:0:27500:0:0:51013
-Tel Sell:11623:h:0:27500:2319:2320:50832
-mSync:11623:h:0:27500:0:0:50837
-NASN:11623:h:0:27500:2322:2323:50839
-Classics TV:11623:h:0:27500:2324:2325:50840
-Information TV:11623:h:0:27500:2326:2327:50841
-Wrestling Chnl:11623:h:0:27500:2329:2330:50842
-TWC Reloaded:11623:h:0:27500:2331:2332:50843
-FRIENDLY TV:11623:h:0:27500:2333:2334:50848
-McColls:11623:h:0:27500:0:2335:50851
-Moto:11623:h:0:27500:0:2336:50852
-Teds FM:11623:h:0:27500:0:2337:50853
-Topps FM:11623:h:0:27500:0:2338:50855
-Kiss:11623:h:0:27500:0:2339:50856
-Smash Hits!:11623:h:0:27500:0:2340:50857
-Kerrang:11623:h:0:27500:0:2341:50858
-The Hits:11623:h:0:27500:0:2342:50859
-Magic:11623:h:0:27500:0:2343:50860
-Q:11623:h:0:27500:0:2344:50861
-MOJO:11623:h:0:27500:0:2345:50862
-Heat:11623:h:0:27500:0:2346:50863
-GlobeCast:11623:h:0:27500:0:2347:50864
-PTV Prime:11623:h:0:27500:2315:2316:50865
-Fashion TV:11623:h:0:27500:0:0:50850
-ITV1 London:10832:h:0:22000:2305:2307:10000
-ITV News:10832:h:0:22000:2329:2336:10009
-ITV1 Central:10832:h:0:22000:2327:2328:10010
-ITV1 HTV Wales:10832:h:0:22000:2334:2335:10020
-ITV1 HTV West:10832:h:0:22000:2341:2342:10030
-ITV1 W Country:10832:h:0:22000:2348:2349:10040
-G49:10832:h:0:22000:2334:2335:10099
-ITV1 Anglia:10891:h:0:22000:2305:2306:10100
-ITV1 Border:10891:h:0:22000:2327:2328:10110
-ITV1 BorderSco:10891:h:0:22000:2334:2335:10120
-ITV1 Meridian S:10891:h:0:22000:2348:2349:10140
-ITV1 Meridian E:10891:h:0:22000:2341:2342:10141
-ITV1 Tyne Tees:10891:h:0:22000:2355:2356:10150
-ITV1 Yorkshire:10891:h:0:22000:2362:2363:10160
-G53:10891:h:0:22000:2334:2335:10199
-ITV Channel Is:10906:v:0:22000:2326:2328:10200
-Grampian TV:10906:v:0:22000:2333:2334:10210
-Scottish TV:10906:v:0:22000:2340:2341:10220
-UTV:10906:v:0:22000:2347:2348:10230
-ITV2:10906:v:0:22000:2350:2351:10240
-ITV1 Granada:10906:v:0:22000:2305:2306:10250
-ITV3:10906:v:0:22000:2363:2364:10260
-G54:10906:v:0:22000:2357:2358:10299
-6300:10758:v:0:22000:2305:2306:10119
-LONDON TV:11222:h:0:27500:2334:2335:52014
-Setanta Sports:11222:h:0:27500:0:0:52021
-Setanta Sports:11222:h:0:27500:0:0:52022
-Pure Dance:11222:h:0:27500:0:2312:52025
-Club Asia:11222:h:0:27500:0:2305:52026
-Setanta PPV2:11222:h:0:27500:0:0:52032
-[fffe]:11222:h:0:27500:0:0:65534
-UCB TV:11222:h:0:27500:2313:2314:52001
-ATN:11222:h:0:27500:2310:2311:52002
-Overload:11222:h:0:27500:2306:2307:52003
-Golf Pro-Shop:11222:h:0:27500:2315:2316:52004
-You TV:11222:h:0:27500:2336:2337:52005
-Escape:11222:h:0:27500:2317:2318:52006
-52007:11222:h:0:27500:2324:2325:52007
-Get Lucky TV:11222:h:0:27500:2319:2320:52008
-Wonderful:11222:h:0:27500:2308:2309:52009
-Musicians Chnl:11222:h:0:27500:2326:2327:52010
-Rangers TV:11222:h:0:27500:2328:2329:52011
-Celtic TV:11222:h:0:27500:2330:2331:52012
-Advert Channel:11222:h:0:27500:2332:2333:52013
-E4+1:10729:v:0:22000:2306:2307:8300
-3310:10729:v:0:22000:2317:2318:8310
-3315:10729:v:0:22000:0:0:8315
-3320:10729:v:0:22000:0:0:8320
-[fffe]:11264:h:0:22000:0:0:65534
-52101:11264:h:0:22000:2305:2306:52101
-52102:11264:h:0:22000:2307:2308:52102
-52103:11264:h:0:22000:2309:2310:52103
-52104:11264:h:0:22000:2311:2312:52104
-IDMT:11307:h:0:27500:2307:2308:52200
- Broadband UK:11307:h:0:27500:2305:2306:52210
-52220:11307:h:0:27500:2309:2310:52220
-Trouble Reload:11307:h:0:27500:2311:2312:52230
-Challenge+1:11307:h:0:27500:2314:2315:52232
-Ftn:11307:h:0:27500:0:0:52231
diff --git a/channels-conf/dvb-s/BrasilSat-B3-84.0W b/channels-conf/dvb-s/BrasilSat-B3-84.0W
deleted file mode 100644
index b3632bb..0000000
--- a/channels-conf/dvb-s/BrasilSat-B3-84.0W
+++ /dev/null
@@ -1,39 +0,0 @@
-NoName:3675:v:0:4285:1110:1211:1
-Rede 21:3688:v:0:2308:308:256:1
-SNG#3 TERRA VIVA:3692:v:0:3200:308:256:1
-TV PONTA PORA       :3697:v:0:3333:1110:1211:1
-Servico 1:3710:v:0:12960:36:37:1
-TV Assembleia:3710:v:0:12960:39:40:2
-Servico 3:3710:v:0:12960:42:43:3
-TV Cultura:3710:v:0:12960:33:34:4
-TV Ra-Tim-Bum:3710:v:0:12960:45:46:5
-Tv Morena:3738:v:0:4710:4096:4097:1
-[6d65]:3754:v:0:5000:0:0:28005
-[6dc9]:3754:v:0:5000:0:0:28105
-[0faa]:3754:v:0:5000:0:0:4010
-[0fb4]:3754:v:0:5000:0:0:4020
-[6d61]:3754:v:0:5000:0:0:28001
-[0f9f]:3754:v:0:5000:0:0:3999
-[0fbe]:3754:v:0:5000:0:0:4030
-[000b]:3754:v:0:5000:0:0:11
-[5014]:3754:v:0:5000:0:0:20500
-STV:3768:v:0:8000:160:80:1
-CANAL 2:3768:v:0:8000:161:84:2
-TELECONF:3768:v:0:8000:162:88:3
-REDETV RO:3805:v:0:3255:4194:4195:1
-Videocom:3858:v:0:4289:1110:1211:1
-TVSULBAHIA:3911:v:0:3255:33:36:2
-TV ARATU BA:3927:v:0:3255:33:36:2
-TV BAND BA:3931:h:0:3255:337:340:21
-TV BAND BA:3932:v:0:3255:337:340:21
-REDE SUPER:3940:v:0:3255:337:340:1
-RBI:3949:v:0:4340:337:340:33
-TV TRIBUNA:3955:v:0:4340:337:340:1
-5                   :3970:v:0:4445:1160:1120:1
-TV EDUCATIVA MS:4013:v:0:3255:337:340:33
-TV Justica:4060:v:0:3330:289:290:1
-CNT GERACAO 1:4075:v:0:4444:289:290:20101
-ASS-LEG-SC:4132:v:0:2532:337:340:33
-EMBRATEL 21:4152:v:0:2300:257:514:1
-SEXY TV:4155:v:0:2170:257:258:1
-BASA:4169:v:0:8140:4141:4140:4
diff --git a/channels-conf/dvb-t/au-Adelaide b/channels-conf/dvb-t/au-Adelaide
deleted file mode 100644
index fc97071..0000000
--- a/channels-conf/dvb-t/au-Adelaide
+++ /dev/null
@@ -1,28 +0,0 @@
-ABC HDTV:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:0:592
-ABC TV Adelaide:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:593
-ABC TV 2:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:594
-ABC TV 3:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:595
-ABC TV 4:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:596
-ABC DiG Radio:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2311:598
-7 Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1360
-7 Digital 1:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1361
-7 Digital 2:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1362
-7 Digital 3:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1363
-7 HD Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1345:1346:1364
-NINE Digital:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1105
-NINE HD:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:0:1112
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1617
-TEN Digital 1:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1618
-TEN Digital 2:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1619
-TEN Digital 3:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1620
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1621
-TEN Digital 4:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1622
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1623
-TEN HD:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1624
-Ten Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1625
-SBS HD:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:832
-SBS DIGITAL 1:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:833
-SBS DIGITAL 2:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:834
-SBS EPG:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:835
-SBS RADIO 1:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:846
-SBS RADIO 2:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:847
diff --git a/channels-conf/dvb-t/au-Brisbane b/channels-conf/dvb-t/au-Brisbane
deleted file mode 100644
index 5eb0853..0000000
--- a/channels-conf/dvb-t/au-Brisbane
+++ /dev/null
@@ -1,29 +0,0 @@
-ABC HDTV:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:0:576
-ABC TV Brisbane:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:577
-ABC TV 2:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:578
-ABC TV 3:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:579
-ABC TV 4:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:580
-ABC DiG Radio:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2310:582
-7 Digital:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1344
-7 Digital 1:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1345
-7 Digital 2:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1346
-7 Digital 3:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1347
-7 HD Digital:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1089:1090:1348
-Nine Digital:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:660:1025
-Nine Guide:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:517:660:1030
-Nine High Definition:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:1152
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1601
-TEN Digital 1:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1602
-TEN Digital 2:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1603
-TEN Digital 3:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1604
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1605
-TEN Digital 4:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1606
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1607
-TEN HD:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1608
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1609
-SBS HD:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:816
-SBS DIGITAL 1:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:817
-SBS DIGITAL 2:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:818
-SBS EPG:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:819
-SBS RADIO 1:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:830
-SBS RADIO 2:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:831
diff --git a/channels-conf/dvb-t/au-Hobart b/channels-conf/dvb-t/au-Hobart
deleted file mode 100644
index 80edcb0..0000000
--- a/channels-conf/dvb-t/au-Hobart
+++ /dev/null
@@ -1,18 +0,0 @@
-ABC HDTV:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2314:0:624
-ABC TV Hobart:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:625
-ABC2:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2309:2310:626
-ABC TV:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:627
-ABC DiG Radio:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2317:630
-ABC DiG Jazz:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2318:631
-SBS HD:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:848
-SBS DIGITAL 1:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:849
-SBS DIGITAL 2:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:850
-SBS EPG:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:851
-SBS RADIO 1:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:862
-SBS RADIO 2:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:863
-SCT Hobart:212500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:625:626:2306
-SCT - HD:212500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3611:0:2338
-WIN TELEVISION:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:116:117:1
-WIN HD:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:129:130:10
-TDT - SD:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:657:658:2071
-TDT - HD:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3511:0:2103
diff --git a/channels-conf/dvb-t/au-Melbourne b/channels-conf/dvb-t/au-Melbourne
deleted file mode 100644
index 0b0542f..0000000
--- a/channels-conf/dvb-t/au-Melbourne
+++ /dev/null
@@ -1,17 +0,0 @@
-ABC HDTV:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:2308:560
-ABC TV Melbourne:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:561
-ABC DiG Radio:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2310:566
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1585
-TEN HD:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1592
-Nine Digital:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:519:720:1072
-Nine Digital HD:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:1073
-Nine Guide:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:517:700:1074
-7 Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:769:770:1328
-7 HD Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:833:834:1332
-7 Program Guide:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:865:866:1334
-SBS HD:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:784
-SBS DIGITAL 1:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:785
-SBS DIGITAL 2:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:786
-SBS EPG:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:787
-SBS RADIO 1:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:798
-SBS RADIO 2:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:799
diff --git a/channels-conf/dvb-t/au-Sydney b/channels-conf/dvb-t/au-Sydney
deleted file mode 100644
index 73021a9..0000000
--- a/channels-conf/dvb-t/au-Sydney
+++ /dev/null
@@ -1,34 +0,0 @@
-ABC News 24:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2314:0:544
-ABC1:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:545
-ABC2 / ABC4:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:2308:546
-ABC1:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:547
-ABC3:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2311:2312:548
-ABC Dig Music:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2317:550
-ABC Jazz:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2318:551
-7 Digital:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:514:1312
-7 Digital 1:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:514:1313
-7TWO:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:545:546:1314
-7mate:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:561:0:1315
-7 Digital:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:514:1316
-TV4ME:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:625:626:1319
-Fresh Ideas TV:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:641:642:1320
-Nine Sydney:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:519:720:1057
-GEM:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:1058
-EXTRA:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:520:730:1060
-EXTRA 2:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:521:740:1061
-GO!:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:517:700:1059
-ONE:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1569
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1573
-TVSN:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:518:690:1574
-ONE:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1575
-ELEVEN:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:516:681:1576
-SpreeTV:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:520:700:1577
-SBS ONE:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:769
-SBS TWO:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:770
-SBS 3:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:772
-NITV:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:164:87:773
-SBS HD:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:774
-SBS Radio 1:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:782
-SBS Radio 2:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:783
-SBS Radio 3:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:203:784
-TVS:536625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QPSK:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:100:101:44
diff --git a/channels-conf/dvb-t/cz-Praha b/channels-conf/dvb-t/cz-Praha
deleted file mode 100644
index 4a5c16c..0000000
--- a/channels-conf/dvb-t/cz-Praha
+++ /dev/null
@@ -1,16 +0,0 @@
-CT2.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:512:650:1
-Nova.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:513:661:2
-CT1.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:2325:2326:3
-Prima.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:514:671:4
-Stanice O.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:2322:2323:5
-Radiozurnal.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:652:6
-Praha.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:653:7
-Vltava.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:651:8
-iTV:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:9
-Prima:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:161:84:1
-CT2:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:164:96:4
-TV Program:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2501:2502:5
-RADIO2:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2832:6
-RADIO:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2831:9
-Proglas:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:180:11
-Nova.:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:205:206:3
diff --git a/channels-conf/dvb-t/de-Berlin b/channels-conf/dvb-t/de-Berlin
deleted file mode 100644
index 69cd114..0000000
--- a/channels-conf/dvb-t/de-Berlin
+++ /dev/null
@@ -1,47 +0,0 @@
-rbb Brandenburg:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1101:1102:11
-rbb Berlin:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1201:1202:12
-Phoenix:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1301:1302:13
-Das Erste:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1401:1402:14
-ARD-MHP-Data:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16
-ZDF:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:545:546:514
-Info/3sat:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:561:562:515
-Doku/KiKa:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:593:594:517
-SAT.1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:385:386:16408
-N24:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:225:226:16398
-ProSieben:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:305:306:16403
-KABEL1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:162:16394
-MDR FERNSEHEN:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:101:102:1
-ARD-Online-Kanal:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:10
-ARD-MHP-Data:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:9
-NDR FERNSEHEN:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:301:302:3
-arte:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:201:202:2
-Test Programm:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3841:3842:16624
-SUD enhanced:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16650
-13 TH STREET:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:4273:4274:16651
-BMCO Nokia IPDC Signalling:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16652
-BMCO Nokia IPDC 1:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16653
-BMCO Nokia IPDC 2:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16654
-BMCO Nokia IPDC 3:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16655
-IP Services:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16640
-Media Broadcast Services:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16641
-SUD:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16642
-SUD 1:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16643
-Kathrein Download:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16644
-HUMAX DOWNLOAD SVC:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16645
-BMCO Nokia IPDC 4:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16656
-BMCO Nokia IPDC 5:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16657
-BMCO Nokia IPDC 6:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16658
-BMCO Nokia IPDC 7:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16659
-BMCO Nokia IPDC 8:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16660
-RTL:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:337:338:16405
-RTL2:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:353:354:16406
-Super RTL:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:433:434:16411
-VOX:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:545:546:16418
-Südwest BW/RP:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:257:258:16
-WDR:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:241:242:15
-BBC World:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:49:50:16387
-FAB:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3073:3074:16576
-DSF:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:129:130:16392
-Testkanal NEUN LIVE:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:273:274:16401
-VIVA Plus:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:529:530:16417
-Eurosport:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:577:578:16420
diff --git a/channels-conf/dvb-t/de-Braunschweig b/channels-conf/dvb-t/de-Braunschweig
deleted file mode 100644
index 28fb4a6..0000000
--- a/channels-conf/dvb-t/de-Braunschweig
+++ /dev/null
@@ -1,25 +0,0 @@
-arte:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsExtra:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:4
-Das Erste:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:128
-ZDF:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-RTL Television:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:369:370:16407
-VOX:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-hr-fernsehen:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4673:4674:65
-MDR FERNSEHEN:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4657:4658:100
-NDR FS NDS:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:129
-NDR FS HH *:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:130
-NDR FS SH *:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:131
-NDR FS MVP *:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:132
-WDR Köln:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4641:4642:262
-SAT.1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:385:386:16408
-N24:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-ProSieben:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-KABEL1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
-Eurosport:786000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-TERRA NOVA:786000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-TELE 5:786000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:465:466:16413
diff --git a/channels-conf/dvb-t/de-Bremen b/channels-conf/dvb-t/de-Bremen
deleted file mode 100644
index 0826f31..0000000
--- a/channels-conf/dvb-t/de-Bremen
+++ /dev/null
@@ -1,25 +0,0 @@
-arte:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:202:2
-Phoenix:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:3
-NDR RB:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:518:519:161
-Das Erste RB:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:261:262:160
-hr-fernsehen:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4673:4674:65
-MDR FERNSEHEN:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4657:4658:100
-NDR FS NDS:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:129
-NDR FS HH *:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:130
-NDR FS SH *:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:131
-NDR FS MVP *:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:132
-WDR Köln:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4641:4642:262
-ZDF:562000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:562000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:562000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-RTL Television:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:369:370:16407
-VOX:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-Eurosport:666000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-TERRA NOVA:666000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-TELE 5:666000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:465:466:16413
-SAT.1:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:385:386:16408
-N24:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-ProSieben:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-KABEL1:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
diff --git a/channels-conf/dvb-t/de-Koeln-Bonn b/channels-conf/dvb-t/de-Koeln-Bonn
deleted file mode 100644
index 199ca85..0000000
--- a/channels-conf/dvb-t/de-Koeln-Bonn
+++ /dev/null
@@ -1,23 +0,0 @@
-RTL Television:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:433:434:16411
-VOX:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-ZDF:514000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:514000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:514000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-MDR Fernsehen:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4657:4658:100
-NDR FS NDS:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4641:4642:129
-SÜDWEST RP:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4673:4674:226
-WDR Köln:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:262
-N24:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-ProSieben:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-KABEL1:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
-SAT.1:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2078:2077:16408
-arte:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsMuXx:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:6
-Das Erste:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:256
-Eurosport:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-VIVA:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:513:514:16416
-TERRA NOVA:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-CNN Int.:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:97:98:16390
diff --git a/channels-conf/dvb-t/de-Leipzig b/channels-conf/dvb-t/de-Leipzig
deleted file mode 100644
index 9173a6f..0000000
--- a/channels-conf/dvb-t/de-Leipzig
+++ /dev/null
@@ -1,7 +0,0 @@
-# channels.conf for DVB-T - Leipzig (Germany) Transmitter
-# Generated by Albrecht Lohoefener <albrechtloh@xxxxxx>
-
-MDR:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1553:1554:97
-rbb:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:2833:2834:177
-WDR:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:4193:4194:262
-BR:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:529:530:33
diff --git a/channels-conf/dvb-t/de-Luebeck b/channels-conf/dvb-t/de-Luebeck
deleted file mode 100644
index 257f139..0000000
--- a/channels-conf/dvb-t/de-Luebeck
+++ /dev/null
@@ -1,22 +0,0 @@
-ZDF:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:545:546:514
-Info/3sat:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:561:562:515
-Doku/KiKa:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:593:594:517
-Bayerisches Fernsehen:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5185:5186:34
-MDR FERNSEHEN:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5169:5170:100
-NDR FS NDS *:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:129
-NDR FS HH *:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:130
-NDR FS SH:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:131
-NDR FS MVP *:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:132
-WDR Köln:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5153:5154:262
-N24:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:225:226:16398
-ProSieben:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:305:306:16403
-KABEL1:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:161:162:16394
-SAT.1:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:385:386:16408
-arte:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsExtra:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:4
-Das Erste:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:128
-RTL Television:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:369:370:16407
-VOX:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
diff --git a/channels-conf/dvb-t/de-Rhein-Main b/channels-conf/dvb-t/de-Rhein-Main
deleted file mode 100644
index 32d4edc..0000000
--- a/channels-conf/dvb-t/de-Rhein-Main
+++ /dev/null
@@ -1,6 +0,0 @@
-c8:198500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c22:482000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c34:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c54:738000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c57:762000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c64:818000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
diff --git a/channels-conf/dvb-t/de-Ruhrgebiet b/channels-conf/dvb-t/de-Ruhrgebiet
deleted file mode 100644
index 029dcd7..0000000
--- a/channels-conf/dvb-t/de-Ruhrgebiet
+++ /dev/null
@@ -1,46 +0,0 @@
-# channels.conf for dvb-t in germany, broadcasting area 'Duesseldorf/Ruhrgebiet'.
-# see
-# http://nrw.ueberallfernsehen.de/fileadmin/downloads/Programm_Ruhr_2005_04_04_final.pdf
-# for details on the regional availability of some channels (see the comments below).
-#
-RTL Television:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:433:434:16411
-VOX:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-ZDF:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-CNN Int.:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:97:98:16390
-VIVA:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:513:514:16416
-Eurosport:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-TERRA NOVA:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-ProSieben:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-SAT.1:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:385:386:16408
-KABEL1:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
-N24:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-arte:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsMuXx:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:6
-Das Erste:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:256
-##
-### regionale Sender/regional channels
-##
-## Kanal 25; Senderstandorte/broadcasting locations: Langenberg, Dortmund
-MDR FERNSEHEN-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5425:5426:100
-NDR FS NDS-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5409:5410:129
-SUEDWEST RP-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5441:5442:226
-WDR Dortmund-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5393:5394:259
-WDR Essen-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5393:5394:261
-#
-## Kanal 46; Senderstandorte/broadcasting locations: Duesseldorf, Wesel, Langenberg
-MDR FERNSEHEN-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4913:4914:100
-NDR FS NDS-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4897:4898:129
-SUEDWEST RP-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4929:4930:226
-WDR Duesseldorf-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4881:4882:260
-WDR Wuppertal-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4881:4882:265
-## Kanal 59; Senderstandorte/broadcasting locations: Essen
-MDR FERNSEHEN-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5169:5170:100
-NDR FS NDS-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5153:5154:129
-SUEDWEST RP-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5185:5186:226
-WDR Dortmund-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5137:5138:259
-WDR Essen-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5137:5138:261
diff --git a/channels-conf/dvb-t/es-Alpicat b/channels-conf/dvb-t/es-Alpicat
deleted file mode 100644
index e69158c..0000000
--- a/channels-conf/dvb-t/es-Alpicat
+++ /dev/null
@@ -1,19 +0,0 @@
-#channels.conf for DVB-T - Alpicat (Lleida) Transmitter
-
-#C42
-TV3:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:112:801
-K3/33:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:121:122:802
-3/24:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:131:132:803
-Canal Pilot:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:141:142:804
-3XL.net:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:151:152:805
-
-#C58
-TVE 1:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
-TVE 2:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:1441
-ANTENA 3:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:1121
-CANAL+:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:1057
-TELECINCO:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:403:1185
-
-#C66
-Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
-Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
diff --git a/channels-conf/dvb-t/es-Collserola b/channels-conf/dvb-t/es-Collserola
deleted file mode 100644
index 9a1ec85..0000000
--- a/channels-conf/dvb-t/es-Collserola
+++ /dev/null
@@ -1,19 +0,0 @@
-#channels.conf for DVB-T - Collserola (Barcelona) Transmitter
-
-#C43
-TV3:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:112:801
-K3/33:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:121:122:802
-3/24:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:131:132:803
-Canal Pilot:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:141:142:804
-3XL.net:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:151:152:805
-
-#C61
-TVE 1:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
-TVE 2:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:1441
-ANTENA 3:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:1121
-CANAL+:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:1057
-TELECINCO:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:403:1185
-
-#C66
-Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
-Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
diff --git a/channels-conf/dvb-t/es-Madrid b/channels-conf/dvb-t/es-Madrid
deleted file mode 100644
index 7066e7b..0000000
--- a/channels-conf/dvb-t/es-Madrid
+++ /dev/null
@@ -1,26 +0,0 @@
-TVE 1:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:380
-TVE 2:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:381
-24H TVE:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1003:382
-RNE1:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:2001:385
-RNEC:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:2011:386
-CLAN/50 TVE:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:1503:383
-RNE3:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:2021:387
-TM3:810000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:113:421
-LAOTRA:810000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:211:212:422
-ONDA6:810000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:311:312:423
-TELEDEPORTE:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:100
-VEO TV:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1002:260
-VEO 2:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:261
-NET TV:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:1502:300
-CUATRO:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:160:80:1057
-CNN+:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:84:1058
-40 LATINO:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:162:88:1059
-LA SEXTA 1:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:0:340
-T5 Estrellas:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:301:181
-T5 Sport:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:202:302:182
-Telecinco:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:203:303:180
-FLYMUSIC:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:1502:301
-antena 3:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:140
-a3.neox:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:141
-a3.nova:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1003:142
-La Sexta 2:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:0:341
diff --git a/channels-conf/dvb-t/es-Mussara b/channels-conf/dvb-t/es-Mussara
deleted file mode 100644
index 7962324..0000000
--- a/channels-conf/dvb-t/es-Mussara
+++ /dev/null
@@ -1,19 +0,0 @@
-#channels.conf for DVB-T - La Mussara (Reus-Tarragona) Transmitter
-
-#C56
-TV3:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:112:801
-K3/33:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:121:122:802
-3/24:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:131:132:803
-Canal Pilot:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:141:142:804
-3XL.net:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:151:152:805
-
-#C59
-TVE 1:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
-TVE 2:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:1441
-ANTENA 3:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:1121
-CANAL+:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:1057
-TELECINCO:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:403:1185
-
-#C66
-Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
-Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
diff --git a/channels-conf/dvb-t/tw-All b/channels-conf/dvb-t/tw-All
deleted file mode 100644
index a7fbe50..0000000
--- a/channels-conf/dvb-t/tw-All
+++ /dev/null
@@ -1,21 +0,0 @@
-中視數位台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1002:100
-中視新聞台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1011:1012:101
-中視綜藝台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1021:1022:102
-中視HD台:533000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1031:1032:103
-公共電視 PTS:545000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2011:2012:201
-公視2台 PTS2:545000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2021:2022:202
-客家電視 HTV:545000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2031:2032:203
-民視綜合台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3001:3002:300
-民視交通台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3011:3012:301
-民視新聞台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3021:3022:302
-民視資料廣播:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:303
-民視HD台:557000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:3041:3042:304
-公視 HD:569000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2001:2002:200
-台灣電視台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4001:4002:400
-台視財經台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4011:4012:401
-台視綜合台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4021:4022:402
-台視 HD台:581000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4031:4032:403
-華視CTS:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5011:5012:501
-華視教育台:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5021:5022:502
-華視新聞資訊台:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5031:5032:503
-華視HD:593000000:INVERSION_AUTO:BANDWIDTH_6_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5041:5042:504
diff --git a/channels-conf/dvb-t/uk-Crystal-Palace b/channels-conf/dvb-t/uk-Crystal-Palace
deleted file mode 100644
index a851867..0000000
--- a/channels-conf/dvb-t/uk-Crystal-Palace
+++ /dev/null
@@ -1,67 +0,0 @@
-#channels.conf for DVB-T - Crystal Palace Transmitter
-
-# Multiplex 1 BBC - Channel 25, Offset -, Freq 505833333
-BBCi:505833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0:4479
-CBBC Channel:505833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0:4671
-BBC ONE:505833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:600:601
-BBC TWO:505833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:610:611
-BBC THREE:505833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:620:621
-BBC NEWS 24:505833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:640:641
-
-# Multiplex 2 Digital 3&4 - Channel 22, Offset -, Freq 481833333
-Teletext:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-FourText:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-CHANNEL4:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2827:2828
-ITV NEWS:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2850:2851
-ITV 1:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:512:650
-ITV 2:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2818:2819
-Ch 14:481833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2840:2841
-
-#Multiplex A SDN - Channel 32, Offset -, Frequency 561833333
-ntl:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-Ch 15:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:660
-BBC Radio 1:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6210
-BBC Radio 2:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6226
-BBC Radio 3:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6242
-BBC Radio 4:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6258
-QVC:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6049:6050
-FIVE:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6017:6018
-bid-up.tv:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6273:6274
-TV Travel Shop:561833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6161:6161
-
-#Multiplex B BBC - Channel 28, Offset -, Frequency 529833333
-#Community                (0x4e00) 01: PCR 0x1fff
-#703                      (0x4c80) 01: PCR 0x1fff
-BBC PARLMNT:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:403
-BBC FOUR:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:401
-701:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:204:411
-702:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:203:407
-CBeebies:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:401:402
-BBC Asian Net:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:435
-1Xtra BBC:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:434
-BBC 7:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:433
-BBC 6 Music:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:432
-BBC 5L SportsX:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:431
-BBC R5 Live:529833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:430
-
-# Multiplex C Crown Castle - Channel 34, Offset +, Frequency 578166666
-UKHistory:578166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:401:402
-Sky Travel:578166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:301:302
-Sky Spts News:578166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:202
-Sky News:578166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:101:102
-
-# Multiplex D Crown Castle - Channel 29, Offset -, Freq 537833333
-#UKBrightIdeas            (0x64c0) 01: PCR 0x1fff
-THE HITS:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:101:102
-TMF:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:202
-CBM:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:501:502
-Free2Play:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-Q:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1901
-Magic:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1801
-The Hits Radio:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1701
-BBC World Sv:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1601
-oneworld:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1501
-jazz fm:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1401
-Kerrang:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1301
-Smash Hits:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1201
-Kiss:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1101
diff --git a/channels-conf/dvb-t/uk-Hannington b/channels-conf/dvb-t/uk-Hannington
deleted file mode 100644
index b83620e..0000000
--- a/channels-conf/dvb-t/uk-Hannington
+++ /dev/null
@@ -1,28 +0,0 @@
-BBC One:706000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:600:601
-BBC Two:706000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:610:611
-CBBC:706000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:620:621
-BBC Three:706000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:620:621
-BBC News 24:706000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:640:641
-CBeebies:674166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:401
-BBC Four:674166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:401
-BBC Parliament:674166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:403
-701:674166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:203:407
-702:674166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:204:411
-703:674166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-ITV 1:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:513:651
-ITV 2:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2818:2819
-Channel 4:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2822:2823
-ITV News:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2822:2823
-price-drop.tv:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2840:2841
-Five:626166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6017:6018
-QVC:626166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6059:6050
-Tv Travel Shop:626166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6161:6162
-Channel 15:626166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:660
-bid-up.tv:626166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6273:6274
-Sky News:658166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:101:102
-Sky Sports News:658166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:202
-Sky Travel:658166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:301:302
-UK History:658166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:401:402
-The Hits:634166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:101:102
-TMF:634166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:202
-UK Bright Ideas:634166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
diff --git a/channels-conf/dvb-t/uk-Oxford b/channels-conf/dvb-t/uk-Oxford
deleted file mode 100644
index 29a53a2..0000000
--- a/channels-conf/dvb-t/uk-Oxford
+++ /dev/null
@@ -1,41 +0,0 @@
-BBC-Choice:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:620:621
-BBC-Knowledge:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:630:631
-BBC-News24:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:640:641
-BBC-1:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:600:601
-BBC-Parliament:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:660
-BBC-2:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:610:611
-ITV-1:850000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:513:651
-ITV-2:850000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2818:2819
-ITV-Sport:850000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2836:2837
-FilmFour:850000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2822:2823
-C4:850000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2826:2827
-E4:850000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2831:2832
-C5:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6017:6018
-Shop:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6049:6050
-ITVSelect-Info:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6065:6066
-ITVSelect-1:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6081:6082
-ITVSelect-2:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6097:6098
-ITVSelect-3:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6113:6114
-ITVSelect-4:713833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6129:6130
-Carlton-Cinema:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:288:289
-Sky-One:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:544:545
-Sky-Sports-1:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:800:801
-Sky-Premier:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:1056:1057
-CartoonNetwork:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:1312:1313
-UK-Horizons:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2336:2337
-ITV-Sport-Plus:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2592:2593
-ITVSportSelect:721833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:2596
-BreezeMen&Mtrs:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:800:801
-Granada-Plus:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:544:545
-MTV:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:1568:1569
-Sky-Movie-Max:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:1312:1313
-Sky-Sports-2:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2080:2081
-UK-Gold:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:288:289
-Wellbeing:690000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:1824:1825
-PLAY-uk:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:288:289
-UK-Style:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:544:545
-no-name:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:800:801
-Discovery:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:1312:1313
-Nick/Paramount:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2080:2081
-Sky-Sports-3:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2336:2337
-Brit-Eurosport:538000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2592:2593
diff --git a/channels-conf/dvb-t/uk-Reigate b/channels-conf/dvb-t/uk-Reigate
deleted file mode 100644
index f5fe7cc..0000000
--- a/channels-conf/dvb-t/uk-Reigate
+++ /dev/null
@@ -1,51 +0,0 @@
-BBC ONE:554000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:600:601
-BBC TWO:554000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:610:611
-ITV 1:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:512:650
-Channel 4:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2827:2828
-five:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6017:6018
-ITV 2:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2818:2819
-BBC THREE:554000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-Teletext:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-BBC FOUR:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-Sky Travel:618166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:301:302
-UKHistory:618166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:401:402
-Ch 14:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2840:2841
-Ch 15:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:660
-QVC:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6049:6050
-TV Travel Shop:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6161:6162
-The HITS:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:101:102
-UKBrightIdeas:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:301:302
-f tn:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-TMF:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:202
-bid-up.tv:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6273:6274
-CBM:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:501:502
-CBBC Channel:554000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:620:621
-CBeebies:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:401
-BBC NEWS 24:554000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:640:641
-ITV News:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2850:2851
-Sky News:618166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:101:102
-Sky Spts News:618166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:201:202
-BBC PARLMNT:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:403
-Community:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-FourText:474000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-BBCi:554000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-ntl:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
-BBC Radio 1:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6210
-1Xtra BBC:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:434
-BBC Radio 2:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6226
-BBC Radio 3:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6242
-BBC Radio 4:498000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_1_2:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:6258
-BBC R5 Live:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:430
-BBC 5L SportsX:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:431
-BBC 6 Music:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:432
-BBC 7:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:433
-BBC Asian Net.:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:435
-BBC World Sv.:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1601
-Smash Hits!:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1201
-Kiss:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1101
-Kerrang!:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1301
-jazz fm:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1401
-oneword:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1501
-701:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:203:407
-702:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:204:411
-703:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:0
diff --git a/channels-conf/dvb-t/uk-Sandy-Heath b/channels-conf/dvb-t/uk-Sandy-Heath
deleted file mode 100644
index 99dc746..0000000
--- a/channels-conf/dvb-t/uk-Sandy-Heath
+++ /dev/null
@@ -1,12 +0,0 @@
-BBC-Choice:641833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:620:621
-BBC-Knowledge:641833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:630:631
-BBC-News24:641833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:640:641
-BBC-1:641833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:600:601
-BBC-Parliament:641833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:660
-BBC-2:641833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:610:611
-ITV-1:665833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:513:651
-ITV-2:665833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2819:2820
-C4:665833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2823:2824
-E4:665833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2831:2832
-C5:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6017:6018
-Shop:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6049:6050
-- 
2.6.2


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux