aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 15:10:06 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-05 15:10:06 -0300
commitcc90cb7196440a88e2a7987203152910049e266d (patch)
tree831616a68d841d14f0ac14068b4d6c2636995c8b
parent06e54ff221c2e3126a7dfbd63e9814431511b558 (diff)
downloaddtv-scan-tables-cc90cb7196440a88e2a7987203152910049e266d.tar.gz
Move the contents of dvbv5_dvb-t into dvb-t
Now that we have everything with DVBv5 format, we can get rid of duplicated tables. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--dvb-t/fi-Aanekoski37
-rw-r--r--dvb-t/fi-Aanekoski_Konginkangas37
-rw-r--r--dvb-t/fi-Ahtari19
-rw-r--r--dvb-t/fi-Alajarvi37
-rw-r--r--dvb-t/fi-Anjalankoski_Ruotila48
-rw-r--r--dvb-t/fi-Enontekio_Ahovaara19
-rw-r--r--dvb-t/fi-Enontekio_Hetta19
-rw-r--r--dvb-t/fi-Enontekio_Kuttanen19
-rw-r--r--dvb-t/fi-Espoo63
-rw-r--r--dvb-t/fi-Eurajoki48
-rw-r--r--dvb-t/fi-Fiskars37
-rw-r--r--dvb-t/fi-Haapavesi37
-rw-r--r--dvb-t/fi-Hameenkyro_Kyroskoski37
-rw-r--r--dvb-t/fi-Hameenlinna_Painokangas28
-rw-r--r--dvb-t/fi-Hanko37
-rw-r--r--dvb-t/fi-Hartola28
-rw-r--r--dvb-t/fi-Heinavesi28
-rw-r--r--dvb-t/fi-Heinola37
-rw-r--r--dvb-t/fi-Hyrynsalmi28
-rw-r--r--dvb-t/fi-Hyrynsalmi_Kyparavaara28
-rw-r--r--dvb-t/fi-Hyrynsalmi_Paljakka28
-rw-r--r--dvb-t/fi-Hyvinkaa37
-rw-r--r--dvb-t/fi-Ii_Raiskio19
-rw-r--r--dvb-t/fi-Iisalmi19
-rw-r--r--dvb-t/fi-Ikaalinen37
-rw-r--r--dvb-t/fi-Ikaalinen_Riitiala37
-rw-r--r--dvb-t/fi-Inari19
-rw-r--r--dvb-t/fi-Inari_Janispaa19
-rw-r--r--dvb-t/fi-Inari_Naatamo19
-rw-r--r--dvb-t/fi-Ivalo_Saarineitamovaara19
-rw-r--r--dvb-t/fi-Jalasjarvi37
-rw-r--r--dvb-t/fi-Jamsa_Halli37
-rw-r--r--dvb-t/fi-Jamsa_Kaipola37
-rw-r--r--dvb-t/fi-Jamsa_Matkosvuori37
-rw-r--r--dvb-t/fi-Jamsa_Ouninpohja28
-rw-r--r--dvb-t/fi-Jamsankoski37
-rw-r--r--dvb-t/fi-Joensuu_Vestinkallio28
-rw-r--r--dvb-t/fi-Joroinen_Puukkola28
-rw-r--r--dvb-t/fi-Joutsa_Lankia37
-rw-r--r--dvb-t/fi-Joutseno48
-rw-r--r--dvb-t/fi-Juupajoki_Kopsamo28
-rw-r--r--dvb-t/fi-Juva37
-rw-r--r--dvb-t/fi-Jyvaskyla65
-rw-r--r--dvb-t/fi-Jyvaskyla_Vaajakoski28
-rw-r--r--dvb-t/fi-Kaavi_Sivakkavaara28
-rw-r--r--dvb-t/fi-Kajaani_Pollyvaara28
-rw-r--r--dvb-t/fi-Kalajoki28
-rw-r--r--dvb-t/fi-Kangaslampi37
-rw-r--r--dvb-t/fi-Kangasniemi_Turkinmaki37
-rw-r--r--dvb-t/fi-Kankaanpaa37
-rw-r--r--dvb-t/fi-Karigasniemi19
-rw-r--r--dvb-t/fi-Karkkila37
-rw-r--r--dvb-t/fi-Karstula28
-rw-r--r--dvb-t/fi-Karvia28
-rw-r--r--dvb-t/fi-Kaunispaa19
-rw-r--r--dvb-t/fi-Kemijarvi_Suomutunturi19
-rw-r--r--dvb-t/fi-Kerimaki37
-rw-r--r--dvb-t/fi-Keuruu37
-rw-r--r--dvb-t/fi-Keuruu_Haapamaki37
-rw-r--r--dvb-t/fi-Kihnio37
-rw-r--r--dvb-t/fi-Kiihtelysvaara19
-rw-r--r--dvb-t/fi-Kilpisjarvi19
-rw-r--r--dvb-t/fi-Kittila_Levitunturi19
-rw-r--r--dvb-t/fi-Kolari_Vuolittaja19
-rw-r--r--dvb-t/fi-Koli37
-rw-r--r--dvb-t/fi-Korpilahti_Vaarunvuori37
-rw-r--r--dvb-t/fi-Korppoo37
-rw-r--r--dvb-t/fi-Kruunupyy48
-rw-r--r--dvb-t/fi-Kuhmo_Haukela28
-rw-r--r--dvb-t/fi-Kuhmo_Lentiira28
-rw-r--r--dvb-t/fi-Kuhmo_Niva28
-rw-r--r--dvb-t/fi-Kuhmoinen37
-rw-r--r--dvb-t/fi-Kuhmoinen_Harjunsalmi37
-rw-r--r--dvb-t/fi-Kuhmoinen_Puukkoinen28
-rw-r--r--dvb-t/fi-Kuopio48
-rw-r--r--dvb-t/fi-Kurikka_Kesti37
-rw-r--r--dvb-t/fi-Kustavi_Viherlahti37
-rw-r--r--dvb-t/fi-Kuusamo_Hamppulampi19
-rw-r--r--dvb-t/fi-Kyyjarvi_Noposenaho28
-rw-r--r--dvb-t/fi-Lahti65
-rw-r--r--dvb-t/fi-Lapua48
-rw-r--r--dvb-t/fi-Laukaa37
-rw-r--r--dvb-t/fi-Laukaa_Vihtavuori37
-rw-r--r--dvb-t/fi-Lavia28
-rw-r--r--dvb-t/fi-Lohja37
-rw-r--r--dvb-t/fi-Loimaa37
-rw-r--r--dvb-t/fi-Luhanka37
-rw-r--r--dvb-t/fi-Luopioinen37
-rw-r--r--dvb-t/fi-Mantta37
-rw-r--r--dvb-t/fi-Mantyharju28
-rw-r--r--dvb-t/fi-Mikkeli37
-rw-r--r--dvb-t/fi-Muonio_Olostunturi19
-rw-r--r--dvb-t/fi-Nilsia37
-rw-r--r--dvb-t/fi-Nilsia_Keski-Siikajarvi28
-rw-r--r--dvb-t/fi-Nilsia_Pisa28
-rw-r--r--dvb-t/fi-Nokia37
-rw-r--r--dvb-t/fi-Nokia_Siuro37
-rw-r--r--dvb-t/fi-Nummi-Pusula_Hyonola37
-rw-r--r--dvb-t/fi-Nuorgam_Njallavaara19
-rw-r--r--dvb-t/fi-Nuorgam_raja19
-rw-r--r--dvb-t/fi-Nurmes_Konnanvaara37
-rw-r--r--dvb-t/fi-Nurmes_Kortevaara28
-rw-r--r--dvb-t/fi-Orivesi_Talviainen28
-rw-r--r--dvb-t/fi-Oulu65
-rw-r--r--dvb-t/fi-Padasjoki37
-rw-r--r--dvb-t/fi-Padasjoki_Arrakoski37
-rw-r--r--dvb-t/fi-Paltamo_Kivesvaara28
-rw-r--r--dvb-t/fi-Parainen_Houtskari37
-rw-r--r--dvb-t/fi-Parikkala37
-rw-r--r--dvb-t/fi-Parkano_Sopukallio37
-rw-r--r--dvb-t/fi-Pello19
-rw-r--r--dvb-t/fi-Pello_Ratasvaara19
-rw-r--r--dvb-t/fi-Perho37
-rw-r--r--dvb-t/fi-Pernaja28
-rw-r--r--dvb-t/fi-Pieksamaki_Halkokumpu28
-rw-r--r--dvb-t/fi-Pihtipudas28
-rw-r--r--dvb-t/fi-Porvoo_Suomenkyla37
-rw-r--r--dvb-t/fi-Posio19
-rw-r--r--dvb-t/fi-Pudasjarvi28
-rw-r--r--dvb-t/fi-Pudasjarvi_Iso-Syote28
-rw-r--r--dvb-t/fi-Pudasjarvi_Kangasvaara19
-rw-r--r--dvb-t/fi-Puolanka37
-rw-r--r--dvb-t/fi-Pyhatunturi19
-rw-r--r--dvb-t/fi-Pyhavuori28
-rw-r--r--dvb-t/fi-Pylkonmaki_Karankajarvi28
-rw-r--r--dvb-t/fi-Raahe_Mestauskallio37
-rw-r--r--dvb-t/fi-Raahe_Piehinki28
-rw-r--r--dvb-t/fi-Ranua_Haasionmaa19
-rw-r--r--dvb-t/fi-Ranua_Leppiaho19
-rw-r--r--dvb-t/fi-Rautavaara_Angervikko37
-rw-r--r--dvb-t/fi-Rautjarvi_Simpele28
-rw-r--r--dvb-t/fi-Ristijarvi28
-rw-r--r--dvb-t/fi-Rovaniemi28
-rw-r--r--dvb-t/fi-Rovaniemi_Kaihuanvaara19
-rw-r--r--dvb-t/fi-Rovaniemi_Karhuvaara19
-rw-r--r--dvb-t/fi-Rovaniemi_Marasenkallio19
-rw-r--r--dvb-t/fi-Rovaniemi_Rantalaki19
-rw-r--r--dvb-t/fi-Rovaniemi_Sonka19
-rw-r--r--dvb-t/fi-Rovaniemi_Sorviselka19
-rw-r--r--dvb-t/fi-Ruka28
-rw-r--r--dvb-t/fi-Ruovesi_Storminiemi37
-rw-r--r--dvb-t/fi-Saarijarvi37
-rw-r--r--dvb-t/fi-Saarijarvi_Kalmari28
-rw-r--r--dvb-t/fi-Saarijarvi_Mahlu28
-rw-r--r--dvb-t/fi-Salla_Hirvasvaara19
-rw-r--r--dvb-t/fi-Salla_Ihistysjanka19
-rw-r--r--dvb-t/fi-Salla_Naruska19
-rw-r--r--dvb-t/fi-Salla_Sallatunturi19
-rw-r--r--dvb-t/fi-Salla_Sarivaara19
-rw-r--r--dvb-t/fi-Salo_Isokyla37
-rw-r--r--dvb-t/fi-Savukoski_Martti19
-rw-r--r--dvb-t/fi-Savukoski_Tanhua19
-rw-r--r--dvb-t/fi-Siilinjarvi37
-rw-r--r--dvb-t/fi-Simo_Viantie28
-rw-r--r--dvb-t/fi-Sipoo_Norrkulla37
-rw-r--r--dvb-t/fi-Sodankyla_Pittiovaara19
-rw-r--r--dvb-t/fi-Sodankyla_Vuotso19
-rw-r--r--dvb-t/fi-Sulkava_Vaatalanmaki28
-rw-r--r--dvb-t/fi-Suomussalmi_Ala-Vuokki19
-rw-r--r--dvb-t/fi-Suomussalmi_Ammansaari19
-rw-r--r--dvb-t/fi-Suomussalmi_Juntusranta19
-rw-r--r--dvb-t/fi-Suomussalmi_Myllylahti19
-rw-r--r--dvb-t/fi-Sysma_Liikola37
-rw-r--r--dvb-t/fi-Taivalkoski19
-rw-r--r--dvb-t/fi-Taivalkoski_Taivalvaara19
-rw-r--r--dvb-t/fi-Tammela48
-rw-r--r--dvb-t/fi-Tammisaari37
-rw-r--r--dvb-t/fi-Tampere65
-rw-r--r--dvb-t/fi-Tampere_Pyynikki48
-rw-r--r--dvb-t/fi-Tervola28
-rw-r--r--dvb-t/fi-Turku65
-rw-r--r--dvb-t/fi-Utsjoki19
-rw-r--r--dvb-t/fi-Utsjoki_Nuvvus19
-rw-r--r--dvb-t/fi-Utsjoki_Outakoski19
-rw-r--r--dvb-t/fi-Utsjoki_Polvarniemi19
-rw-r--r--dvb-t/fi-Utsjoki_Rovisuvanto19
-rw-r--r--dvb-t/fi-Utsjoki_Tenola19
-rw-r--r--dvb-t/fi-Uusikaupunki_Orivo37
-rw-r--r--dvb-t/fi-Vaala28
-rw-r--r--dvb-t/fi-Vaasa28
-rw-r--r--dvb-t/fi-Valtimo28
-rw-r--r--dvb-t/fi-Vammala_Jyranvuori37
-rw-r--r--dvb-t/fi-Vammala_Roismala28
-rw-r--r--dvb-t/fi-Vammala_Savi28
-rw-r--r--dvb-t/fi-Vantaa_Hakunila37
-rw-r--r--dvb-t/fi-Varpaisjarvi_Honkamaki37
-rw-r--r--dvb-t/fi-Virrat_Lappavuori37
-rw-r--r--dvb-t/fi-Vuokatti37
-rw-r--r--dvb-t/fi-Ylitornio_Ainiovaara28
-rw-r--r--dvb-t/fi-Ylitornio_Raanujarvi19
-rw-r--r--dvb-t/fi-Yllas19
-rw-r--r--dvb-t/fi-Yllasjarvi19
-rw-r--r--dvbv5_dvb-t/fi-Aanekoski23
-rw-r--r--dvbv5_dvb-t/fi-Aanekoski_Konginkangas23
-rw-r--r--dvbv5_dvb-t/fi-Ahtari13
-rw-r--r--dvbv5_dvb-t/fi-Alajarvi23
-rw-r--r--dvbv5_dvb-t/fi-Anjalankoski_Ruotila28
-rw-r--r--dvbv5_dvb-t/fi-Enontekio_Ahovaara13
-rw-r--r--dvbv5_dvb-t/fi-Enontekio_Hetta13
-rw-r--r--dvbv5_dvb-t/fi-Enontekio_Kuttanen13
-rw-r--r--dvbv5_dvb-t/fi-Espoo28
-rw-r--r--dvbv5_dvb-t/fi-Eurajoki28
-rw-r--r--dvbv5_dvb-t/fi-Fiskars23
-rw-r--r--dvbv5_dvb-t/fi-Haapavesi23
-rw-r--r--dvbv5_dvb-t/fi-Hameenkyro_Kyroskoski23
-rw-r--r--dvbv5_dvb-t/fi-Hameenlinna_Painokangas18
-rw-r--r--dvbv5_dvb-t/fi-Hanko23
-rw-r--r--dvbv5_dvb-t/fi-Hartola18
-rw-r--r--dvbv5_dvb-t/fi-Heinavesi18
-rw-r--r--dvbv5_dvb-t/fi-Heinola23
-rw-r--r--dvbv5_dvb-t/fi-Hyrynsalmi18
-rw-r--r--dvbv5_dvb-t/fi-Hyrynsalmi_Kyparavaara18
-rw-r--r--dvbv5_dvb-t/fi-Hyrynsalmi_Paljakka18
-rw-r--r--dvbv5_dvb-t/fi-Hyvinkaa23
-rw-r--r--dvbv5_dvb-t/fi-Ii_Raiskio13
-rw-r--r--dvbv5_dvb-t/fi-Iisalmi13
-rw-r--r--dvbv5_dvb-t/fi-Ikaalinen23
-rw-r--r--dvbv5_dvb-t/fi-Ikaalinen_Riitiala23
-rw-r--r--dvbv5_dvb-t/fi-Inari13
-rw-r--r--dvbv5_dvb-t/fi-Inari_Janispaa13
-rw-r--r--dvbv5_dvb-t/fi-Inari_Naatamo13
-rw-r--r--dvbv5_dvb-t/fi-Ivalo_Saarineitamovaara13
-rw-r--r--dvbv5_dvb-t/fi-Jalasjarvi23
-rw-r--r--dvbv5_dvb-t/fi-Jamsa_Halli23
-rw-r--r--dvbv5_dvb-t/fi-Jamsa_Kaipola23
-rw-r--r--dvbv5_dvb-t/fi-Jamsa_Matkosvuori23
-rw-r--r--dvbv5_dvb-t/fi-Jamsa_Ouninpohja18
-rw-r--r--dvbv5_dvb-t/fi-Jamsankoski23
-rw-r--r--dvbv5_dvb-t/fi-Joensuu_Vestinkallio18
-rw-r--r--dvbv5_dvb-t/fi-Joroinen_Puukkola18
-rw-r--r--dvbv5_dvb-t/fi-Joutsa_Lankia23
-rw-r--r--dvbv5_dvb-t/fi-Joutseno28
-rw-r--r--dvbv5_dvb-t/fi-Juupajoki_Kopsamo18
-rw-r--r--dvbv5_dvb-t/fi-Juva23
-rw-r--r--dvbv5_dvb-t/fi-Jyvaskyla28
-rw-r--r--dvbv5_dvb-t/fi-Jyvaskyla_Vaajakoski18
-rw-r--r--dvbv5_dvb-t/fi-Kaavi_Sivakkavaara18
-rw-r--r--dvbv5_dvb-t/fi-Kajaani_Pollyvaara18
-rw-r--r--dvbv5_dvb-t/fi-Kalajoki18
-rw-r--r--dvbv5_dvb-t/fi-Kangaslampi23
-rw-r--r--dvbv5_dvb-t/fi-Kangasniemi_Turkinmaki23
-rw-r--r--dvbv5_dvb-t/fi-Kankaanpaa23
-rw-r--r--dvbv5_dvb-t/fi-Karigasniemi13
-rw-r--r--dvbv5_dvb-t/fi-Karkkila23
-rw-r--r--dvbv5_dvb-t/fi-Karstula18
-rw-r--r--dvbv5_dvb-t/fi-Karvia18
-rw-r--r--dvbv5_dvb-t/fi-Kaunispaa13
-rw-r--r--dvbv5_dvb-t/fi-Kemijarvi_Suomutunturi13
-rw-r--r--dvbv5_dvb-t/fi-Kerimaki23
-rw-r--r--dvbv5_dvb-t/fi-Keuruu23
-rw-r--r--dvbv5_dvb-t/fi-Keuruu_Haapamaki23
-rw-r--r--dvbv5_dvb-t/fi-Kihnio23
-rw-r--r--dvbv5_dvb-t/fi-Kiihtelysvaara13
-rw-r--r--dvbv5_dvb-t/fi-Kilpisjarvi13
-rw-r--r--dvbv5_dvb-t/fi-Kittila_Levitunturi13
-rw-r--r--dvbv5_dvb-t/fi-Kolari_Vuolittaja13
-rw-r--r--dvbv5_dvb-t/fi-Koli23
-rw-r--r--dvbv5_dvb-t/fi-Korpilahti_Vaarunvuori23
-rw-r--r--dvbv5_dvb-t/fi-Korppoo23
-rw-r--r--dvbv5_dvb-t/fi-Kruunupyy28
-rw-r--r--dvbv5_dvb-t/fi-Kuhmo_Haukela18
-rw-r--r--dvbv5_dvb-t/fi-Kuhmo_Lentiira18
-rw-r--r--dvbv5_dvb-t/fi-Kuhmo_Niva18
-rw-r--r--dvbv5_dvb-t/fi-Kuhmoinen23
-rw-r--r--dvbv5_dvb-t/fi-Kuhmoinen_Harjunsalmi23
-rw-r--r--dvbv5_dvb-t/fi-Kuhmoinen_Puukkoinen18
-rw-r--r--dvbv5_dvb-t/fi-Kuopio28
-rw-r--r--dvbv5_dvb-t/fi-Kurikka_Kesti23
-rw-r--r--dvbv5_dvb-t/fi-Kustavi_Viherlahti23
-rw-r--r--dvbv5_dvb-t/fi-Kuusamo_Hamppulampi13
-rw-r--r--dvbv5_dvb-t/fi-Kyyjarvi_Noposenaho18
-rw-r--r--dvbv5_dvb-t/fi-Lahti28
-rw-r--r--dvbv5_dvb-t/fi-Lapua28
-rw-r--r--dvbv5_dvb-t/fi-Laukaa23
-rw-r--r--dvbv5_dvb-t/fi-Laukaa_Vihtavuori23
-rw-r--r--dvbv5_dvb-t/fi-Lavia18
-rw-r--r--dvbv5_dvb-t/fi-Lohja23
-rw-r--r--dvbv5_dvb-t/fi-Loimaa23
-rw-r--r--dvbv5_dvb-t/fi-Luhanka23
-rw-r--r--dvbv5_dvb-t/fi-Luopioinen23
-rw-r--r--dvbv5_dvb-t/fi-Mantta23
-rw-r--r--dvbv5_dvb-t/fi-Mantyharju18
-rw-r--r--dvbv5_dvb-t/fi-Mikkeli23
-rw-r--r--dvbv5_dvb-t/fi-Muonio_Olostunturi13
-rw-r--r--dvbv5_dvb-t/fi-Nilsia23
-rw-r--r--dvbv5_dvb-t/fi-Nilsia_Keski-Siikajarvi18
-rw-r--r--dvbv5_dvb-t/fi-Nilsia_Pisa18
-rw-r--r--dvbv5_dvb-t/fi-Nokia23
-rw-r--r--dvbv5_dvb-t/fi-Nokia_Siuro23
-rw-r--r--dvbv5_dvb-t/fi-Nummi-Pusula_Hyonola23
-rw-r--r--dvbv5_dvb-t/fi-Nuorgam_Njallavaara13
-rw-r--r--dvbv5_dvb-t/fi-Nuorgam_raja13
-rw-r--r--dvbv5_dvb-t/fi-Nurmes_Konnanvaara23
-rw-r--r--dvbv5_dvb-t/fi-Nurmes_Kortevaara18
-rw-r--r--dvbv5_dvb-t/fi-Orivesi_Talviainen18
-rw-r--r--dvbv5_dvb-t/fi-Oulu28
-rw-r--r--dvbv5_dvb-t/fi-Padasjoki23
-rw-r--r--dvbv5_dvb-t/fi-Padasjoki_Arrakoski23
-rw-r--r--dvbv5_dvb-t/fi-Paltamo_Kivesvaara18
-rw-r--r--dvbv5_dvb-t/fi-Parainen_Houtskari23
-rw-r--r--dvbv5_dvb-t/fi-Parikkala23
-rw-r--r--dvbv5_dvb-t/fi-Parkano_Sopukallio23
-rw-r--r--dvbv5_dvb-t/fi-Pello13
-rw-r--r--dvbv5_dvb-t/fi-Pello_Ratasvaara13
-rw-r--r--dvbv5_dvb-t/fi-Perho23
-rw-r--r--dvbv5_dvb-t/fi-Pernaja18
-rw-r--r--dvbv5_dvb-t/fi-Pieksamaki_Halkokumpu18
-rw-r--r--dvbv5_dvb-t/fi-Pihtipudas18
-rw-r--r--dvbv5_dvb-t/fi-Porvoo_Suomenkyla23
-rw-r--r--dvbv5_dvb-t/fi-Posio13
-rw-r--r--dvbv5_dvb-t/fi-Pudasjarvi18
-rw-r--r--dvbv5_dvb-t/fi-Pudasjarvi_Iso-Syote18
-rw-r--r--dvbv5_dvb-t/fi-Pudasjarvi_Kangasvaara13
-rw-r--r--dvbv5_dvb-t/fi-Puolanka23
-rw-r--r--dvbv5_dvb-t/fi-Pyhatunturi13
-rw-r--r--dvbv5_dvb-t/fi-Pyhavuori18
-rw-r--r--dvbv5_dvb-t/fi-Pylkonmaki_Karankajarvi18
-rw-r--r--dvbv5_dvb-t/fi-Raahe_Mestauskallio23
-rw-r--r--dvbv5_dvb-t/fi-Raahe_Piehinki18
-rw-r--r--dvbv5_dvb-t/fi-Ranua_Haasionmaa13
-rw-r--r--dvbv5_dvb-t/fi-Ranua_Leppiaho13
-rw-r--r--dvbv5_dvb-t/fi-Rautavaara_Angervikko23
-rw-r--r--dvbv5_dvb-t/fi-Rautjarvi_Simpele18
-rw-r--r--dvbv5_dvb-t/fi-Ristijarvi18
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi18
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi_Kaihuanvaara13
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi_Karhuvaara13
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi_Marasenkallio13
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi_Rantalaki13
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi_Sonka13
-rw-r--r--dvbv5_dvb-t/fi-Rovaniemi_Sorviselka13
-rw-r--r--dvbv5_dvb-t/fi-Ruka18
-rw-r--r--dvbv5_dvb-t/fi-Ruovesi_Storminiemi23
-rw-r--r--dvbv5_dvb-t/fi-Saarijarvi23
-rw-r--r--dvbv5_dvb-t/fi-Saarijarvi_Kalmari18
-rw-r--r--dvbv5_dvb-t/fi-Saarijarvi_Mahlu18
-rw-r--r--dvbv5_dvb-t/fi-Salla_Hirvasvaara13
-rw-r--r--dvbv5_dvb-t/fi-Salla_Ihistysjanka13
-rw-r--r--dvbv5_dvb-t/fi-Salla_Naruska13
-rw-r--r--dvbv5_dvb-t/fi-Salla_Sallatunturi13
-rw-r--r--dvbv5_dvb-t/fi-Salla_Sarivaara13
-rw-r--r--dvbv5_dvb-t/fi-Salo_Isokyla23
-rw-r--r--dvbv5_dvb-t/fi-Savukoski_Martti13
-rw-r--r--dvbv5_dvb-t/fi-Savukoski_Tanhua13
-rw-r--r--dvbv5_dvb-t/fi-Siilinjarvi23
-rw-r--r--dvbv5_dvb-t/fi-Simo_Viantie18
-rw-r--r--dvbv5_dvb-t/fi-Sipoo_Norrkulla23
-rw-r--r--dvbv5_dvb-t/fi-Sodankyla_Pittiovaara13
-rw-r--r--dvbv5_dvb-t/fi-Sodankyla_Vuotso13
-rw-r--r--dvbv5_dvb-t/fi-Sulkava_Vaatalanmaki18
-rw-r--r--dvbv5_dvb-t/fi-Suomussalmi_Ala-Vuokki13
-rw-r--r--dvbv5_dvb-t/fi-Suomussalmi_Ammansaari13
-rw-r--r--dvbv5_dvb-t/fi-Suomussalmi_Juntusranta13
-rw-r--r--dvbv5_dvb-t/fi-Suomussalmi_Myllylahti13
-rw-r--r--dvbv5_dvb-t/fi-Sysma_Liikola23
-rw-r--r--dvbv5_dvb-t/fi-Taivalkoski13
-rw-r--r--dvbv5_dvb-t/fi-Taivalkoski_Taivalvaara13
-rw-r--r--dvbv5_dvb-t/fi-Tammela28
-rw-r--r--dvbv5_dvb-t/fi-Tammisaari23
-rw-r--r--dvbv5_dvb-t/fi-Tampere28
-rw-r--r--dvbv5_dvb-t/fi-Tampere_Pyynikki28
-rw-r--r--dvbv5_dvb-t/fi-Tervola18
-rw-r--r--dvbv5_dvb-t/fi-Turku28
-rw-r--r--dvbv5_dvb-t/fi-Utsjoki13
-rw-r--r--dvbv5_dvb-t/fi-Utsjoki_Nuvvus13
-rw-r--r--dvbv5_dvb-t/fi-Utsjoki_Outakoski13
-rw-r--r--dvbv5_dvb-t/fi-Utsjoki_Polvarniemi13
-rw-r--r--dvbv5_dvb-t/fi-Utsjoki_Rovisuvanto13
-rw-r--r--dvbv5_dvb-t/fi-Utsjoki_Tenola13
-rw-r--r--dvbv5_dvb-t/fi-Uusikaupunki_Orivo23
-rw-r--r--dvbv5_dvb-t/fi-Vaala18
-rw-r--r--dvbv5_dvb-t/fi-Vaasa18
-rw-r--r--dvbv5_dvb-t/fi-Valtimo18
-rw-r--r--dvbv5_dvb-t/fi-Vammala_Jyranvuori23
-rw-r--r--dvbv5_dvb-t/fi-Vammala_Roismala18
-rw-r--r--dvbv5_dvb-t/fi-Vammala_Savi18
-rw-r--r--dvbv5_dvb-t/fi-Vantaa_Hakunila23
-rw-r--r--dvbv5_dvb-t/fi-Varpaisjarvi_Honkamaki23
-rw-r--r--dvbv5_dvb-t/fi-Virrat_Lappavuori23
-rw-r--r--dvbv5_dvb-t/fi-Vuokatti23
-rw-r--r--dvbv5_dvb-t/fi-Ylitornio_Ainiovaara18
-rw-r--r--dvbv5_dvb-t/fi-Ylitornio_Raanujarvi13
-rw-r--r--dvbv5_dvb-t/fi-Yllas13
-rw-r--r--dvbv5_dvb-t/fi-Yllasjarvi13
-rw-r--r--isdb-t/br-Brazil (renamed from dvbv5_isdb-t/br-Brazil)0
-rw-r--r--isdb-t/br-ac-Bujari (renamed from dvbv5_isdb-t/br-ac-Bujari)0
-rw-r--r--isdb-t/br-ac-PortoAcre (renamed from dvbv5_isdb-t/br-ac-PortoAcre)0
-rw-r--r--isdb-t/br-ac-RioBranco (renamed from dvbv5_isdb-t/br-ac-RioBranco)0
-rw-r--r--isdb-t/br-ac-SenadorGuiomard (renamed from dvbv5_isdb-t/br-ac-SenadorGuiomard)0
-rw-r--r--isdb-t/br-al-Arapiraca (renamed from dvbv5_isdb-t/br-al-Arapiraca)0
-rw-r--r--isdb-t/br-al-Craibas (renamed from dvbv5_isdb-t/br-al-Craibas)0
-rw-r--r--isdb-t/br-al-Maceio (renamed from dvbv5_isdb-t/br-al-Maceio)0
-rw-r--r--isdb-t/br-al-Piranhas (renamed from dvbv5_isdb-t/br-al-Piranhas)0
-rw-r--r--isdb-t/br-al-RioLargo (renamed from dvbv5_isdb-t/br-al-RioLargo)0
-rw-r--r--isdb-t/br-al-SaoMiguelDosCampos (renamed from dvbv5_isdb-t/br-al-SaoMiguelDosCampos)0
-rw-r--r--isdb-t/br-am-CareiroDaVarzea (renamed from dvbv5_isdb-t/br-am-CareiroDaVarzea)0
-rw-r--r--isdb-t/br-am-Iranduba (renamed from dvbv5_isdb-t/br-am-Iranduba)0
-rw-r--r--isdb-t/br-am-Manaquiri (renamed from dvbv5_isdb-t/br-am-Manaquiri)0
-rw-r--r--isdb-t/br-am-Manaus (renamed from dvbv5_isdb-t/br-am-Manaus)0
-rw-r--r--isdb-t/br-am-Parintins (renamed from dvbv5_isdb-t/br-am-Parintins)0
-rw-r--r--isdb-t/br-ap-Macapa (renamed from dvbv5_isdb-t/br-ap-Macapa)0
-rw-r--r--isdb-t/br-ap-Santana (renamed from dvbv5_isdb-t/br-ap-Santana)0
-rw-r--r--isdb-t/br-ba-Alagoinhas (renamed from dvbv5_isdb-t/br-ba-Alagoinhas)0
-rw-r--r--isdb-t/br-ba-Alcobaca (renamed from dvbv5_isdb-t/br-ba-Alcobaca)0
-rw-r--r--isdb-t/br-ba-Amargosa (renamed from dvbv5_isdb-t/br-ba-Amargosa)0
-rw-r--r--isdb-t/br-ba-AmeliaRodrigues (renamed from dvbv5_isdb-t/br-ba-AmeliaRodrigues)0
-rw-r--r--isdb-t/br-ba-Anguera (renamed from dvbv5_isdb-t/br-ba-Anguera)0
-rw-r--r--isdb-t/br-ba-AntonioCardoso (renamed from dvbv5_isdb-t/br-ba-AntonioCardoso)0
-rw-r--r--isdb-t/br-ba-Aracatu (renamed from dvbv5_isdb-t/br-ba-Aracatu)0
-rw-r--r--isdb-t/br-ba-Barra (renamed from dvbv5_isdb-t/br-ba-Barra)0
-rw-r--r--isdb-t/br-ba-BarraDoChoca (renamed from dvbv5_isdb-t/br-ba-BarraDoChoca)0
-rw-r--r--isdb-t/br-ba-Barreiras (renamed from dvbv5_isdb-t/br-ba-Barreiras)0
-rw-r--r--isdb-t/br-ba-BeloCampo (renamed from dvbv5_isdb-t/br-ba-BeloCampo)0
-rw-r--r--isdb-t/br-ba-Biritinga (renamed from dvbv5_isdb-t/br-ba-Biritinga)0
-rw-r--r--isdb-t/br-ba-BomJesusDaLapa (renamed from dvbv5_isdb-t/br-ba-BomJesusDaLapa)0
-rw-r--r--isdb-t/br-ba-Brumado (renamed from dvbv5_isdb-t/br-ba-Brumado)0
-rw-r--r--isdb-t/br-ba-Caetite (renamed from dvbv5_isdb-t/br-ba-Caetite)0
-rw-r--r--isdb-t/br-ba-Camacari (renamed from dvbv5_isdb-t/br-ba-Camacari)0
-rw-r--r--isdb-t/br-ba-CampoFormoso (renamed from dvbv5_isdb-t/br-ba-CampoFormoso)0
-rw-r--r--isdb-t/br-ba-Candeal (renamed from dvbv5_isdb-t/br-ba-Candeal)0
-rw-r--r--isdb-t/br-ba-Candeias (renamed from dvbv5_isdb-t/br-ba-Candeias)0
-rw-r--r--isdb-t/br-ba-CandidoSales (renamed from dvbv5_isdb-t/br-ba-CandidoSales)0
-rw-r--r--isdb-t/br-ba-Caraibas (renamed from dvbv5_isdb-t/br-ba-Caraibas)0
-rw-r--r--isdb-t/br-ba-ConceicaoDaFeira (renamed from dvbv5_isdb-t/br-ba-ConceicaoDaFeira)0
-rw-r--r--isdb-t/br-ba-ConceicaoDoJacuipe (renamed from dvbv5_isdb-t/br-ba-ConceicaoDoJacuipe)0
-rw-r--r--isdb-t/br-ba-CoracaoDeMaria (renamed from dvbv5_isdb-t/br-ba-CoracaoDeMaria)0
-rw-r--r--isdb-t/br-ba-CruzDasAlmas (renamed from dvbv5_isdb-t/br-ba-CruzDasAlmas)0
-rw-r--r--isdb-t/br-ba-DiasDAvila (renamed from dvbv5_isdb-t/br-ba-DiasDAvila)0
-rw-r--r--isdb-t/br-ba-EntreRios (renamed from dvbv5_isdb-t/br-ba-EntreRios)0
-rw-r--r--isdb-t/br-ba-Eunapolis (renamed from dvbv5_isdb-t/br-ba-Eunapolis)0
-rw-r--r--isdb-t/br-ba-FeiraDeSantana (renamed from dvbv5_isdb-t/br-ba-FeiraDeSantana)0
-rw-r--r--isdb-t/br-ba-Guanambi (renamed from dvbv5_isdb-t/br-ba-Guanambi)0
-rw-r--r--isdb-t/br-ba-Ichu (renamed from dvbv5_isdb-t/br-ba-Ichu)0
-rw-r--r--isdb-t/br-ba-Ilheus (renamed from dvbv5_isdb-t/br-ba-Ilheus)0
-rw-r--r--isdb-t/br-ba-Inhambupe (renamed from dvbv5_isdb-t/br-ba-Inhambupe)0
-rw-r--r--isdb-t/br-ba-Ipecaeta (renamed from dvbv5_isdb-t/br-ba-Ipecaeta)0
-rw-r--r--isdb-t/br-ba-Irara (renamed from dvbv5_isdb-t/br-ba-Irara)0
-rw-r--r--isdb-t/br-ba-Irece (renamed from dvbv5_isdb-t/br-ba-Irece)0
-rw-r--r--isdb-t/br-ba-Itabuna (renamed from dvbv5_isdb-t/br-ba-Itabuna)0
-rw-r--r--isdb-t/br-ba-Itamaraju (renamed from dvbv5_isdb-t/br-ba-Itamaraju)0
-rw-r--r--isdb-t/br-ba-Itambe (renamed from dvbv5_isdb-t/br-ba-Itambe)0
-rw-r--r--isdb-t/br-ba-Itaparica (renamed from dvbv5_isdb-t/br-ba-Itaparica)0
-rw-r--r--isdb-t/br-ba-Itapetinga (renamed from dvbv5_isdb-t/br-ba-Itapetinga)0
-rw-r--r--isdb-t/br-ba-Jacobina (renamed from dvbv5_isdb-t/br-ba-Jacobina)0
-rw-r--r--isdb-t/br-ba-Jaguaquara (renamed from dvbv5_isdb-t/br-ba-Jaguaquara)0
-rw-r--r--isdb-t/br-ba-Jaguaripe (renamed from dvbv5_isdb-t/br-ba-Jaguaripe)0
-rw-r--r--isdb-t/br-ba-Jequie (renamed from dvbv5_isdb-t/br-ba-Jequie)0
-rw-r--r--isdb-t/br-ba-Juazeiro (renamed from dvbv5_isdb-t/br-ba-Juazeiro)0
-rw-r--r--isdb-t/br-ba-LauroDeFreitas (renamed from dvbv5_isdb-t/br-ba-LauroDeFreitas)0
-rw-r--r--isdb-t/br-ba-LuisEduardoMagalhaes (renamed from dvbv5_isdb-t/br-ba-LuisEduardoMagalhaes)0
-rw-r--r--isdb-t/br-ba-MadreDeDeus (renamed from dvbv5_isdb-t/br-ba-MadreDeDeus)0
-rw-r--r--isdb-t/br-ba-Maragogipe (renamed from dvbv5_isdb-t/br-ba-Maragogipe)0
-rw-r--r--isdb-t/br-ba-MataDeSaoJoao (renamed from dvbv5_isdb-t/br-ba-MataDeSaoJoao)0
-rw-r--r--isdb-t/br-ba-Nazare (renamed from dvbv5_isdb-t/br-ba-Nazare)0
-rw-r--r--isdb-t/br-ba-PauloAfonso (renamed from dvbv5_isdb-t/br-ba-PauloAfonso)0
-rw-r--r--isdb-t/br-ba-Piripa (renamed from dvbv5_isdb-t/br-ba-Piripa)0
-rw-r--r--isdb-t/br-ba-Planalto (renamed from dvbv5_isdb-t/br-ba-Planalto)0
-rw-r--r--isdb-t/br-ba-Pocoes (renamed from dvbv5_isdb-t/br-ba-Pocoes)0
-rw-r--r--isdb-t/br-ba-Pojuca (renamed from dvbv5_isdb-t/br-ba-Pojuca)0
-rw-r--r--isdb-t/br-ba-PortoSeguro (renamed from dvbv5_isdb-t/br-ba-PortoSeguro)0
-rw-r--r--isdb-t/br-ba-PresidenteJanioQuadros (renamed from dvbv5_isdb-t/br-ba-PresidenteJanioQuadros)0
-rw-r--r--isdb-t/br-ba-RafaelJambeiro (renamed from dvbv5_isdb-t/br-ba-RafaelJambeiro)0
-rw-r--r--isdb-t/br-ba-SalinasDaMargarida (renamed from dvbv5_isdb-t/br-ba-SalinasDaMargarida)0
-rw-r--r--isdb-t/br-ba-Salvador (renamed from dvbv5_isdb-t/br-ba-Salvador)0
-rw-r--r--isdb-t/br-ba-SantaBarbara (renamed from dvbv5_isdb-t/br-ba-SantaBarbara)0
-rw-r--r--isdb-t/br-ba-SantaCruzCabralia (renamed from dvbv5_isdb-t/br-ba-SantaCruzCabralia)0
-rw-r--r--isdb-t/br-ba-SantaMariaDaVitoria (renamed from dvbv5_isdb-t/br-ba-SantaMariaDaVitoria)0
-rw-r--r--isdb-t/br-ba-Santanopolis (renamed from dvbv5_isdb-t/br-ba-Santanopolis)0
-rw-r--r--isdb-t/br-ba-SantoAmaro (renamed from dvbv5_isdb-t/br-ba-SantoAmaro)0
-rw-r--r--isdb-t/br-ba-SantoAntonioDeJesus (renamed from dvbv5_isdb-t/br-ba-SantoAntonioDeJesus)0
-rw-r--r--isdb-t/br-ba-SantoEstevao (renamed from dvbv5_isdb-t/br-ba-SantoEstevao)0
-rw-r--r--isdb-t/br-ba-SaoFranciscoDoConde (renamed from dvbv5_isdb-t/br-ba-SaoFranciscoDoConde)0
-rw-r--r--isdb-t/br-ba-SaoGoncaloDosCampos (renamed from dvbv5_isdb-t/br-ba-SaoGoncaloDosCampos)0
-rw-r--r--isdb-t/br-ba-SaoSebastiaoDoPasse (renamed from dvbv5_isdb-t/br-ba-SaoSebastiaoDoPasse)0
-rw-r--r--isdb-t/br-ba-SenhorDoBonfim (renamed from dvbv5_isdb-t/br-ba-SenhorDoBonfim)0
-rw-r--r--isdb-t/br-ba-SerraPreta (renamed from dvbv5_isdb-t/br-ba-SerraPreta)0
-rw-r--r--isdb-t/br-ba-Serrinha (renamed from dvbv5_isdb-t/br-ba-Serrinha)0
-rw-r--r--isdb-t/br-ba-SimoesFilho (renamed from dvbv5_isdb-t/br-ba-SimoesFilho)0
-rw-r--r--isdb-t/br-ba-Tanquinho (renamed from dvbv5_isdb-t/br-ba-Tanquinho)0
-rw-r--r--isdb-t/br-ba-TeixeiraDeFreitas (renamed from dvbv5_isdb-t/br-ba-TeixeiraDeFreitas)0
-rw-r--r--isdb-t/br-ba-Teofilandia (renamed from dvbv5_isdb-t/br-ba-Teofilandia)0
-rw-r--r--isdb-t/br-ba-Tremedal (renamed from dvbv5_isdb-t/br-ba-Tremedal)0
-rw-r--r--isdb-t/br-ba-VeraCruz (renamed from dvbv5_isdb-t/br-ba-VeraCruz)0
-rw-r--r--isdb-t/br-ba-VitoriaDaConquista (renamed from dvbv5_isdb-t/br-ba-VitoriaDaConquista)0
-rw-r--r--isdb-t/br-ba-Xiquexique (renamed from dvbv5_isdb-t/br-ba-Xiquexique)0
-rw-r--r--isdb-t/br-ce-Acarape (renamed from dvbv5_isdb-t/br-ce-Acarape)0
-rw-r--r--isdb-t/br-ce-Aquiraz (renamed from dvbv5_isdb-t/br-ce-Aquiraz)0
-rw-r--r--isdb-t/br-ce-Aurora (renamed from dvbv5_isdb-t/br-ce-Aurora)0
-rw-r--r--isdb-t/br-ce-Caninde (renamed from dvbv5_isdb-t/br-ce-Caninde)0
-rw-r--r--isdb-t/br-ce-Fortaleza (renamed from dvbv5_isdb-t/br-ce-Fortaleza)0
-rw-r--r--isdb-t/br-ce-Horizonte (renamed from dvbv5_isdb-t/br-ce-Horizonte)0
-rw-r--r--isdb-t/br-ce-Maracanau (renamed from dvbv5_isdb-t/br-ce-Maracanau)0
-rw-r--r--isdb-t/br-ce-MaranguapeItapebussu (renamed from dvbv5_isdb-t/br-ce-MaranguapeItapebussu)0
-rw-r--r--isdb-t/br-ce-Pacajus (renamed from dvbv5_isdb-t/br-ce-Pacajus)0
-rw-r--r--isdb-t/br-df-Brasilia (renamed from dvbv5_isdb-t/br-df-Brasilia)0
-rw-r--r--isdb-t/br-df-BrasiliaGama (renamed from dvbv5_isdb-t/br-df-BrasiliaGama)0
-rw-r--r--isdb-t/br-es-CachoeiroDoItapemirim (renamed from dvbv5_isdb-t/br-es-CachoeiroDoItapemirim)0
-rw-r--r--isdb-t/br-es-Colatina (renamed from dvbv5_isdb-t/br-es-Colatina)0
-rw-r--r--isdb-t/br-es-Guarapari (renamed from dvbv5_isdb-t/br-es-Guarapari)0
-rw-r--r--isdb-t/br-es-Linhares (renamed from dvbv5_isdb-t/br-es-Linhares)0
-rw-r--r--isdb-t/br-es-SaoMateus (renamed from dvbv5_isdb-t/br-es-SaoMateus)0
-rw-r--r--isdb-t/br-es-Vitoria (renamed from dvbv5_isdb-t/br-es-Vitoria)0
-rw-r--r--isdb-t/br-go-AguasLindasDeGoias (renamed from dvbv5_isdb-t/br-go-AguasLindasDeGoias)0
-rw-r--r--isdb-t/br-go-Alexania (renamed from dvbv5_isdb-t/br-go-Alexania)0
-rw-r--r--isdb-t/br-go-Anapolis (renamed from dvbv5_isdb-t/br-go-Anapolis)0
-rw-r--r--isdb-t/br-go-AparecidaDeGoiania (renamed from dvbv5_isdb-t/br-go-AparecidaDeGoiania)0
-rw-r--r--isdb-t/br-go-CaldasNovas (renamed from dvbv5_isdb-t/br-go-CaldasNovas)0
-rw-r--r--isdb-t/br-go-Catalao (renamed from dvbv5_isdb-t/br-go-Catalao)0
-rw-r--r--isdb-t/br-go-Cristalina (renamed from dvbv5_isdb-t/br-go-Cristalina)0
-rw-r--r--isdb-t/br-go-Formosa (renamed from dvbv5_isdb-t/br-go-Formosa)0
-rw-r--r--isdb-t/br-go-Goianesia (renamed from dvbv5_isdb-t/br-go-Goianesia)0
-rw-r--r--isdb-t/br-go-Goiania (renamed from dvbv5_isdb-t/br-go-Goiania)0
-rw-r--r--isdb-t/br-go-Guapo (renamed from dvbv5_isdb-t/br-go-Guapo)0
-rw-r--r--isdb-t/br-go-Inhumas (renamed from dvbv5_isdb-t/br-go-Inhumas)0
-rw-r--r--isdb-t/br-go-Itumbiara (renamed from dvbv5_isdb-t/br-go-Itumbiara)0
-rw-r--r--isdb-t/br-go-Jatai (renamed from dvbv5_isdb-t/br-go-Jatai)0
-rw-r--r--isdb-t/br-go-Luziania (renamed from dvbv5_isdb-t/br-go-Luziania)0
-rw-r--r--isdb-t/br-go-PlanaltinaDeGoias (renamed from dvbv5_isdb-t/br-go-PlanaltinaDeGoias)0
-rw-r--r--isdb-t/br-go-RioVerde (renamed from dvbv5_isdb-t/br-go-RioVerde)0
-rw-r--r--isdb-t/br-go-SantaHelenaDeGoias (renamed from dvbv5_isdb-t/br-go-SantaHelenaDeGoias)0
-rw-r--r--isdb-t/br-go-SantoAntonioDoDescoberto (renamed from dvbv5_isdb-t/br-go-SantoAntonioDoDescoberto)0
-rw-r--r--isdb-t/br-go-SaoLuisDeMontesBelos (renamed from dvbv5_isdb-t/br-go-SaoLuisDeMontesBelos)0
-rw-r--r--isdb-t/br-go-SenadorCanedo (renamed from dvbv5_isdb-t/br-go-SenadorCanedo)0
-rw-r--r--isdb-t/br-go-ValparaisoDeGoias (renamed from dvbv5_isdb-t/br-go-ValparaisoDeGoias)0
-rw-r--r--isdb-t/br-ma-Alcantara (renamed from dvbv5_isdb-t/br-ma-Alcantara)0
-rw-r--r--isdb-t/br-ma-Axixa (renamed from dvbv5_isdb-t/br-ma-Axixa)0
-rw-r--r--isdb-t/br-ma-CachoeiraGrande (renamed from dvbv5_isdb-t/br-ma-CachoeiraGrande)0
-rw-r--r--isdb-t/br-ma-Caxias (renamed from dvbv5_isdb-t/br-ma-Caxias)0
-rw-r--r--isdb-t/br-ma-HumbertoDeCampos (renamed from dvbv5_isdb-t/br-ma-HumbertoDeCampos)0
-rw-r--r--isdb-t/br-ma-Imperatriz (renamed from dvbv5_isdb-t/br-ma-Imperatriz)0
-rw-r--r--isdb-t/br-ma-Morros (renamed from dvbv5_isdb-t/br-ma-Morros)0
-rw-r--r--isdb-t/br-ma-PacoDoLumiar (renamed from dvbv5_isdb-t/br-ma-PacoDoLumiar)0
-rw-r--r--isdb-t/br-ma-PresidenteJuscelino (renamed from dvbv5_isdb-t/br-ma-PresidenteJuscelino)0
-rw-r--r--isdb-t/br-ma-PrimeiraCruz (renamed from dvbv5_isdb-t/br-ma-PrimeiraCruz)0
-rw-r--r--isdb-t/br-ma-Raposa (renamed from dvbv5_isdb-t/br-ma-Raposa)0
-rw-r--r--isdb-t/br-ma-Rosario (renamed from dvbv5_isdb-t/br-ma-Rosario)0
-rw-r--r--isdb-t/br-ma-SaoJoseDeRibamar (renamed from dvbv5_isdb-t/br-ma-SaoJoseDeRibamar)0
-rw-r--r--isdb-t/br-ma-SaoLuis (renamed from dvbv5_isdb-t/br-ma-SaoLuis)0
-rw-r--r--isdb-t/br-ma-Timon (renamed from dvbv5_isdb-t/br-ma-Timon)0
-rw-r--r--isdb-t/br-mg-AguaComprida (renamed from dvbv5_isdb-t/br-mg-AguaComprida)0
-rw-r--r--isdb-t/br-mg-Alfenas (renamed from dvbv5_isdb-t/br-mg-Alfenas)0
-rw-r--r--isdb-t/br-mg-Almenara (renamed from dvbv5_isdb-t/br-mg-Almenara)0
-rw-r--r--isdb-t/br-mg-Andradas (renamed from dvbv5_isdb-t/br-mg-Andradas)0
-rw-r--r--isdb-t/br-mg-Araguari (renamed from dvbv5_isdb-t/br-mg-Araguari)0
-rw-r--r--isdb-t/br-mg-Arapora (renamed from dvbv5_isdb-t/br-mg-Arapora)0
-rw-r--r--isdb-t/br-mg-Araxa (renamed from dvbv5_isdb-t/br-mg-Araxa)0
-rw-r--r--isdb-t/br-mg-Arinos (renamed from dvbv5_isdb-t/br-mg-Arinos)0
-rw-r--r--isdb-t/br-mg-Barbacena (renamed from dvbv5_isdb-t/br-mg-Barbacena)0
-rw-r--r--isdb-t/br-mg-Barroso (renamed from dvbv5_isdb-t/br-mg-Barroso)0
-rw-r--r--isdb-t/br-mg-BeloHorizonte (renamed from dvbv5_isdb-t/br-mg-BeloHorizonte)0
-rw-r--r--isdb-t/br-mg-Betim (renamed from dvbv5_isdb-t/br-mg-Betim)0
-rw-r--r--isdb-t/br-mg-BordaDaMata (renamed from dvbv5_isdb-t/br-mg-BordaDaMata)0
-rw-r--r--isdb-t/br-mg-Campanha (renamed from dvbv5_isdb-t/br-mg-Campanha)0
-rw-r--r--isdb-t/br-mg-Caratinga (renamed from dvbv5_isdb-t/br-mg-Caratinga)0
-rw-r--r--isdb-t/br-mg-Cataguases (renamed from dvbv5_isdb-t/br-mg-Cataguases)0
-rw-r--r--isdb-t/br-mg-Claraval (renamed from dvbv5_isdb-t/br-mg-Claraval)0
-rw-r--r--isdb-t/br-mg-CoronelFabriciano (renamed from dvbv5_isdb-t/br-mg-CoronelFabriciano)0
-rw-r--r--isdb-t/br-mg-Curvelo (renamed from dvbv5_isdb-t/br-mg-Curvelo)0
-rw-r--r--isdb-t/br-mg-Diamantina (renamed from dvbv5_isdb-t/br-mg-Diamantina)0
-rw-r--r--isdb-t/br-mg-Divinopolis (renamed from dvbv5_isdb-t/br-mg-Divinopolis)0
-rw-r--r--isdb-t/br-mg-Fronteira (renamed from dvbv5_isdb-t/br-mg-Fronteira)0
-rw-r--r--isdb-t/br-mg-Frutal (renamed from dvbv5_isdb-t/br-mg-Frutal)0
-rw-r--r--isdb-t/br-mg-GovernadorValadares (renamed from dvbv5_isdb-t/br-mg-GovernadorValadares)0
-rw-r--r--isdb-t/br-mg-Guanhaes (renamed from dvbv5_isdb-t/br-mg-Guanhaes)0
-rw-r--r--isdb-t/br-mg-Guaxupe (renamed from dvbv5_isdb-t/br-mg-Guaxupe)0
-rw-r--r--isdb-t/br-mg-Ibirite (renamed from dvbv5_isdb-t/br-mg-Ibirite)0
-rw-r--r--isdb-t/br-mg-Ipatinga (renamed from dvbv5_isdb-t/br-mg-Ipatinga)0
-rw-r--r--isdb-t/br-mg-Itabira (renamed from dvbv5_isdb-t/br-mg-Itabira)0
-rw-r--r--isdb-t/br-mg-Itajuba (renamed from dvbv5_isdb-t/br-mg-Itajuba)0
-rw-r--r--isdb-t/br-mg-Itapagipe (renamed from dvbv5_isdb-t/br-mg-Itapagipe)0
-rw-r--r--isdb-t/br-mg-Ituiutaba (renamed from dvbv5_isdb-t/br-mg-Ituiutaba)0
-rw-r--r--isdb-t/br-mg-Janauba (renamed from dvbv5_isdb-t/br-mg-Janauba)0
-rw-r--r--isdb-t/br-mg-Januaria (renamed from dvbv5_isdb-t/br-mg-Januaria)0
-rw-r--r--isdb-t/br-mg-JuizDeFora (renamed from dvbv5_isdb-t/br-mg-JuizDeFora)0
-rw-r--r--isdb-t/br-mg-Manhuacu (renamed from dvbv5_isdb-t/br-mg-Manhuacu)0
-rw-r--r--isdb-t/br-mg-Mariana (renamed from dvbv5_isdb-t/br-mg-Mariana)0
-rw-r--r--isdb-t/br-mg-MonteSiao (renamed from dvbv5_isdb-t/br-mg-MonteSiao)0
-rw-r--r--isdb-t/br-mg-MontesClaros (renamed from dvbv5_isdb-t/br-mg-MontesClaros)0
-rw-r--r--isdb-t/br-mg-Muriae (renamed from dvbv5_isdb-t/br-mg-Muriae)0
-rw-r--r--isdb-t/br-mg-Oliveira (renamed from dvbv5_isdb-t/br-mg-Oliveira)0
-rw-r--r--isdb-t/br-mg-OuroFino (renamed from dvbv5_isdb-t/br-mg-OuroFino)0
-rw-r--r--isdb-t/br-mg-Paracatu (renamed from dvbv5_isdb-t/br-mg-Paracatu)0
-rw-r--r--isdb-t/br-mg-Passos (renamed from dvbv5_isdb-t/br-mg-Passos)0
-rw-r--r--isdb-t/br-mg-PatosDeMinas (renamed from dvbv5_isdb-t/br-mg-PatosDeMinas)0
-rw-r--r--isdb-t/br-mg-Periquito (renamed from dvbv5_isdb-t/br-mg-Periquito)0
-rw-r--r--isdb-t/br-mg-Pirapora (renamed from dvbv5_isdb-t/br-mg-Pirapora)0
-rw-r--r--isdb-t/br-mg-Planura (renamed from dvbv5_isdb-t/br-mg-Planura)0
-rw-r--r--isdb-t/br-mg-PocosDeCaldas (renamed from dvbv5_isdb-t/br-mg-PocosDeCaldas)0
-rw-r--r--isdb-t/br-mg-PousoAlegre (renamed from dvbv5_isdb-t/br-mg-PousoAlegre)0
-rw-r--r--isdb-t/br-mg-SantaRitaDoSapucai (renamed from dvbv5_isdb-t/br-mg-SantaRitaDoSapucai)0
-rw-r--r--isdb-t/br-mg-SaoJoaoDelRei (renamed from dvbv5_isdb-t/br-mg-SaoJoaoDelRei)0
-rw-r--r--isdb-t/br-mg-SaoLourenco (renamed from dvbv5_isdb-t/br-mg-SaoLourenco)0
-rw-r--r--isdb-t/br-mg-SaoSebastiaoDoParaiso (renamed from dvbv5_isdb-t/br-mg-SaoSebastiaoDoParaiso)0
-rw-r--r--isdb-t/br-mg-SeteLagoas (renamed from dvbv5_isdb-t/br-mg-SeteLagoas)0
-rw-r--r--isdb-t/br-mg-TeofiloOtoni (renamed from dvbv5_isdb-t/br-mg-TeofiloOtoni)0
-rw-r--r--isdb-t/br-mg-Timoteo (renamed from dvbv5_isdb-t/br-mg-Timoteo)0
-rw-r--r--isdb-t/br-mg-TresCoracoes (renamed from dvbv5_isdb-t/br-mg-TresCoracoes)0
-rw-r--r--isdb-t/br-mg-TresPontas (renamed from dvbv5_isdb-t/br-mg-TresPontas)0
-rw-r--r--isdb-t/br-mg-Uberaba (renamed from dvbv5_isdb-t/br-mg-Uberaba)0
-rw-r--r--isdb-t/br-mg-Uberlandia (renamed from dvbv5_isdb-t/br-mg-Uberlandia)0
-rw-r--r--isdb-t/br-mg-Varginha (renamed from dvbv5_isdb-t/br-mg-Varginha)0
-rw-r--r--isdb-t/br-ms-Anastacio (renamed from dvbv5_isdb-t/br-ms-Anastacio)0
-rw-r--r--isdb-t/br-ms-Aquidauana (renamed from dvbv5_isdb-t/br-ms-Aquidauana)0
-rw-r--r--isdb-t/br-ms-CampoGrande (renamed from dvbv5_isdb-t/br-ms-CampoGrande)0
-rw-r--r--isdb-t/br-ms-Corumba (renamed from dvbv5_isdb-t/br-ms-Corumba)0
-rw-r--r--isdb-t/br-ms-Dourados (renamed from dvbv5_isdb-t/br-ms-Dourados)0
-rw-r--r--isdb-t/br-ms-Ladario (renamed from dvbv5_isdb-t/br-ms-Ladario)0
-rw-r--r--isdb-t/br-ms-NovaAndradina (renamed from dvbv5_isdb-t/br-ms-NovaAndradina)0
-rw-r--r--isdb-t/br-ms-Paranaiba (renamed from dvbv5_isdb-t/br-ms-Paranaiba)0
-rw-r--r--isdb-t/br-ms-PontaPora (renamed from dvbv5_isdb-t/br-ms-PontaPora)0
-rw-r--r--isdb-t/br-ms-Rochedo (renamed from dvbv5_isdb-t/br-ms-Rochedo)0
-rw-r--r--isdb-t/br-ms-Sidrolandia (renamed from dvbv5_isdb-t/br-ms-Sidrolandia)0
-rw-r--r--isdb-t/br-ms-TresLagoas (renamed from dvbv5_isdb-t/br-ms-TresLagoas)0
-rw-r--r--isdb-t/br-mt-AltaFloresta (renamed from dvbv5_isdb-t/br-mt-AltaFloresta)0
-rw-r--r--isdb-t/br-mt-Cuiaba (renamed from dvbv5_isdb-t/br-mt-Cuiaba)0
-rw-r--r--isdb-t/br-mt-Rondonopolis (renamed from dvbv5_isdb-t/br-mt-Rondonopolis)0
-rw-r--r--isdb-t/br-mt-Sinop (renamed from dvbv5_isdb-t/br-mt-Sinop)0
-rw-r--r--isdb-t/br-mt-Sorriso (renamed from dvbv5_isdb-t/br-mt-Sorriso)0
-rw-r--r--isdb-t/br-mt-TangaraDaSerra (renamed from dvbv5_isdb-t/br-mt-TangaraDaSerra)0
-rw-r--r--isdb-t/br-pa-Abaetetuba (renamed from dvbv5_isdb-t/br-pa-Abaetetuba)0
-rw-r--r--isdb-t/br-pa-Afua (renamed from dvbv5_isdb-t/br-pa-Afua)0
-rw-r--r--isdb-t/br-pa-Barcarena (renamed from dvbv5_isdb-t/br-pa-Barcarena)0
-rw-r--r--isdb-t/br-pa-Belem (renamed from dvbv5_isdb-t/br-pa-Belem)0
-rw-r--r--isdb-t/br-pa-Belterra (renamed from dvbv5_isdb-t/br-pa-Belterra)0
-rw-r--r--isdb-t/br-pa-Castanhal (renamed from dvbv5_isdb-t/br-pa-Castanhal)0
-rw-r--r--isdb-t/br-pa-Maraba (renamed from dvbv5_isdb-t/br-pa-Maraba)0
-rw-r--r--isdb-t/br-pa-Moju (renamed from dvbv5_isdb-t/br-pa-Moju)0
-rw-r--r--isdb-t/br-pa-PontaDePedras (renamed from dvbv5_isdb-t/br-pa-PontaDePedras)0
-rw-r--r--isdb-t/br-pa-Santarem (renamed from dvbv5_isdb-t/br-pa-Santarem)0
-rw-r--r--isdb-t/br-pb-AlagoaGrande (renamed from dvbv5_isdb-t/br-pb-AlagoaGrande)0
-rw-r--r--isdb-t/br-pb-Alagoinha (renamed from dvbv5_isdb-t/br-pb-Alagoinha)0
-rw-r--r--isdb-t/br-pb-Aparecida (renamed from dvbv5_isdb-t/br-pb-Aparecida)0
-rw-r--r--isdb-t/br-pb-Bayeux (renamed from dvbv5_isdb-t/br-pb-Bayeux)0
-rw-r--r--isdb-t/br-pb-BomJesus (renamed from dvbv5_isdb-t/br-pb-BomJesus)0
-rw-r--r--isdb-t/br-pb-Cabedelo (renamed from dvbv5_isdb-t/br-pb-Cabedelo)0
-rw-r--r--isdb-t/br-pb-CachoeiraDosIndios (renamed from dvbv5_isdb-t/br-pb-CachoeiraDosIndios)0
-rw-r--r--isdb-t/br-pb-CacimbaDeDentro (renamed from dvbv5_isdb-t/br-pb-CacimbaDeDentro)0
-rw-r--r--isdb-t/br-pb-Cajazeiras (renamed from dvbv5_isdb-t/br-pb-Cajazeiras)0
-rw-r--r--isdb-t/br-pb-CaldasBrandao (renamed from dvbv5_isdb-t/br-pb-CaldasBrandao)0
-rw-r--r--isdb-t/br-pb-CampinaGrande (renamed from dvbv5_isdb-t/br-pb-CampinaGrande)0
-rw-r--r--isdb-t/br-pb-Catingueira (renamed from dvbv5_isdb-t/br-pb-Catingueira)0
-rw-r--r--isdb-t/br-pb-Condado (renamed from dvbv5_isdb-t/br-pb-Condado)0
-rw-r--r--isdb-t/br-pb-Cuitegi (renamed from dvbv5_isdb-t/br-pb-Cuitegi)0
-rw-r--r--isdb-t/br-pb-Desterro (renamed from dvbv5_isdb-t/br-pb-Desterro)0
-rw-r--r--isdb-t/br-pb-Guarabira (renamed from dvbv5_isdb-t/br-pb-Guarabira)0
-rw-r--r--isdb-t/br-pb-Gurinhem (renamed from dvbv5_isdb-t/br-pb-Gurinhem)0
-rw-r--r--isdb-t/br-pb-Imaculada (renamed from dvbv5_isdb-t/br-pb-Imaculada)0
-rw-r--r--isdb-t/br-pb-Itabaiana (renamed from dvbv5_isdb-t/br-pb-Itabaiana)0
-rw-r--r--isdb-t/br-pb-Jacarau (renamed from dvbv5_isdb-t/br-pb-Jacarau)0
-rw-r--r--isdb-t/br-pb-JoaoPessoa (renamed from dvbv5_isdb-t/br-pb-JoaoPessoa)0
-rw-r--r--isdb-t/br-pb-Juripiranga (renamed from dvbv5_isdb-t/br-pb-Juripiranga)0
-rw-r--r--isdb-t/br-pb-LagoaSeca (renamed from dvbv5_isdb-t/br-pb-LagoaSeca)0
-rw-r--r--isdb-t/br-pb-Lucena (renamed from dvbv5_isdb-t/br-pb-Lucena)0
-rw-r--r--isdb-t/br-pb-MaeDAgua (renamed from dvbv5_isdb-t/br-pb-MaeDAgua)0
-rw-r--r--isdb-t/br-pb-Mamanguape (renamed from dvbv5_isdb-t/br-pb-Mamanguape)0
-rw-r--r--isdb-t/br-pb-Marizopolis (renamed from dvbv5_isdb-t/br-pb-Marizopolis)0
-rw-r--r--isdb-t/br-pb-Massaranduba (renamed from dvbv5_isdb-t/br-pb-Massaranduba)0
-rw-r--r--isdb-t/br-pb-Matinhas (renamed from dvbv5_isdb-t/br-pb-Matinhas)0
-rw-r--r--isdb-t/br-pb-Matureia (renamed from dvbv5_isdb-t/br-pb-Matureia)0
-rw-r--r--isdb-t/br-pb-Mulungu (renamed from dvbv5_isdb-t/br-pb-Mulungu)0
-rw-r--r--isdb-t/br-pb-OlhoDAgua (renamed from dvbv5_isdb-t/br-pb-OlhoDAgua)0
-rw-r--r--isdb-t/br-pb-Patos (renamed from dvbv5_isdb-t/br-pb-Patos)0
-rw-r--r--isdb-t/br-pb-Pilar (renamed from dvbv5_isdb-t/br-pb-Pilar)0
-rw-r--r--isdb-t/br-pb-Piloezinhos (renamed from dvbv5_isdb-t/br-pb-Piloezinhos)0
-rw-r--r--isdb-t/br-pb-Puxinana (renamed from dvbv5_isdb-t/br-pb-Puxinana)0
-rw-r--r--isdb-t/br-pb-RioTinto (renamed from dvbv5_isdb-t/br-pb-RioTinto)0
-rw-r--r--isdb-t/br-pb-SantaRita (renamed from dvbv5_isdb-t/br-pb-SantaRita)0
-rw-r--r--isdb-t/br-pb-SantaTeresinha (renamed from dvbv5_isdb-t/br-pb-SantaTeresinha)0
-rw-r--r--isdb-t/br-pb-SaoFrancisco (renamed from dvbv5_isdb-t/br-pb-SaoFrancisco)0
-rw-r--r--isdb-t/br-pb-SaoJoseDePiranhas (renamed from dvbv5_isdb-t/br-pb-SaoJoseDePiranhas)0
-rw-r--r--isdb-t/br-pb-SaoMamede (renamed from dvbv5_isdb-t/br-pb-SaoMamede)0
-rw-r--r--isdb-t/br-pb-Sape (renamed from dvbv5_isdb-t/br-pb-Sape)0
-rw-r--r--isdb-t/br-pb-Sousa (renamed from dvbv5_isdb-t/br-pb-Sousa)0
-rw-r--r--isdb-t/br-pb-Teixeira (renamed from dvbv5_isdb-t/br-pb-Teixeira)0
-rw-r--r--isdb-t/br-pe-Agrestina (renamed from dvbv5_isdb-t/br-pe-Agrestina)0
-rw-r--r--isdb-t/br-pe-Altinho (renamed from dvbv5_isdb-t/br-pe-Altinho)0
-rw-r--r--isdb-t/br-pe-Bezerros (renamed from dvbv5_isdb-t/br-pe-Bezerros)0
-rw-r--r--isdb-t/br-pe-Camaragibe (renamed from dvbv5_isdb-t/br-pe-Camaragibe)0
-rw-r--r--isdb-t/br-pe-Caruaru (renamed from dvbv5_isdb-t/br-pe-Caruaru)0
-rw-r--r--isdb-t/br-pe-Garanhuns (renamed from dvbv5_isdb-t/br-pe-Garanhuns)0
-rw-r--r--isdb-t/br-pe-Jupi (renamed from dvbv5_isdb-t/br-pe-Jupi)0
-rw-r--r--isdb-t/br-pe-Limoeiro (renamed from dvbv5_isdb-t/br-pe-Limoeiro)0
-rw-r--r--isdb-t/br-pe-Petrolina (renamed from dvbv5_isdb-t/br-pe-Petrolina)0
-rw-r--r--isdb-t/br-pe-Recife (renamed from dvbv5_isdb-t/br-pe-Recife)0
-rw-r--r--isdb-t/br-pe-SaoLourencoDaMata (renamed from dvbv5_isdb-t/br-pe-SaoLourencoDaMata)0
-rw-r--r--isdb-t/br-pi-Teresina (renamed from dvbv5_isdb-t/br-pi-Teresina)0
-rw-r--r--isdb-t/br-pr-AltoParana (renamed from dvbv5_isdb-t/br-pr-AltoParana)0
-rw-r--r--isdb-t/br-pr-AltoPiquiri (renamed from dvbv5_isdb-t/br-pr-AltoPiquiri)0
-rw-r--r--isdb-t/br-pr-Antonina (renamed from dvbv5_isdb-t/br-pr-Antonina)0
-rw-r--r--isdb-t/br-pr-Apucarana (renamed from dvbv5_isdb-t/br-pr-Apucarana)0
-rw-r--r--isdb-t/br-pr-Arapongas (renamed from dvbv5_isdb-t/br-pr-Arapongas)0
-rw-r--r--isdb-t/br-pr-AssisChateaubriand (renamed from dvbv5_isdb-t/br-pr-AssisChateaubriand)0
-rw-r--r--isdb-t/br-pr-BoaVistaDaAparecida (renamed from dvbv5_isdb-t/br-pr-BoaVistaDaAparecida)0
-rw-r--r--isdb-t/br-pr-Cafelandia (renamed from dvbv5_isdb-t/br-pr-Cafelandia)0
-rw-r--r--isdb-t/br-pr-Cambe (renamed from dvbv5_isdb-t/br-pr-Cambe)0
-rw-r--r--isdb-t/br-pr-CampoLargo (renamed from dvbv5_isdb-t/br-pr-CampoLargo)0
-rw-r--r--isdb-t/br-pr-CampoMourao (renamed from dvbv5_isdb-t/br-pr-CampoMourao)0
-rw-r--r--isdb-t/br-pr-Carambei (renamed from dvbv5_isdb-t/br-pr-Carambei)0
-rw-r--r--isdb-t/br-pr-Cascavel (renamed from dvbv5_isdb-t/br-pr-Cascavel)0
-rw-r--r--isdb-t/br-pr-CeuAzul (renamed from dvbv5_isdb-t/br-pr-CeuAzul)0
-rw-r--r--isdb-t/br-pr-Cianorte (renamed from dvbv5_isdb-t/br-pr-Cianorte)0
-rw-r--r--isdb-t/br-pr-Colombo (renamed from dvbv5_isdb-t/br-pr-Colombo)0
-rw-r--r--isdb-t/br-pr-Corbelia (renamed from dvbv5_isdb-t/br-pr-Corbelia)0
-rw-r--r--isdb-t/br-pr-CornelioProcopio (renamed from dvbv5_isdb-t/br-pr-CornelioProcopio)0
-rw-r--r--isdb-t/br-pr-Curitiba (renamed from dvbv5_isdb-t/br-pr-Curitiba)0
-rw-r--r--isdb-t/br-pr-Florestopolis (renamed from dvbv5_isdb-t/br-pr-Florestopolis)0
-rw-r--r--isdb-t/br-pr-FozDoIguacu (renamed from dvbv5_isdb-t/br-pr-FozDoIguacu)0
-rw-r--r--isdb-t/br-pr-FranciscoBeltrao (renamed from dvbv5_isdb-t/br-pr-FranciscoBeltrao)0
-rw-r--r--isdb-t/br-pr-Guaraniacu (renamed from dvbv5_isdb-t/br-pr-Guaraniacu)0
-rw-r--r--isdb-t/br-pr-Guarapuava (renamed from dvbv5_isdb-t/br-pr-Guarapuava)0
-rw-r--r--isdb-t/br-pr-Guaratuba (renamed from dvbv5_isdb-t/br-pr-Guaratuba)0
-rw-r--r--isdb-t/br-pr-HonorioSerpa (renamed from dvbv5_isdb-t/br-pr-HonorioSerpa)0
-rw-r--r--isdb-t/br-pr-Ibema (renamed from dvbv5_isdb-t/br-pr-Ibema)0
-rw-r--r--isdb-t/br-pr-Ibipora (renamed from dvbv5_isdb-t/br-pr-Ibipora)0
-rw-r--r--isdb-t/br-pr-Imbituva (renamed from dvbv5_isdb-t/br-pr-Imbituva)0
-rw-r--r--isdb-t/br-pr-Irati (renamed from dvbv5_isdb-t/br-pr-Irati)0
-rw-r--r--isdb-t/br-pr-Ivaipora (renamed from dvbv5_isdb-t/br-pr-Ivaipora)0
-rw-r--r--isdb-t/br-pr-Jacarezinho (renamed from dvbv5_isdb-t/br-pr-Jacarezinho)0
-rw-r--r--isdb-t/br-pr-Japira (renamed from dvbv5_isdb-t/br-pr-Japira)0
-rw-r--r--isdb-t/br-pr-Jataizinho (renamed from dvbv5_isdb-t/br-pr-Jataizinho)0
-rw-r--r--isdb-t/br-pr-Lapa (renamed from dvbv5_isdb-t/br-pr-Lapa)0
-rw-r--r--isdb-t/br-pr-Londrina (renamed from dvbv5_isdb-t/br-pr-Londrina)0
-rw-r--r--isdb-t/br-pr-Maringa (renamed from dvbv5_isdb-t/br-pr-Maringa)0
-rw-r--r--isdb-t/br-pr-Matinhos (renamed from dvbv5_isdb-t/br-pr-Matinhos)0
-rw-r--r--isdb-t/br-pr-MoreiraSales (renamed from dvbv5_isdb-t/br-pr-MoreiraSales)0
-rw-r--r--isdb-t/br-pr-NovaAurora (renamed from dvbv5_isdb-t/br-pr-NovaAurora)0
-rw-r--r--isdb-t/br-pr-Paranagua (renamed from dvbv5_isdb-t/br-pr-Paranagua)0
-rw-r--r--isdb-t/br-pr-Paranavai (renamed from dvbv5_isdb-t/br-pr-Paranavai)0
-rw-r--r--isdb-t/br-pr-PatoBranco (renamed from dvbv5_isdb-t/br-pr-PatoBranco)0
-rw-r--r--isdb-t/br-pr-Perola (renamed from dvbv5_isdb-t/br-pr-Perola)0
-rw-r--r--isdb-t/br-pr-PontaGrossa (renamed from dvbv5_isdb-t/br-pr-PontaGrossa)0
-rw-r--r--isdb-t/br-pr-PontalDoParana (renamed from dvbv5_isdb-t/br-pr-PontalDoParana)0
-rw-r--r--isdb-t/br-pr-Porecatu (renamed from dvbv5_isdb-t/br-pr-Porecatu)0
-rw-r--r--isdb-t/br-pr-PrimeiroDeMaio (renamed from dvbv5_isdb-t/br-pr-PrimeiroDeMaio)0
-rw-r--r--isdb-t/br-pr-RioNegro (renamed from dvbv5_isdb-t/br-pr-RioNegro)0
-rw-r--r--isdb-t/br-pr-Rolandia (renamed from dvbv5_isdb-t/br-pr-Rolandia)0
-rw-r--r--isdb-t/br-pr-Sarandi (renamed from dvbv5_isdb-t/br-pr-Sarandi)0
-rw-r--r--isdb-t/br-pr-Sertanopolis (renamed from dvbv5_isdb-t/br-pr-Sertanopolis)0
-rw-r--r--isdb-t/br-pr-TeixeiraSoares (renamed from dvbv5_isdb-t/br-pr-TeixeiraSoares)0
-rw-r--r--isdb-t/br-pr-TelemacoBorba (renamed from dvbv5_isdb-t/br-pr-TelemacoBorba)0
-rw-r--r--isdb-t/br-pr-Toledo (renamed from dvbv5_isdb-t/br-pr-Toledo)0
-rw-r--r--isdb-t/br-pr-TresBarrasDoParana (renamed from dvbv5_isdb-t/br-pr-TresBarrasDoParana)0
-rw-r--r--isdb-t/br-pr-Tupassi (renamed from dvbv5_isdb-t/br-pr-Tupassi)0
-rw-r--r--isdb-t/br-pr-Ubirata (renamed from dvbv5_isdb-t/br-pr-Ubirata)0
-rw-r--r--isdb-t/br-pr-Umuarama (renamed from dvbv5_isdb-t/br-pr-Umuarama)0
-rw-r--r--isdb-t/br-pr-Vere (renamed from dvbv5_isdb-t/br-pr-Vere)0
-rw-r--r--isdb-t/br-rj-AngraDosReis (renamed from dvbv5_isdb-t/br-rj-AngraDosReis)0
-rw-r--r--isdb-t/br-rj-Araruama (renamed from dvbv5_isdb-t/br-rj-Araruama)0
-rw-r--r--isdb-t/br-rj-ArraialDoCabo (renamed from dvbv5_isdb-t/br-rj-ArraialDoCabo)0
-rw-r--r--isdb-t/br-rj-BarraMansa (renamed from dvbv5_isdb-t/br-rj-BarraMansa)0
-rw-r--r--isdb-t/br-rj-CaboFrio (renamed from dvbv5_isdb-t/br-rj-CaboFrio)0
-rw-r--r--isdb-t/br-rj-CamposDosGoytacazes (renamed from dvbv5_isdb-t/br-rj-CamposDosGoytacazes)0
-rw-r--r--isdb-t/br-rj-DuqueDeCaxias (renamed from dvbv5_isdb-t/br-rj-DuqueDeCaxias)0
-rw-r--r--isdb-t/br-rj-Itaguai (renamed from dvbv5_isdb-t/br-rj-Itaguai)0
-rw-r--r--isdb-t/br-rj-Itaperuna (renamed from dvbv5_isdb-t/br-rj-Itaperuna)0
-rw-r--r--isdb-t/br-rj-Itatiaia (renamed from dvbv5_isdb-t/br-rj-Itatiaia)0
-rw-r--r--isdb-t/br-rj-Macae (renamed from dvbv5_isdb-t/br-rj-Macae)0
-rw-r--r--isdb-t/br-rj-Marica (renamed from dvbv5_isdb-t/br-rj-Marica)0
-rw-r--r--isdb-t/br-rj-NovaFriburgo (renamed from dvbv5_isdb-t/br-rj-NovaFriburgo)0
-rw-r--r--isdb-t/br-rj-NovaIguacu (renamed from dvbv5_isdb-t/br-rj-NovaIguacu)0
-rw-r--r--isdb-t/br-rj-Queimados (renamed from dvbv5_isdb-t/br-rj-Queimados)0
-rw-r--r--isdb-t/br-rj-Quissama (renamed from dvbv5_isdb-t/br-rj-Quissama)0
-rw-r--r--isdb-t/br-rj-Resende (renamed from dvbv5_isdb-t/br-rj-Resende)0
-rw-r--r--isdb-t/br-rj-RioBonito (renamed from dvbv5_isdb-t/br-rj-RioBonito)0
-rw-r--r--isdb-t/br-rj-RioDasOstras (renamed from dvbv5_isdb-t/br-rj-RioDasOstras)0
-rw-r--r--isdb-t/br-rj-RioDeJaneiro (renamed from dvbv5_isdb-t/br-rj-RioDeJaneiro)0
-rw-r--r--isdb-t/br-rj-SaoGoncalo (renamed from dvbv5_isdb-t/br-rj-SaoGoncalo)0
-rw-r--r--isdb-t/br-rj-SaoJoaoDaBarra (renamed from dvbv5_isdb-t/br-rj-SaoJoaoDaBarra)0
-rw-r--r--isdb-t/br-rj-SaoJoaoDeMeriti (renamed from dvbv5_isdb-t/br-rj-SaoJoaoDeMeriti)0
-rw-r--r--isdb-t/br-rj-SaoPedroDaAldeia (renamed from dvbv5_isdb-t/br-rj-SaoPedroDaAldeia)0
-rw-r--r--isdb-t/br-rj-Saquarema (renamed from dvbv5_isdb-t/br-rj-Saquarema)0
-rw-r--r--isdb-t/br-rj-SilvaJardim (renamed from dvbv5_isdb-t/br-rj-SilvaJardim)0
-rw-r--r--isdb-t/br-rj-TrajanoDeMorais (renamed from dvbv5_isdb-t/br-rj-TrajanoDeMorais)0
-rw-r--r--isdb-t/br-rj-TresRios (renamed from dvbv5_isdb-t/br-rj-TresRios)0
-rw-r--r--isdb-t/br-rj-VoltaRedonda (renamed from dvbv5_isdb-t/br-rj-VoltaRedonda)0
-rw-r--r--isdb-t/br-rn-Extremoz (renamed from dvbv5_isdb-t/br-rn-Extremoz)0
-rw-r--r--isdb-t/br-rn-Macaiba (renamed from dvbv5_isdb-t/br-rn-Macaiba)0
-rw-r--r--isdb-t/br-rn-Mossoro (renamed from dvbv5_isdb-t/br-rn-Mossoro)0
-rw-r--r--isdb-t/br-rn-Natal (renamed from dvbv5_isdb-t/br-rn-Natal)0
-rw-r--r--isdb-t/br-rn-SaoJoseDeMipibu (renamed from dvbv5_isdb-t/br-rn-SaoJoseDeMipibu)0
-rw-r--r--isdb-t/br-rn-SenadorEloiDeSousa (renamed from dvbv5_isdb-t/br-rn-SenadorEloiDeSousa)0
-rw-r--r--isdb-t/br-ro-Ariquemes (renamed from dvbv5_isdb-t/br-ro-Ariquemes)0
-rw-r--r--isdb-t/br-ro-Cacoal (renamed from dvbv5_isdb-t/br-ro-Cacoal)0
-rw-r--r--isdb-t/br-ro-Jiparana (renamed from dvbv5_isdb-t/br-ro-Jiparana)0
-rw-r--r--isdb-t/br-ro-PimentaBueno (renamed from dvbv5_isdb-t/br-ro-PimentaBueno)0
-rw-r--r--isdb-t/br-ro-PortoVelho (renamed from dvbv5_isdb-t/br-ro-PortoVelho)0
-rw-r--r--isdb-t/br-rr-BoaVista (renamed from dvbv5_isdb-t/br-rr-BoaVista)0
-rw-r--r--isdb-t/br-rs-Alegrete (renamed from dvbv5_isdb-t/br-rs-Alegrete)0
-rw-r--r--isdb-t/br-rs-ArroioDoSal (renamed from dvbv5_isdb-t/br-rs-ArroioDoSal)0
-rw-r--r--isdb-t/br-rs-Bage (renamed from dvbv5_isdb-t/br-rs-Bage)0
-rw-r--r--isdb-t/br-rs-BentoGoncalves (renamed from dvbv5_isdb-t/br-rs-BentoGoncalves)0
-rw-r--r--isdb-t/br-rs-CachoeiraDoSul (renamed from dvbv5_isdb-t/br-rs-CachoeiraDoSul)0
-rw-r--r--isdb-t/br-rs-Camaqua (renamed from dvbv5_isdb-t/br-rs-Camaqua)0
-rw-r--r--isdb-t/br-rs-CampoBom (renamed from dvbv5_isdb-t/br-rs-CampoBom)0
-rw-r--r--isdb-t/br-rs-Candelaria (renamed from dvbv5_isdb-t/br-rs-Candelaria)0
-rw-r--r--isdb-t/br-rs-Canela (renamed from dvbv5_isdb-t/br-rs-Canela)0
-rw-r--r--isdb-t/br-rs-Cangucu (renamed from dvbv5_isdb-t/br-rs-Cangucu)0
-rw-r--r--isdb-t/br-rs-CapaoDaCanoa (renamed from dvbv5_isdb-t/br-rs-CapaoDaCanoa)0
-rw-r--r--isdb-t/br-rs-CapaoDoLeao (renamed from dvbv5_isdb-t/br-rs-CapaoDoLeao)0
-rw-r--r--isdb-t/br-rs-Carazinho (renamed from dvbv5_isdb-t/br-rs-Carazinho)0
-rw-r--r--isdb-t/br-rs-CarlosBarbosa (renamed from dvbv5_isdb-t/br-rs-CarlosBarbosa)0
-rw-r--r--isdb-t/br-rs-CaxiasDoSul (renamed from dvbv5_isdb-t/br-rs-CaxiasDoSul)0
-rw-r--r--isdb-t/br-rs-Cidreira (renamed from dvbv5_isdb-t/br-rs-Cidreira)0
-rw-r--r--isdb-t/br-rs-CruzAlta (renamed from dvbv5_isdb-t/br-rs-CruzAlta)0
-rw-r--r--isdb-t/br-rs-DomPedroDeAlcantara (renamed from dvbv5_isdb-t/br-rs-DomPedroDeAlcantara)0
-rw-r--r--isdb-t/br-rs-Erechim (renamed from dvbv5_isdb-t/br-rs-Erechim)0
-rw-r--r--isdb-t/br-rs-Estrela (renamed from dvbv5_isdb-t/br-rs-Estrela)0
-rw-r--r--isdb-t/br-rs-Farroupilha (renamed from dvbv5_isdb-t/br-rs-Farroupilha)0
-rw-r--r--isdb-t/br-rs-Feliz (renamed from dvbv5_isdb-t/br-rs-Feliz)0
-rw-r--r--isdb-t/br-rs-FloresDaCunha (renamed from dvbv5_isdb-t/br-rs-FloresDaCunha)0
-rw-r--r--isdb-t/br-rs-Gramado (renamed from dvbv5_isdb-t/br-rs-Gramado)0
-rw-r--r--isdb-t/br-rs-Ijui (renamed from dvbv5_isdb-t/br-rs-Ijui)0
-rw-r--r--isdb-t/br-rs-Lajeado (renamed from dvbv5_isdb-t/br-rs-Lajeado)0
-rw-r--r--isdb-t/br-rs-MonteAlegreDosCampos (renamed from dvbv5_isdb-t/br-rs-MonteAlegreDosCampos)0
-rw-r--r--isdb-t/br-rs-Montenegro (renamed from dvbv5_isdb-t/br-rs-Montenegro)0
-rw-r--r--isdb-t/br-rs-MorroRedondo (renamed from dvbv5_isdb-t/br-rs-MorroRedondo)0
-rw-r--r--isdb-t/br-rs-NovaPetropolis (renamed from dvbv5_isdb-t/br-rs-NovaPetropolis)0
-rw-r--r--isdb-t/br-rs-NovaSantaRita (renamed from dvbv5_isdb-t/br-rs-NovaSantaRita)0
-rw-r--r--isdb-t/br-rs-NovoHamburgo (renamed from dvbv5_isdb-t/br-rs-NovoHamburgo)0
-rw-r--r--isdb-t/br-rs-Osorio (renamed from dvbv5_isdb-t/br-rs-Osorio)0
-rw-r--r--isdb-t/br-rs-PalmaresDoSul (renamed from dvbv5_isdb-t/br-rs-PalmaresDoSul)0
-rw-r--r--isdb-t/br-rs-ParaisoDoSul (renamed from dvbv5_isdb-t/br-rs-ParaisoDoSul)0
-rw-r--r--isdb-t/br-rs-PassoFundo (renamed from dvbv5_isdb-t/br-rs-PassoFundo)0
-rw-r--r--isdb-t/br-rs-Pelotas (renamed from dvbv5_isdb-t/br-rs-Pelotas)0
-rw-r--r--isdb-t/br-rs-PicadaCafe (renamed from dvbv5_isdb-t/br-rs-PicadaCafe)0
-rw-r--r--isdb-t/br-rs-PortoAlegre (renamed from dvbv5_isdb-t/br-rs-PortoAlegre)0
-rw-r--r--isdb-t/br-rs-RioGrande (renamed from dvbv5_isdb-t/br-rs-RioGrande)0
-rw-r--r--isdb-t/br-rs-RioGrandeCassino (renamed from dvbv5_isdb-t/br-rs-RioGrandeCassino)0
-rw-r--r--isdb-t/br-rs-SalvadorDoSul (renamed from dvbv5_isdb-t/br-rs-SalvadorDoSul)0
-rw-r--r--isdb-t/br-rs-Sananduva (renamed from dvbv5_isdb-t/br-rs-Sananduva)0
-rw-r--r--isdb-t/br-rs-SantaCruzDoSul (renamed from dvbv5_isdb-t/br-rs-SantaCruzDoSul)0
-rw-r--r--isdb-t/br-rs-SantaMaria (renamed from dvbv5_isdb-t/br-rs-SantaMaria)0
-rw-r--r--isdb-t/br-rs-SantaRosa (renamed from dvbv5_isdb-t/br-rs-SantaRosa)0
-rw-r--r--isdb-t/br-rs-SantanaDoLivramento (renamed from dvbv5_isdb-t/br-rs-SantanaDoLivramento)0
-rw-r--r--isdb-t/br-rs-SantoAngelo (renamed from dvbv5_isdb-t/br-rs-SantoAngelo)0
-rw-r--r--isdb-t/br-rs-SantoAntonioDaPatrulha (renamed from dvbv5_isdb-t/br-rs-SantoAntonioDaPatrulha)0
-rw-r--r--isdb-t/br-rs-SaoBorja (renamed from dvbv5_isdb-t/br-rs-SaoBorja)0
-rw-r--r--isdb-t/br-rs-SaoGabriel (renamed from dvbv5_isdb-t/br-rs-SaoGabriel)0
-rw-r--r--isdb-t/br-rs-SaoJoseDoNorte (renamed from dvbv5_isdb-t/br-rs-SaoJoseDoNorte)0
-rw-r--r--isdb-t/br-rs-SaoSepe (renamed from dvbv5_isdb-t/br-rs-SaoSepe)0
-rw-r--r--isdb-t/br-rs-Sapiranga (renamed from dvbv5_isdb-t/br-rs-Sapiranga)0
-rw-r--r--isdb-t/br-rs-Sertao (renamed from dvbv5_isdb-t/br-rs-Sertao)0
-rw-r--r--isdb-t/br-rs-Taquara (renamed from dvbv5_isdb-t/br-rs-Taquara)0
-rw-r--r--isdb-t/br-rs-TerraDeAreia (renamed from dvbv5_isdb-t/br-rs-TerraDeAreia)0
-rw-r--r--isdb-t/br-rs-Torres (renamed from dvbv5_isdb-t/br-rs-Torres)0
-rw-r--r--isdb-t/br-rs-Tramandai (renamed from dvbv5_isdb-t/br-rs-Tramandai)0
-rw-r--r--isdb-t/br-rs-TresCachoeiras (renamed from dvbv5_isdb-t/br-rs-TresCachoeiras)0
-rw-r--r--isdb-t/br-rs-TresCoroas (renamed from dvbv5_isdb-t/br-rs-TresCoroas)0
-rw-r--r--isdb-t/br-rs-TresDeMaio (renamed from dvbv5_isdb-t/br-rs-TresDeMaio)0
-rw-r--r--isdb-t/br-rs-Triunfo (renamed from dvbv5_isdb-t/br-rs-Triunfo)0
-rw-r--r--isdb-t/br-rs-Tucunduva (renamed from dvbv5_isdb-t/br-rs-Tucunduva)0
-rw-r--r--isdb-t/br-rs-Uruguaiana (renamed from dvbv5_isdb-t/br-rs-Uruguaiana)0
-rw-r--r--isdb-t/br-rs-Vacaria (renamed from dvbv5_isdb-t/br-rs-Vacaria)0
-rw-r--r--isdb-t/br-rs-VenancioAires (renamed from dvbv5_isdb-t/br-rs-VenancioAires)0
-rw-r--r--isdb-t/br-rs-VilaNovaDoSul (renamed from dvbv5_isdb-t/br-rs-VilaNovaDoSul)0
-rw-r--r--isdb-t/br-rs-Xangrila (renamed from dvbv5_isdb-t/br-rs-Xangrila)0
-rw-r--r--isdb-t/br-sc-Agronomica (renamed from dvbv5_isdb-t/br-sc-Agronomica)0
-rw-r--r--isdb-t/br-sc-AguasMornas (renamed from dvbv5_isdb-t/br-sc-AguasMornas)0
-rw-r--r--isdb-t/br-sc-AntonioCarlos (renamed from dvbv5_isdb-t/br-sc-AntonioCarlos)0
-rw-r--r--isdb-t/br-sc-Ararangua (renamed from dvbv5_isdb-t/br-sc-Ararangua)0
-rw-r--r--isdb-t/br-sc-Aurora (renamed from dvbv5_isdb-t/br-sc-Aurora)0
-rw-r--r--isdb-t/br-sc-BalnearioCamboriu (renamed from dvbv5_isdb-t/br-sc-BalnearioCamboriu)0
-rw-r--r--isdb-t/br-sc-BarraVelha (renamed from dvbv5_isdb-t/br-sc-BarraVelha)0
-rw-r--r--isdb-t/br-sc-Blumenau (renamed from dvbv5_isdb-t/br-sc-Blumenau)0
-rw-r--r--isdb-t/br-sc-Brusque (renamed from dvbv5_isdb-t/br-sc-Brusque)0
-rw-r--r--isdb-t/br-sc-Cacador (renamed from dvbv5_isdb-t/br-sc-Cacador)0
-rw-r--r--isdb-t/br-sc-Canoinhas (renamed from dvbv5_isdb-t/br-sc-Canoinhas)0
-rw-r--r--isdb-t/br-sc-CapaoAlto (renamed from dvbv5_isdb-t/br-sc-CapaoAlto)0
-rw-r--r--isdb-t/br-sc-CapivariDeBaixo (renamed from dvbv5_isdb-t/br-sc-CapivariDeBaixo)0
-rw-r--r--isdb-t/br-sc-Chapeco (renamed from dvbv5_isdb-t/br-sc-Chapeco)0
-rw-r--r--isdb-t/br-sc-Concordia (renamed from dvbv5_isdb-t/br-sc-Concordia)0
-rw-r--r--isdb-t/br-sc-CorreiaPinto (renamed from dvbv5_isdb-t/br-sc-CorreiaPinto)0
-rw-r--r--isdb-t/br-sc-Corupa (renamed from dvbv5_isdb-t/br-sc-Corupa)0
-rw-r--r--isdb-t/br-sc-Criciuma (renamed from dvbv5_isdb-t/br-sc-Criciuma)0
-rw-r--r--isdb-t/br-sc-Florianopolis (renamed from dvbv5_isdb-t/br-sc-Florianopolis)0
-rw-r--r--isdb-t/br-sc-FlorianopolisCanasvieiras (renamed from dvbv5_isdb-t/br-sc-FlorianopolisCanasvieiras)0
-rw-r--r--isdb-t/br-sc-FlorianopolisIngleses (renamed from dvbv5_isdb-t/br-sc-FlorianopolisIngleses)0
-rw-r--r--isdb-t/br-sc-Garopaba (renamed from dvbv5_isdb-t/br-sc-Garopaba)0
-rw-r--r--isdb-t/br-sc-Garuva (renamed from dvbv5_isdb-t/br-sc-Garuva)0
-rw-r--r--isdb-t/br-sc-Gaspar (renamed from dvbv5_isdb-t/br-sc-Gaspar)0
-rw-r--r--isdb-t/br-sc-GovernadorCelsoRamos (renamed from dvbv5_isdb-t/br-sc-GovernadorCelsoRamos)0
-rw-r--r--isdb-t/br-sc-Guabiruba (renamed from dvbv5_isdb-t/br-sc-Guabiruba)0
-rw-r--r--isdb-t/br-sc-Guaramirim (renamed from dvbv5_isdb-t/br-sc-Guaramirim)0
-rw-r--r--isdb-t/br-sc-HervalDOeste (renamed from dvbv5_isdb-t/br-sc-HervalDOeste)0
-rw-r--r--isdb-t/br-sc-Icara (renamed from dvbv5_isdb-t/br-sc-Icara)0
-rw-r--r--isdb-t/br-sc-Itajai (renamed from dvbv5_isdb-t/br-sc-Itajai)0
-rw-r--r--isdb-t/br-sc-Itapema (renamed from dvbv5_isdb-t/br-sc-Itapema)0
-rw-r--r--isdb-t/br-sc-Itapoa (renamed from dvbv5_isdb-t/br-sc-Itapoa)0
-rw-r--r--isdb-t/br-sc-JaraguaDoSul (renamed from dvbv5_isdb-t/br-sc-JaraguaDoSul)0
-rw-r--r--isdb-t/br-sc-Joacaba (renamed from dvbv5_isdb-t/br-sc-Joacaba)0
-rw-r--r--isdb-t/br-sc-Joinville (renamed from dvbv5_isdb-t/br-sc-Joinville)0
-rw-r--r--isdb-t/br-sc-Lages (renamed from dvbv5_isdb-t/br-sc-Lages)0
-rw-r--r--isdb-t/br-sc-Laguna (renamed from dvbv5_isdb-t/br-sc-Laguna)0
-rw-r--r--isdb-t/br-sc-Laurentino (renamed from dvbv5_isdb-t/br-sc-Laurentino)0
-rw-r--r--isdb-t/br-sc-Lontras (renamed from dvbv5_isdb-t/br-sc-Lontras)0
-rw-r--r--isdb-t/br-sc-Mafra (renamed from dvbv5_isdb-t/br-sc-Mafra)0
-rw-r--r--isdb-t/br-sc-Massaranduba (renamed from dvbv5_isdb-t/br-sc-Massaranduba)0
-rw-r--r--isdb-t/br-sc-Navegantes (renamed from dvbv5_isdb-t/br-sc-Navegantes)0
-rw-r--r--isdb-t/br-sc-NovaVeneza (renamed from dvbv5_isdb-t/br-sc-NovaVeneza)0
-rw-r--r--isdb-t/br-sc-Painel (renamed from dvbv5_isdb-t/br-sc-Painel)0
-rw-r--r--isdb-t/br-sc-PassoDeTorres (renamed from dvbv5_isdb-t/br-sc-PassoDeTorres)0
-rw-r--r--isdb-t/br-sc-Penha (renamed from dvbv5_isdb-t/br-sc-Penha)0
-rw-r--r--isdb-t/br-sc-Picarras (renamed from dvbv5_isdb-t/br-sc-Picarras)0
-rw-r--r--isdb-t/br-sc-RioDoSul (renamed from dvbv5_isdb-t/br-sc-RioDoSul)0
-rw-r--r--isdb-t/br-sc-RioNegrinho (renamed from dvbv5_isdb-t/br-sc-RioNegrinho)0
-rw-r--r--isdb-t/br-sc-SantaRosaDoSul (renamed from dvbv5_isdb-t/br-sc-SantaRosaDoSul)0
-rw-r--r--isdb-t/br-sc-SantoAmaroDaImperatriz (renamed from dvbv5_isdb-t/br-sc-SantoAmaroDaImperatriz)0
-rw-r--r--isdb-t/br-sc-SaoBentoDoSul (renamed from dvbv5_isdb-t/br-sc-SaoBentoDoSul)0
-rw-r--r--isdb-t/br-sc-Schroeder (renamed from dvbv5_isdb-t/br-sc-Schroeder)0
-rw-r--r--isdb-t/br-sc-Sombrio (renamed from dvbv5_isdb-t/br-sc-Sombrio)0
-rw-r--r--isdb-t/br-sc-Tijucas (renamed from dvbv5_isdb-t/br-sc-Tijucas)0
-rw-r--r--isdb-t/br-sc-Tubarao (renamed from dvbv5_isdb-t/br-sc-Tubarao)0
-rw-r--r--isdb-t/br-se-Aquidaba (renamed from dvbv5_isdb-t/br-se-Aquidaba)0
-rw-r--r--isdb-t/br-se-Aracaju (renamed from dvbv5_isdb-t/br-se-Aracaju)0
-rw-r--r--isdb-t/br-se-Araua (renamed from dvbv5_isdb-t/br-se-Araua)0
-rw-r--r--isdb-t/br-se-AreiaBranca (renamed from dvbv5_isdb-t/br-se-AreiaBranca)0
-rw-r--r--isdb-t/br-se-BarraDosCoqueiros (renamed from dvbv5_isdb-t/br-se-BarraDosCoqueiros)0
-rw-r--r--isdb-t/br-se-Boquim (renamed from dvbv5_isdb-t/br-se-Boquim)0
-rw-r--r--isdb-t/br-se-CampoDoBrito (renamed from dvbv5_isdb-t/br-se-CampoDoBrito)0
-rw-r--r--isdb-t/br-se-CanindeDeSaoFrancisco (renamed from dvbv5_isdb-t/br-se-CanindeDeSaoFrancisco)0
-rw-r--r--isdb-t/br-se-Capela (renamed from dvbv5_isdb-t/br-se-Capela)0
-rw-r--r--isdb-t/br-se-Carira (renamed from dvbv5_isdb-t/br-se-Carira)0
-rw-r--r--isdb-t/br-se-Carmopolis (renamed from dvbv5_isdb-t/br-se-Carmopolis)0
-rw-r--r--isdb-t/br-se-Cristinapolis (renamed from dvbv5_isdb-t/br-se-Cristinapolis)0
-rw-r--r--isdb-t/br-se-DivinaPastora (renamed from dvbv5_isdb-t/br-se-DivinaPastora)0
-rw-r--r--isdb-t/br-se-Estancia (renamed from dvbv5_isdb-t/br-se-Estancia)0
-rw-r--r--isdb-t/br-se-FeiraNova (renamed from dvbv5_isdb-t/br-se-FeiraNova)0
-rw-r--r--isdb-t/br-se-FreiPaulo (renamed from dvbv5_isdb-t/br-se-FreiPaulo)0
-rw-r--r--isdb-t/br-se-Gararu (renamed from dvbv5_isdb-t/br-se-Gararu)0
-rw-r--r--isdb-t/br-se-GeneralMaynard (renamed from dvbv5_isdb-t/br-se-GeneralMaynard)0
-rw-r--r--isdb-t/br-se-Itabaiana (renamed from dvbv5_isdb-t/br-se-Itabaiana)0
-rw-r--r--isdb-t/br-se-Itabaianinha (renamed from dvbv5_isdb-t/br-se-Itabaianinha)0
-rw-r--r--isdb-t/br-se-Itabi (renamed from dvbv5_isdb-t/br-se-Itabi)0
-rw-r--r--isdb-t/br-se-ItaporangaDAjuda (renamed from dvbv5_isdb-t/br-se-ItaporangaDAjuda)0
-rw-r--r--isdb-t/br-se-Japaratuba (renamed from dvbv5_isdb-t/br-se-Japaratuba)0
-rw-r--r--isdb-t/br-se-Lagarto (renamed from dvbv5_isdb-t/br-se-Lagarto)0
-rw-r--r--isdb-t/br-se-Laranjeiras (renamed from dvbv5_isdb-t/br-se-Laranjeiras)0
-rw-r--r--isdb-t/br-se-Macambira (renamed from dvbv5_isdb-t/br-se-Macambira)0
-rw-r--r--isdb-t/br-se-Malhador (renamed from dvbv5_isdb-t/br-se-Malhador)0
-rw-r--r--isdb-t/br-se-Maruim (renamed from dvbv5_isdb-t/br-se-Maruim)0
-rw-r--r--isdb-t/br-se-MoitaBonita (renamed from dvbv5_isdb-t/br-se-MoitaBonita)0
-rw-r--r--isdb-t/br-se-MonteAlegreDeSergipe (renamed from dvbv5_isdb-t/br-se-MonteAlegreDeSergipe)0
-rw-r--r--isdb-t/br-se-NossaSenhoraAparecida (renamed from dvbv5_isdb-t/br-se-NossaSenhoraAparecida)0
-rw-r--r--isdb-t/br-se-NossaSenhoraDaGloria (renamed from dvbv5_isdb-t/br-se-NossaSenhoraDaGloria)0
-rw-r--r--isdb-t/br-se-NossaSenhoraDoSocorro (renamed from dvbv5_isdb-t/br-se-NossaSenhoraDoSocorro)0
-rw-r--r--isdb-t/br-se-Pedrinhas (renamed from dvbv5_isdb-t/br-se-Pedrinhas)0
-rw-r--r--isdb-t/br-se-PocoRedondo (renamed from dvbv5_isdb-t/br-se-PocoRedondo)0
-rw-r--r--isdb-t/br-se-RiachaoDoDantas (renamed from dvbv5_isdb-t/br-se-RiachaoDoDantas)0
-rw-r--r--isdb-t/br-se-Riachuelo (renamed from dvbv5_isdb-t/br-se-Riachuelo)0
-rw-r--r--isdb-t/br-se-Ribeiropolis (renamed from dvbv5_isdb-t/br-se-Ribeiropolis)0
-rw-r--r--isdb-t/br-se-RosarioDoCatete (renamed from dvbv5_isdb-t/br-se-RosarioDoCatete)0
-rw-r--r--isdb-t/br-se-Salgado (renamed from dvbv5_isdb-t/br-se-Salgado)0
-rw-r--r--isdb-t/br-se-SantaLuziaDoIntanhy (renamed from dvbv5_isdb-t/br-se-SantaLuziaDoIntanhy)0
-rw-r--r--isdb-t/br-se-SantoAmaroDasBrotas (renamed from dvbv5_isdb-t/br-se-SantoAmaroDasBrotas)0
-rw-r--r--isdb-t/br-se-SaoCristovao (renamed from dvbv5_isdb-t/br-se-SaoCristovao)0
-rw-r--r--isdb-t/br-se-SaoDomingos (renamed from dvbv5_isdb-t/br-se-SaoDomingos)0
-rw-r--r--isdb-t/br-se-SaoMiguelDoAleixo (renamed from dvbv5_isdb-t/br-se-SaoMiguelDoAleixo)0
-rw-r--r--isdb-t/br-se-TomarDoGeru (renamed from dvbv5_isdb-t/br-se-TomarDoGeru)0
-rw-r--r--isdb-t/br-se-Umbauba (renamed from dvbv5_isdb-t/br-se-Umbauba)0
-rw-r--r--isdb-t/br-sp-Aguai (renamed from dvbv5_isdb-t/br-sp-Aguai)0
-rw-r--r--isdb-t/br-sp-AguasDeLindoia (renamed from dvbv5_isdb-t/br-sp-AguasDeLindoia)0
-rw-r--r--isdb-t/br-sp-AguasDeSaoPedro (renamed from dvbv5_isdb-t/br-sp-AguasDeSaoPedro)0
-rw-r--r--isdb-t/br-sp-Agudos (renamed from dvbv5_isdb-t/br-sp-Agudos)0
-rw-r--r--isdb-t/br-sp-Americana (renamed from dvbv5_isdb-t/br-sp-Americana)0
-rw-r--r--isdb-t/br-sp-AmericoBrasiliense (renamed from dvbv5_isdb-t/br-sp-AmericoBrasiliense)0
-rw-r--r--isdb-t/br-sp-Amparo (renamed from dvbv5_isdb-t/br-sp-Amparo)0
-rw-r--r--isdb-t/br-sp-Andradina (renamed from dvbv5_isdb-t/br-sp-Andradina)0
-rw-r--r--isdb-t/br-sp-Aparecida (renamed from dvbv5_isdb-t/br-sp-Aparecida)0
-rw-r--r--isdb-t/br-sp-AparecidaDOeste (renamed from dvbv5_isdb-t/br-sp-AparecidaDOeste)0
-rw-r--r--isdb-t/br-sp-Apiai (renamed from dvbv5_isdb-t/br-sp-Apiai)0
-rw-r--r--isdb-t/br-sp-Aracatuba (renamed from dvbv5_isdb-t/br-sp-Aracatuba)0
-rw-r--r--isdb-t/br-sp-Araraquara (renamed from dvbv5_isdb-t/br-sp-Araraquara)0
-rw-r--r--isdb-t/br-sp-Araras (renamed from dvbv5_isdb-t/br-sp-Araras)0
-rw-r--r--isdb-t/br-sp-Arealva (renamed from dvbv5_isdb-t/br-sp-Arealva)0
-rw-r--r--isdb-t/br-sp-Assis (renamed from dvbv5_isdb-t/br-sp-Assis)0
-rw-r--r--isdb-t/br-sp-Atibaia (renamed from dvbv5_isdb-t/br-sp-Atibaia)0
-rw-r--r--isdb-t/br-sp-Auriflama (renamed from dvbv5_isdb-t/br-sp-Auriflama)0
-rw-r--r--isdb-t/br-sp-BarraBonita (renamed from dvbv5_isdb-t/br-sp-BarraBonita)0
-rw-r--r--isdb-t/br-sp-Barretos (renamed from dvbv5_isdb-t/br-sp-Barretos)0
-rw-r--r--isdb-t/br-sp-Batatais (renamed from dvbv5_isdb-t/br-sp-Batatais)0
-rw-r--r--isdb-t/br-sp-Bauru (renamed from dvbv5_isdb-t/br-sp-Bauru)0
-rw-r--r--isdb-t/br-sp-Bebedouro (renamed from dvbv5_isdb-t/br-sp-Bebedouro)0
-rw-r--r--isdb-t/br-sp-Bertioga (renamed from dvbv5_isdb-t/br-sp-Bertioga)0
-rw-r--r--isdb-t/br-sp-Birigui (renamed from dvbv5_isdb-t/br-sp-Birigui)0
-rw-r--r--isdb-t/br-sp-Boituva (renamed from dvbv5_isdb-t/br-sp-Boituva)0
-rw-r--r--isdb-t/br-sp-Botucatu (renamed from dvbv5_isdb-t/br-sp-Botucatu)0
-rw-r--r--isdb-t/br-sp-BragancaPaulista (renamed from dvbv5_isdb-t/br-sp-BragancaPaulista)0
-rw-r--r--isdb-t/br-sp-Brodowski (renamed from dvbv5_isdb-t/br-sp-Brodowski)0
-rw-r--r--isdb-t/br-sp-CachoeiraPaulista (renamed from dvbv5_isdb-t/br-sp-CachoeiraPaulista)0
-rw-r--r--isdb-t/br-sp-Cajamar (renamed from dvbv5_isdb-t/br-sp-Cajamar)0
-rw-r--r--isdb-t/br-sp-Cajati (renamed from dvbv5_isdb-t/br-sp-Cajati)0
-rw-r--r--isdb-t/br-sp-Cajobi (renamed from dvbv5_isdb-t/br-sp-Cajobi)0
-rw-r--r--isdb-t/br-sp-Campinas (renamed from dvbv5_isdb-t/br-sp-Campinas)0
-rw-r--r--isdb-t/br-sp-CampoLimpoPaulista (renamed from dvbv5_isdb-t/br-sp-CampoLimpoPaulista)0
-rw-r--r--isdb-t/br-sp-CamposDoJordao (renamed from dvbv5_isdb-t/br-sp-CamposDoJordao)0
-rw-r--r--isdb-t/br-sp-Capivari (renamed from dvbv5_isdb-t/br-sp-Capivari)0
-rw-r--r--isdb-t/br-sp-Caraguatatuba (renamed from dvbv5_isdb-t/br-sp-Caraguatatuba)0
-rw-r--r--isdb-t/br-sp-Carapicuiba (renamed from dvbv5_isdb-t/br-sp-Carapicuiba)0
-rw-r--r--isdb-t/br-sp-CassiaDosCoqueiros (renamed from dvbv5_isdb-t/br-sp-CassiaDosCoqueiros)0
-rw-r--r--isdb-t/br-sp-Catanduva (renamed from dvbv5_isdb-t/br-sp-Catanduva)0
-rw-r--r--isdb-t/br-sp-Colina (renamed from dvbv5_isdb-t/br-sp-Colina)0
-rw-r--r--isdb-t/br-sp-Colombia (renamed from dvbv5_isdb-t/br-sp-Colombia)0
-rw-r--r--isdb-t/br-sp-Cravinhos (renamed from dvbv5_isdb-t/br-sp-Cravinhos)0
-rw-r--r--isdb-t/br-sp-CristaisPaulista (renamed from dvbv5_isdb-t/br-sp-CristaisPaulista)0
-rw-r--r--isdb-t/br-sp-Cruzeiro (renamed from dvbv5_isdb-t/br-sp-Cruzeiro)0
-rw-r--r--isdb-t/br-sp-Cubatao (renamed from dvbv5_isdb-t/br-sp-Cubatao)0
-rw-r--r--isdb-t/br-sp-Diadema (renamed from dvbv5_isdb-t/br-sp-Diadema)0
-rw-r--r--isdb-t/br-sp-Dracena (renamed from dvbv5_isdb-t/br-sp-Dracena)0
-rw-r--r--isdb-t/br-sp-Dumont (renamed from dvbv5_isdb-t/br-sp-Dumont)0
-rw-r--r--isdb-t/br-sp-Eldorado (renamed from dvbv5_isdb-t/br-sp-Eldorado)0
-rw-r--r--isdb-t/br-sp-EmbuDasArtes (renamed from dvbv5_isdb-t/br-sp-EmbuDasArtes)0
-rw-r--r--isdb-t/br-sp-EstivaGerbi (renamed from dvbv5_isdb-t/br-sp-EstivaGerbi)0
-rw-r--r--isdb-t/br-sp-EstrelaDOeste (renamed from dvbv5_isdb-t/br-sp-EstrelaDOeste)0
-rw-r--r--isdb-t/br-sp-Fernandopolis (renamed from dvbv5_isdb-t/br-sp-Fernandopolis)0
-rw-r--r--isdb-t/br-sp-FerrazDeVasconcelos (renamed from dvbv5_isdb-t/br-sp-FerrazDeVasconcelos)0
-rw-r--r--isdb-t/br-sp-Franca (renamed from dvbv5_isdb-t/br-sp-Franca)0
-rw-r--r--isdb-t/br-sp-FrancoDaRocha (renamed from dvbv5_isdb-t/br-sp-FrancoDaRocha)0
-rw-r--r--isdb-t/br-sp-Garca (renamed from dvbv5_isdb-t/br-sp-Garca)0
-rw-r--r--isdb-t/br-sp-Guapiacu (renamed from dvbv5_isdb-t/br-sp-Guapiacu)0
-rw-r--r--isdb-t/br-sp-GuaraniDOeste (renamed from dvbv5_isdb-t/br-sp-GuaraniDOeste)0
-rw-r--r--isdb-t/br-sp-Guaratingueta (renamed from dvbv5_isdb-t/br-sp-Guaratingueta)0
-rw-r--r--isdb-t/br-sp-Guaruja (renamed from dvbv5_isdb-t/br-sp-Guaruja)0
-rw-r--r--isdb-t/br-sp-Guarulhos (renamed from dvbv5_isdb-t/br-sp-Guarulhos)0
-rw-r--r--isdb-t/br-sp-Guzolandia (renamed from dvbv5_isdb-t/br-sp-Guzolandia)0
-rw-r--r--isdb-t/br-sp-Hortolandia (renamed from dvbv5_isdb-t/br-sp-Hortolandia)0
-rw-r--r--isdb-t/br-sp-Iacanga (renamed from dvbv5_isdb-t/br-sp-Iacanga)0
-rw-r--r--isdb-t/br-sp-Ibate (renamed from dvbv5_isdb-t/br-sp-Ibate)0
-rw-r--r--isdb-t/br-sp-Ibitinga (renamed from dvbv5_isdb-t/br-sp-Ibitinga)0
-rw-r--r--isdb-t/br-sp-Ibiuna (renamed from dvbv5_isdb-t/br-sp-Ibiuna)0
-rw-r--r--isdb-t/br-sp-IgaracuDoTiete (renamed from dvbv5_isdb-t/br-sp-IgaracuDoTiete)0
-rw-r--r--isdb-t/br-sp-Iguape (renamed from dvbv5_isdb-t/br-sp-Iguape)0
-rw-r--r--isdb-t/br-sp-IlhaComprida (renamed from dvbv5_isdb-t/br-sp-IlhaComprida)0
-rw-r--r--isdb-t/br-sp-IlhaSolteira (renamed from dvbv5_isdb-t/br-sp-IlhaSolteira)0
-rw-r--r--isdb-t/br-sp-Ilhabela (renamed from dvbv5_isdb-t/br-sp-Ilhabela)0
-rw-r--r--isdb-t/br-sp-Indaiatuba (renamed from dvbv5_isdb-t/br-sp-Indaiatuba)0
-rw-r--r--isdb-t/br-sp-Ipero (renamed from dvbv5_isdb-t/br-sp-Ipero)0
-rw-r--r--isdb-t/br-sp-Itanhaem (renamed from dvbv5_isdb-t/br-sp-Itanhaem)0
-rw-r--r--isdb-t/br-sp-Itapetininga (renamed from dvbv5_isdb-t/br-sp-Itapetininga)0
-rw-r--r--isdb-t/br-sp-Itapeva (renamed from dvbv5_isdb-t/br-sp-Itapeva)0
-rw-r--r--isdb-t/br-sp-Itapevi (renamed from dvbv5_isdb-t/br-sp-Itapevi)0
-rw-r--r--isdb-t/br-sp-Itapolis (renamed from dvbv5_isdb-t/br-sp-Itapolis)0
-rw-r--r--isdb-t/br-sp-Itaquaquecetuba (renamed from dvbv5_isdb-t/br-sp-Itaquaquecetuba)0
-rw-r--r--isdb-t/br-sp-Itu (renamed from dvbv5_isdb-t/br-sp-Itu)0
-rw-r--r--isdb-t/br-sp-Jaborandi (renamed from dvbv5_isdb-t/br-sp-Jaborandi)0
-rw-r--r--isdb-t/br-sp-Jaboticabal (renamed from dvbv5_isdb-t/br-sp-Jaboticabal)0
-rw-r--r--isdb-t/br-sp-Jacarei (renamed from dvbv5_isdb-t/br-sp-Jacarei)0
-rw-r--r--isdb-t/br-sp-Jaci (renamed from dvbv5_isdb-t/br-sp-Jaci)0
-rw-r--r--isdb-t/br-sp-Jacupiranga (renamed from dvbv5_isdb-t/br-sp-Jacupiranga)0
-rw-r--r--isdb-t/br-sp-Jaguariuna (renamed from dvbv5_isdb-t/br-sp-Jaguariuna)0
-rw-r--r--isdb-t/br-sp-Jales (renamed from dvbv5_isdb-t/br-sp-Jales)0
-rw-r--r--isdb-t/br-sp-Jandira (renamed from dvbv5_isdb-t/br-sp-Jandira)0
-rw-r--r--isdb-t/br-sp-Jardinopolis (renamed from dvbv5_isdb-t/br-sp-Jardinopolis)0
-rw-r--r--isdb-t/br-sp-Jau (renamed from dvbv5_isdb-t/br-sp-Jau)0
-rw-r--r--isdb-t/br-sp-Jeriquara (renamed from dvbv5_isdb-t/br-sp-Jeriquara)0
-rw-r--r--isdb-t/br-sp-JoseBonifacio (renamed from dvbv5_isdb-t/br-sp-JoseBonifacio)0
-rw-r--r--isdb-t/br-sp-Jundiai (renamed from dvbv5_isdb-t/br-sp-Jundiai)0
-rw-r--r--isdb-t/br-sp-Leme (renamed from dvbv5_isdb-t/br-sp-Leme)0
-rw-r--r--isdb-t/br-sp-LencoisPaulista (renamed from dvbv5_isdb-t/br-sp-LencoisPaulista)0
-rw-r--r--isdb-t/br-sp-Limeira (renamed from dvbv5_isdb-t/br-sp-Limeira)0
-rw-r--r--isdb-t/br-sp-Lins (renamed from dvbv5_isdb-t/br-sp-Lins)0
-rw-r--r--isdb-t/br-sp-Lorena (renamed from dvbv5_isdb-t/br-sp-Lorena)0
-rw-r--r--isdb-t/br-sp-LuizAntonio (renamed from dvbv5_isdb-t/br-sp-LuizAntonio)0
-rw-r--r--isdb-t/br-sp-Macatuba (renamed from dvbv5_isdb-t/br-sp-Macatuba)0
-rw-r--r--isdb-t/br-sp-MarabaPaulista (renamed from dvbv5_isdb-t/br-sp-MarabaPaulista)0
-rw-r--r--isdb-t/br-sp-Marilia (renamed from dvbv5_isdb-t/br-sp-Marilia)0
-rw-r--r--isdb-t/br-sp-Matao (renamed from dvbv5_isdb-t/br-sp-Matao)0
-rw-r--r--isdb-t/br-sp-MiranteDoParanapanema (renamed from dvbv5_isdb-t/br-sp-MiranteDoParanapanema)0
-rw-r--r--isdb-t/br-sp-Mirassol (renamed from dvbv5_isdb-t/br-sp-Mirassol)0
-rw-r--r--isdb-t/br-sp-Mococa (renamed from dvbv5_isdb-t/br-sp-Mococa)0
-rw-r--r--isdb-t/br-sp-MogiDasCruzes (renamed from dvbv5_isdb-t/br-sp-MogiDasCruzes)0
-rw-r--r--isdb-t/br-sp-Mogiguacu (renamed from dvbv5_isdb-t/br-sp-Mogiguacu)0
-rw-r--r--isdb-t/br-sp-Mongagua (renamed from dvbv5_isdb-t/br-sp-Mongagua)0
-rw-r--r--isdb-t/br-sp-MonteAzulPaulista (renamed from dvbv5_isdb-t/br-sp-MonteAzulPaulista)0
-rw-r--r--isdb-t/br-sp-NevesPaulista (renamed from dvbv5_isdb-t/br-sp-NevesPaulista)0
-rw-r--r--isdb-t/br-sp-NovoHorizonte (renamed from dvbv5_isdb-t/br-sp-NovoHorizonte)0
-rw-r--r--isdb-t/br-sp-Nuporanga (renamed from dvbv5_isdb-t/br-sp-Nuporanga)0
-rw-r--r--isdb-t/br-sp-Orlandia (renamed from dvbv5_isdb-t/br-sp-Orlandia)0
-rw-r--r--isdb-t/br-sp-Ourinhos (renamed from dvbv5_isdb-t/br-sp-Ourinhos)0
-rw-r--r--isdb-t/br-sp-Paraibuna (renamed from dvbv5_isdb-t/br-sp-Paraibuna)0
-rw-r--r--isdb-t/br-sp-PariqueraAcu (renamed from dvbv5_isdb-t/br-sp-PariqueraAcu)0
-rw-r--r--isdb-t/br-sp-Paulinia (renamed from dvbv5_isdb-t/br-sp-Paulinia)0
-rw-r--r--isdb-t/br-sp-Pederneiras (renamed from dvbv5_isdb-t/br-sp-Pederneiras)0
-rw-r--r--isdb-t/br-sp-Pedregulho (renamed from dvbv5_isdb-t/br-sp-Pedregulho)0
-rw-r--r--isdb-t/br-sp-Penapolis (renamed from dvbv5_isdb-t/br-sp-Penapolis)0
-rw-r--r--isdb-t/br-sp-Peruibe (renamed from dvbv5_isdb-t/br-sp-Peruibe)0
-rw-r--r--isdb-t/br-sp-Piedade (renamed from dvbv5_isdb-t/br-sp-Piedade)0
-rw-r--r--isdb-t/br-sp-Pindamonhangaba (renamed from dvbv5_isdb-t/br-sp-Pindamonhangaba)0
-rw-r--r--isdb-t/br-sp-Piquete (renamed from dvbv5_isdb-t/br-sp-Piquete)0
-rw-r--r--isdb-t/br-sp-Piracicaba (renamed from dvbv5_isdb-t/br-sp-Piracicaba)0
-rw-r--r--isdb-t/br-sp-Pirangi (renamed from dvbv5_isdb-t/br-sp-Pirangi)0
-rw-r--r--isdb-t/br-sp-Pirassununga (renamed from dvbv5_isdb-t/br-sp-Pirassununga)0
-rw-r--r--isdb-t/br-sp-Pitangueiras (renamed from dvbv5_isdb-t/br-sp-Pitangueiras)0
-rw-r--r--isdb-t/br-sp-Poa (renamed from dvbv5_isdb-t/br-sp-Poa)0
-rw-r--r--isdb-t/br-sp-Pontal (renamed from dvbv5_isdb-t/br-sp-Pontal)0
-rw-r--r--isdb-t/br-sp-PortoFeliz (renamed from dvbv5_isdb-t/br-sp-PortoFeliz)0
-rw-r--r--isdb-t/br-sp-PortoFerreira (renamed from dvbv5_isdb-t/br-sp-PortoFerreira)0
-rw-r--r--isdb-t/br-sp-PraiaGrande (renamed from dvbv5_isdb-t/br-sp-PraiaGrande)0
-rw-r--r--isdb-t/br-sp-PresidenteBernardes (renamed from dvbv5_isdb-t/br-sp-PresidenteBernardes)0
-rw-r--r--isdb-t/br-sp-PresidentePrudente (renamed from dvbv5_isdb-t/br-sp-PresidentePrudente)0
-rw-r--r--isdb-t/br-sp-PresidenteVenceslau (renamed from dvbv5_isdb-t/br-sp-PresidenteVenceslau)0
-rw-r--r--isdb-t/br-sp-RedencaoDaSerra (renamed from dvbv5_isdb-t/br-sp-RedencaoDaSerra)0
-rw-r--r--isdb-t/br-sp-Reginopolis (renamed from dvbv5_isdb-t/br-sp-Reginopolis)0
-rw-r--r--isdb-t/br-sp-Registro (renamed from dvbv5_isdb-t/br-sp-Registro)0
-rw-r--r--isdb-t/br-sp-Restinga (renamed from dvbv5_isdb-t/br-sp-Restinga)0
-rw-r--r--isdb-t/br-sp-RibeiraoCorrente (renamed from dvbv5_isdb-t/br-sp-RibeiraoCorrente)0
-rw-r--r--isdb-t/br-sp-RibeiraoPreto (renamed from dvbv5_isdb-t/br-sp-RibeiraoPreto)0
-rw-r--r--isdb-t/br-sp-RioClaro (renamed from dvbv5_isdb-t/br-sp-RioClaro)0
-rw-r--r--isdb-t/br-sp-Roseira (renamed from dvbv5_isdb-t/br-sp-Roseira)0
-rw-r--r--isdb-t/br-sp-SalesOliveira (renamed from dvbv5_isdb-t/br-sp-SalesOliveira)0
-rw-r--r--isdb-t/br-sp-Salto (renamed from dvbv5_isdb-t/br-sp-Salto)0
-rw-r--r--isdb-t/br-sp-SantaBarbaraDOeste (renamed from dvbv5_isdb-t/br-sp-SantaBarbaraDOeste)0
-rw-r--r--isdb-t/br-sp-SantaCruzDaConceicao (renamed from dvbv5_isdb-t/br-sp-SantaCruzDaConceicao)0
-rw-r--r--isdb-t/br-sp-SantaCruzDaEsperanca (renamed from dvbv5_isdb-t/br-sp-SantaCruzDaEsperanca)0
-rw-r--r--isdb-t/br-sp-SantaCruzDasPalmeiras (renamed from dvbv5_isdb-t/br-sp-SantaCruzDasPalmeiras)0
-rw-r--r--isdb-t/br-sp-SantaGertrudes (renamed from dvbv5_isdb-t/br-sp-SantaGertrudes)0
-rw-r--r--isdb-t/br-sp-SantaLucia (renamed from dvbv5_isdb-t/br-sp-SantaLucia)0
-rw-r--r--isdb-t/br-sp-SantaRitaDoPassaQuatro (renamed from dvbv5_isdb-t/br-sp-SantaRitaDoPassaQuatro)0
-rw-r--r--isdb-t/br-sp-SantaRosaDeViterbo (renamed from dvbv5_isdb-t/br-sp-SantaRosaDeViterbo)0
-rw-r--r--isdb-t/br-sp-SantoAnastacio (renamed from dvbv5_isdb-t/br-sp-SantoAnastacio)0
-rw-r--r--isdb-t/br-sp-SantoAndre (renamed from dvbv5_isdb-t/br-sp-SantoAndre)0
-rw-r--r--isdb-t/br-sp-Santos (renamed from dvbv5_isdb-t/br-sp-Santos)0
-rw-r--r--isdb-t/br-sp-SaoCarlos (renamed from dvbv5_isdb-t/br-sp-SaoCarlos)0
-rw-r--r--isdb-t/br-sp-SaoJoaoDaBoaVista (renamed from dvbv5_isdb-t/br-sp-SaoJoaoDaBoaVista)0
-rw-r--r--isdb-t/br-sp-SaoJoseDaBelaVista (renamed from dvbv5_isdb-t/br-sp-SaoJoseDaBelaVista)0
-rw-r--r--isdb-t/br-sp-SaoJoseDoRioPardo (renamed from dvbv5_isdb-t/br-sp-SaoJoseDoRioPardo)0
-rw-r--r--isdb-t/br-sp-SaoJoseDoRioPreto (renamed from dvbv5_isdb-t/br-sp-SaoJoseDoRioPreto)0
-rw-r--r--isdb-t/br-sp-SaoJoseDosCampos (renamed from dvbv5_isdb-t/br-sp-SaoJoseDosCampos)0
-rw-r--r--isdb-t/br-sp-SaoPaulo (renamed from dvbv5_isdb-t/br-sp-SaoPaulo)0
-rw-r--r--isdb-t/br-sp-SaoPedro (renamed from dvbv5_isdb-t/br-sp-SaoPedro)0
-rw-r--r--isdb-t/br-sp-SaoRoque (renamed from dvbv5_isdb-t/br-sp-SaoRoque)0
-rw-r--r--isdb-t/br-sp-SaoSebastiao (renamed from dvbv5_isdb-t/br-sp-SaoSebastiao)0
-rw-r--r--isdb-t/br-sp-SaoSimao (renamed from dvbv5_isdb-t/br-sp-SaoSimao)0
-rw-r--r--isdb-t/br-sp-SaoVicente (renamed from dvbv5_isdb-t/br-sp-SaoVicente)0
-rw-r--r--isdb-t/br-sp-SerraAzul (renamed from dvbv5_isdb-t/br-sp-SerraAzul)0
-rw-r--r--isdb-t/br-sp-Serrana (renamed from dvbv5_isdb-t/br-sp-Serrana)0
-rw-r--r--isdb-t/br-sp-Sertaozinho (renamed from dvbv5_isdb-t/br-sp-Sertaozinho)0
-rw-r--r--isdb-t/br-sp-SeteBarras (renamed from dvbv5_isdb-t/br-sp-SeteBarras)0
-rw-r--r--isdb-t/br-sp-Sorocaba (renamed from dvbv5_isdb-t/br-sp-Sorocaba)0
-rw-r--r--isdb-t/br-sp-Sumare (renamed from dvbv5_isdb-t/br-sp-Sumare)0
-rw-r--r--isdb-t/br-sp-Suzano (renamed from dvbv5_isdb-t/br-sp-Suzano)0
-rw-r--r--isdb-t/br-sp-Taiacu (renamed from dvbv5_isdb-t/br-sp-Taiacu)0
-rw-r--r--isdb-t/br-sp-Taiuva (renamed from dvbv5_isdb-t/br-sp-Taiuva)0
-rw-r--r--isdb-t/br-sp-Tambau (renamed from dvbv5_isdb-t/br-sp-Tambau)0
-rw-r--r--isdb-t/br-sp-Tanabi (renamed from dvbv5_isdb-t/br-sp-Tanabi)0
-rw-r--r--isdb-t/br-sp-Taquaritinga (renamed from dvbv5_isdb-t/br-sp-Taquaritinga)0
-rw-r--r--isdb-t/br-sp-Tatui (renamed from dvbv5_isdb-t/br-sp-Tatui)0
-rw-r--r--isdb-t/br-sp-Taubate (renamed from dvbv5_isdb-t/br-sp-Taubate)0
-rw-r--r--isdb-t/br-sp-TerraRoxa (renamed from dvbv5_isdb-t/br-sp-TerraRoxa)0
-rw-r--r--isdb-t/br-sp-Tupa (renamed from dvbv5_isdb-t/br-sp-Tupa)0
-rw-r--r--isdb-t/br-sp-TupiPaulista (renamed from dvbv5_isdb-t/br-sp-TupiPaulista)0
-rw-r--r--isdb-t/br-sp-Ubatuba (renamed from dvbv5_isdb-t/br-sp-Ubatuba)0
-rw-r--r--isdb-t/br-sp-Valinhos (renamed from dvbv5_isdb-t/br-sp-Valinhos)0
-rw-r--r--isdb-t/br-sp-VarzeaPaulista (renamed from dvbv5_isdb-t/br-sp-VarzeaPaulista)0
-rw-r--r--isdb-t/br-sp-Viradouro (renamed from dvbv5_isdb-t/br-sp-Viradouro)0
-rw-r--r--isdb-t/br-sp-Votorantim (renamed from dvbv5_isdb-t/br-sp-Votorantim)0
-rw-r--r--isdb-t/br-sp-Votuporanga (renamed from dvbv5_isdb-t/br-sp-Votuporanga)0
-rw-r--r--isdb-t/br-to-Aragominas (renamed from dvbv5_isdb-t/br-to-Aragominas)0
-rw-r--r--isdb-t/br-to-Araguaina (renamed from dvbv5_isdb-t/br-to-Araguaina)0
-rw-r--r--isdb-t/br-to-Babaculandia (renamed from dvbv5_isdb-t/br-to-Babaculandia)0
-rw-r--r--isdb-t/br-to-BrejinhoDeNazare (renamed from dvbv5_isdb-t/br-to-BrejinhoDeNazare)0
-rw-r--r--isdb-t/br-to-ChapadaDeAreia (renamed from dvbv5_isdb-t/br-to-ChapadaDeAreia)0
-rw-r--r--isdb-t/br-to-Darcinopolis (renamed from dvbv5_isdb-t/br-to-Darcinopolis)0
-rw-r--r--isdb-t/br-to-Fatima (renamed from dvbv5_isdb-t/br-to-Fatima)0
-rw-r--r--isdb-t/br-to-Filadelfia (renamed from dvbv5_isdb-t/br-to-Filadelfia)0
-rw-r--r--isdb-t/br-to-Gurupi (renamed from dvbv5_isdb-t/br-to-Gurupi)0
-rw-r--r--isdb-t/br-to-MiracemaDoTocantins (renamed from dvbv5_isdb-t/br-to-MiracemaDoTocantins)0
-rw-r--r--isdb-t/br-to-Miranorte (renamed from dvbv5_isdb-t/br-to-Miranorte)0
-rw-r--r--isdb-t/br-to-MonteSantoDoTocantins (renamed from dvbv5_isdb-t/br-to-MonteSantoDoTocantins)0
-rw-r--r--isdb-t/br-to-OliveiraDeFatima (renamed from dvbv5_isdb-t/br-to-OliveiraDeFatima)0
-rw-r--r--isdb-t/br-to-Palmas (renamed from dvbv5_isdb-t/br-to-Palmas)0
-rw-r--r--isdb-t/br-to-ParaisoDoTocantins (renamed from dvbv5_isdb-t/br-to-ParaisoDoTocantins)0
-rw-r--r--isdb-t/br-to-PortoNacional (renamed from dvbv5_isdb-t/br-to-PortoNacional)0
1172 files changed, 832 insertions, 8674 deletions
diff --git a/dvb-t/fi-Aanekoski b/dvb-t/fi-Aanekoski
index a74e405f..7dda3262 100644
--- a/dvb-t/fi-Aanekoski
+++ b/dvb-t/fi-Aanekoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Aanekoski_Konginkangas b/dvb-t/fi-Aanekoski_Konginkangas
index 49a5dbc0..ff13741e 100644
--- a/dvb-t/fi-Aanekoski_Konginkangas
+++ b/dvb-t/fi-Aanekoski_Konginkangas
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Aanekoski_Konginkangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ahtari b/dvb-t/fi-Ahtari
index a88bdcc9..aa90ea2d 100644
--- a/dvb-t/fi-Ahtari
+++ b/dvb-t/fi-Ahtari
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ahtari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ahtari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Alajarvi b/dvb-t/fi-Alajarvi
index 7f117f42..712483d1 100644
--- a/dvb-t/fi-Alajarvi
+++ b/dvb-t/fi-Alajarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Alajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Anjalankoski_Ruotila b/dvb-t/fi-Anjalankoski_Ruotila
index 7fb3b635..8ae12319 100644
--- a/dvb-t/fi-Anjalankoski_Ruotila
+++ b/dvb-t/fi-Anjalankoski_Ruotila
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Anjalankoski_Ruotila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Anjalankoski_Ruotila]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Enontekio_Ahovaara b/dvb-t/fi-Enontekio_Ahovaara
index 000ea591..21abdbc0 100644
--- a/dvb-t/fi-Enontekio_Ahovaara
+++ b/dvb-t/fi-Enontekio_Ahovaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Enontekio_Ahovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Enontekio_Ahovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Enontekio_Hetta b/dvb-t/fi-Enontekio_Hetta
index e55d2b31..6ff6b845 100644
--- a/dvb-t/fi-Enontekio_Hetta
+++ b/dvb-t/fi-Enontekio_Hetta
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Enontekio_Hetta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Enontekio_Hetta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Enontekio_Kuttanen b/dvb-t/fi-Enontekio_Kuttanen
index ccca087c..f9a6af82 100644
--- a/dvb-t/fi-Enontekio_Kuttanen
+++ b/dvb-t/fi-Enontekio_Kuttanen
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Enontekio_Kuttanen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Enontekio_Kuttanen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Espoo b/dvb-t/fi-Espoo
index 7b1ed6fd..03296aeb 100644
--- a/dvb-t/fi-Espoo
+++ b/dvb-t/fi-Espoo
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-# and addded new mux H
-[CHANNEL]
+
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Espoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Espoo]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Eurajoki b/dvb-t/fi-Eurajoki
index 4bae5a64..1d090a53 100644
--- a/dvb-t/fi-Eurajoki
+++ b/dvb-t/fi-Eurajoki
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Eurajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Eurajoki]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Fiskars b/dvb-t/fi-Fiskars
index 938cf00d..0f84bb7a 100644
--- a/dvb-t/fi-Fiskars
+++ b/dvb-t/fi-Fiskars
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Fiskars]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Haapavesi b/dvb-t/fi-Haapavesi
index d2ae4c68..8be1f62b 100644
--- a/dvb-t/fi-Haapavesi
+++ b/dvb-t/fi-Haapavesi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Haapavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hameenkyro_Kyroskoski b/dvb-t/fi-Hameenkyro_Kyroskoski
index 1dc8b8bd..8a98791c 100644
--- a/dvb-t/fi-Hameenkyro_Kyroskoski
+++ b/dvb-t/fi-Hameenkyro_Kyroskoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenkyro_Kyroskoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hameenlinna_Painokangas b/dvb-t/fi-Hameenlinna_Painokangas
index 1302d294..9a56b2bb 100644
--- a/dvb-t/fi-Hameenlinna_Painokangas
+++ b/dvb-t/fi-Hameenlinna_Painokangas
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hameenlinna_Painokangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenlinna_Painokangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hameenlinna_Painokangas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hanko b/dvb-t/fi-Hanko
index 5eb77890..ab08a142 100644
--- a/dvb-t/fi-Hanko
+++ b/dvb-t/fi-Hanko
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hanko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hartola b/dvb-t/fi-Hartola
index 4712253e..d10df22d 100644
--- a/dvb-t/fi-Hartola
+++ b/dvb-t/fi-Hartola
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hartola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hartola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hartola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Heinavesi b/dvb-t/fi-Heinavesi
index ee8ce95b..b33bb39e 100644
--- a/dvb-t/fi-Heinavesi
+++ b/dvb-t/fi-Heinavesi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Heinavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinavesi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Heinola b/dvb-t/fi-Heinola
index 16796ca7..7a6f234e 100644
--- a/dvb-t/fi-Heinola
+++ b/dvb-t/fi-Heinola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Heinola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyrynsalmi b/dvb-t/fi-Hyrynsalmi
index 3b798a2a..e11f89ac 100644
--- a/dvb-t/fi-Hyrynsalmi
+++ b/dvb-t/fi-Hyrynsalmi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyrynsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyrynsalmi_Kyparavaara b/dvb-t/fi-Hyrynsalmi_Kyparavaara
index 040b6a3c..f402d8af 100644
--- a/dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ b/dvb-t/fi-Hyrynsalmi_Kyparavaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyrynsalmi_Kyparavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Kyparavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Kyparavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyrynsalmi_Paljakka b/dvb-t/fi-Hyrynsalmi_Paljakka
index 50c70e37..806a3c09 100644
--- a/dvb-t/fi-Hyrynsalmi_Paljakka
+++ b/dvb-t/fi-Hyrynsalmi_Paljakka
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyrynsalmi_Paljakka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Paljakka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyrynsalmi_Paljakka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Hyvinkaa b/dvb-t/fi-Hyvinkaa
index ac299e6d..e711b16d 100644
--- a/dvb-t/fi-Hyvinkaa
+++ b/dvb-t/fi-Hyvinkaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Hyvinkaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ii_Raiskio b/dvb-t/fi-Ii_Raiskio
index 60bc0f12..c5fda678 100644
--- a/dvb-t/fi-Ii_Raiskio
+++ b/dvb-t/fi-Ii_Raiskio
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ii_Raiskio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ii_Raiskio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Iisalmi b/dvb-t/fi-Iisalmi
index b72a7bc1..d2818251 100644
--- a/dvb-t/fi-Iisalmi
+++ b/dvb-t/fi-Iisalmi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Iisalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Iisalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ikaalinen b/dvb-t/fi-Ikaalinen
index 2d7d87ae..885d44b5 100644
--- a/dvb-t/fi-Ikaalinen
+++ b/dvb-t/fi-Ikaalinen
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ikaalinen_Riitiala b/dvb-t/fi-Ikaalinen_Riitiala
index d6c9f2e0..55d82022 100644
--- a/dvb-t/fi-Ikaalinen_Riitiala
+++ b/dvb-t/fi-Ikaalinen_Riitiala
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ikaalinen_Riitiala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Inari b/dvb-t/fi-Inari
index c8d8508d..31deb212 100644
--- a/dvb-t/fi-Inari
+++ b/dvb-t/fi-Inari
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Inari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Inari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Inari_Janispaa b/dvb-t/fi-Inari_Janispaa
index e02aaaaf..37bd31e2 100644
--- a/dvb-t/fi-Inari_Janispaa
+++ b/dvb-t/fi-Inari_Janispaa
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Inari_Janispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Inari_Janispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Inari_Naatamo b/dvb-t/fi-Inari_Naatamo
index 555a0c39..ba843609 100644
--- a/dvb-t/fi-Inari_Naatamo
+++ b/dvb-t/fi-Inari_Naatamo
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Inari_Naatamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Inari_Naatamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ivalo_Saarineitamovaara b/dvb-t/fi-Ivalo_Saarineitamovaara
index 1835ff5e..70181bbe 100644
--- a/dvb-t/fi-Ivalo_Saarineitamovaara
+++ b/dvb-t/fi-Ivalo_Saarineitamovaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ivalo_Saarineitamovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ivalo_Saarineitamovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jalasjarvi b/dvb-t/fi-Jalasjarvi
index 21bf3e17..9bc70582 100644
--- a/dvb-t/fi-Jalasjarvi
+++ b/dvb-t/fi-Jalasjarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jalasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Halli b/dvb-t/fi-Jamsa_Halli
index 10f74c5c..5d06520a 100644
--- a/dvb-t/fi-Jamsa_Halli
+++ b/dvb-t/fi-Jamsa_Halli
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Halli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Kaipola b/dvb-t/fi-Jamsa_Kaipola
index 46101608..ca8e563f 100644
--- a/dvb-t/fi-Jamsa_Kaipola
+++ b/dvb-t/fi-Jamsa_Kaipola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Kaipola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Matkosvuori b/dvb-t/fi-Jamsa_Matkosvuori
index 09505cbd..eacacff3 100644
--- a/dvb-t/fi-Jamsa_Matkosvuori
+++ b/dvb-t/fi-Jamsa_Matkosvuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Matkosvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsa_Ouninpohja b/dvb-t/fi-Jamsa_Ouninpohja
index 38b22b84..70eb8e14 100644
--- a/dvb-t/fi-Jamsa_Ouninpohja
+++ b/dvb-t/fi-Jamsa_Ouninpohja
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsa_Ouninpohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Ouninpohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsa_Ouninpohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jamsankoski b/dvb-t/fi-Jamsankoski
index b9ff038a..142be917 100644
--- a/dvb-t/fi-Jamsankoski
+++ b/dvb-t/fi-Jamsankoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jamsankoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joensuu_Vestinkallio b/dvb-t/fi-Joensuu_Vestinkallio
index 858c41b2..765ba1ce 100644
--- a/dvb-t/fi-Joensuu_Vestinkallio
+++ b/dvb-t/fi-Joensuu_Vestinkallio
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joensuu_Vestinkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joensuu_Vestinkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joensuu_Vestinkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joroinen_Puukkola b/dvb-t/fi-Joroinen_Puukkola
index 1cc60c08..5fce8db4 100644
--- a/dvb-t/fi-Joroinen_Puukkola
+++ b/dvb-t/fi-Joroinen_Puukkola
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joroinen_Puukkola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joroinen_Puukkola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joroinen_Puukkola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joutsa_Lankia b/dvb-t/fi-Joutsa_Lankia
index b355e873..cc44c813 100644
--- a/dvb-t/fi-Joutsa_Lankia
+++ b/dvb-t/fi-Joutsa_Lankia
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutsa_Lankia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Joutseno b/dvb-t/fi-Joutseno
index b9013c7a..80337fc7 100644
--- a/dvb-t/fi-Joutseno
+++ b/dvb-t/fi-Joutseno
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Joutseno]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Joutseno]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Juupajoki_Kopsamo b/dvb-t/fi-Juupajoki_Kopsamo
index aefc0906..a99af77e 100644
--- a/dvb-t/fi-Juupajoki_Kopsamo
+++ b/dvb-t/fi-Juupajoki_Kopsamo
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Juupajoki_Kopsamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juupajoki_Kopsamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juupajoki_Kopsamo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Juva b/dvb-t/fi-Juva
index 8900203a..ab8a15e5 100644
--- a/dvb-t/fi-Juva
+++ b/dvb-t/fi-Juva
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Juva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jyvaskyla b/dvb-t/fi-Jyvaskyla
index 39fc33f2..3e2c51fa 100644
--- a/dvb-t/fi-Jyvaskyla
+++ b/dvb-t/fi-Jyvaskyla
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Jyvaskyla_Vaajakoski b/dvb-t/fi-Jyvaskyla_Vaajakoski
index dff0fd3b..92b5ac96 100644
--- a/dvb-t/fi-Jyvaskyla_Vaajakoski
+++ b/dvb-t/fi-Jyvaskyla_Vaajakoski
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Jyvaskyla_Vaajakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla_Vaajakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Jyvaskyla_Vaajakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kaavi_Sivakkavaara b/dvb-t/fi-Kaavi_Sivakkavaara
index e400648a..7595a398 100644
--- a/dvb-t/fi-Kaavi_Sivakkavaara
+++ b/dvb-t/fi-Kaavi_Sivakkavaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kaavi_Sivakkavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kaavi_Sivakkavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kaavi_Sivakkavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kajaani_Pollyvaara b/dvb-t/fi-Kajaani_Pollyvaara
index 0442ba98..3ea7b90f 100644
--- a/dvb-t/fi-Kajaani_Pollyvaara
+++ b/dvb-t/fi-Kajaani_Pollyvaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kajaani_Pollyvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kajaani_Pollyvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kajaani_Pollyvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kalajoki b/dvb-t/fi-Kalajoki
index 3dfe323d..cab796dc 100644
--- a/dvb-t/fi-Kalajoki
+++ b/dvb-t/fi-Kalajoki
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kalajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kalajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kalajoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kangaslampi b/dvb-t/fi-Kangaslampi
index d3647e22..d84b2a9e 100644
--- a/dvb-t/fi-Kangaslampi
+++ b/dvb-t/fi-Kangaslampi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangaslampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kangasniemi_Turkinmaki b/dvb-t/fi-Kangasniemi_Turkinmaki
index a134e86b..56476e6b 100644
--- a/dvb-t/fi-Kangasniemi_Turkinmaki
+++ b/dvb-t/fi-Kangasniemi_Turkinmaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kangasniemi_Turkinmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kankaanpaa b/dvb-t/fi-Kankaanpaa
index f6f982f0..a3df7ba5 100644
--- a/dvb-t/fi-Kankaanpaa
+++ b/dvb-t/fi-Kankaanpaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kankaanpaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karigasniemi b/dvb-t/fi-Karigasniemi
index d6706a90..60548c72 100644
--- a/dvb-t/fi-Karigasniemi
+++ b/dvb-t/fi-Karigasniemi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karigasniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karigasniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karkkila b/dvb-t/fi-Karkkila
index d5796078..d598f471 100644
--- a/dvb-t/fi-Karkkila
+++ b/dvb-t/fi-Karkkila
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karkkila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karstula b/dvb-t/fi-Karstula
index c625e004..dfd30016 100644
--- a/dvb-t/fi-Karstula
+++ b/dvb-t/fi-Karstula
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karstula]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karstula]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karstula]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Karvia b/dvb-t/fi-Karvia
index 12bc970a..51e89b7b 100644
--- a/dvb-t/fi-Karvia
+++ b/dvb-t/fi-Karvia
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Karvia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karvia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Karvia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kaunispaa b/dvb-t/fi-Kaunispaa
index c8d8508d..e9fea9c7 100644
--- a/dvb-t/fi-Kaunispaa
+++ b/dvb-t/fi-Kaunispaa
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kaunispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kaunispaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kemijarvi_Suomutunturi b/dvb-t/fi-Kemijarvi_Suomutunturi
index eb617319..dac5d932 100644
--- a/dvb-t/fi-Kemijarvi_Suomutunturi
+++ b/dvb-t/fi-Kemijarvi_Suomutunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kemijarvi_Suomutunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kemijarvi_Suomutunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kerimaki b/dvb-t/fi-Kerimaki
index ea8510eb..68f45d10 100644
--- a/dvb-t/fi-Kerimaki
+++ b/dvb-t/fi-Kerimaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kerimaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Keuruu b/dvb-t/fi-Keuruu
index a08dab8a..dd49b5b6 100644
--- a/dvb-t/fi-Keuruu
+++ b/dvb-t/fi-Keuruu
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Keuruu_Haapamaki b/dvb-t/fi-Keuruu_Haapamaki
index f4e167fe..cfb9b0e2 100644
--- a/dvb-t/fi-Keuruu_Haapamaki
+++ b/dvb-t/fi-Keuruu_Haapamaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Keuruu_Haapamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kihnio b/dvb-t/fi-Kihnio
index c8a961ec..7c5c9924 100644
--- a/dvb-t/fi-Kihnio
+++ b/dvb-t/fi-Kihnio
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kihnio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kiihtelysvaara b/dvb-t/fi-Kiihtelysvaara
index d720c463..52e60b8e 100644
--- a/dvb-t/fi-Kiihtelysvaara
+++ b/dvb-t/fi-Kiihtelysvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kiihtelysvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kiihtelysvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kilpisjarvi b/dvb-t/fi-Kilpisjarvi
index abf73805..9d3435c4 100644
--- a/dvb-t/fi-Kilpisjarvi
+++ b/dvb-t/fi-Kilpisjarvi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kilpisjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kilpisjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kittila_Levitunturi b/dvb-t/fi-Kittila_Levitunturi
index 08ec326f..ae4c1c90 100644
--- a/dvb-t/fi-Kittila_Levitunturi
+++ b/dvb-t/fi-Kittila_Levitunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kittila_Levitunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kittila_Levitunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kolari_Vuolittaja b/dvb-t/fi-Kolari_Vuolittaja
index 787cfd4e..f507750a 100644
--- a/dvb-t/fi-Kolari_Vuolittaja
+++ b/dvb-t/fi-Kolari_Vuolittaja
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kolari_Vuolittaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kolari_Vuolittaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Koli b/dvb-t/fi-Koli
index 2076a7d9..034bf2d4 100644
--- a/dvb-t/fi-Koli
+++ b/dvb-t/fi-Koli
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Koli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Korpilahti_Vaarunvuori b/dvb-t/fi-Korpilahti_Vaarunvuori
index b9ff038a..7fa3ed65 100644
--- a/dvb-t/fi-Korpilahti_Vaarunvuori
+++ b/dvb-t/fi-Korpilahti_Vaarunvuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korpilahti_Vaarunvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Korppoo b/dvb-t/fi-Korppoo
index 233138ea..6c842414 100644
--- a/dvb-t/fi-Korppoo
+++ b/dvb-t/fi-Korppoo
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Korppoo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kruunupyy b/dvb-t/fi-Kruunupyy
index 424e9033..65d86c4c 100644
--- a/dvb-t/fi-Kruunupyy
+++ b/dvb-t/fi-Kruunupyy
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kruunupyy]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Kruunupyy]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmo_Haukela b/dvb-t/fi-Kuhmo_Haukela
index 9ae57945..c3a3bd8b 100644
--- a/dvb-t/fi-Kuhmo_Haukela
+++ b/dvb-t/fi-Kuhmo_Haukela
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmo_Haukela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Haukela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Haukela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmo_Lentiira b/dvb-t/fi-Kuhmo_Lentiira
index 588463dc..11279993 100644
--- a/dvb-t/fi-Kuhmo_Lentiira
+++ b/dvb-t/fi-Kuhmo_Lentiira
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmo_Lentiira]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Lentiira]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Lentiira]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmo_Niva b/dvb-t/fi-Kuhmo_Niva
index 53a28c1f..6f7aa2cb 100644
--- a/dvb-t/fi-Kuhmo_Niva
+++ b/dvb-t/fi-Kuhmo_Niva
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmo_Niva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Niva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmo_Niva]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmoinen b/dvb-t/fi-Kuhmoinen
index 1c1b5d2a..53d2de9e 100644
--- a/dvb-t/fi-Kuhmoinen
+++ b/dvb-t/fi-Kuhmoinen
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmoinen_Harjunsalmi b/dvb-t/fi-Kuhmoinen_Harjunsalmi
index 1b370294..059df911 100644
--- a/dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ b/dvb-t/fi-Kuhmoinen_Harjunsalmi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Harjunsalmi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuhmoinen_Puukkoinen b/dvb-t/fi-Kuhmoinen_Puukkoinen
index 5fbf978a..113e0f45 100644
--- a/dvb-t/fi-Kuhmoinen_Puukkoinen
+++ b/dvb-t/fi-Kuhmoinen_Puukkoinen
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuhmoinen_Puukkoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Puukkoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuhmoinen_Puukkoinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuopio b/dvb-t/fi-Kuopio
index 669e246d..eb39e5f0 100644
--- a/dvb-t/fi-Kuopio
+++ b/dvb-t/fi-Kuopio
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuopio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Kuopio]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kurikka_Kesti b/dvb-t/fi-Kurikka_Kesti
index 3ce29b6f..c34cfe62 100644
--- a/dvb-t/fi-Kurikka_Kesti
+++ b/dvb-t/fi-Kurikka_Kesti
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kurikka_Kesti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kustavi_Viherlahti b/dvb-t/fi-Kustavi_Viherlahti
index 3dd49338..ecef74dd 100644
--- a/dvb-t/fi-Kustavi_Viherlahti
+++ b/dvb-t/fi-Kustavi_Viherlahti
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kustavi_Viherlahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kuusamo_Hamppulampi b/dvb-t/fi-Kuusamo_Hamppulampi
index 89e20712..6ce9243a 100644
--- a/dvb-t/fi-Kuusamo_Hamppulampi
+++ b/dvb-t/fi-Kuusamo_Hamppulampi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kuusamo_Hamppulampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kuusamo_Hamppulampi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Kyyjarvi_Noposenaho b/dvb-t/fi-Kyyjarvi_Noposenaho
index 0ad6c3ae..d3deab81 100644
--- a/dvb-t/fi-Kyyjarvi_Noposenaho
+++ b/dvb-t/fi-Kyyjarvi_Noposenaho
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Kyyjarvi_Noposenaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kyyjarvi_Noposenaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Kyyjarvi_Noposenaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lahti b/dvb-t/fi-Lahti
index 6d96ea0e..d4bf4033 100644
--- a/dvb-t/fi-Lahti
+++ b/dvb-t/fi-Lahti
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Lahti]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lapua b/dvb-t/fi-Lapua
index 67d55288..9084440f 100644
--- a/dvb-t/fi-Lapua
+++ b/dvb-t/fi-Lapua
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lapua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Lapua]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Laukaa b/dvb-t/fi-Laukaa
index b9ff038a..3c484aeb 100644
--- a/dvb-t/fi-Laukaa
+++ b/dvb-t/fi-Laukaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Laukaa_Vihtavuori b/dvb-t/fi-Laukaa_Vihtavuori
index b9ff038a..5bc93a78 100644
--- a/dvb-t/fi-Laukaa_Vihtavuori
+++ b/dvb-t/fi-Laukaa_Vihtavuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Laukaa_Vihtavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lavia b/dvb-t/fi-Lavia
index 1e5a20d6..f2f13916 100644
--- a/dvb-t/fi-Lavia
+++ b/dvb-t/fi-Lavia
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Lavia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lavia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lavia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Lohja b/dvb-t/fi-Lohja
index 7e4d94db..d040f9b4 100644
--- a/dvb-t/fi-Lohja
+++ b/dvb-t/fi-Lohja
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Lohja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Loimaa b/dvb-t/fi-Loimaa
index 215521c6..0b6aad87 100644
--- a/dvb-t/fi-Loimaa
+++ b/dvb-t/fi-Loimaa
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Loimaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Luhanka b/dvb-t/fi-Luhanka
index 3745545f..f6407ce3 100644
--- a/dvb-t/fi-Luhanka
+++ b/dvb-t/fi-Luhanka
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luhanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Luopioinen b/dvb-t/fi-Luopioinen
index 76173808..9ed4e3f2 100644
--- a/dvb-t/fi-Luopioinen
+++ b/dvb-t/fi-Luopioinen
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Luopioinen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Mantta b/dvb-t/fi-Mantta
index 5c037350..e2014052 100644
--- a/dvb-t/fi-Mantta
+++ b/dvb-t/fi-Mantta
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Mantyharju b/dvb-t/fi-Mantyharju
index 6d13d6d4..3b7f127a 100644
--- a/dvb-t/fi-Mantyharju
+++ b/dvb-t/fi-Mantyharju
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Mantyharju]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantyharju]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mantyharju]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Mikkeli b/dvb-t/fi-Mikkeli
index 4a2a9168..f523878c 100644
--- a/dvb-t/fi-Mikkeli
+++ b/dvb-t/fi-Mikkeli
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Mikkeli]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Muonio_Olostunturi b/dvb-t/fi-Muonio_Olostunturi
index 1099f56f..bfdf0c73 100644
--- a/dvb-t/fi-Muonio_Olostunturi
+++ b/dvb-t/fi-Muonio_Olostunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Muonio_Olostunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Muonio_Olostunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nilsia b/dvb-t/fi-Nilsia
index 2c1d030e..208d1c43 100644
--- a/dvb-t/fi-Nilsia
+++ b/dvb-t/fi-Nilsia
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nilsia_Keski-Siikajarvi b/dvb-t/fi-Nilsia_Keski-Siikajarvi
index 28eb1602..bfbc561a 100644
--- a/dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ b/dvb-t/fi-Nilsia_Keski-Siikajarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nilsia_Keski-Siikajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Keski-Siikajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Keski-Siikajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nilsia_Pisa b/dvb-t/fi-Nilsia_Pisa
index a4ad289b..8c8ee34f 100644
--- a/dvb-t/fi-Nilsia_Pisa
+++ b/dvb-t/fi-Nilsia_Pisa
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nilsia_Pisa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Pisa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nilsia_Pisa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nokia b/dvb-t/fi-Nokia
index a9d4132e..2a2b3803 100644
--- a/dvb-t/fi-Nokia
+++ b/dvb-t/fi-Nokia
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nokia_Siuro b/dvb-t/fi-Nokia_Siuro
index a9d4132e..1ba3ccac 100644
--- a/dvb-t/fi-Nokia_Siuro
+++ b/dvb-t/fi-Nokia_Siuro
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nokia_Siuro]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nummi-Pusula_Hyonola b/dvb-t/fi-Nummi-Pusula_Hyonola
index d3aa9c44..08840cc3 100644
--- a/dvb-t/fi-Nummi-Pusula_Hyonola
+++ b/dvb-t/fi-Nummi-Pusula_Hyonola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nummi-Pusula_Hyonola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nuorgam_Njallavaara b/dvb-t/fi-Nuorgam_Njallavaara
index c6797a3b..e1c1c3e0 100644
--- a/dvb-t/fi-Nuorgam_Njallavaara
+++ b/dvb-t/fi-Nuorgam_Njallavaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nuorgam_Njallavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nuorgam_Njallavaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nuorgam_raja b/dvb-t/fi-Nuorgam_raja
index 8d9887b5..2b2cb3cd 100644
--- a/dvb-t/fi-Nuorgam_raja
+++ b/dvb-t/fi-Nuorgam_raja
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nuorgam_raja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nuorgam_raja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nurmes_Konnanvaara b/dvb-t/fi-Nurmes_Konnanvaara
index 1a921bd5..7cd3d91d 100644
--- a/dvb-t/fi-Nurmes_Konnanvaara
+++ b/dvb-t/fi-Nurmes_Konnanvaara
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Konnanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Nurmes_Kortevaara b/dvb-t/fi-Nurmes_Kortevaara
index 583b202a..3e118ad4 100644
--- a/dvb-t/fi-Nurmes_Kortevaara
+++ b/dvb-t/fi-Nurmes_Kortevaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Nurmes_Kortevaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Kortevaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Nurmes_Kortevaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Orivesi_Talviainen b/dvb-t/fi-Orivesi_Talviainen
index a3d50ee9..149782ea 100644
--- a/dvb-t/fi-Orivesi_Talviainen
+++ b/dvb-t/fi-Orivesi_Talviainen
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Orivesi_Talviainen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Orivesi_Talviainen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Orivesi_Talviainen]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Oulu b/dvb-t/fi-Oulu
index 7f754f94..6d108499 100644
--- a/dvb-t/fi-Oulu
+++ b/dvb-t/fi-Oulu
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Oulu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Oulu]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Padasjoki b/dvb-t/fi-Padasjoki
index 9b6bdd17..47246b4b 100644
--- a/dvb-t/fi-Padasjoki
+++ b/dvb-t/fi-Padasjoki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Padasjoki_Arrakoski b/dvb-t/fi-Padasjoki_Arrakoski
index f8549f7c..c8c1b05b 100644
--- a/dvb-t/fi-Padasjoki_Arrakoski
+++ b/dvb-t/fi-Padasjoki_Arrakoski
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Padasjoki_Arrakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 746000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Paltamo_Kivesvaara b/dvb-t/fi-Paltamo_Kivesvaara
index aca37244..56f8ba05 100644
--- a/dvb-t/fi-Paltamo_Kivesvaara
+++ b/dvb-t/fi-Paltamo_Kivesvaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Paltamo_Kivesvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Paltamo_Kivesvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Paltamo_Kivesvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Parainen_Houtskari b/dvb-t/fi-Parainen_Houtskari
index 233138ea..e1878142 100644
--- a/dvb-t/fi-Parainen_Houtskari
+++ b/dvb-t/fi-Parainen_Houtskari
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parainen_Houtskari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Parikkala b/dvb-t/fi-Parikkala
index ab3cf80e..f0f52f7a 100644
--- a/dvb-t/fi-Parikkala
+++ b/dvb-t/fi-Parikkala
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parikkala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Parkano_Sopukallio b/dvb-t/fi-Parkano_Sopukallio
index 362f20a6..62e85079 100644
--- a/dvb-t/fi-Parkano_Sopukallio
+++ b/dvb-t/fi-Parkano_Sopukallio
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Parkano_Sopukallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pello b/dvb-t/fi-Pello
index d5ff22f3..2cbd28ec 100644
--- a/dvb-t/fi-Pello
+++ b/dvb-t/fi-Pello
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pello]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pello]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pello_Ratasvaara b/dvb-t/fi-Pello_Ratasvaara
index eae4a7e7..ff7f6607 100644
--- a/dvb-t/fi-Pello_Ratasvaara
+++ b/dvb-t/fi-Pello_Ratasvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pello_Ratasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pello_Ratasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Perho b/dvb-t/fi-Perho
index 82a0b8c0..0a7a2dc9 100644
--- a/dvb-t/fi-Perho
+++ b/dvb-t/fi-Perho
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Perho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pernaja b/dvb-t/fi-Pernaja
index a5eb6704..5459e885 100644
--- a/dvb-t/fi-Pernaja
+++ b/dvb-t/fi-Pernaja
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pernaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pernaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pernaja]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pieksamaki_Halkokumpu b/dvb-t/fi-Pieksamaki_Halkokumpu
index 19d2df98..f03f9a04 100644
--- a/dvb-t/fi-Pieksamaki_Halkokumpu
+++ b/dvb-t/fi-Pieksamaki_Halkokumpu
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pieksamaki_Halkokumpu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pieksamaki_Halkokumpu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pieksamaki_Halkokumpu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pihtipudas b/dvb-t/fi-Pihtipudas
index 6d336b7b..42cdd293 100644
--- a/dvb-t/fi-Pihtipudas
+++ b/dvb-t/fi-Pihtipudas
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pihtipudas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pihtipudas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pihtipudas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Porvoo_Suomenkyla b/dvb-t/fi-Porvoo_Suomenkyla
index b2f8e018..7b5e79df 100644
--- a/dvb-t/fi-Porvoo_Suomenkyla
+++ b/dvb-t/fi-Porvoo_Suomenkyla
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Porvoo_Suomenkyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Posio b/dvb-t/fi-Posio
index 897f0130..02586479 100644
--- a/dvb-t/fi-Posio
+++ b/dvb-t/fi-Posio
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Posio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Posio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pudasjarvi b/dvb-t/fi-Pudasjarvi
index db4c846c..dc85d9ab 100644
--- a/dvb-t/fi-Pudasjarvi
+++ b/dvb-t/fi-Pudasjarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pudasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pudasjarvi_Iso-Syote b/dvb-t/fi-Pudasjarvi_Iso-Syote
index cec818bd..24cebddf 100644
--- a/dvb-t/fi-Pudasjarvi_Iso-Syote
+++ b/dvb-t/fi-Pudasjarvi_Iso-Syote
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pudasjarvi_Iso-Syote]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi_Iso-Syote]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi_Iso-Syote]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pudasjarvi_Kangasvaara b/dvb-t/fi-Pudasjarvi_Kangasvaara
index c58005f4..cb911634 100644
--- a/dvb-t/fi-Pudasjarvi_Kangasvaara
+++ b/dvb-t/fi-Pudasjarvi_Kangasvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pudasjarvi_Kangasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pudasjarvi_Kangasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Puolanka b/dvb-t/fi-Puolanka
index 804001ae..3370a9a6 100644
--- a/dvb-t/fi-Puolanka
+++ b/dvb-t/fi-Puolanka
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Puolanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pyhatunturi b/dvb-t/fi-Pyhatunturi
index c15f4134..c5005761 100644
--- a/dvb-t/fi-Pyhatunturi
+++ b/dvb-t/fi-Pyhatunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pyhatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pyhatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pyhavuori b/dvb-t/fi-Pyhavuori
index 47c8268e..ad232654 100644
--- a/dvb-t/fi-Pyhavuori
+++ b/dvb-t/fi-Pyhavuori
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pyhavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pyhavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pyhavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Pylkonmaki_Karankajarvi b/dvb-t/fi-Pylkonmaki_Karankajarvi
index 2bfe9761..2d7ef178 100644
--- a/dvb-t/fi-Pylkonmaki_Karankajarvi
+++ b/dvb-t/fi-Pylkonmaki_Karankajarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Pylkonmaki_Karankajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pylkonmaki_Karankajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Pylkonmaki_Karankajarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Raahe_Mestauskallio b/dvb-t/fi-Raahe_Mestauskallio
index bc29a204..e4cc7b19 100644
--- a/dvb-t/fi-Raahe_Mestauskallio
+++ b/dvb-t/fi-Raahe_Mestauskallio
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Mestauskallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Raahe_Piehinki b/dvb-t/fi-Raahe_Piehinki
index 535649d0..1b3836d9 100644
--- a/dvb-t/fi-Raahe_Piehinki
+++ b/dvb-t/fi-Raahe_Piehinki
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Raahe_Piehinki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Piehinki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Raahe_Piehinki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ranua_Haasionmaa b/dvb-t/fi-Ranua_Haasionmaa
index 967aefef..837a10f3 100644
--- a/dvb-t/fi-Ranua_Haasionmaa
+++ b/dvb-t/fi-Ranua_Haasionmaa
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ranua_Haasionmaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ranua_Haasionmaa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ranua_Leppiaho b/dvb-t/fi-Ranua_Leppiaho
index 0c2637f0..94d3eef7 100644
--- a/dvb-t/fi-Ranua_Leppiaho
+++ b/dvb-t/fi-Ranua_Leppiaho
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ranua_Leppiaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ranua_Leppiaho]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rautavaara_Angervikko b/dvb-t/fi-Rautavaara_Angervikko
index 30e66934..c89e4bf4 100644
--- a/dvb-t/fi-Rautavaara_Angervikko
+++ b/dvb-t/fi-Rautavaara_Angervikko
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautavaara_Angervikko]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rautjarvi_Simpele b/dvb-t/fi-Rautjarvi_Simpele
index 1460323b..2d4c254f 100644
--- a/dvb-t/fi-Rautjarvi_Simpele
+++ b/dvb-t/fi-Rautjarvi_Simpele
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rautjarvi_Simpele]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautjarvi_Simpele]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rautjarvi_Simpele]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ristijarvi b/dvb-t/fi-Ristijarvi
index 08f92837..79a58c39 100644
--- a/dvb-t/fi-Ristijarvi
+++ b/dvb-t/fi-Ristijarvi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ristijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ristijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ristijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi b/dvb-t/fi-Rovaniemi
index 6028454b..87a65b17 100644
--- a/dvb-t/fi-Rovaniemi
+++ b/dvb-t/fi-Rovaniemi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Kaihuanvaara b/dvb-t/fi-Rovaniemi_Kaihuanvaara
index ff70c01c..3808ebc8 100644
--- a/dvb-t/fi-Rovaniemi_Kaihuanvaara
+++ b/dvb-t/fi-Rovaniemi_Kaihuanvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Kaihuanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Kaihuanvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Karhuvaara b/dvb-t/fi-Rovaniemi_Karhuvaara
index 787cfd4e..069ecb4b 100644
--- a/dvb-t/fi-Rovaniemi_Karhuvaara
+++ b/dvb-t/fi-Rovaniemi_Karhuvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Karhuvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Karhuvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Marasenkallio b/dvb-t/fi-Rovaniemi_Marasenkallio
index a1006dff..6c8d5421 100644
--- a/dvb-t/fi-Rovaniemi_Marasenkallio
+++ b/dvb-t/fi-Rovaniemi_Marasenkallio
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Marasenkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Marasenkallio]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Rantalaki b/dvb-t/fi-Rovaniemi_Rantalaki
index 42253393..fe3ea4c5 100644
--- a/dvb-t/fi-Rovaniemi_Rantalaki
+++ b/dvb-t/fi-Rovaniemi_Rantalaki
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Rantalaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Rantalaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Sonka b/dvb-t/fi-Rovaniemi_Sonka
index a1006dff..932b409c 100644
--- a/dvb-t/fi-Rovaniemi_Sonka
+++ b/dvb-t/fi-Rovaniemi_Sonka
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Sonka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Sonka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Rovaniemi_Sorviselka b/dvb-t/fi-Rovaniemi_Sorviselka
index 09d3f336..feb3bcf4 100644
--- a/dvb-t/fi-Rovaniemi_Sorviselka
+++ b/dvb-t/fi-Rovaniemi_Sorviselka
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Rovaniemi_Sorviselka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Rovaniemi_Sorviselka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ruka b/dvb-t/fi-Ruka
index 53c7c9b3..de41ddc7 100644
--- a/dvb-t/fi-Ruka
+++ b/dvb-t/fi-Ruka
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ruka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ruovesi_Storminiemi b/dvb-t/fi-Ruovesi_Storminiemi
index 1dc8b8bd..ac465cbf 100644
--- a/dvb-t/fi-Ruovesi_Storminiemi
+++ b/dvb-t/fi-Ruovesi_Storminiemi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ruovesi_Storminiemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Saarijarvi b/dvb-t/fi-Saarijarvi
index 5cd332d7..18c923f8 100644
--- a/dvb-t/fi-Saarijarvi
+++ b/dvb-t/fi-Saarijarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Saarijarvi_Kalmari b/dvb-t/fi-Saarijarvi_Kalmari
index 2bfe9761..77d5adeb 100644
--- a/dvb-t/fi-Saarijarvi_Kalmari
+++ b/dvb-t/fi-Saarijarvi_Kalmari
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Saarijarvi_Kalmari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Kalmari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Kalmari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Saarijarvi_Mahlu b/dvb-t/fi-Saarijarvi_Mahlu
index bfe350e1..48324d0e 100644
--- a/dvb-t/fi-Saarijarvi_Mahlu
+++ b/dvb-t/fi-Saarijarvi_Mahlu
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Saarijarvi_Mahlu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Mahlu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Saarijarvi_Mahlu]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Hirvasvaara b/dvb-t/fi-Salla_Hirvasvaara
index a91b1ba1..e1410a0e 100644
--- a/dvb-t/fi-Salla_Hirvasvaara
+++ b/dvb-t/fi-Salla_Hirvasvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Hirvasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Hirvasvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Ihistysjanka b/dvb-t/fi-Salla_Ihistysjanka
index accc619f..0d857b59 100644
--- a/dvb-t/fi-Salla_Ihistysjanka
+++ b/dvb-t/fi-Salla_Ihistysjanka
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Ihistysjanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Ihistysjanka]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Naruska b/dvb-t/fi-Salla_Naruska
index 43e17324..06bc1bab 100644
--- a/dvb-t/fi-Salla_Naruska
+++ b/dvb-t/fi-Salla_Naruska
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Naruska]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Naruska]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Sallatunturi b/dvb-t/fi-Salla_Sallatunturi
index b72a7bc1..54a55540 100644
--- a/dvb-t/fi-Salla_Sallatunturi
+++ b/dvb-t/fi-Salla_Sallatunturi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Sallatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Sallatunturi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salla_Sarivaara b/dvb-t/fi-Salla_Sarivaara
index b72a7bc1..eb9bbc0d 100644
--- a/dvb-t/fi-Salla_Sarivaara
+++ b/dvb-t/fi-Salla_Sarivaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salla_Sarivaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salla_Sarivaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Salo_Isokyla b/dvb-t/fi-Salo_Isokyla
index 47eb1c3c..42df3b49 100644
--- a/dvb-t/fi-Salo_Isokyla
+++ b/dvb-t/fi-Salo_Isokyla
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Salo_Isokyla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Savukoski_Martti b/dvb-t/fi-Savukoski_Martti
index 86534b91..aafbdcbd 100644
--- a/dvb-t/fi-Savukoski_Martti
+++ b/dvb-t/fi-Savukoski_Martti
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Savukoski_Martti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Savukoski_Martti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Savukoski_Tanhua b/dvb-t/fi-Savukoski_Tanhua
index 7df1eb88..91f5fa75 100644
--- a/dvb-t/fi-Savukoski_Tanhua
+++ b/dvb-t/fi-Savukoski_Tanhua
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Savukoski_Tanhua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Savukoski_Tanhua]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Siilinjarvi b/dvb-t/fi-Siilinjarvi
index e37b7079..7fc1f473 100644
--- a/dvb-t/fi-Siilinjarvi
+++ b/dvb-t/fi-Siilinjarvi
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Siilinjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Simo_Viantie b/dvb-t/fi-Simo_Viantie
index f70ebaf1..580c7bdd 100644
--- a/dvb-t/fi-Simo_Viantie
+++ b/dvb-t/fi-Simo_Viantie
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Simo_Viantie]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Simo_Viantie]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Simo_Viantie]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sipoo_Norrkulla b/dvb-t/fi-Sipoo_Norrkulla
index c56023e4..abfb413d 100644
--- a/dvb-t/fi-Sipoo_Norrkulla
+++ b/dvb-t/fi-Sipoo_Norrkulla
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sipoo_Norrkulla]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sodankyla_Pittiovaara b/dvb-t/fi-Sodankyla_Pittiovaara
index e20b23f3..a123f643 100644
--- a/dvb-t/fi-Sodankyla_Pittiovaara
+++ b/dvb-t/fi-Sodankyla_Pittiovaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sodankyla_Pittiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sodankyla_Pittiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sodankyla_Vuotso b/dvb-t/fi-Sodankyla_Vuotso
index 3924f17f..9c60b771 100644
--- a/dvb-t/fi-Sodankyla_Vuotso
+++ b/dvb-t/fi-Sodankyla_Vuotso
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sodankyla_Vuotso]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sodankyla_Vuotso]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sulkava_Vaatalanmaki b/dvb-t/fi-Sulkava_Vaatalanmaki
index 41b0dd11..31bdd61f 100644
--- a/dvb-t/fi-Sulkava_Vaatalanmaki
+++ b/dvb-t/fi-Sulkava_Vaatalanmaki
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sulkava_Vaatalanmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sulkava_Vaatalanmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sulkava_Vaatalanmaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Ala-Vuokki b/dvb-t/fi-Suomussalmi_Ala-Vuokki
index 09fe6574..0878a88e 100644
--- a/dvb-t/fi-Suomussalmi_Ala-Vuokki
+++ b/dvb-t/fi-Suomussalmi_Ala-Vuokki
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Ala-Vuokki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Ala-Vuokki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Ammansaari b/dvb-t/fi-Suomussalmi_Ammansaari
index fcf1c0ab..9afcefff 100644
--- a/dvb-t/fi-Suomussalmi_Ammansaari
+++ b/dvb-t/fi-Suomussalmi_Ammansaari
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Ammansaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Ammansaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Juntusranta b/dvb-t/fi-Suomussalmi_Juntusranta
index fcf1c0ab..66c4e5b5 100644
--- a/dvb-t/fi-Suomussalmi_Juntusranta
+++ b/dvb-t/fi-Suomussalmi_Juntusranta
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Juntusranta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Juntusranta]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 666000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Suomussalmi_Myllylahti b/dvb-t/fi-Suomussalmi_Myllylahti
index 3291e046..9630977d 100644
--- a/dvb-t/fi-Suomussalmi_Myllylahti
+++ b/dvb-t/fi-Suomussalmi_Myllylahti
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Suomussalmi_Myllylahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Suomussalmi_Myllylahti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Sysma_Liikola b/dvb-t/fi-Sysma_Liikola
index 2b6e7cbf..9db44246 100644
--- a/dvb-t/fi-Sysma_Liikola
+++ b/dvb-t/fi-Sysma_Liikola
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Sysma_Liikola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Taivalkoski b/dvb-t/fi-Taivalkoski
index 510997a9..c307ae49 100644
--- a/dvb-t/fi-Taivalkoski
+++ b/dvb-t/fi-Taivalkoski
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Taivalkoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Taivalkoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Taivalkoski_Taivalvaara b/dvb-t/fi-Taivalkoski_Taivalvaara
index fe0a6cb8..ff81bf02 100644
--- a/dvb-t/fi-Taivalkoski_Taivalvaara
+++ b/dvb-t/fi-Taivalkoski_Taivalvaara
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Taivalkoski_Taivalvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Taivalkoski_Taivalvaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tammela b/dvb-t/fi-Tammela
index ddf6d975..f537bef2 100644
--- a/dvb-t/fi-Tammela
+++ b/dvb-t/fi-Tammela
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammela]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Tammela]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tammisaari b/dvb-t/fi-Tammisaari
index 1bfa8e0f..5248fd22 100644
--- a/dvb-t/fi-Tammisaari
+++ b/dvb-t/fi-Tammisaari
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tammisaari]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tampere b/dvb-t/fi-Tampere
index 88f2d1c2..1440032d 100644
--- a/dvb-t/fi-Tampere
+++ b/dvb-t/fi-Tampere
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Tampere]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tampere_Pyynikki b/dvb-t/fi-Tampere_Pyynikki
index fd700d3f..03e8ecca 100644
--- a/dvb-t/fi-Tampere_Pyynikki
+++ b/dvb-t/fi-Tampere_Pyynikki
@@ -1,62 +1,28 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 682000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tampere_Pyynikki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Tampere_Pyynikki]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Tervola b/dvb-t/fi-Tervola
index 57bc2217..d2c2d949 100644
--- a/dvb-t/fi-Tervola
+++ b/dvb-t/fi-Tervola
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Tervola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tervola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 642000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Tervola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Turku b/dvb-t/fi-Turku
index a5d1844d..281048d4 100644
--- a/dvb-t/fi-Turku
+++ b/dvb-t/fi-Turku
@@ -1,75 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-[CHANNEL]
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 738000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Turku]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
+[Turku]
+ DELIVERY_SYSTEM = DVBT2
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-
-[CHANNEL]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki b/dvb-t/fi-Utsjoki
index 0f06f422..b884a17a 100644
--- a/dvb-t/fi-Utsjoki
+++ b/dvb-t/fi-Utsjoki
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Nuvvus b/dvb-t/fi-Utsjoki_Nuvvus
index a240a988..66d35a3a 100644
--- a/dvb-t/fi-Utsjoki_Nuvvus
+++ b/dvb-t/fi-Utsjoki_Nuvvus
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Nuvvus]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Nuvvus]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Outakoski b/dvb-t/fi-Utsjoki_Outakoski
index d6706a90..53a75af8 100644
--- a/dvb-t/fi-Utsjoki_Outakoski
+++ b/dvb-t/fi-Utsjoki_Outakoski
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Outakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Outakoski]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Polvarniemi b/dvb-t/fi-Utsjoki_Polvarniemi
index d6706a90..0ee4cebd 100644
--- a/dvb-t/fi-Utsjoki_Polvarniemi
+++ b/dvb-t/fi-Utsjoki_Polvarniemi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Polvarniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 706000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Polvarniemi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Rovisuvanto b/dvb-t/fi-Utsjoki_Rovisuvanto
index 3483896c..7459a8d6 100644
--- a/dvb-t/fi-Utsjoki_Rovisuvanto
+++ b/dvb-t/fi-Utsjoki_Rovisuvanto
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Rovisuvanto]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Rovisuvanto]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 578000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Utsjoki_Tenola b/dvb-t/fi-Utsjoki_Tenola
index 663f5906..96504393 100644
--- a/dvb-t/fi-Utsjoki_Tenola
+++ b/dvb-t/fi-Utsjoki_Tenola
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Utsjoki_Tenola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Utsjoki_Tenola]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Uusikaupunki_Orivo b/dvb-t/fi-Uusikaupunki_Orivo
index 429ed608..abe1f7f1 100644
--- a/dvb-t/fi-Uusikaupunki_Orivo
+++ b/dvb-t/fi-Uusikaupunki_Orivo
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 498000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Uusikaupunki_Orivo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vaala b/dvb-t/fi-Vaala
index 4b335719..86e87732 100644
--- a/dvb-t/fi-Vaala
+++ b/dvb-t/fi-Vaala
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vaala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 770000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vaasa b/dvb-t/fi-Vaasa
index a952ade5..7826313c 100644
--- a/dvb-t/fi-Vaasa
+++ b/dvb-t/fi-Vaasa
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vaasa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaasa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vaasa]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Valtimo b/dvb-t/fi-Valtimo
index 131e4083..81e82455 100644
--- a/dvb-t/fi-Valtimo
+++ b/dvb-t/fi-Valtimo
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Valtimo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 586000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Valtimo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 610000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Valtimo]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vammala_Jyranvuori b/dvb-t/fi-Vammala_Jyranvuori
index edd55f01..26582a83 100644
--- a/dvb-t/fi-Vammala_Jyranvuori
+++ b/dvb-t/fi-Vammala_Jyranvuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 714000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 506000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Jyranvuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vammala_Roismala b/dvb-t/fi-Vammala_Roismala
index 1f3446d2..53f37934 100644
--- a/dvb-t/fi-Vammala_Roismala
+++ b/dvb-t/fi-Vammala_Roismala
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vammala_Roismala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Roismala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Roismala]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vammala_Savi b/dvb-t/fi-Vammala_Savi
index 036fa009..189afb4a 100644
--- a/dvb-t/fi-Vammala_Savi
+++ b/dvb-t/fi-Vammala_Savi
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vammala_Savi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Savi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 698000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vammala_Savi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 626000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vantaa_Hakunila b/dvb-t/fi-Vantaa_Hakunila
index f18657ce..af493a1d 100644
--- a/dvb-t/fi-Vantaa_Hakunila
+++ b/dvb-t/fi-Vantaa_Hakunila
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 562000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 658000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 674000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vantaa_Hakunila]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 730000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Varpaisjarvi_Honkamaki b/dvb-t/fi-Varpaisjarvi_Honkamaki
index 60c276ec..5bdf9742 100644
--- a/dvb-t/fi-Varpaisjarvi_Honkamaki
+++ b/dvb-t/fi-Varpaisjarvi_Honkamaki
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 634000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 786000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Varpaisjarvi_Honkamaki]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 650000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Virrat_Lappavuori b/dvb-t/fi-Virrat_Lappavuori
index b1c8c285..61f12b0b 100644
--- a/dvb-t/fi-Virrat_Lappavuori
+++ b/dvb-t/fi-Virrat_Lappavuori
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 522000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Virrat_Lappavuori]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 554000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Vuokatti b/dvb-t/fi-Vuokatti
index db1af70c..5a78cf36 100644
--- a/dvb-t/fi-Vuokatti
+++ b/dvb-t/fi-Vuokatti
@@ -1,50 +1,23 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 722000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 754000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Vuokatti]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 778000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ylitornio_Ainiovaara b/dvb-t/fi-Ylitornio_Ainiovaara
index a2a8d96c..ebd72b90 100644
--- a/dvb-t/fi-Ylitornio_Ainiovaara
+++ b/dvb-t/fi-Ylitornio_Ainiovaara
@@ -1,38 +1,18 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ylitornio_Ainiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ylitornio_Ainiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 602000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ylitornio_Ainiovaara]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 762000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Ylitornio_Raanujarvi b/dvb-t/fi-Ylitornio_Raanujarvi
index c7bac5ad..885c18f5 100644
--- a/dvb-t/fi-Ylitornio_Raanujarvi
+++ b/dvb-t/fi-Ylitornio_Raanujarvi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Ylitornio_Raanujarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Ylitornio_Raanujarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 618000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Yllas b/dvb-t/fi-Yllas
index d5ff22f3..0488cfb8 100644
--- a/dvb-t/fi-Yllas
+++ b/dvb-t/fi-Yllas
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Yllas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 546000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Yllas]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvb-t/fi-Yllasjarvi b/dvb-t/fi-Yllasjarvi
index 889c588c..67900896 100644
--- a/dvb-t/fi-Yllasjarvi
+++ b/dvb-t/fi-Yllasjarvi
@@ -1,26 +1,13 @@
# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-[CHANNEL]
+
+[Yllasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 482000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
-[CHANNEL]
+[Yllasjarvi]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 530000000
BANDWIDTH_HZ = 8000000
- CODE_RATE_HP = 2/3
- CODE_RATE_LP = NONE
- MODULATION = QAM/64
- TRANSMISSION_MODE = 8K
- GUARD_INTERVAL = 1/8
- HIERARCHY = NONE
- INVERSION = AUTO
diff --git a/dvbv5_dvb-t/fi-Aanekoski b/dvbv5_dvb-t/fi-Aanekoski
deleted file mode 100644
index 7dda3262..00000000
--- a/dvbv5_dvb-t/fi-Aanekoski
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Aanekoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Aanekoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Aanekoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Aanekoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Aanekoski_Konginkangas b/dvbv5_dvb-t/fi-Aanekoski_Konginkangas
deleted file mode 100644
index ff13741e..00000000
--- a/dvbv5_dvb-t/fi-Aanekoski_Konginkangas
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Aanekoski_Konginkangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Aanekoski_Konginkangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Aanekoski_Konginkangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Aanekoski_Konginkangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ahtari b/dvbv5_dvb-t/fi-Ahtari
deleted file mode 100644
index aa90ea2d..00000000
--- a/dvbv5_dvb-t/fi-Ahtari
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ahtari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Ahtari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Alajarvi b/dvbv5_dvb-t/fi-Alajarvi
deleted file mode 100644
index 712483d1..00000000
--- a/dvbv5_dvb-t/fi-Alajarvi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Alajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Alajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Alajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
-[Alajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Anjalankoski_Ruotila b/dvbv5_dvb-t/fi-Anjalankoski_Ruotila
deleted file mode 100644
index 8ae12319..00000000
--- a/dvbv5_dvb-t/fi-Anjalankoski_Ruotila
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Anjalankoski_Ruotila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Anjalankoski_Ruotila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Anjalankoski_Ruotila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Anjalankoski_Ruotila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Anjalankoski_Ruotila]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Enontekio_Ahovaara b/dvbv5_dvb-t/fi-Enontekio_Ahovaara
deleted file mode 100644
index 21abdbc0..00000000
--- a/dvbv5_dvb-t/fi-Enontekio_Ahovaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Enontekio_Ahovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Enontekio_Ahovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Enontekio_Hetta b/dvbv5_dvb-t/fi-Enontekio_Hetta
deleted file mode 100644
index 6ff6b845..00000000
--- a/dvbv5_dvb-t/fi-Enontekio_Hetta
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Enontekio_Hetta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Enontekio_Hetta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Enontekio_Kuttanen b/dvbv5_dvb-t/fi-Enontekio_Kuttanen
deleted file mode 100644
index f9a6af82..00000000
--- a/dvbv5_dvb-t/fi-Enontekio_Kuttanen
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Enontekio_Kuttanen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Enontekio_Kuttanen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Espoo b/dvbv5_dvb-t/fi-Espoo
deleted file mode 100644
index 03296aeb..00000000
--- a/dvbv5_dvb-t/fi-Espoo
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Espoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Espoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Espoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Espoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Espoo]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Eurajoki b/dvbv5_dvb-t/fi-Eurajoki
deleted file mode 100644
index 1d090a53..00000000
--- a/dvbv5_dvb-t/fi-Eurajoki
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Eurajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Eurajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Eurajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Eurajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Eurajoki]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Fiskars b/dvbv5_dvb-t/fi-Fiskars
deleted file mode 100644
index 0f84bb7a..00000000
--- a/dvbv5_dvb-t/fi-Fiskars
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Fiskars]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Fiskars]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Fiskars]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Fiskars]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Haapavesi b/dvbv5_dvb-t/fi-Haapavesi
deleted file mode 100644
index 8be1f62b..00000000
--- a/dvbv5_dvb-t/fi-Haapavesi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Haapavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Haapavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Haapavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Haapavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hameenkyro_Kyroskoski b/dvbv5_dvb-t/fi-Hameenkyro_Kyroskoski
deleted file mode 100644
index 8a98791c..00000000
--- a/dvbv5_dvb-t/fi-Hameenkyro_Kyroskoski
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hameenkyro_Kyroskoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Hameenkyro_Kyroskoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Hameenkyro_Kyroskoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
-[Hameenkyro_Kyroskoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hameenlinna_Painokangas b/dvbv5_dvb-t/fi-Hameenlinna_Painokangas
deleted file mode 100644
index 9a56b2bb..00000000
--- a/dvbv5_dvb-t/fi-Hameenlinna_Painokangas
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hameenlinna_Painokangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Hameenlinna_Painokangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Hameenlinna_Painokangas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hanko b/dvbv5_dvb-t/fi-Hanko
deleted file mode 100644
index ab08a142..00000000
--- a/dvbv5_dvb-t/fi-Hanko
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hanko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Hanko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Hanko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Hanko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hartola b/dvbv5_dvb-t/fi-Hartola
deleted file mode 100644
index d10df22d..00000000
--- a/dvbv5_dvb-t/fi-Hartola
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hartola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Hartola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Hartola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Heinavesi b/dvbv5_dvb-t/fi-Heinavesi
deleted file mode 100644
index b33bb39e..00000000
--- a/dvbv5_dvb-t/fi-Heinavesi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Heinavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Heinavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Heinavesi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Heinola b/dvbv5_dvb-t/fi-Heinola
deleted file mode 100644
index 7a6f234e..00000000
--- a/dvbv5_dvb-t/fi-Heinola
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Heinola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Heinola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Heinola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Heinola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hyrynsalmi b/dvbv5_dvb-t/fi-Hyrynsalmi
deleted file mode 100644
index e11f89ac..00000000
--- a/dvbv5_dvb-t/fi-Hyrynsalmi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hyrynsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Hyrynsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Hyrynsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hyrynsalmi_Kyparavaara b/dvbv5_dvb-t/fi-Hyrynsalmi_Kyparavaara
deleted file mode 100644
index f402d8af..00000000
--- a/dvbv5_dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hyrynsalmi_Kyparavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Hyrynsalmi_Kyparavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Hyrynsalmi_Kyparavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hyrynsalmi_Paljakka b/dvbv5_dvb-t/fi-Hyrynsalmi_Paljakka
deleted file mode 100644
index 806a3c09..00000000
--- a/dvbv5_dvb-t/fi-Hyrynsalmi_Paljakka
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hyrynsalmi_Paljakka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Hyrynsalmi_Paljakka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Hyrynsalmi_Paljakka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Hyvinkaa b/dvbv5_dvb-t/fi-Hyvinkaa
deleted file mode 100644
index e711b16d..00000000
--- a/dvbv5_dvb-t/fi-Hyvinkaa
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Hyvinkaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
-[Hyvinkaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Hyvinkaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Hyvinkaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ii_Raiskio b/dvbv5_dvb-t/fi-Ii_Raiskio
deleted file mode 100644
index c5fda678..00000000
--- a/dvbv5_dvb-t/fi-Ii_Raiskio
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ii_Raiskio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Ii_Raiskio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Iisalmi b/dvbv5_dvb-t/fi-Iisalmi
deleted file mode 100644
index d2818251..00000000
--- a/dvbv5_dvb-t/fi-Iisalmi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Iisalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Iisalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ikaalinen b/dvbv5_dvb-t/fi-Ikaalinen
deleted file mode 100644
index 885d44b5..00000000
--- a/dvbv5_dvb-t/fi-Ikaalinen
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ikaalinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
-[Ikaalinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Ikaalinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Ikaalinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ikaalinen_Riitiala b/dvbv5_dvb-t/fi-Ikaalinen_Riitiala
deleted file mode 100644
index 55d82022..00000000
--- a/dvbv5_dvb-t/fi-Ikaalinen_Riitiala
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ikaalinen_Riitiala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Ikaalinen_Riitiala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
-[Ikaalinen_Riitiala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Ikaalinen_Riitiala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Inari b/dvbv5_dvb-t/fi-Inari
deleted file mode 100644
index 31deb212..00000000
--- a/dvbv5_dvb-t/fi-Inari
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Inari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Inari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Inari_Janispaa b/dvbv5_dvb-t/fi-Inari_Janispaa
deleted file mode 100644
index 37bd31e2..00000000
--- a/dvbv5_dvb-t/fi-Inari_Janispaa
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Inari_Janispaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Inari_Janispaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Inari_Naatamo b/dvbv5_dvb-t/fi-Inari_Naatamo
deleted file mode 100644
index ba843609..00000000
--- a/dvbv5_dvb-t/fi-Inari_Naatamo
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Inari_Naatamo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Inari_Naatamo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ivalo_Saarineitamovaara b/dvbv5_dvb-t/fi-Ivalo_Saarineitamovaara
deleted file mode 100644
index 70181bbe..00000000
--- a/dvbv5_dvb-t/fi-Ivalo_Saarineitamovaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ivalo_Saarineitamovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Ivalo_Saarineitamovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jalasjarvi b/dvbv5_dvb-t/fi-Jalasjarvi
deleted file mode 100644
index 9bc70582..00000000
--- a/dvbv5_dvb-t/fi-Jalasjarvi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jalasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Jalasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Jalasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Jalasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jamsa_Halli b/dvbv5_dvb-t/fi-Jamsa_Halli
deleted file mode 100644
index 5d06520a..00000000
--- a/dvbv5_dvb-t/fi-Jamsa_Halli
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jamsa_Halli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Halli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Halli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Halli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jamsa_Kaipola b/dvbv5_dvb-t/fi-Jamsa_Kaipola
deleted file mode 100644
index ca8e563f..00000000
--- a/dvbv5_dvb-t/fi-Jamsa_Kaipola
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jamsa_Kaipola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Kaipola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Kaipola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Kaipola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jamsa_Matkosvuori b/dvbv5_dvb-t/fi-Jamsa_Matkosvuori
deleted file mode 100644
index eacacff3..00000000
--- a/dvbv5_dvb-t/fi-Jamsa_Matkosvuori
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jamsa_Matkosvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Matkosvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Matkosvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Matkosvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jamsa_Ouninpohja b/dvbv5_dvb-t/fi-Jamsa_Ouninpohja
deleted file mode 100644
index 70eb8e14..00000000
--- a/dvbv5_dvb-t/fi-Jamsa_Ouninpohja
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jamsa_Ouninpohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Ouninpohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsa_Ouninpohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jamsankoski b/dvbv5_dvb-t/fi-Jamsankoski
deleted file mode 100644
index 142be917..00000000
--- a/dvbv5_dvb-t/fi-Jamsankoski
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jamsankoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsankoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsankoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Jamsankoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Joensuu_Vestinkallio b/dvbv5_dvb-t/fi-Joensuu_Vestinkallio
deleted file mode 100644
index 765ba1ce..00000000
--- a/dvbv5_dvb-t/fi-Joensuu_Vestinkallio
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Joensuu_Vestinkallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Joensuu_Vestinkallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Joensuu_Vestinkallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Joroinen_Puukkola b/dvbv5_dvb-t/fi-Joroinen_Puukkola
deleted file mode 100644
index 5fce8db4..00000000
--- a/dvbv5_dvb-t/fi-Joroinen_Puukkola
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Joroinen_Puukkola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Joroinen_Puukkola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Joroinen_Puukkola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Joutsa_Lankia b/dvbv5_dvb-t/fi-Joutsa_Lankia
deleted file mode 100644
index cc44c813..00000000
--- a/dvbv5_dvb-t/fi-Joutsa_Lankia
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Joutsa_Lankia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Joutsa_Lankia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Joutsa_Lankia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Joutsa_Lankia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Joutseno b/dvbv5_dvb-t/fi-Joutseno
deleted file mode 100644
index 80337fc7..00000000
--- a/dvbv5_dvb-t/fi-Joutseno
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Joutseno]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Joutseno]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
-[Joutseno]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Joutseno]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Joutseno]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Juupajoki_Kopsamo b/dvbv5_dvb-t/fi-Juupajoki_Kopsamo
deleted file mode 100644
index a99af77e..00000000
--- a/dvbv5_dvb-t/fi-Juupajoki_Kopsamo
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Juupajoki_Kopsamo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Juupajoki_Kopsamo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Juupajoki_Kopsamo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Juva b/dvbv5_dvb-t/fi-Juva
deleted file mode 100644
index ab8a15e5..00000000
--- a/dvbv5_dvb-t/fi-Juva
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Juva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Juva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Juva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Juva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jyvaskyla b/dvbv5_dvb-t/fi-Jyvaskyla
deleted file mode 100644
index 3e2c51fa..00000000
--- a/dvbv5_dvb-t/fi-Jyvaskyla
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jyvaskyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Jyvaskyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Jyvaskyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Jyvaskyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
-[Jyvaskyla]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Jyvaskyla_Vaajakoski b/dvbv5_dvb-t/fi-Jyvaskyla_Vaajakoski
deleted file mode 100644
index 92b5ac96..00000000
--- a/dvbv5_dvb-t/fi-Jyvaskyla_Vaajakoski
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Jyvaskyla_Vaajakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Jyvaskyla_Vaajakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Jyvaskyla_Vaajakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kaavi_Sivakkavaara b/dvbv5_dvb-t/fi-Kaavi_Sivakkavaara
deleted file mode 100644
index 7595a398..00000000
--- a/dvbv5_dvb-t/fi-Kaavi_Sivakkavaara
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kaavi_Sivakkavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Kaavi_Sivakkavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Kaavi_Sivakkavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kajaani_Pollyvaara b/dvbv5_dvb-t/fi-Kajaani_Pollyvaara
deleted file mode 100644
index 3ea7b90f..00000000
--- a/dvbv5_dvb-t/fi-Kajaani_Pollyvaara
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kajaani_Pollyvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Kajaani_Pollyvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Kajaani_Pollyvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kalajoki b/dvbv5_dvb-t/fi-Kalajoki
deleted file mode 100644
index cab796dc..00000000
--- a/dvbv5_dvb-t/fi-Kalajoki
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kalajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Kalajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Kalajoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kangaslampi b/dvbv5_dvb-t/fi-Kangaslampi
deleted file mode 100644
index d84b2a9e..00000000
--- a/dvbv5_dvb-t/fi-Kangaslampi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kangaslampi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Kangaslampi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Kangaslampi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Kangaslampi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kangasniemi_Turkinmaki b/dvbv5_dvb-t/fi-Kangasniemi_Turkinmaki
deleted file mode 100644
index 56476e6b..00000000
--- a/dvbv5_dvb-t/fi-Kangasniemi_Turkinmaki
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kangasniemi_Turkinmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Kangasniemi_Turkinmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Kangasniemi_Turkinmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Kangasniemi_Turkinmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kankaanpaa b/dvbv5_dvb-t/fi-Kankaanpaa
deleted file mode 100644
index a3df7ba5..00000000
--- a/dvbv5_dvb-t/fi-Kankaanpaa
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kankaanpaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Kankaanpaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Kankaanpaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Kankaanpaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Karigasniemi b/dvbv5_dvb-t/fi-Karigasniemi
deleted file mode 100644
index 60548c72..00000000
--- a/dvbv5_dvb-t/fi-Karigasniemi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Karigasniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Karigasniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Karkkila b/dvbv5_dvb-t/fi-Karkkila
deleted file mode 100644
index d598f471..00000000
--- a/dvbv5_dvb-t/fi-Karkkila
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Karkkila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Karkkila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Karkkila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Karkkila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Karstula b/dvbv5_dvb-t/fi-Karstula
deleted file mode 100644
index dfd30016..00000000
--- a/dvbv5_dvb-t/fi-Karstula
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Karstula]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Karstula]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Karstula]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Karvia b/dvbv5_dvb-t/fi-Karvia
deleted file mode 100644
index 51e89b7b..00000000
--- a/dvbv5_dvb-t/fi-Karvia
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Karvia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Karvia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Karvia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kaunispaa b/dvbv5_dvb-t/fi-Kaunispaa
deleted file mode 100644
index e9fea9c7..00000000
--- a/dvbv5_dvb-t/fi-Kaunispaa
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kaunispaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Kaunispaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kemijarvi_Suomutunturi b/dvbv5_dvb-t/fi-Kemijarvi_Suomutunturi
deleted file mode 100644
index dac5d932..00000000
--- a/dvbv5_dvb-t/fi-Kemijarvi_Suomutunturi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kemijarvi_Suomutunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Kemijarvi_Suomutunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kerimaki b/dvbv5_dvb-t/fi-Kerimaki
deleted file mode 100644
index 68f45d10..00000000
--- a/dvbv5_dvb-t/fi-Kerimaki
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kerimaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Kerimaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Kerimaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Kerimaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Keuruu b/dvbv5_dvb-t/fi-Keuruu
deleted file mode 100644
index dd49b5b6..00000000
--- a/dvbv5_dvb-t/fi-Keuruu
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Keuruu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Keuruu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Keuruu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Keuruu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Keuruu_Haapamaki b/dvbv5_dvb-t/fi-Keuruu_Haapamaki
deleted file mode 100644
index cfb9b0e2..00000000
--- a/dvbv5_dvb-t/fi-Keuruu_Haapamaki
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Keuruu_Haapamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Keuruu_Haapamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Keuruu_Haapamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Keuruu_Haapamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kihnio b/dvbv5_dvb-t/fi-Kihnio
deleted file mode 100644
index 7c5c9924..00000000
--- a/dvbv5_dvb-t/fi-Kihnio
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kihnio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
-[Kihnio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Kihnio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Kihnio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kiihtelysvaara b/dvbv5_dvb-t/fi-Kiihtelysvaara
deleted file mode 100644
index 52e60b8e..00000000
--- a/dvbv5_dvb-t/fi-Kiihtelysvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kiihtelysvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Kiihtelysvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kilpisjarvi b/dvbv5_dvb-t/fi-Kilpisjarvi
deleted file mode 100644
index 9d3435c4..00000000
--- a/dvbv5_dvb-t/fi-Kilpisjarvi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kilpisjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Kilpisjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kittila_Levitunturi b/dvbv5_dvb-t/fi-Kittila_Levitunturi
deleted file mode 100644
index ae4c1c90..00000000
--- a/dvbv5_dvb-t/fi-Kittila_Levitunturi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kittila_Levitunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Kittila_Levitunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kolari_Vuolittaja b/dvbv5_dvb-t/fi-Kolari_Vuolittaja
deleted file mode 100644
index f507750a..00000000
--- a/dvbv5_dvb-t/fi-Kolari_Vuolittaja
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kolari_Vuolittaja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Kolari_Vuolittaja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Koli b/dvbv5_dvb-t/fi-Koli
deleted file mode 100644
index 034bf2d4..00000000
--- a/dvbv5_dvb-t/fi-Koli
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Koli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Koli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Koli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Koli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Korpilahti_Vaarunvuori b/dvbv5_dvb-t/fi-Korpilahti_Vaarunvuori
deleted file mode 100644
index 7fa3ed65..00000000
--- a/dvbv5_dvb-t/fi-Korpilahti_Vaarunvuori
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Korpilahti_Vaarunvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Korpilahti_Vaarunvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Korpilahti_Vaarunvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Korpilahti_Vaarunvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Korppoo b/dvbv5_dvb-t/fi-Korppoo
deleted file mode 100644
index 6c842414..00000000
--- a/dvbv5_dvb-t/fi-Korppoo
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Korppoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Korppoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Korppoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Korppoo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kruunupyy b/dvbv5_dvb-t/fi-Kruunupyy
deleted file mode 100644
index 65d86c4c..00000000
--- a/dvbv5_dvb-t/fi-Kruunupyy
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kruunupyy]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Kruunupyy]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Kruunupyy]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
-[Kruunupyy]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Kruunupyy]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuhmo_Haukela b/dvbv5_dvb-t/fi-Kuhmo_Haukela
deleted file mode 100644
index c3a3bd8b..00000000
--- a/dvbv5_dvb-t/fi-Kuhmo_Haukela
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuhmo_Haukela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmo_Haukela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmo_Haukela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuhmo_Lentiira b/dvbv5_dvb-t/fi-Kuhmo_Lentiira
deleted file mode 100644
index 11279993..00000000
--- a/dvbv5_dvb-t/fi-Kuhmo_Lentiira
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuhmo_Lentiira]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmo_Lentiira]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmo_Lentiira]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuhmo_Niva b/dvbv5_dvb-t/fi-Kuhmo_Niva
deleted file mode 100644
index 6f7aa2cb..00000000
--- a/dvbv5_dvb-t/fi-Kuhmo_Niva
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuhmo_Niva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmo_Niva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmo_Niva]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuhmoinen b/dvbv5_dvb-t/fi-Kuhmoinen
deleted file mode 100644
index 53d2de9e..00000000
--- a/dvbv5_dvb-t/fi-Kuhmoinen
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuhmoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuhmoinen_Harjunsalmi b/dvbv5_dvb-t/fi-Kuhmoinen_Harjunsalmi
deleted file mode 100644
index 059df911..00000000
--- a/dvbv5_dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuhmoinen_Harjunsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen_Harjunsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen_Harjunsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen_Harjunsalmi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuhmoinen_Puukkoinen b/dvbv5_dvb-t/fi-Kuhmoinen_Puukkoinen
deleted file mode 100644
index 113e0f45..00000000
--- a/dvbv5_dvb-t/fi-Kuhmoinen_Puukkoinen
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuhmoinen_Puukkoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen_Puukkoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Kuhmoinen_Puukkoinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuopio b/dvbv5_dvb-t/fi-Kuopio
deleted file mode 100644
index eb39e5f0..00000000
--- a/dvbv5_dvb-t/fi-Kuopio
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuopio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Kuopio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Kuopio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Kuopio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Kuopio]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kurikka_Kesti b/dvbv5_dvb-t/fi-Kurikka_Kesti
deleted file mode 100644
index c34cfe62..00000000
--- a/dvbv5_dvb-t/fi-Kurikka_Kesti
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kurikka_Kesti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Kurikka_Kesti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Kurikka_Kesti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Kurikka_Kesti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kustavi_Viherlahti b/dvbv5_dvb-t/fi-Kustavi_Viherlahti
deleted file mode 100644
index ecef74dd..00000000
--- a/dvbv5_dvb-t/fi-Kustavi_Viherlahti
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kustavi_Viherlahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Kustavi_Viherlahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
-[Kustavi_Viherlahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Kustavi_Viherlahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kuusamo_Hamppulampi b/dvbv5_dvb-t/fi-Kuusamo_Hamppulampi
deleted file mode 100644
index 6ce9243a..00000000
--- a/dvbv5_dvb-t/fi-Kuusamo_Hamppulampi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kuusamo_Hamppulampi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Kuusamo_Hamppulampi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Kyyjarvi_Noposenaho b/dvbv5_dvb-t/fi-Kyyjarvi_Noposenaho
deleted file mode 100644
index d3deab81..00000000
--- a/dvbv5_dvb-t/fi-Kyyjarvi_Noposenaho
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Kyyjarvi_Noposenaho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Kyyjarvi_Noposenaho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
-[Kyyjarvi_Noposenaho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Lahti b/dvbv5_dvb-t/fi-Lahti
deleted file mode 100644
index d4bf4033..00000000
--- a/dvbv5_dvb-t/fi-Lahti
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Lahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Lahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Lahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Lahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Lahti]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Lapua b/dvbv5_dvb-t/fi-Lapua
deleted file mode 100644
index 9084440f..00000000
--- a/dvbv5_dvb-t/fi-Lapua
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Lapua]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Lapua]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Lapua]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Lapua]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Lapua]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Laukaa b/dvbv5_dvb-t/fi-Laukaa
deleted file mode 100644
index 3c484aeb..00000000
--- a/dvbv5_dvb-t/fi-Laukaa
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Laukaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Laukaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Laukaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Laukaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Laukaa_Vihtavuori b/dvbv5_dvb-t/fi-Laukaa_Vihtavuori
deleted file mode 100644
index 5bc93a78..00000000
--- a/dvbv5_dvb-t/fi-Laukaa_Vihtavuori
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Laukaa_Vihtavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Laukaa_Vihtavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Laukaa_Vihtavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Laukaa_Vihtavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Lavia b/dvbv5_dvb-t/fi-Lavia
deleted file mode 100644
index f2f13916..00000000
--- a/dvbv5_dvb-t/fi-Lavia
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Lavia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Lavia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Lavia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Lohja b/dvbv5_dvb-t/fi-Lohja
deleted file mode 100644
index d040f9b4..00000000
--- a/dvbv5_dvb-t/fi-Lohja
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Lohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Lohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Lohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Lohja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Loimaa b/dvbv5_dvb-t/fi-Loimaa
deleted file mode 100644
index 0b6aad87..00000000
--- a/dvbv5_dvb-t/fi-Loimaa
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Loimaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Loimaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Loimaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Loimaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Luhanka b/dvbv5_dvb-t/fi-Luhanka
deleted file mode 100644
index f6407ce3..00000000
--- a/dvbv5_dvb-t/fi-Luhanka
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Luhanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Luhanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Luhanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Luhanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Luopioinen b/dvbv5_dvb-t/fi-Luopioinen
deleted file mode 100644
index 9ed4e3f2..00000000
--- a/dvbv5_dvb-t/fi-Luopioinen
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Luopioinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Luopioinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Luopioinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Luopioinen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Mantta b/dvbv5_dvb-t/fi-Mantta
deleted file mode 100644
index e2014052..00000000
--- a/dvbv5_dvb-t/fi-Mantta
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Mantta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Mantta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Mantta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Mantta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Mantyharju b/dvbv5_dvb-t/fi-Mantyharju
deleted file mode 100644
index 3b7f127a..00000000
--- a/dvbv5_dvb-t/fi-Mantyharju
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Mantyharju]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Mantyharju]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Mantyharju]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Mikkeli b/dvbv5_dvb-t/fi-Mikkeli
deleted file mode 100644
index f523878c..00000000
--- a/dvbv5_dvb-t/fi-Mikkeli
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Mikkeli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
-[Mikkeli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Mikkeli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
-[Mikkeli]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Muonio_Olostunturi b/dvbv5_dvb-t/fi-Muonio_Olostunturi
deleted file mode 100644
index bfdf0c73..00000000
--- a/dvbv5_dvb-t/fi-Muonio_Olostunturi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Muonio_Olostunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Muonio_Olostunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nilsia b/dvbv5_dvb-t/fi-Nilsia
deleted file mode 100644
index 208d1c43..00000000
--- a/dvbv5_dvb-t/fi-Nilsia
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nilsia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nilsia_Keski-Siikajarvi b/dvbv5_dvb-t/fi-Nilsia_Keski-Siikajarvi
deleted file mode 100644
index bfbc561a..00000000
--- a/dvbv5_dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nilsia_Keski-Siikajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia_Keski-Siikajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia_Keski-Siikajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nilsia_Pisa b/dvbv5_dvb-t/fi-Nilsia_Pisa
deleted file mode 100644
index 8c8ee34f..00000000
--- a/dvbv5_dvb-t/fi-Nilsia_Pisa
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nilsia_Pisa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia_Pisa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Nilsia_Pisa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nokia b/dvbv5_dvb-t/fi-Nokia
deleted file mode 100644
index 2a2b3803..00000000
--- a/dvbv5_dvb-t/fi-Nokia
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nokia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Nokia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Nokia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Nokia]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nokia_Siuro b/dvbv5_dvb-t/fi-Nokia_Siuro
deleted file mode 100644
index 1ba3ccac..00000000
--- a/dvbv5_dvb-t/fi-Nokia_Siuro
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nokia_Siuro]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Nokia_Siuro]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
-[Nokia_Siuro]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Nokia_Siuro]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nummi-Pusula_Hyonola b/dvbv5_dvb-t/fi-Nummi-Pusula_Hyonola
deleted file mode 100644
index 08840cc3..00000000
--- a/dvbv5_dvb-t/fi-Nummi-Pusula_Hyonola
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nummi-Pusula_Hyonola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Nummi-Pusula_Hyonola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
-[Nummi-Pusula_Hyonola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Nummi-Pusula_Hyonola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nuorgam_Njallavaara b/dvbv5_dvb-t/fi-Nuorgam_Njallavaara
deleted file mode 100644
index e1c1c3e0..00000000
--- a/dvbv5_dvb-t/fi-Nuorgam_Njallavaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nuorgam_Njallavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Nuorgam_Njallavaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nuorgam_raja b/dvbv5_dvb-t/fi-Nuorgam_raja
deleted file mode 100644
index 2b2cb3cd..00000000
--- a/dvbv5_dvb-t/fi-Nuorgam_raja
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nuorgam_raja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Nuorgam_raja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nurmes_Konnanvaara b/dvbv5_dvb-t/fi-Nurmes_Konnanvaara
deleted file mode 100644
index 7cd3d91d..00000000
--- a/dvbv5_dvb-t/fi-Nurmes_Konnanvaara
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nurmes_Konnanvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Nurmes_Konnanvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Nurmes_Konnanvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Nurmes_Konnanvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Nurmes_Kortevaara b/dvbv5_dvb-t/fi-Nurmes_Kortevaara
deleted file mode 100644
index 3e118ad4..00000000
--- a/dvbv5_dvb-t/fi-Nurmes_Kortevaara
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Nurmes_Kortevaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Nurmes_Kortevaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Nurmes_Kortevaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Orivesi_Talviainen b/dvbv5_dvb-t/fi-Orivesi_Talviainen
deleted file mode 100644
index 149782ea..00000000
--- a/dvbv5_dvb-t/fi-Orivesi_Talviainen
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Orivesi_Talviainen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Orivesi_Talviainen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Orivesi_Talviainen]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Oulu b/dvbv5_dvb-t/fi-Oulu
deleted file mode 100644
index 6d108499..00000000
--- a/dvbv5_dvb-t/fi-Oulu
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Oulu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
-[Oulu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Oulu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
-[Oulu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Oulu]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Padasjoki b/dvbv5_dvb-t/fi-Padasjoki
deleted file mode 100644
index 47246b4b..00000000
--- a/dvbv5_dvb-t/fi-Padasjoki
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Padasjoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Padasjoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Padasjoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Padasjoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Padasjoki_Arrakoski b/dvbv5_dvb-t/fi-Padasjoki_Arrakoski
deleted file mode 100644
index c8c1b05b..00000000
--- a/dvbv5_dvb-t/fi-Padasjoki_Arrakoski
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Padasjoki_Arrakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Padasjoki_Arrakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Padasjoki_Arrakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
-[Padasjoki_Arrakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 746000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Paltamo_Kivesvaara b/dvbv5_dvb-t/fi-Paltamo_Kivesvaara
deleted file mode 100644
index 56f8ba05..00000000
--- a/dvbv5_dvb-t/fi-Paltamo_Kivesvaara
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Paltamo_Kivesvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Paltamo_Kivesvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Paltamo_Kivesvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Parainen_Houtskari b/dvbv5_dvb-t/fi-Parainen_Houtskari
deleted file mode 100644
index e1878142..00000000
--- a/dvbv5_dvb-t/fi-Parainen_Houtskari
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Parainen_Houtskari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Parainen_Houtskari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Parainen_Houtskari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Parainen_Houtskari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Parikkala b/dvbv5_dvb-t/fi-Parikkala
deleted file mode 100644
index f0f52f7a..00000000
--- a/dvbv5_dvb-t/fi-Parikkala
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Parikkala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Parikkala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
-[Parikkala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
-[Parikkala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Parkano_Sopukallio b/dvbv5_dvb-t/fi-Parkano_Sopukallio
deleted file mode 100644
index 62e85079..00000000
--- a/dvbv5_dvb-t/fi-Parkano_Sopukallio
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Parkano_Sopukallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Parkano_Sopukallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Parkano_Sopukallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Parkano_Sopukallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pello b/dvbv5_dvb-t/fi-Pello
deleted file mode 100644
index 2cbd28ec..00000000
--- a/dvbv5_dvb-t/fi-Pello
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pello]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Pello]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pello_Ratasvaara b/dvbv5_dvb-t/fi-Pello_Ratasvaara
deleted file mode 100644
index ff7f6607..00000000
--- a/dvbv5_dvb-t/fi-Pello_Ratasvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pello_Ratasvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Pello_Ratasvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Perho b/dvbv5_dvb-t/fi-Perho
deleted file mode 100644
index 0a7a2dc9..00000000
--- a/dvbv5_dvb-t/fi-Perho
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Perho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Perho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Perho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Perho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pernaja b/dvbv5_dvb-t/fi-Pernaja
deleted file mode 100644
index 5459e885..00000000
--- a/dvbv5_dvb-t/fi-Pernaja
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pernaja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Pernaja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Pernaja]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pieksamaki_Halkokumpu b/dvbv5_dvb-t/fi-Pieksamaki_Halkokumpu
deleted file mode 100644
index f03f9a04..00000000
--- a/dvbv5_dvb-t/fi-Pieksamaki_Halkokumpu
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pieksamaki_Halkokumpu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Pieksamaki_Halkokumpu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Pieksamaki_Halkokumpu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pihtipudas b/dvbv5_dvb-t/fi-Pihtipudas
deleted file mode 100644
index 42cdd293..00000000
--- a/dvbv5_dvb-t/fi-Pihtipudas
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pihtipudas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Pihtipudas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Pihtipudas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Porvoo_Suomenkyla b/dvbv5_dvb-t/fi-Porvoo_Suomenkyla
deleted file mode 100644
index 7b5e79df..00000000
--- a/dvbv5_dvb-t/fi-Porvoo_Suomenkyla
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Porvoo_Suomenkyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Porvoo_Suomenkyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Porvoo_Suomenkyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Porvoo_Suomenkyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Posio b/dvbv5_dvb-t/fi-Posio
deleted file mode 100644
index 02586479..00000000
--- a/dvbv5_dvb-t/fi-Posio
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Posio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Posio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pudasjarvi b/dvbv5_dvb-t/fi-Pudasjarvi
deleted file mode 100644
index dc85d9ab..00000000
--- a/dvbv5_dvb-t/fi-Pudasjarvi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pudasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Pudasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Pudasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pudasjarvi_Iso-Syote b/dvbv5_dvb-t/fi-Pudasjarvi_Iso-Syote
deleted file mode 100644
index 24cebddf..00000000
--- a/dvbv5_dvb-t/fi-Pudasjarvi_Iso-Syote
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pudasjarvi_Iso-Syote]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Pudasjarvi_Iso-Syote]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Pudasjarvi_Iso-Syote]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pudasjarvi_Kangasvaara b/dvbv5_dvb-t/fi-Pudasjarvi_Kangasvaara
deleted file mode 100644
index cb911634..00000000
--- a/dvbv5_dvb-t/fi-Pudasjarvi_Kangasvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pudasjarvi_Kangasvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Pudasjarvi_Kangasvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Puolanka b/dvbv5_dvb-t/fi-Puolanka
deleted file mode 100644
index 3370a9a6..00000000
--- a/dvbv5_dvb-t/fi-Puolanka
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Puolanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Puolanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Puolanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Puolanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pyhatunturi b/dvbv5_dvb-t/fi-Pyhatunturi
deleted file mode 100644
index c5005761..00000000
--- a/dvbv5_dvb-t/fi-Pyhatunturi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pyhatunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Pyhatunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pyhavuori b/dvbv5_dvb-t/fi-Pyhavuori
deleted file mode 100644
index ad232654..00000000
--- a/dvbv5_dvb-t/fi-Pyhavuori
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pyhavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Pyhavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
-[Pyhavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Pylkonmaki_Karankajarvi b/dvbv5_dvb-t/fi-Pylkonmaki_Karankajarvi
deleted file mode 100644
index 2d7ef178..00000000
--- a/dvbv5_dvb-t/fi-Pylkonmaki_Karankajarvi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Pylkonmaki_Karankajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Pylkonmaki_Karankajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Pylkonmaki_Karankajarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Raahe_Mestauskallio b/dvbv5_dvb-t/fi-Raahe_Mestauskallio
deleted file mode 100644
index e4cc7b19..00000000
--- a/dvbv5_dvb-t/fi-Raahe_Mestauskallio
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Raahe_Mestauskallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Raahe_Mestauskallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Raahe_Mestauskallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Raahe_Mestauskallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Raahe_Piehinki b/dvbv5_dvb-t/fi-Raahe_Piehinki
deleted file mode 100644
index 1b3836d9..00000000
--- a/dvbv5_dvb-t/fi-Raahe_Piehinki
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Raahe_Piehinki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Raahe_Piehinki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Raahe_Piehinki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ranua_Haasionmaa b/dvbv5_dvb-t/fi-Ranua_Haasionmaa
deleted file mode 100644
index 837a10f3..00000000
--- a/dvbv5_dvb-t/fi-Ranua_Haasionmaa
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ranua_Haasionmaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Ranua_Haasionmaa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ranua_Leppiaho b/dvbv5_dvb-t/fi-Ranua_Leppiaho
deleted file mode 100644
index 94d3eef7..00000000
--- a/dvbv5_dvb-t/fi-Ranua_Leppiaho
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ranua_Leppiaho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Ranua_Leppiaho]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rautavaara_Angervikko b/dvbv5_dvb-t/fi-Rautavaara_Angervikko
deleted file mode 100644
index c89e4bf4..00000000
--- a/dvbv5_dvb-t/fi-Rautavaara_Angervikko
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rautavaara_Angervikko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Rautavaara_Angervikko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
-[Rautavaara_Angervikko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Rautavaara_Angervikko]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rautjarvi_Simpele b/dvbv5_dvb-t/fi-Rautjarvi_Simpele
deleted file mode 100644
index 2d4c254f..00000000
--- a/dvbv5_dvb-t/fi-Rautjarvi_Simpele
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rautjarvi_Simpele]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Rautjarvi_Simpele]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Rautjarvi_Simpele]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ristijarvi b/dvbv5_dvb-t/fi-Ristijarvi
deleted file mode 100644
index 79a58c39..00000000
--- a/dvbv5_dvb-t/fi-Ristijarvi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ristijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Ristijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Ristijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi b/dvbv5_dvb-t/fi-Rovaniemi
deleted file mode 100644
index 87a65b17..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi_Kaihuanvaara b/dvbv5_dvb-t/fi-Rovaniemi_Kaihuanvaara
deleted file mode 100644
index 3808ebc8..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi_Kaihuanvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi_Kaihuanvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi_Kaihuanvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi_Karhuvaara b/dvbv5_dvb-t/fi-Rovaniemi_Karhuvaara
deleted file mode 100644
index 069ecb4b..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi_Karhuvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi_Karhuvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi_Karhuvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi_Marasenkallio b/dvbv5_dvb-t/fi-Rovaniemi_Marasenkallio
deleted file mode 100644
index 6c8d5421..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi_Marasenkallio
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi_Marasenkallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi_Marasenkallio]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi_Rantalaki b/dvbv5_dvb-t/fi-Rovaniemi_Rantalaki
deleted file mode 100644
index fe3ea4c5..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi_Rantalaki
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi_Rantalaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi_Rantalaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi_Sonka b/dvbv5_dvb-t/fi-Rovaniemi_Sonka
deleted file mode 100644
index 932b409c..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi_Sonka
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi_Sonka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi_Sonka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Rovaniemi_Sorviselka b/dvbv5_dvb-t/fi-Rovaniemi_Sorviselka
deleted file mode 100644
index feb3bcf4..00000000
--- a/dvbv5_dvb-t/fi-Rovaniemi_Sorviselka
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Rovaniemi_Sorviselka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Rovaniemi_Sorviselka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ruka b/dvbv5_dvb-t/fi-Ruka
deleted file mode 100644
index de41ddc7..00000000
--- a/dvbv5_dvb-t/fi-Ruka
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ruka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Ruka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Ruka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ruovesi_Storminiemi b/dvbv5_dvb-t/fi-Ruovesi_Storminiemi
deleted file mode 100644
index ac465cbf..00000000
--- a/dvbv5_dvb-t/fi-Ruovesi_Storminiemi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ruovesi_Storminiemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Ruovesi_Storminiemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Ruovesi_Storminiemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
-[Ruovesi_Storminiemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Saarijarvi b/dvbv5_dvb-t/fi-Saarijarvi
deleted file mode 100644
index 18c923f8..00000000
--- a/dvbv5_dvb-t/fi-Saarijarvi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Saarijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Saarijarvi_Kalmari b/dvbv5_dvb-t/fi-Saarijarvi_Kalmari
deleted file mode 100644
index 77d5adeb..00000000
--- a/dvbv5_dvb-t/fi-Saarijarvi_Kalmari
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Saarijarvi_Kalmari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi_Kalmari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi_Kalmari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Saarijarvi_Mahlu b/dvbv5_dvb-t/fi-Saarijarvi_Mahlu
deleted file mode 100644
index 48324d0e..00000000
--- a/dvbv5_dvb-t/fi-Saarijarvi_Mahlu
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Saarijarvi_Mahlu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi_Mahlu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Saarijarvi_Mahlu]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Salla_Hirvasvaara b/dvbv5_dvb-t/fi-Salla_Hirvasvaara
deleted file mode 100644
index e1410a0e..00000000
--- a/dvbv5_dvb-t/fi-Salla_Hirvasvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Salla_Hirvasvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Salla_Hirvasvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Salla_Ihistysjanka b/dvbv5_dvb-t/fi-Salla_Ihistysjanka
deleted file mode 100644
index 0d857b59..00000000
--- a/dvbv5_dvb-t/fi-Salla_Ihistysjanka
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Salla_Ihistysjanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
-[Salla_Ihistysjanka]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Salla_Naruska b/dvbv5_dvb-t/fi-Salla_Naruska
deleted file mode 100644
index 06bc1bab..00000000
--- a/dvbv5_dvb-t/fi-Salla_Naruska
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Salla_Naruska]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Salla_Naruska]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Salla_Sallatunturi b/dvbv5_dvb-t/fi-Salla_Sallatunturi
deleted file mode 100644
index 54a55540..00000000
--- a/dvbv5_dvb-t/fi-Salla_Sallatunturi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Salla_Sallatunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Salla_Sallatunturi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Salla_Sarivaara b/dvbv5_dvb-t/fi-Salla_Sarivaara
deleted file mode 100644
index eb9bbc0d..00000000
--- a/dvbv5_dvb-t/fi-Salla_Sarivaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Salla_Sarivaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Salla_Sarivaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Salo_Isokyla b/dvbv5_dvb-t/fi-Salo_Isokyla
deleted file mode 100644
index 42df3b49..00000000
--- a/dvbv5_dvb-t/fi-Salo_Isokyla
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Salo_Isokyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Salo_Isokyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
-[Salo_Isokyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Salo_Isokyla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Savukoski_Martti b/dvbv5_dvb-t/fi-Savukoski_Martti
deleted file mode 100644
index aafbdcbd..00000000
--- a/dvbv5_dvb-t/fi-Savukoski_Martti
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Savukoski_Martti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Savukoski_Martti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Savukoski_Tanhua b/dvbv5_dvb-t/fi-Savukoski_Tanhua
deleted file mode 100644
index 91f5fa75..00000000
--- a/dvbv5_dvb-t/fi-Savukoski_Tanhua
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Savukoski_Tanhua]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Savukoski_Tanhua]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Siilinjarvi b/dvbv5_dvb-t/fi-Siilinjarvi
deleted file mode 100644
index 7fc1f473..00000000
--- a/dvbv5_dvb-t/fi-Siilinjarvi
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Siilinjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
-[Siilinjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
-[Siilinjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Siilinjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Simo_Viantie b/dvbv5_dvb-t/fi-Simo_Viantie
deleted file mode 100644
index 580c7bdd..00000000
--- a/dvbv5_dvb-t/fi-Simo_Viantie
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Simo_Viantie]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Simo_Viantie]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Simo_Viantie]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Sipoo_Norrkulla b/dvbv5_dvb-t/fi-Sipoo_Norrkulla
deleted file mode 100644
index abfb413d..00000000
--- a/dvbv5_dvb-t/fi-Sipoo_Norrkulla
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Sipoo_Norrkulla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Sipoo_Norrkulla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Sipoo_Norrkulla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Sipoo_Norrkulla]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Sodankyla_Pittiovaara b/dvbv5_dvb-t/fi-Sodankyla_Pittiovaara
deleted file mode 100644
index a123f643..00000000
--- a/dvbv5_dvb-t/fi-Sodankyla_Pittiovaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Sodankyla_Pittiovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Sodankyla_Pittiovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Sodankyla_Vuotso b/dvbv5_dvb-t/fi-Sodankyla_Vuotso
deleted file mode 100644
index 9c60b771..00000000
--- a/dvbv5_dvb-t/fi-Sodankyla_Vuotso
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Sodankyla_Vuotso]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
-[Sodankyla_Vuotso]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Sulkava_Vaatalanmaki b/dvbv5_dvb-t/fi-Sulkava_Vaatalanmaki
deleted file mode 100644
index 31bdd61f..00000000
--- a/dvbv5_dvb-t/fi-Sulkava_Vaatalanmaki
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Sulkava_Vaatalanmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Sulkava_Vaatalanmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Sulkava_Vaatalanmaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Suomussalmi_Ala-Vuokki b/dvbv5_dvb-t/fi-Suomussalmi_Ala-Vuokki
deleted file mode 100644
index 0878a88e..00000000
--- a/dvbv5_dvb-t/fi-Suomussalmi_Ala-Vuokki
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Suomussalmi_Ala-Vuokki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Suomussalmi_Ala-Vuokki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Suomussalmi_Ammansaari b/dvbv5_dvb-t/fi-Suomussalmi_Ammansaari
deleted file mode 100644
index 9afcefff..00000000
--- a/dvbv5_dvb-t/fi-Suomussalmi_Ammansaari
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Suomussalmi_Ammansaari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Suomussalmi_Ammansaari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Suomussalmi_Juntusranta b/dvbv5_dvb-t/fi-Suomussalmi_Juntusranta
deleted file mode 100644
index 66c4e5b5..00000000
--- a/dvbv5_dvb-t/fi-Suomussalmi_Juntusranta
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Suomussalmi_Juntusranta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Suomussalmi_Juntusranta]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 666000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Suomussalmi_Myllylahti b/dvbv5_dvb-t/fi-Suomussalmi_Myllylahti
deleted file mode 100644
index 9630977d..00000000
--- a/dvbv5_dvb-t/fi-Suomussalmi_Myllylahti
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Suomussalmi_Myllylahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Suomussalmi_Myllylahti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Sysma_Liikola b/dvbv5_dvb-t/fi-Sysma_Liikola
deleted file mode 100644
index 9db44246..00000000
--- a/dvbv5_dvb-t/fi-Sysma_Liikola
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Sysma_Liikola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Sysma_Liikola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Sysma_Liikola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Sysma_Liikola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Taivalkoski b/dvbv5_dvb-t/fi-Taivalkoski
deleted file mode 100644
index c307ae49..00000000
--- a/dvbv5_dvb-t/fi-Taivalkoski
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Taivalkoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Taivalkoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Taivalkoski_Taivalvaara b/dvbv5_dvb-t/fi-Taivalkoski_Taivalvaara
deleted file mode 100644
index ff81bf02..00000000
--- a/dvbv5_dvb-t/fi-Taivalkoski_Taivalvaara
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Taivalkoski_Taivalvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Taivalkoski_Taivalvaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Tammela b/dvbv5_dvb-t/fi-Tammela
deleted file mode 100644
index f537bef2..00000000
--- a/dvbv5_dvb-t/fi-Tammela
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Tammela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Tammela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Tammela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Tammela]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Tammela]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Tammisaari b/dvbv5_dvb-t/fi-Tammisaari
deleted file mode 100644
index 5248fd22..00000000
--- a/dvbv5_dvb-t/fi-Tammisaari
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Tammisaari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
-[Tammisaari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
-[Tammisaari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
-[Tammisaari]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Tampere b/dvbv5_dvb-t/fi-Tampere
deleted file mode 100644
index 1440032d..00000000
--- a/dvbv5_dvb-t/fi-Tampere
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Tampere]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 490000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Tampere_Pyynikki b/dvbv5_dvb-t/fi-Tampere_Pyynikki
deleted file mode 100644
index 03e8ecca..00000000
--- a/dvbv5_dvb-t/fi-Tampere_Pyynikki
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Tampere_Pyynikki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere_Pyynikki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere_Pyynikki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 682000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere_Pyynikki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
-[Tampere_Pyynikki]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Tervola b/dvbv5_dvb-t/fi-Tervola
deleted file mode 100644
index d2c2d949..00000000
--- a/dvbv5_dvb-t/fi-Tervola
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Tervola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
-[Tervola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 642000000
- BANDWIDTH_HZ = 8000000
-
-[Tervola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Turku b/dvbv5_dvb-t/fi-Turku
deleted file mode 100644
index 281048d4..00000000
--- a/dvbv5_dvb-t/fi-Turku
+++ /dev/null
@@ -1,28 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Turku]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Turku]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 738000000
- BANDWIDTH_HZ = 8000000
-
-[Turku]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Turku]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Turku]
- DELIVERY_SYSTEM = DVBT2
- FREQUENCY = 538000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Utsjoki b/dvbv5_dvb-t/fi-Utsjoki
deleted file mode 100644
index b884a17a..00000000
--- a/dvbv5_dvb-t/fi-Utsjoki
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Utsjoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Utsjoki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Utsjoki_Nuvvus b/dvbv5_dvb-t/fi-Utsjoki_Nuvvus
deleted file mode 100644
index 66d35a3a..00000000
--- a/dvbv5_dvb-t/fi-Utsjoki_Nuvvus
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Utsjoki_Nuvvus]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Utsjoki_Nuvvus]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Utsjoki_Outakoski b/dvbv5_dvb-t/fi-Utsjoki_Outakoski
deleted file mode 100644
index 53a75af8..00000000
--- a/dvbv5_dvb-t/fi-Utsjoki_Outakoski
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Utsjoki_Outakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Utsjoki_Outakoski]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Utsjoki_Polvarniemi b/dvbv5_dvb-t/fi-Utsjoki_Polvarniemi
deleted file mode 100644
index 0ee4cebd..00000000
--- a/dvbv5_dvb-t/fi-Utsjoki_Polvarniemi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Utsjoki_Polvarniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 706000000
- BANDWIDTH_HZ = 8000000
-
-[Utsjoki_Polvarniemi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Utsjoki_Rovisuvanto b/dvbv5_dvb-t/fi-Utsjoki_Rovisuvanto
deleted file mode 100644
index 7459a8d6..00000000
--- a/dvbv5_dvb-t/fi-Utsjoki_Rovisuvanto
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Utsjoki_Rovisuvanto]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
-[Utsjoki_Rovisuvanto]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 578000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Utsjoki_Tenola b/dvbv5_dvb-t/fi-Utsjoki_Tenola
deleted file mode 100644
index 96504393..00000000
--- a/dvbv5_dvb-t/fi-Utsjoki_Tenola
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Utsjoki_Tenola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Utsjoki_Tenola]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Uusikaupunki_Orivo b/dvbv5_dvb-t/fi-Uusikaupunki_Orivo
deleted file mode 100644
index abe1f7f1..00000000
--- a/dvbv5_dvb-t/fi-Uusikaupunki_Orivo
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Uusikaupunki_Orivo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Uusikaupunki_Orivo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Uusikaupunki_Orivo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 498000000
- BANDWIDTH_HZ = 8000000
-
-[Uusikaupunki_Orivo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vaala b/dvbv5_dvb-t/fi-Vaala
deleted file mode 100644
index 86e87732..00000000
--- a/dvbv5_dvb-t/fi-Vaala
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vaala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 770000000
- BANDWIDTH_HZ = 8000000
-
-[Vaala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Vaala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vaasa b/dvbv5_dvb-t/fi-Vaasa
deleted file mode 100644
index 7826313c..00000000
--- a/dvbv5_dvb-t/fi-Vaasa
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vaasa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Vaasa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Vaasa]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Valtimo b/dvbv5_dvb-t/fi-Valtimo
deleted file mode 100644
index 81e82455..00000000
--- a/dvbv5_dvb-t/fi-Valtimo
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Valtimo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 586000000
- BANDWIDTH_HZ = 8000000
-
-[Valtimo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 610000000
- BANDWIDTH_HZ = 8000000
-
-[Valtimo]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vammala_Jyranvuori b/dvbv5_dvb-t/fi-Vammala_Jyranvuori
deleted file mode 100644
index 26582a83..00000000
--- a/dvbv5_dvb-t/fi-Vammala_Jyranvuori
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vammala_Jyranvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 714000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Jyranvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Jyranvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 506000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Jyranvuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 690000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vammala_Roismala b/dvbv5_dvb-t/fi-Vammala_Roismala
deleted file mode 100644
index 53f37934..00000000
--- a/dvbv5_dvb-t/fi-Vammala_Roismala
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vammala_Roismala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 514000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Roismala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Roismala]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vammala_Savi b/dvbv5_dvb-t/fi-Vammala_Savi
deleted file mode 100644
index 189afb4a..00000000
--- a/dvbv5_dvb-t/fi-Vammala_Savi
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vammala_Savi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Savi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 698000000
- BANDWIDTH_HZ = 8000000
-
-[Vammala_Savi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 626000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vantaa_Hakunila b/dvbv5_dvb-t/fi-Vantaa_Hakunila
deleted file mode 100644
index af493a1d..00000000
--- a/dvbv5_dvb-t/fi-Vantaa_Hakunila
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vantaa_Hakunila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 562000000
- BANDWIDTH_HZ = 8000000
-
-[Vantaa_Hakunila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 658000000
- BANDWIDTH_HZ = 8000000
-
-[Vantaa_Hakunila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 674000000
- BANDWIDTH_HZ = 8000000
-
-[Vantaa_Hakunila]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 730000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Varpaisjarvi_Honkamaki b/dvbv5_dvb-t/fi-Varpaisjarvi_Honkamaki
deleted file mode 100644
index 5bdf9742..00000000
--- a/dvbv5_dvb-t/fi-Varpaisjarvi_Honkamaki
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Varpaisjarvi_Honkamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 634000000
- BANDWIDTH_HZ = 8000000
-
-[Varpaisjarvi_Honkamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 786000000
- BANDWIDTH_HZ = 8000000
-
-[Varpaisjarvi_Honkamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Varpaisjarvi_Honkamaki]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 650000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Virrat_Lappavuori b/dvbv5_dvb-t/fi-Virrat_Lappavuori
deleted file mode 100644
index 61f12b0b..00000000
--- a/dvbv5_dvb-t/fi-Virrat_Lappavuori
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Virrat_Lappavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 522000000
- BANDWIDTH_HZ = 8000000
-
-[Virrat_Lappavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
-[Virrat_Lappavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
-[Virrat_Lappavuori]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 554000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Vuokatti b/dvbv5_dvb-t/fi-Vuokatti
deleted file mode 100644
index 5a78cf36..00000000
--- a/dvbv5_dvb-t/fi-Vuokatti
+++ /dev/null
@@ -1,23 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Vuokatti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Vuokatti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 722000000
- BANDWIDTH_HZ = 8000000
-
-[Vuokatti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 754000000
- BANDWIDTH_HZ = 8000000
-
-[Vuokatti]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 778000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ylitornio_Ainiovaara b/dvbv5_dvb-t/fi-Ylitornio_Ainiovaara
deleted file mode 100644
index ebd72b90..00000000
--- a/dvbv5_dvb-t/fi-Ylitornio_Ainiovaara
+++ /dev/null
@@ -1,18 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ylitornio_Ainiovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Ylitornio_Ainiovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 602000000
- BANDWIDTH_HZ = 8000000
-
-[Ylitornio_Ainiovaara]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 762000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Ylitornio_Raanujarvi b/dvbv5_dvb-t/fi-Ylitornio_Raanujarvi
deleted file mode 100644
index 885c18f5..00000000
--- a/dvbv5_dvb-t/fi-Ylitornio_Raanujarvi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Ylitornio_Raanujarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 570000000
- BANDWIDTH_HZ = 8000000
-
-[Ylitornio_Raanujarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 618000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Yllas b/dvbv5_dvb-t/fi-Yllas
deleted file mode 100644
index 0488cfb8..00000000
--- a/dvbv5_dvb-t/fi-Yllas
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Yllas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 546000000
- BANDWIDTH_HZ = 8000000
-
-[Yllas]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 594000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_dvb-t/fi-Yllasjarvi b/dvbv5_dvb-t/fi-Yllasjarvi
deleted file mode 100644
index 67900896..00000000
--- a/dvbv5_dvb-t/fi-Yllasjarvi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 2014-04-18 Antti Palosaari <crope@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-
-[Yllasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 482000000
- BANDWIDTH_HZ = 8000000
-
-[Yllasjarvi]
- DELIVERY_SYSTEM = DVBT
- FREQUENCY = 530000000
- BANDWIDTH_HZ = 8000000
-
diff --git a/dvbv5_isdb-t/br-Brazil b/isdb-t/br-Brazil
index 05cd2b8e..05cd2b8e 100644
--- a/dvbv5_isdb-t/br-Brazil
+++ b/isdb-t/br-Brazil
diff --git a/dvbv5_isdb-t/br-ac-Bujari b/isdb-t/br-ac-Bujari
index aa484804..aa484804 100644
--- a/dvbv5_isdb-t/br-ac-Bujari
+++ b/isdb-t/br-ac-Bujari
diff --git a/dvbv5_isdb-t/br-ac-PortoAcre b/isdb-t/br-ac-PortoAcre
index 0abd41f4..0abd41f4 100644
--- a/dvbv5_isdb-t/br-ac-PortoAcre
+++ b/isdb-t/br-ac-PortoAcre
diff --git a/dvbv5_isdb-t/br-ac-RioBranco b/isdb-t/br-ac-RioBranco
index 0ab5ec01..0ab5ec01 100644
--- a/dvbv5_isdb-t/br-ac-RioBranco
+++ b/isdb-t/br-ac-RioBranco
diff --git a/dvbv5_isdb-t/br-ac-SenadorGuiomard b/isdb-t/br-ac-SenadorGuiomard
index b130cd2f..b130cd2f 100644
--- a/dvbv5_isdb-t/br-ac-SenadorGuiomard
+++ b/isdb-t/br-ac-SenadorGuiomard
diff --git a/dvbv5_isdb-t/br-al-Arapiraca b/isdb-t/br-al-Arapiraca
index 0f8a1690..0f8a1690 100644
--- a/dvbv5_isdb-t/br-al-Arapiraca
+++ b/isdb-t/br-al-Arapiraca
diff --git a/dvbv5_isdb-t/br-al-Craibas b/isdb-t/br-al-Craibas
index 0eeb0f0f..0eeb0f0f 100644
--- a/dvbv5_isdb-t/br-al-Craibas
+++ b/isdb-t/br-al-Craibas
diff --git a/dvbv5_isdb-t/br-al-Maceio b/isdb-t/br-al-Maceio
index 15bcce26..15bcce26 100644
--- a/dvbv5_isdb-t/br-al-Maceio
+++ b/isdb-t/br-al-Maceio
diff --git a/dvbv5_isdb-t/br-al-Piranhas b/isdb-t/br-al-Piranhas
index 683d225b..683d225b 100644
--- a/dvbv5_isdb-t/br-al-Piranhas
+++ b/isdb-t/br-al-Piranhas
diff --git a/dvbv5_isdb-t/br-al-RioLargo b/isdb-t/br-al-RioLargo
index 7b816884..7b816884 100644
--- a/dvbv5_isdb-t/br-al-RioLargo
+++ b/isdb-t/br-al-RioLargo
diff --git a/dvbv5_isdb-t/br-al-SaoMiguelDosCampos b/isdb-t/br-al-SaoMiguelDosCampos
index 3c429932..3c429932 100644
--- a/dvbv5_isdb-t/br-al-SaoMiguelDosCampos
+++ b/isdb-t/br-al-SaoMiguelDosCampos
diff --git a/dvbv5_isdb-t/br-am-CareiroDaVarzea b/isdb-t/br-am-CareiroDaVarzea
index 50114c96..50114c96 100644
--- a/dvbv5_isdb-t/br-am-CareiroDaVarzea
+++ b/isdb-t/br-am-CareiroDaVarzea
diff --git a/dvbv5_isdb-t/br-am-Iranduba b/isdb-t/br-am-Iranduba
index cf027348..cf027348 100644
--- a/dvbv5_isdb-t/br-am-Iranduba
+++ b/isdb-t/br-am-Iranduba
diff --git a/dvbv5_isdb-t/br-am-Manaquiri b/isdb-t/br-am-Manaquiri
index 8116802b..8116802b 100644
--- a/dvbv5_isdb-t/br-am-Manaquiri
+++ b/isdb-t/br-am-Manaquiri
diff --git a/dvbv5_isdb-t/br-am-Manaus b/isdb-t/br-am-Manaus
index 159d57c0..159d57c0 100644
--- a/dvbv5_isdb-t/br-am-Manaus
+++ b/isdb-t/br-am-Manaus
diff --git a/dvbv5_isdb-t/br-am-Parintins b/isdb-t/br-am-Parintins
index 696a7949..696a7949 100644
--- a/dvbv5_isdb-t/br-am-Parintins
+++ b/isdb-t/br-am-Parintins
diff --git a/dvbv5_isdb-t/br-ap-Macapa b/isdb-t/br-ap-Macapa
index ff928259..ff928259 100644
--- a/dvbv5_isdb-t/br-ap-Macapa
+++ b/isdb-t/br-ap-Macapa
diff --git a/dvbv5_isdb-t/br-ap-Santana b/isdb-t/br-ap-Santana
index d298136c..d298136c 100644
--- a/dvbv5_isdb-t/br-ap-Santana
+++ b/isdb-t/br-ap-Santana
diff --git a/dvbv5_isdb-t/br-ba-Alagoinhas b/isdb-t/br-ba-Alagoinhas
index 1cde650e..1cde650e 100644
--- a/dvbv5_isdb-t/br-ba-Alagoinhas
+++ b/isdb-t/br-ba-Alagoinhas
diff --git a/dvbv5_isdb-t/br-ba-Alcobaca b/isdb-t/br-ba-Alcobaca
index 1bd719c8..1bd719c8 100644
--- a/dvbv5_isdb-t/br-ba-Alcobaca
+++ b/isdb-t/br-ba-Alcobaca
diff --git a/dvbv5_isdb-t/br-ba-Amargosa b/isdb-t/br-ba-Amargosa
index fc047f0a..fc047f0a 100644
--- a/dvbv5_isdb-t/br-ba-Amargosa
+++ b/isdb-t/br-ba-Amargosa
diff --git a/dvbv5_isdb-t/br-ba-AmeliaRodrigues b/isdb-t/br-ba-AmeliaRodrigues
index 16ac715a..16ac715a 100644
--- a/dvbv5_isdb-t/br-ba-AmeliaRodrigues
+++ b/isdb-t/br-ba-AmeliaRodrigues
diff --git a/dvbv5_isdb-t/br-ba-Anguera b/isdb-t/br-ba-Anguera
index d1b856bd..d1b856bd 100644
--- a/dvbv5_isdb-t/br-ba-Anguera
+++ b/isdb-t/br-ba-Anguera
diff --git a/dvbv5_isdb-t/br-ba-AntonioCardoso b/isdb-t/br-ba-AntonioCardoso
index 6cf4b3bc..6cf4b3bc 100644
--- a/dvbv5_isdb-t/br-ba-AntonioCardoso
+++ b/isdb-t/br-ba-AntonioCardoso
diff --git a/dvbv5_isdb-t/br-ba-Aracatu b/isdb-t/br-ba-Aracatu
index d78715a2..d78715a2 100644
--- a/dvbv5_isdb-t/br-ba-Aracatu
+++ b/isdb-t/br-ba-Aracatu
diff --git a/dvbv5_isdb-t/br-ba-Barra b/isdb-t/br-ba-Barra
index 88a35b76..88a35b76 100644
--- a/dvbv5_isdb-t/br-ba-Barra
+++ b/isdb-t/br-ba-Barra
diff --git a/dvbv5_isdb-t/br-ba-BarraDoChoca b/isdb-t/br-ba-BarraDoChoca
index b27d6b05..b27d6b05 100644
--- a/dvbv5_isdb-t/br-ba-BarraDoChoca
+++ b/isdb-t/br-ba-BarraDoChoca
diff --git a/dvbv5_isdb-t/br-ba-Barreiras b/isdb-t/br-ba-Barreiras
index a188fcf6..a188fcf6 100644
--- a/dvbv5_isdb-t/br-ba-Barreiras
+++ b/isdb-t/br-ba-Barreiras
diff --git a/dvbv5_isdb-t/br-ba-BeloCampo b/isdb-t/br-ba-BeloCampo
index d14f4412..d14f4412 100644
--- a/dvbv5_isdb-t/br-ba-BeloCampo
+++ b/isdb-t/br-ba-BeloCampo
diff --git a/dvbv5_isdb-t/br-ba-Biritinga b/isdb-t/br-ba-Biritinga
index 85d294bc..85d294bc 100644
--- a/dvbv5_isdb-t/br-ba-Biritinga
+++ b/isdb-t/br-ba-Biritinga
diff --git a/dvbv5_isdb-t/br-ba-BomJesusDaLapa b/isdb-t/br-ba-BomJesusDaLapa
index dbf9dd4d..dbf9dd4d 100644
--- a/dvbv5_isdb-t/br-ba-BomJesusDaLapa
+++ b/isdb-t/br-ba-BomJesusDaLapa
diff --git a/dvbv5_isdb-t/br-ba-Brumado b/isdb-t/br-ba-Brumado
index 089a2de1..089a2de1 100644
--- a/dvbv5_isdb-t/br-ba-Brumado
+++ b/isdb-t/br-ba-Brumado
diff --git a/dvbv5_isdb-t/br-ba-Caetite b/isdb-t/br-ba-Caetite
index 0921de0e..0921de0e 100644
--- a/dvbv5_isdb-t/br-ba-Caetite
+++ b/isdb-t/br-ba-Caetite
diff --git a/dvbv5_isdb-t/br-ba-Camacari b/isdb-t/br-ba-Camacari
index ca5cf087..ca5cf087 100644
--- a/dvbv5_isdb-t/br-ba-Camacari
+++ b/isdb-t/br-ba-Camacari
diff --git a/dvbv5_isdb-t/br-ba-CampoFormoso b/isdb-t/br-ba-CampoFormoso
index e31b8434..e31b8434 100644
--- a/dvbv5_isdb-t/br-ba-CampoFormoso
+++ b/isdb-t/br-ba-CampoFormoso
diff --git a/dvbv5_isdb-t/br-ba-Candeal b/isdb-t/br-ba-Candeal
index 58f170b4..58f170b4 100644
--- a/dvbv5_isdb-t/br-ba-Candeal
+++ b/isdb-t/br-ba-Candeal
diff --git a/dvbv5_isdb-t/br-ba-Candeias b/isdb-t/br-ba-Candeias
index e0f5aab2..e0f5aab2 100644
--- a/dvbv5_isdb-t/br-ba-Candeias
+++ b/isdb-t/br-ba-Candeias
diff --git a/dvbv5_isdb-t/br-ba-CandidoSales b/isdb-t/br-ba-CandidoSales
index c7a70945..c7a70945 100644
--- a/dvbv5_isdb-t/br-ba-CandidoSales
+++ b/isdb-t/br-ba-CandidoSales
diff --git a/dvbv5_isdb-t/br-ba-Caraibas b/isdb-t/br-ba-Caraibas
index 92ff8c1a..92ff8c1a 100644
--- a/dvbv5_isdb-t/br-ba-Caraibas
+++ b/isdb-t/br-ba-Caraibas
diff --git a/dvbv5_isdb-t/br-ba-ConceicaoDaFeira b/isdb-t/br-ba-ConceicaoDaFeira
index 756801ca..756801ca 100644
--- a/dvbv5_isdb-t/br-ba-ConceicaoDaFeira
+++ b/isdb-t/br-ba-ConceicaoDaFeira
diff --git a/dvbv5_isdb-t/br-ba-ConceicaoDoJacuipe b/isdb-t/br-ba-ConceicaoDoJacuipe
index 9959ff91..9959ff91 100644
--- a/dvbv5_isdb-t/br-ba-ConceicaoDoJacuipe
+++ b/isdb-t/br-ba-ConceicaoDoJacuipe
diff --git a/dvbv5_isdb-t/br-ba-CoracaoDeMaria b/isdb-t/br-ba-CoracaoDeMaria
index 0e322428..0e322428 100644
--- a/dvbv5_isdb-t/br-ba-CoracaoDeMaria
+++ b/isdb-t/br-ba-CoracaoDeMaria
diff --git a/dvbv5_isdb-t/br-ba-CruzDasAlmas b/isdb-t/br-ba-CruzDasAlmas
index 47666914..47666914 100644
--- a/dvbv5_isdb-t/br-ba-CruzDasAlmas
+++ b/isdb-t/br-ba-CruzDasAlmas
diff --git a/dvbv5_isdb-t/br-ba-DiasDAvila b/isdb-t/br-ba-DiasDAvila
index 6ee2fd18..6ee2fd18 100644
--- a/dvbv5_isdb-t/br-ba-DiasDAvila
+++ b/isdb-t/br-ba-DiasDAvila
diff --git a/dvbv5_isdb-t/br-ba-EntreRios b/isdb-t/br-ba-EntreRios
index 59b8db1e..59b8db1e 100644
--- a/dvbv5_isdb-t/br-ba-EntreRios
+++ b/isdb-t/br-ba-EntreRios
diff --git a/dvbv5_isdb-t/br-ba-Eunapolis b/isdb-t/br-ba-Eunapolis
index bf2384e6..bf2384e6 100644
--- a/dvbv5_isdb-t/br-ba-Eunapolis
+++ b/isdb-t/br-ba-Eunapolis
diff --git a/dvbv5_isdb-t/br-ba-FeiraDeSantana b/isdb-t/br-ba-FeiraDeSantana
index c3c2cf7f..c3c2cf7f 100644
--- a/dvbv5_isdb-t/br-ba-FeiraDeSantana
+++ b/isdb-t/br-ba-FeiraDeSantana
diff --git a/dvbv5_isdb-t/br-ba-Guanambi b/isdb-t/br-ba-Guanambi
index 3b51c42c..3b51c42c 100644
--- a/dvbv5_isdb-t/br-ba-Guanambi
+++ b/isdb-t/br-ba-Guanambi
diff --git a/dvbv5_isdb-t/br-ba-Ichu b/isdb-t/br-ba-Ichu
index e736b7a8..e736b7a8 100644
--- a/dvbv5_isdb-t/br-ba-Ichu
+++ b/isdb-t/br-ba-Ichu
diff --git a/dvbv5_isdb-t/br-ba-Ilheus b/isdb-t/br-ba-Ilheus
index 22f45a5b..22f45a5b 100644
--- a/dvbv5_isdb-t/br-ba-Ilheus
+++ b/isdb-t/br-ba-Ilheus
diff --git a/dvbv5_isdb-t/br-ba-Inhambupe b/isdb-t/br-ba-Inhambupe
index 755a5206..755a5206 100644
--- a/dvbv5_isdb-t/br-ba-Inhambupe
+++ b/isdb-t/br-ba-Inhambupe
diff --git a/dvbv5_isdb-t/br-ba-Ipecaeta b/isdb-t/br-ba-Ipecaeta
index c3aaeff3..c3aaeff3 100644
--- a/dvbv5_isdb-t/br-ba-Ipecaeta
+++ b/isdb-t/br-ba-Ipecaeta
diff --git a/dvbv5_isdb-t/br-ba-Irara b/isdb-t/br-ba-Irara
index 987ac6a1..987ac6a1 100644
--- a/dvbv5_isdb-t/br-ba-Irara
+++ b/isdb-t/br-ba-Irara
diff --git a/dvbv5_isdb-t/br-ba-Irece b/isdb-t/br-ba-Irece
index 55e8c78f..55e8c78f 100644
--- a/dvbv5_isdb-t/br-ba-Irece
+++ b/isdb-t/br-ba-Irece
diff --git a/dvbv5_isdb-t/br-ba-Itabuna b/isdb-t/br-ba-Itabuna
index 5f695fdc..5f695fdc 100644
--- a/dvbv5_isdb-t/br-ba-Itabuna
+++ b/isdb-t/br-ba-Itabuna
diff --git a/dvbv5_isdb-t/br-ba-Itamaraju b/isdb-t/br-ba-Itamaraju
index 707b5f3b..707b5f3b 100644
--- a/dvbv5_isdb-t/br-ba-Itamaraju
+++ b/isdb-t/br-ba-Itamaraju
diff --git a/dvbv5_isdb-t/br-ba-Itambe b/isdb-t/br-ba-Itambe
index 899aae3d..899aae3d 100644
--- a/dvbv5_isdb-t/br-ba-Itambe
+++ b/isdb-t/br-ba-Itambe
diff --git a/dvbv5_isdb-t/br-ba-Itaparica b/isdb-t/br-ba-Itaparica
index 1f69529e..1f69529e 100644
--- a/dvbv5_isdb-t/br-ba-Itaparica
+++ b/isdb-t/br-ba-Itaparica
diff --git a/dvbv5_isdb-t/br-ba-Itapetinga b/isdb-t/br-ba-Itapetinga
index 330bc134..330bc134 100644
--- a/dvbv5_isdb-t/br-ba-Itapetinga
+++ b/isdb-t/br-ba-Itapetinga
diff --git a/dvbv5_isdb-t/br-ba-Jacobina b/isdb-t/br-ba-Jacobina
index 4f30e57c..4f30e57c 100644
--- a/dvbv5_isdb-t/br-ba-Jacobina
+++ b/isdb-t/br-ba-Jacobina
diff --git a/dvbv5_isdb-t/br-ba-Jaguaquara b/isdb-t/br-ba-Jaguaquara
index dc15ea18..dc15ea18 100644
--- a/dvbv5_isdb-t/br-ba-Jaguaquara
+++ b/isdb-t/br-ba-Jaguaquara
diff --git a/dvbv5_isdb-t/br-ba-Jaguaripe b/isdb-t/br-ba-Jaguaripe
index 029511ad..029511ad 100644
--- a/dvbv5_isdb-t/br-ba-Jaguaripe
+++ b/isdb-t/br-ba-Jaguaripe
diff --git a/dvbv5_isdb-t/br-ba-Jequie b/isdb-t/br-ba-Jequie
index 0b209179..0b209179 100644
--- a/dvbv5_isdb-t/br-ba-Jequie
+++ b/isdb-t/br-ba-Jequie
diff --git a/dvbv5_isdb-t/br-ba-Juazeiro b/isdb-t/br-ba-Juazeiro
index b35b7033..b35b7033 100644
--- a/dvbv5_isdb-t/br-ba-Juazeiro
+++ b/isdb-t/br-ba-Juazeiro
diff --git a/dvbv5_isdb-t/br-ba-LauroDeFreitas b/isdb-t/br-ba-LauroDeFreitas
index e942c3aa..e942c3aa 100644
--- a/dvbv5_isdb-t/br-ba-LauroDeFreitas
+++ b/isdb-t/br-ba-LauroDeFreitas
diff --git a/dvbv5_isdb-t/br-ba-LuisEduardoMagalhaes b/isdb-t/br-ba-LuisEduardoMagalhaes
index b92c2dcd..b92c2dcd 100644
--- a/dvbv5_isdb-t/br-ba-LuisEduardoMagalhaes
+++ b/isdb-t/br-ba-LuisEduardoMagalhaes
diff --git a/dvbv5_isdb-t/br-ba-MadreDeDeus b/isdb-t/br-ba-MadreDeDeus
index e47c2e75..e47c2e75 100644
--- a/dvbv5_isdb-t/br-ba-MadreDeDeus
+++ b/isdb-t/br-ba-MadreDeDeus
diff --git a/dvbv5_isdb-t/br-ba-Maragogipe b/isdb-t/br-ba-Maragogipe
index e1b0abfc..e1b0abfc 100644
--- a/dvbv5_isdb-t/br-ba-Maragogipe
+++ b/isdb-t/br-ba-Maragogipe
diff --git a/dvbv5_isdb-t/br-ba-MataDeSaoJoao b/isdb-t/br-ba-MataDeSaoJoao
index 91ba6db1..91ba6db1 100644
--- a/dvbv5_isdb-t/br-ba-MataDeSaoJoao
+++ b/isdb-t/br-ba-MataDeSaoJoao
diff --git a/dvbv5_isdb-t/br-ba-Nazare b/isdb-t/br-ba-Nazare
index c5d80d19..c5d80d19 100644
--- a/dvbv5_isdb-t/br-ba-Nazare
+++ b/isdb-t/br-ba-Nazare
diff --git a/dvbv5_isdb-t/br-ba-PauloAfonso b/isdb-t/br-ba-PauloAfonso
index f200afd4..f200afd4 100644
--- a/dvbv5_isdb-t/br-ba-PauloAfonso
+++ b/isdb-t/br-ba-PauloAfonso
diff --git a/dvbv5_isdb-t/br-ba-Piripa b/isdb-t/br-ba-Piripa
index dfb4f520..dfb4f520 100644
--- a/dvbv5_isdb-t/br-ba-Piripa
+++ b/isdb-t/br-ba-Piripa
diff --git a/dvbv5_isdb-t/br-ba-Planalto b/isdb-t/br-ba-Planalto
index 3aedf048..3aedf048 100644
--- a/dvbv5_isdb-t/br-ba-Planalto
+++ b/isdb-t/br-ba-Planalto
diff --git a/dvbv5_isdb-t/br-ba-Pocoes b/isdb-t/br-ba-Pocoes
index 8db4e2a2..8db4e2a2 100644
--- a/dvbv5_isdb-t/br-ba-Pocoes
+++ b/isdb-t/br-ba-Pocoes
diff --git a/dvbv5_isdb-t/br-ba-Pojuca b/isdb-t/br-ba-Pojuca
index bf0c5dfa..bf0c5dfa 100644
--- a/dvbv5_isdb-t/br-ba-Pojuca
+++ b/isdb-t/br-ba-Pojuca
diff --git a/dvbv5_isdb-t/br-ba-PortoSeguro b/isdb-t/br-ba-PortoSeguro
index d61c96bc..d61c96bc 100644
--- a/dvbv5_isdb-t/br-ba-PortoSeguro
+++ b/isdb-t/br-ba-PortoSeguro
diff --git a/dvbv5_isdb-t/br-ba-PresidenteJanioQuadros b/isdb-t/br-ba-PresidenteJanioQuadros
index 109c9388..109c9388 100644
--- a/dvbv5_isdb-t/br-ba-PresidenteJanioQuadros
+++ b/isdb-t/br-ba-PresidenteJanioQuadros
diff --git a/dvbv5_isdb-t/br-ba-RafaelJambeiro b/isdb-t/br-ba-RafaelJambeiro
index 46c14d39..46c14d39 100644
--- a/dvbv5_isdb-t/br-ba-RafaelJambeiro
+++ b/isdb-t/br-ba-RafaelJambeiro
diff --git a/dvbv5_isdb-t/br-ba-SalinasDaMargarida b/isdb-t/br-ba-SalinasDaMargarida
index f4a8cc60..f4a8cc60 100644
--- a/dvbv5_isdb-t/br-ba-SalinasDaMargarida
+++ b/isdb-t/br-ba-SalinasDaMargarida
diff --git a/dvbv5_isdb-t/br-ba-Salvador b/isdb-t/br-ba-Salvador
index cf4eb900..cf4eb900 100644
--- a/dvbv5_isdb-t/br-ba-Salvador
+++ b/isdb-t/br-ba-Salvador
diff --git a/dvbv5_isdb-t/br-ba-SantaBarbara b/isdb-t/br-ba-SantaBarbara
index bd76431f..bd76431f 100644
--- a/dvbv5_isdb-t/br-ba-SantaBarbara
+++ b/isdb-t/br-ba-SantaBarbara
diff --git a/dvbv5_isdb-t/br-ba-SantaCruzCabralia b/isdb-t/br-ba-SantaCruzCabralia
index 05ce784e..05ce784e 100644
--- a/dvbv5_isdb-t/br-ba-SantaCruzCabralia
+++ b/isdb-t/br-ba-SantaCruzCabralia
diff --git a/dvbv5_isdb-t/br-ba-SantaMariaDaVitoria b/isdb-t/br-ba-SantaMariaDaVitoria
index 6ef7a174..6ef7a174 100644
--- a/dvbv5_isdb-t/br-ba-SantaMariaDaVitoria
+++ b/isdb-t/br-ba-SantaMariaDaVitoria
diff --git a/dvbv5_isdb-t/br-ba-Santanopolis b/isdb-t/br-ba-Santanopolis
index 2a924f39..2a924f39 100644
--- a/dvbv5_isdb-t/br-ba-Santanopolis
+++ b/isdb-t/br-ba-Santanopolis
diff --git a/dvbv5_isdb-t/br-ba-SantoAmaro b/isdb-t/br-ba-SantoAmaro
index 852bc82f..852bc82f 100644
--- a/dvbv5_isdb-t/br-ba-SantoAmaro
+++ b/isdb-t/br-ba-SantoAmaro
diff --git a/dvbv5_isdb-t/br-ba-SantoAntonioDeJesus b/isdb-t/br-ba-SantoAntonioDeJesus
index e342d1d6..e342d1d6 100644
--- a/dvbv5_isdb-t/br-ba-SantoAntonioDeJesus
+++ b/isdb-t/br-ba-SantoAntonioDeJesus
diff --git a/dvbv5_isdb-t/br-ba-SantoEstevao b/isdb-t/br-ba-SantoEstevao
index b1b8dfed..b1b8dfed 100644
--- a/dvbv5_isdb-t/br-ba-SantoEstevao
+++ b/isdb-t/br-ba-SantoEstevao
diff --git a/dvbv5_isdb-t/br-ba-SaoFranciscoDoConde b/isdb-t/br-ba-SaoFranciscoDoConde
index e49183bf..e49183bf 100644
--- a/dvbv5_isdb-t/br-ba-SaoFranciscoDoConde
+++ b/isdb-t/br-ba-SaoFranciscoDoConde
diff --git a/dvbv5_isdb-t/br-ba-SaoGoncaloDosCampos b/isdb-t/br-ba-SaoGoncaloDosCampos
index d1ca71fc..d1ca71fc 100644
--- a/dvbv5_isdb-t/br-ba-SaoGoncaloDosCampos
+++ b/isdb-t/br-ba-SaoGoncaloDosCampos
diff --git a/dvbv5_isdb-t/br-ba-SaoSebastiaoDoPasse b/isdb-t/br-ba-SaoSebastiaoDoPasse
index 1164147c..1164147c 100644
--- a/dvbv5_isdb-t/br-ba-SaoSebastiaoDoPasse
+++ b/isdb-t/br-ba-SaoSebastiaoDoPasse
diff --git a/dvbv5_isdb-t/br-ba-SenhorDoBonfim b/isdb-t/br-ba-SenhorDoBonfim
index c3610c83..c3610c83 100644
--- a/dvbv5_isdb-t/br-ba-SenhorDoBonfim
+++ b/isdb-t/br-ba-SenhorDoBonfim
diff --git a/dvbv5_isdb-t/br-ba-SerraPreta b/isdb-t/br-ba-SerraPreta
index 5256c62d..5256c62d 100644
--- a/dvbv5_isdb-t/br-ba-SerraPreta
+++ b/isdb-t/br-ba-SerraPreta
diff --git a/dvbv5_isdb-t/br-ba-Serrinha b/isdb-t/br-ba-Serrinha
index 11284d04..11284d04 100644
--- a/dvbv5_isdb-t/br-ba-Serrinha
+++ b/isdb-t/br-ba-Serrinha
diff --git a/dvbv5_isdb-t/br-ba-SimoesFilho b/isdb-t/br-ba-SimoesFilho
index 10775fef..10775fef 100644
--- a/dvbv5_isdb-t/br-ba-SimoesFilho
+++ b/isdb-t/br-ba-SimoesFilho
diff --git a/dvbv5_isdb-t/br-ba-Tanquinho b/isdb-t/br-ba-Tanquinho
index b1864163..b1864163 100644
--- a/dvbv5_isdb-t/br-ba-Tanquinho
+++ b/isdb-t/br-ba-Tanquinho
diff --git a/dvbv5_isdb-t/br-ba-TeixeiraDeFreitas b/isdb-t/br-ba-TeixeiraDeFreitas
index e095b38d..e095b38d 100644
--- a/dvbv5_isdb-t/br-ba-TeixeiraDeFreitas
+++ b/isdb-t/br-ba-TeixeiraDeFreitas
diff --git a/dvbv5_isdb-t/br-ba-Teofilandia b/isdb-t/br-ba-Teofilandia
index 168e38b0..168e38b0 100644
--- a/dvbv5_isdb-t/br-ba-Teofilandia
+++ b/isdb-t/br-ba-Teofilandia
diff --git a/dvbv5_isdb-t/br-ba-Tremedal b/isdb-t/br-ba-Tremedal
index 054f7362..054f7362 100644
--- a/dvbv5_isdb-t/br-ba-Tremedal
+++ b/isdb-t/br-ba-Tremedal
diff --git a/dvbv5_isdb-t/br-ba-VeraCruz b/isdb-t/br-ba-VeraCruz
index fb15bea0..fb15bea0 100644
--- a/dvbv5_isdb-t/br-ba-VeraCruz
+++ b/isdb-t/br-ba-VeraCruz
diff --git a/dvbv5_isdb-t/br-ba-VitoriaDaConquista b/isdb-t/br-ba-VitoriaDaConquista
index 888eeff6..888eeff6 100644
--- a/dvbv5_isdb-t/br-ba-VitoriaDaConquista
+++ b/isdb-t/br-ba-VitoriaDaConquista
diff --git a/dvbv5_isdb-t/br-ba-Xiquexique b/isdb-t/br-ba-Xiquexique
index cb31ffb5..cb31ffb5 100644
--- a/dvbv5_isdb-t/br-ba-Xiquexique
+++ b/isdb-t/br-ba-Xiquexique
diff --git a/dvbv5_isdb-t/br-ce-Acarape b/isdb-t/br-ce-Acarape
index 4bf17a6f..4bf17a6f 100644
--- a/dvbv5_isdb-t/br-ce-Acarape
+++ b/isdb-t/br-ce-Acarape
diff --git a/dvbv5_isdb-t/br-ce-Aquiraz b/isdb-t/br-ce-Aquiraz
index b6596ba4..b6596ba4 100644
--- a/dvbv5_isdb-t/br-ce-Aquiraz
+++ b/isdb-t/br-ce-Aquiraz
diff --git a/dvbv5_isdb-t/br-ce-Aurora b/isdb-t/br-ce-Aurora
index b1e9b2e7..b1e9b2e7 100644
--- a/dvbv5_isdb-t/br-ce-Aurora
+++ b/isdb-t/br-ce-Aurora
diff --git a/dvbv5_isdb-t/br-ce-Caninde b/isdb-t/br-ce-Caninde
index 0d0bc309..0d0bc309 100644
--- a/dvbv5_isdb-t/br-ce-Caninde
+++ b/isdb-t/br-ce-Caninde
diff --git a/dvbv5_isdb-t/br-ce-Fortaleza b/isdb-t/br-ce-Fortaleza
index 450c3ecc..450c3ecc 100644
--- a/dvbv5_isdb-t/br-ce-Fortaleza
+++ b/isdb-t/br-ce-Fortaleza
diff --git a/dvbv5_isdb-t/br-ce-Horizonte b/isdb-t/br-ce-Horizonte
index 5ea4a373..5ea4a373 100644
--- a/dvbv5_isdb-t/br-ce-Horizonte
+++ b/isdb-t/br-ce-Horizonte
diff --git a/dvbv5_isdb-t/br-ce-Maracanau b/isdb-t/br-ce-Maracanau
index c127995d..c127995d 100644
--- a/dvbv5_isdb-t/br-ce-Maracanau
+++ b/isdb-t/br-ce-Maracanau
diff --git a/dvbv5_isdb-t/br-ce-MaranguapeItapebussu b/isdb-t/br-ce-MaranguapeItapebussu
index da2b015d..da2b015d 100644
--- a/dvbv5_isdb-t/br-ce-MaranguapeItapebussu
+++ b/isdb-t/br-ce-MaranguapeItapebussu
diff --git a/dvbv5_isdb-t/br-ce-Pacajus b/isdb-t/br-ce-Pacajus
index cce0fbf9..cce0fbf9 100644
--- a/dvbv5_isdb-t/br-ce-Pacajus
+++ b/isdb-t/br-ce-Pacajus
diff --git a/dvbv5_isdb-t/br-df-Brasilia b/isdb-t/br-df-Brasilia
index 1f1e49a3..1f1e49a3 100644
--- a/dvbv5_isdb-t/br-df-Brasilia
+++ b/isdb-t/br-df-Brasilia
diff --git a/dvbv5_isdb-t/br-df-BrasiliaGama b/isdb-t/br-df-BrasiliaGama
index ca425589..ca425589 100644
--- a/dvbv5_isdb-t/br-df-BrasiliaGama
+++ b/isdb-t/br-df-BrasiliaGama
diff --git a/dvbv5_isdb-t/br-es-CachoeiroDoItapemirim b/isdb-t/br-es-CachoeiroDoItapemirim
index 38b55ac1..38b55ac1 100644
--- a/dvbv5_isdb-t/br-es-CachoeiroDoItapemirim
+++ b/isdb-t/br-es-CachoeiroDoItapemirim
diff --git a/dvbv5_isdb-t/br-es-Colatina b/isdb-t/br-es-Colatina
index 8bb332ef..8bb332ef 100644
--- a/dvbv5_isdb-t/br-es-Colatina
+++ b/isdb-t/br-es-Colatina
diff --git a/dvbv5_isdb-t/br-es-Guarapari b/isdb-t/br-es-Guarapari
index 08be6684..08be6684 100644
--- a/dvbv5_isdb-t/br-es-Guarapari
+++ b/isdb-t/br-es-Guarapari
diff --git a/dvbv5_isdb-t/br-es-Linhares b/isdb-t/br-es-Linhares
index e4904047..e4904047 100644
--- a/dvbv5_isdb-t/br-es-Linhares
+++ b/isdb-t/br-es-Linhares
diff --git a/dvbv5_isdb-t/br-es-SaoMateus b/isdb-t/br-es-SaoMateus
index ebec31b3..ebec31b3 100644
--- a/dvbv5_isdb-t/br-es-SaoMateus
+++ b/isdb-t/br-es-SaoMateus
diff --git a/dvbv5_isdb-t/br-es-Vitoria b/isdb-t/br-es-Vitoria
index d70deb80..d70deb80 100644
--- a/dvbv5_isdb-t/br-es-Vitoria
+++ b/isdb-t/br-es-Vitoria
diff --git a/dvbv5_isdb-t/br-go-AguasLindasDeGoias b/isdb-t/br-go-AguasLindasDeGoias
index 36b68894..36b68894 100644
--- a/dvbv5_isdb-t/br-go-AguasLindasDeGoias
+++ b/isdb-t/br-go-AguasLindasDeGoias
diff --git a/dvbv5_isdb-t/br-go-Alexania b/isdb-t/br-go-Alexania
index 25b1a64a..25b1a64a 100644
--- a/dvbv5_isdb-t/br-go-Alexania
+++ b/isdb-t/br-go-Alexania
diff --git a/dvbv5_isdb-t/br-go-Anapolis b/isdb-t/br-go-Anapolis
index 204202f1..204202f1 100644
--- a/dvbv5_isdb-t/br-go-Anapolis
+++ b/isdb-t/br-go-Anapolis
diff --git a/dvbv5_isdb-t/br-go-AparecidaDeGoiania b/isdb-t/br-go-AparecidaDeGoiania
index 6dd31141..6dd31141 100644
--- a/dvbv5_isdb-t/br-go-AparecidaDeGoiania
+++ b/isdb-t/br-go-AparecidaDeGoiania
diff --git a/dvbv5_isdb-t/br-go-CaldasNovas b/isdb-t/br-go-CaldasNovas
index ae493144..ae493144 100644
--- a/dvbv5_isdb-t/br-go-CaldasNovas
+++ b/isdb-t/br-go-CaldasNovas
diff --git a/dvbv5_isdb-t/br-go-Catalao b/isdb-t/br-go-Catalao
index b0565207..b0565207 100644
--- a/dvbv5_isdb-t/br-go-Catalao
+++ b/isdb-t/br-go-Catalao
diff --git a/dvbv5_isdb-t/br-go-Cristalina b/isdb-t/br-go-Cristalina
index b1aa3e00..b1aa3e00 100644
--- a/dvbv5_isdb-t/br-go-Cristalina
+++ b/isdb-t/br-go-Cristalina
diff --git a/dvbv5_isdb-t/br-go-Formosa b/isdb-t/br-go-Formosa
index c487d495..c487d495 100644
--- a/dvbv5_isdb-t/br-go-Formosa
+++ b/isdb-t/br-go-Formosa
diff --git a/dvbv5_isdb-t/br-go-Goianesia b/isdb-t/br-go-Goianesia
index bec96176..bec96176 100644
--- a/dvbv5_isdb-t/br-go-Goianesia
+++ b/isdb-t/br-go-Goianesia
diff --git a/dvbv5_isdb-t/br-go-Goiania b/isdb-t/br-go-Goiania
index 677b810f..677b810f 100644
--- a/dvbv5_isdb-t/br-go-Goiania
+++ b/isdb-t/br-go-Goiania
diff --git a/dvbv5_isdb-t/br-go-Guapo b/isdb-t/br-go-Guapo
index 8610b006..8610b006 100644
--- a/dvbv5_isdb-t/br-go-Guapo
+++ b/isdb-t/br-go-Guapo
diff --git a/dvbv5_isdb-t/br-go-Inhumas b/isdb-t/br-go-Inhumas
index 3b0cf7ee..3b0cf7ee 100644
--- a/dvbv5_isdb-t/br-go-Inhumas
+++ b/isdb-t/br-go-Inhumas
diff --git a/dvbv5_isdb-t/br-go-Itumbiara b/isdb-t/br-go-Itumbiara
index 37e12a8f..37e12a8f 100644
--- a/dvbv5_isdb-t/br-go-Itumbiara
+++ b/isdb-t/br-go-Itumbiara
diff --git a/dvbv5_isdb-t/br-go-Jatai b/isdb-t/br-go-Jatai
index 6deae0bf..6deae0bf 100644
--- a/dvbv5_isdb-t/br-go-Jatai
+++ b/isdb-t/br-go-Jatai
diff --git a/dvbv5_isdb-t/br-go-Luziania b/isdb-t/br-go-Luziania
index 8a497dd6..8a497dd6 100644
--- a/dvbv5_isdb-t/br-go-Luziania
+++ b/isdb-t/br-go-Luziania
diff --git a/dvbv5_isdb-t/br-go-PlanaltinaDeGoias b/isdb-t/br-go-PlanaltinaDeGoias
index e29002d5..e29002d5 100644
--- a/dvbv5_isdb-t/br-go-PlanaltinaDeGoias
+++ b/isdb-t/br-go-PlanaltinaDeGoias
diff --git a/dvbv5_isdb-t/br-go-RioVerde b/isdb-t/br-go-RioVerde
index 2b360403..2b360403 100644
--- a/dvbv5_isdb-t/br-go-RioVerde
+++ b/isdb-t/br-go-RioVerde
diff --git a/dvbv5_isdb-t/br-go-SantaHelenaDeGoias b/isdb-t/br-go-SantaHelenaDeGoias
index 78cf1622..78cf1622 100644
--- a/dvbv5_isdb-t/br-go-SantaHelenaDeGoias
+++ b/isdb-t/br-go-SantaHelenaDeGoias
diff --git a/dvbv5_isdb-t/br-go-SantoAntonioDoDescoberto b/isdb-t/br-go-SantoAntonioDoDescoberto
index 8bb3c04a..8bb3c04a 100644
--- a/dvbv5_isdb-t/br-go-SantoAntonioDoDescoberto
+++ b/isdb-t/br-go-SantoAntonioDoDescoberto
diff --git a/dvbv5_isdb-t/br-go-SaoLuisDeMontesBelos b/isdb-t/br-go-SaoLuisDeMontesBelos
index 8b7d422f..8b7d422f 100644
--- a/dvbv5_isdb-t/br-go-SaoLuisDeMontesBelos
+++ b/isdb-t/br-go-SaoLuisDeMontesBelos
diff --git a/dvbv5_isdb-t/br-go-SenadorCanedo b/isdb-t/br-go-SenadorCanedo
index bc6aef2a..bc6aef2a 100644
--- a/dvbv5_isdb-t/br-go-SenadorCanedo
+++ b/isdb-t/br-go-SenadorCanedo
diff --git a/dvbv5_isdb-t/br-go-ValparaisoDeGoias b/isdb-t/br-go-ValparaisoDeGoias
index c3a778d0..c3a778d0 100644
--- a/dvbv5_isdb-t/br-go-ValparaisoDeGoias
+++ b/isdb-t/br-go-ValparaisoDeGoias
diff --git a/dvbv5_isdb-t/br-ma-Alcantara b/isdb-t/br-ma-Alcantara
index 3f7fe513..3f7fe513 100644
--- a/dvbv5_isdb-t/br-ma-Alcantara
+++ b/isdb-t/br-ma-Alcantara
diff --git a/dvbv5_isdb-t/br-ma-Axixa b/isdb-t/br-ma-Axixa
index 9062bf8f..9062bf8f 100644
--- a/dvbv5_isdb-t/br-ma-Axixa
+++ b/isdb-t/br-ma-Axixa
diff --git a/dvbv5_isdb-t/br-ma-CachoeiraGrande b/isdb-t/br-ma-CachoeiraGrande
index d2f3d4b0..d2f3d4b0 100644
--- a/dvbv5_isdb-t/br-ma-CachoeiraGrande
+++ b/isdb-t/br-ma-CachoeiraGrande
diff --git a/dvbv5_isdb-t/br-ma-Caxias b/isdb-t/br-ma-Caxias
index 0318a2b6..0318a2b6 100644
--- a/dvbv5_isdb-t/br-ma-Caxias
+++ b/isdb-t/br-ma-Caxias
diff --git a/dvbv5_isdb-t/br-ma-HumbertoDeCampos b/isdb-t/br-ma-HumbertoDeCampos
index 6b352b9b..6b352b9b 100644
--- a/dvbv5_isdb-t/br-ma-HumbertoDeCampos
+++ b/isdb-t/br-ma-HumbertoDeCampos
diff --git a/dvbv5_isdb-t/br-ma-Imperatriz b/isdb-t/br-ma-Imperatriz
index 0053f48c..0053f48c 100644
--- a/dvbv5_isdb-t/br-ma-Imperatriz
+++ b/isdb-t/br-ma-Imperatriz
diff --git a/dvbv5_isdb-t/br-ma-Morros b/isdb-t/br-ma-Morros
index c82581e4..c82581e4 100644
--- a/dvbv5_isdb-t/br-ma-Morros
+++ b/isdb-t/br-ma-Morros
diff --git a/dvbv5_isdb-t/br-ma-PacoDoLumiar b/isdb-t/br-ma-PacoDoLumiar
index d3e72aca..d3e72aca 100644
--- a/dvbv5_isdb-t/br-ma-PacoDoLumiar
+++ b/isdb-t/br-ma-PacoDoLumiar
diff --git a/dvbv5_isdb-t/br-ma-PresidenteJuscelino b/isdb-t/br-ma-PresidenteJuscelino
index 808afb25..808afb25 100644
--- a/dvbv5_isdb-t/br-ma-PresidenteJuscelino
+++ b/isdb-t/br-ma-PresidenteJuscelino
diff --git a/dvbv5_isdb-t/br-ma-PrimeiraCruz b/isdb-t/br-ma-PrimeiraCruz
index e344e38c..e344e38c 100644
--- a/dvbv5_isdb-t/br-ma-PrimeiraCruz
+++ b/isdb-t/br-ma-PrimeiraCruz
diff --git a/dvbv5_isdb-t/br-ma-Raposa b/isdb-t/br-ma-Raposa
index 1c60a0ec..1c60a0ec 100644
--- a/dvbv5_isdb-t/br-ma-Raposa
+++ b/isdb-t/br-ma-Raposa
diff --git a/dvbv5_isdb-t/br-ma-Rosario b/isdb-t/br-ma-Rosario
index cbd18369..cbd18369 100644
--- a/dvbv5_isdb-t/br-ma-Rosario
+++ b/isdb-t/br-ma-Rosario
diff --git a/dvbv5_isdb-t/br-ma-SaoJoseDeRibamar b/isdb-t/br-ma-SaoJoseDeRibamar
index 9f32be4f..9f32be4f 100644
--- a/dvbv5_isdb-t/br-ma-SaoJoseDeRibamar
+++ b/isdb-t/br-ma-SaoJoseDeRibamar
diff --git a/dvbv5_isdb-t/br-ma-SaoLuis b/isdb-t/br-ma-SaoLuis
index 73ab19c2..73ab19c2 100644
--- a/dvbv5_isdb-t/br-ma-SaoLuis
+++ b/isdb-t/br-ma-SaoLuis
diff --git a/dvbv5_isdb-t/br-ma-Timon b/isdb-t/br-ma-Timon
index bb717430..bb717430 100644
--- a/dvbv5_isdb-t/br-ma-Timon
+++ b/isdb-t/br-ma-Timon
diff --git a/dvbv5_isdb-t/br-mg-AguaComprida b/isdb-t/br-mg-AguaComprida
index b996bf59..b996bf59 100644
--- a/dvbv5_isdb-t/br-mg-AguaComprida
+++ b/isdb-t/br-mg-AguaComprida
diff --git a/dvbv5_isdb-t/br-mg-Alfenas b/isdb-t/br-mg-Alfenas
index 0f8a861c..0f8a861c 100644
--- a/dvbv5_isdb-t/br-mg-Alfenas
+++ b/isdb-t/br-mg-Alfenas
diff --git a/dvbv5_isdb-t/br-mg-Almenara b/isdb-t/br-mg-Almenara
index 01554284..01554284 100644
--- a/dvbv5_isdb-t/br-mg-Almenara
+++ b/isdb-t/br-mg-Almenara
diff --git a/dvbv5_isdb-t/br-mg-Andradas b/isdb-t/br-mg-Andradas
index 513e8f14..513e8f14 100644
--- a/dvbv5_isdb-t/br-mg-Andradas
+++ b/isdb-t/br-mg-Andradas
diff --git a/dvbv5_isdb-t/br-mg-Araguari b/isdb-t/br-mg-Araguari
index 3eb4c5d2..3eb4c5d2 100644
--- a/dvbv5_isdb-t/br-mg-Araguari
+++ b/isdb-t/br-mg-Araguari
diff --git a/dvbv5_isdb-t/br-mg-Arapora b/isdb-t/br-mg-Arapora
index c2ed657f..c2ed657f 100644
--- a/dvbv5_isdb-t/br-mg-Arapora
+++ b/isdb-t/br-mg-Arapora
diff --git a/dvbv5_isdb-t/br-mg-Araxa b/isdb-t/br-mg-Araxa
index 88e778e6..88e778e6 100644
--- a/dvbv5_isdb-t/br-mg-Araxa
+++ b/isdb-t/br-mg-Araxa
diff --git a/dvbv5_isdb-t/br-mg-Arinos b/isdb-t/br-mg-Arinos
index 5cc9052f..5cc9052f 100644
--- a/dvbv5_isdb-t/br-mg-Arinos
+++ b/isdb-t/br-mg-Arinos
diff --git a/dvbv5_isdb-t/br-mg-Barbacena b/isdb-t/br-mg-Barbacena
index 47e586bd..47e586bd 100644
--- a/dvbv5_isdb-t/br-mg-Barbacena
+++ b/isdb-t/br-mg-Barbacena
diff --git a/dvbv5_isdb-t/br-mg-Barroso b/isdb-t/br-mg-Barroso
index 2477e845..2477e845 100644
--- a/dvbv5_isdb-t/br-mg-Barroso
+++ b/isdb-t/br-mg-Barroso
diff --git a/dvbv5_isdb-t/br-mg-BeloHorizonte b/isdb-t/br-mg-BeloHorizonte
index 7aaeccc9..7aaeccc9 100644
--- a/dvbv5_isdb-t/br-mg-BeloHorizonte
+++ b/isdb-t/br-mg-BeloHorizonte
diff --git a/dvbv5_isdb-t/br-mg-Betim b/isdb-t/br-mg-Betim
index 2a2570fa..2a2570fa 100644
--- a/dvbv5_isdb-t/br-mg-Betim
+++ b/isdb-t/br-mg-Betim
diff --git a/dvbv5_isdb-t/br-mg-BordaDaMata b/isdb-t/br-mg-BordaDaMata
index 49b5ad7e..49b5ad7e 100644
--- a/dvbv5_isdb-t/br-mg-BordaDaMata
+++ b/isdb-t/br-mg-BordaDaMata
diff --git a/dvbv5_isdb-t/br-mg-Campanha b/isdb-t/br-mg-Campanha
index e7b2e21d..e7b2e21d 100644
--- a/dvbv5_isdb-t/br-mg-Campanha
+++ b/isdb-t/br-mg-Campanha
diff --git a/dvbv5_isdb-t/br-mg-Caratinga b/isdb-t/br-mg-Caratinga
index b892abf6..b892abf6 100644
--- a/dvbv5_isdb-t/br-mg-Caratinga
+++ b/isdb-t/br-mg-Caratinga
diff --git a/dvbv5_isdb-t/br-mg-Cataguases b/isdb-t/br-mg-Cataguases
index 1925dd54..1925dd54 100644
--- a/dvbv5_isdb-t/br-mg-Cataguases
+++ b/isdb-t/br-mg-Cataguases
diff --git a/dvbv5_isdb-t/br-mg-Claraval b/isdb-t/br-mg-Claraval
index c2d98657..c2d98657 100644
--- a/dvbv5_isdb-t/br-mg-Claraval
+++ b/isdb-t/br-mg-Claraval
diff --git a/dvbv5_isdb-t/br-mg-CoronelFabriciano b/isdb-t/br-mg-CoronelFabriciano
index 67f3f640..67f3f640 100644
--- a/dvbv5_isdb-t/br-mg-CoronelFabriciano
+++ b/isdb-t/br-mg-CoronelFabriciano
diff --git a/dvbv5_isdb-t/br-mg-Curvelo b/isdb-t/br-mg-Curvelo
index f24728c8..f24728c8 100644
--- a/dvbv5_isdb-t/br-mg-Curvelo
+++ b/isdb-t/br-mg-Curvelo
diff --git a/dvbv5_isdb-t/br-mg-Diamantina b/isdb-t/br-mg-Diamantina
index e3c157f9..e3c157f9 100644
--- a/dvbv5_isdb-t/br-mg-Diamantina
+++ b/isdb-t/br-mg-Diamantina
diff --git a/dvbv5_isdb-t/br-mg-Divinopolis b/isdb-t/br-mg-Divinopolis
index a166e8b6..a166e8b6 100644
--- a/dvbv5_isdb-t/br-mg-Divinopolis
+++ b/isdb-t/br-mg-Divinopolis
diff --git a/dvbv5_isdb-t/br-mg-Fronteira b/isdb-t/br-mg-Fronteira
index 68b853e5..68b853e5 100644
--- a/dvbv5_isdb-t/br-mg-Fronteira
+++ b/isdb-t/br-mg-Fronteira
diff --git a/dvbv5_isdb-t/br-mg-Frutal b/isdb-t/br-mg-Frutal
index 57396629..57396629 100644
--- a/dvbv5_isdb-t/br-mg-Frutal
+++ b/isdb-t/br-mg-Frutal
diff --git a/dvbv5_isdb-t/br-mg-GovernadorValadares b/isdb-t/br-mg-GovernadorValadares
index 2739c071..2739c071 100644
--- a/dvbv5_isdb-t/br-mg-GovernadorValadares
+++ b/isdb-t/br-mg-GovernadorValadares
diff --git a/dvbv5_isdb-t/br-mg-Guanhaes b/isdb-t/br-mg-Guanhaes
index 58839e82..58839e82 100644
--- a/dvbv5_isdb-t/br-mg-Guanhaes
+++ b/isdb-t/br-mg-Guanhaes
diff --git a/dvbv5_isdb-t/br-mg-Guaxupe b/isdb-t/br-mg-Guaxupe
index b3313939..b3313939 100644
--- a/dvbv5_isdb-t/br-mg-Guaxupe
+++ b/isdb-t/br-mg-Guaxupe
diff --git a/dvbv5_isdb-t/br-mg-Ibirite b/isdb-t/br-mg-Ibirite
index 4a8b88a4..4a8b88a4 100644
--- a/dvbv5_isdb-t/br-mg-Ibirite
+++ b/isdb-t/br-mg-Ibirite
diff --git a/dvbv5_isdb-t/br-mg-Ipatinga b/isdb-t/br-mg-Ipatinga
index f2840d63..f2840d63 100644
--- a/dvbv5_isdb-t/br-mg-Ipatinga
+++ b/isdb-t/br-mg-Ipatinga
diff --git a/dvbv5_isdb-t/br-mg-Itabira b/isdb-t/br-mg-Itabira
index 6541de26..6541de26 100644
--- a/dvbv5_isdb-t/br-mg-Itabira
+++ b/isdb-t/br-mg-Itabira
diff --git a/dvbv5_isdb-t/br-mg-Itajuba b/isdb-t/br-mg-Itajuba
index 8c7c9114..8c7c9114 100644
--- a/dvbv5_isdb-t/br-mg-Itajuba
+++ b/isdb-t/br-mg-Itajuba
diff --git a/dvbv5_isdb-t/br-mg-Itapagipe b/isdb-t/br-mg-Itapagipe
index cbe8f31d..cbe8f31d 100644
--- a/dvbv5_isdb-t/br-mg-Itapagipe
+++ b/isdb-t/br-mg-Itapagipe
diff --git a/dvbv5_isdb-t/br-mg-Ituiutaba b/isdb-t/br-mg-Ituiutaba
index 0c4ff79b..0c4ff79b 100644
--- a/dvbv5_isdb-t/br-mg-Ituiutaba
+++ b/isdb-t/br-mg-Ituiutaba
diff --git a/dvbv5_isdb-t/br-mg-Janauba b/isdb-t/br-mg-Janauba
index 5b953288..5b953288 100644
--- a/dvbv5_isdb-t/br-mg-Janauba
+++ b/isdb-t/br-mg-Janauba
diff --git a/dvbv5_isdb-t/br-mg-Januaria b/isdb-t/br-mg-Januaria
index 0dac5c90..0dac5c90 100644
--- a/dvbv5_isdb-t/br-mg-Januaria
+++ b/isdb-t/br-mg-Januaria
diff --git a/dvbv5_isdb-t/br-mg-JuizDeFora b/isdb-t/br-mg-JuizDeFora
index 7e7d673b..7e7d673b 100644
--- a/dvbv5_isdb-t/br-mg-JuizDeFora
+++ b/isdb-t/br-mg-JuizDeFora
diff --git a/dvbv5_isdb-t/br-mg-Manhuacu b/isdb-t/br-mg-Manhuacu
index 00464aea..00464aea 100644
--- a/dvbv5_isdb-t/br-mg-Manhuacu
+++ b/isdb-t/br-mg-Manhuacu
diff --git a/dvbv5_isdb-t/br-mg-Mariana b/isdb-t/br-mg-Mariana
index ce5ec68d..ce5ec68d 100644
--- a/dvbv5_isdb-t/br-mg-Mariana
+++ b/isdb-t/br-mg-Mariana
diff --git a/dvbv5_isdb-t/br-mg-MonteSiao b/isdb-t/br-mg-MonteSiao
index b5139283..b5139283 100644
--- a/dvbv5_isdb-t/br-mg-MonteSiao
+++ b/isdb-t/br-mg-MonteSiao
diff --git a/dvbv5_isdb-t/br-mg-MontesClaros b/isdb-t/br-mg-MontesClaros
index 178727e8..178727e8 100644
--- a/dvbv5_isdb-t/br-mg-MontesClaros
+++ b/isdb-t/br-mg-MontesClaros
diff --git a/dvbv5_isdb-t/br-mg-Muriae b/isdb-t/br-mg-Muriae
index 255b2dcd..255b2dcd 100644
--- a/dvbv5_isdb-t/br-mg-Muriae
+++ b/isdb-t/br-mg-Muriae
diff --git a/dvbv5_isdb-t/br-mg-Oliveira b/isdb-t/br-mg-Oliveira
index d9ae918a..d9ae918a 100644
--- a/dvbv5_isdb-t/br-mg-Oliveira
+++ b/isdb-t/br-mg-Oliveira
diff --git a/dvbv5_isdb-t/br-mg-OuroFino b/isdb-t/br-mg-OuroFino
index 09005614..09005614 100644
--- a/dvbv5_isdb-t/br-mg-OuroFino
+++ b/isdb-t/br-mg-OuroFino
diff --git a/dvbv5_isdb-t/br-mg-Paracatu b/isdb-t/br-mg-Paracatu
index e3596a13..e3596a13 100644
--- a/dvbv5_isdb-t/br-mg-Paracatu
+++ b/isdb-t/br-mg-Paracatu
diff --git a/dvbv5_isdb-t/br-mg-Passos b/isdb-t/br-mg-Passos
index 2e596280..2e596280 100644
--- a/dvbv5_isdb-t/br-mg-Passos
+++ b/isdb-t/br-mg-Passos
diff --git a/dvbv5_isdb-t/br-mg-PatosDeMinas b/isdb-t/br-mg-PatosDeMinas
index bf419def..bf419def 100644
--- a/dvbv5_isdb-t/br-mg-PatosDeMinas
+++ b/isdb-t/br-mg-PatosDeMinas
diff --git a/dvbv5_isdb-t/br-mg-Periquito b/isdb-t/br-mg-Periquito
index 9acda573..9acda573 100644
--- a/dvbv5_isdb-t/br-mg-Periquito
+++ b/isdb-t/br-mg-Periquito
diff --git a/dvbv5_isdb-t/br-mg-Pirapora b/isdb-t/br-mg-Pirapora
index 4796bd84..4796bd84 100644
--- a/dvbv5_isdb-t/br-mg-Pirapora
+++ b/isdb-t/br-mg-Pirapora
diff --git a/dvbv5_isdb-t/br-mg-Planura b/isdb-t/br-mg-Planura
index 882ee11e..882ee11e 100644
--- a/dvbv5_isdb-t/br-mg-Planura
+++ b/isdb-t/br-mg-Planura
diff --git a/dvbv5_isdb-t/br-mg-PocosDeCaldas b/isdb-t/br-mg-PocosDeCaldas
index 56955367..56955367 100644
--- a/dvbv5_isdb-t/br-mg-PocosDeCaldas
+++ b/isdb-t/br-mg-PocosDeCaldas
diff --git a/dvbv5_isdb-t/br-mg-PousoAlegre b/isdb-t/br-mg-PousoAlegre
index 041531d0..041531d0 100644
--- a/dvbv5_isdb-t/br-mg-PousoAlegre
+++ b/isdb-t/br-mg-PousoAlegre
diff --git a/dvbv5_isdb-t/br-mg-SantaRitaDoSapucai b/isdb-t/br-mg-SantaRitaDoSapucai
index 60d86fa6..60d86fa6 100644
--- a/dvbv5_isdb-t/br-mg-SantaRitaDoSapucai
+++ b/isdb-t/br-mg-SantaRitaDoSapucai
diff --git a/dvbv5_isdb-t/br-mg-SaoJoaoDelRei b/isdb-t/br-mg-SaoJoaoDelRei
index 8ba6965c..8ba6965c 100644
--- a/dvbv5_isdb-t/br-mg-SaoJoaoDelRei
+++ b/isdb-t/br-mg-SaoJoaoDelRei
diff --git a/dvbv5_isdb-t/br-mg-SaoLourenco b/isdb-t/br-mg-SaoLourenco
index aad0b617..aad0b617 100644
--- a/dvbv5_isdb-t/br-mg-SaoLourenco
+++ b/isdb-t/br-mg-SaoLourenco
diff --git a/dvbv5_isdb-t/br-mg-SaoSebastiaoDoParaiso b/isdb-t/br-mg-SaoSebastiaoDoParaiso
index 12ceedec..12ceedec 100644
--- a/dvbv5_isdb-t/br-mg-SaoSebastiaoDoParaiso
+++ b/isdb-t/br-mg-SaoSebastiaoDoParaiso
diff --git a/dvbv5_isdb-t/br-mg-SeteLagoas b/isdb-t/br-mg-SeteLagoas
index 111770b9..111770b9 100644
--- a/dvbv5_isdb-t/br-mg-SeteLagoas
+++ b/isdb-t/br-mg-SeteLagoas
diff --git a/dvbv5_isdb-t/br-mg-TeofiloOtoni b/isdb-t/br-mg-TeofiloOtoni
index 112c2110..112c2110 100644
--- a/dvbv5_isdb-t/br-mg-TeofiloOtoni
+++ b/isdb-t/br-mg-TeofiloOtoni
diff --git a/dvbv5_isdb-t/br-mg-Timoteo b/isdb-t/br-mg-Timoteo
index 335df149..335df149 100644
--- a/dvbv5_isdb-t/br-mg-Timoteo
+++ b/isdb-t/br-mg-Timoteo
diff --git a/dvbv5_isdb-t/br-mg-TresCoracoes b/isdb-t/br-mg-TresCoracoes
index 3516dc7b..3516dc7b 100644
--- a/dvbv5_isdb-t/br-mg-TresCoracoes
+++ b/isdb-t/br-mg-TresCoracoes
diff --git a/dvbv5_isdb-t/br-mg-TresPontas b/isdb-t/br-mg-TresPontas
index 87912448..87912448 100644
--- a/dvbv5_isdb-t/br-mg-TresPontas
+++ b/isdb-t/br-mg-TresPontas
diff --git a/dvbv5_isdb-t/br-mg-Uberaba b/isdb-t/br-mg-Uberaba
index 19ec6add..19ec6add 100644
--- a/dvbv5_isdb-t/br-mg-Uberaba
+++ b/isdb-t/br-mg-Uberaba
diff --git a/dvbv5_isdb-t/br-mg-Uberlandia b/isdb-t/br-mg-Uberlandia
index 94a3496d..94a3496d 100644
--- a/dvbv5_isdb-t/br-mg-Uberlandia
+++ b/isdb-t/br-mg-Uberlandia
diff --git a/dvbv5_isdb-t/br-mg-Varginha b/isdb-t/br-mg-Varginha
index 9bff60a9..9bff60a9 100644
--- a/dvbv5_isdb-t/br-mg-Varginha
+++ b/isdb-t/br-mg-Varginha
diff --git a/dvbv5_isdb-t/br-ms-Anastacio b/isdb-t/br-ms-Anastacio
index 0037056f..0037056f 100644
--- a/dvbv5_isdb-t/br-ms-Anastacio
+++ b/isdb-t/br-ms-Anastacio
diff --git a/dvbv5_isdb-t/br-ms-Aquidauana b/isdb-t/br-ms-Aquidauana
index 8e281e25..8e281e25 100644
--- a/dvbv5_isdb-t/br-ms-Aquidauana
+++ b/isdb-t/br-ms-Aquidauana
diff --git a/dvbv5_isdb-t/br-ms-CampoGrande b/isdb-t/br-ms-CampoGrande
index df541084..df541084 100644
--- a/dvbv5_isdb-t/br-ms-CampoGrande
+++ b/isdb-t/br-ms-CampoGrande
diff --git a/dvbv5_isdb-t/br-ms-Corumba b/isdb-t/br-ms-Corumba
index b0135ad2..b0135ad2 100644
--- a/dvbv5_isdb-t/br-ms-Corumba
+++ b/isdb-t/br-ms-Corumba
diff --git a/dvbv5_isdb-t/br-ms-Dourados b/isdb-t/br-ms-Dourados
index 6bdab96d..6bdab96d 100644
--- a/dvbv5_isdb-t/br-ms-Dourados
+++ b/isdb-t/br-ms-Dourados
diff --git a/dvbv5_isdb-t/br-ms-Ladario b/isdb-t/br-ms-Ladario
index ac0c0566..ac0c0566 100644
--- a/dvbv5_isdb-t/br-ms-Ladario
+++ b/isdb-t/br-ms-Ladario
diff --git a/dvbv5_isdb-t/br-ms-NovaAndradina b/isdb-t/br-ms-NovaAndradina
index 9dabb425..9dabb425 100644
--- a/dvbv5_isdb-t/br-ms-NovaAndradina
+++ b/isdb-t/br-ms-NovaAndradina
diff --git a/dvbv5_isdb-t/br-ms-Paranaiba b/isdb-t/br-ms-Paranaiba
index 79adbfcc..79adbfcc 100644
--- a/dvbv5_isdb-t/br-ms-Paranaiba
+++ b/isdb-t/br-ms-Paranaiba
diff --git a/dvbv5_isdb-t/br-ms-PontaPora b/isdb-t/br-ms-PontaPora
index db4089da..db4089da 100644
--- a/dvbv5_isdb-t/br-ms-PontaPora
+++ b/isdb-t/br-ms-PontaPora
diff --git a/dvbv5_isdb-t/br-ms-Rochedo b/isdb-t/br-ms-Rochedo
index 58a71c9d..58a71c9d 100644
--- a/dvbv5_isdb-t/br-ms-Rochedo
+++ b/isdb-t/br-ms-Rochedo
diff --git a/dvbv5_isdb-t/br-ms-Sidrolandia b/isdb-t/br-ms-Sidrolandia
index 66ce3aef..66ce3aef 100644
--- a/dvbv5_isdb-t/br-ms-Sidrolandia
+++ b/isdb-t/br-ms-Sidrolandia
diff --git a/dvbv5_isdb-t/br-ms-TresLagoas b/isdb-t/br-ms-TresLagoas
index bc342067..bc342067 100644
--- a/dvbv5_isdb-t/br-ms-TresLagoas
+++ b/isdb-t/br-ms-TresLagoas
diff --git a/dvbv5_isdb-t/br-mt-AltaFloresta b/isdb-t/br-mt-AltaFloresta
index 77f31ea0..77f31ea0 100644
--- a/dvbv5_isdb-t/br-mt-AltaFloresta
+++ b/isdb-t/br-mt-AltaFloresta
diff --git a/dvbv5_isdb-t/br-mt-Cuiaba b/isdb-t/br-mt-Cuiaba
index b10f7c80..b10f7c80 100644
--- a/dvbv5_isdb-t/br-mt-Cuiaba
+++ b/isdb-t/br-mt-Cuiaba
diff --git a/dvbv5_isdb-t/br-mt-Rondonopolis b/isdb-t/br-mt-Rondonopolis
index 72502588..72502588 100644
--- a/dvbv5_isdb-t/br-mt-Rondonopolis
+++ b/isdb-t/br-mt-Rondonopolis
diff --git a/dvbv5_isdb-t/br-mt-Sinop b/isdb-t/br-mt-Sinop
index bc57fa23..bc57fa23 100644
--- a/dvbv5_isdb-t/br-mt-Sinop
+++ b/isdb-t/br-mt-Sinop
diff --git a/dvbv5_isdb-t/br-mt-Sorriso b/isdb-t/br-mt-Sorriso
index 82af99d7..82af99d7 100644
--- a/dvbv5_isdb-t/br-mt-Sorriso
+++ b/isdb-t/br-mt-Sorriso
diff --git a/dvbv5_isdb-t/br-mt-TangaraDaSerra b/isdb-t/br-mt-TangaraDaSerra
index 48c1602a..48c1602a 100644
--- a/dvbv5_isdb-t/br-mt-TangaraDaSerra
+++ b/isdb-t/br-mt-TangaraDaSerra
diff --git a/dvbv5_isdb-t/br-pa-Abaetetuba b/isdb-t/br-pa-Abaetetuba
index 80cb07e0..80cb07e0 100644
--- a/dvbv5_isdb-t/br-pa-Abaetetuba
+++ b/isdb-t/br-pa-Abaetetuba
diff --git a/dvbv5_isdb-t/br-pa-Afua b/isdb-t/br-pa-Afua
index 41905cae..41905cae 100644
--- a/dvbv5_isdb-t/br-pa-Afua
+++ b/isdb-t/br-pa-Afua
diff --git a/dvbv5_isdb-t/br-pa-Barcarena b/isdb-t/br-pa-Barcarena
index 21967834..21967834 100644
--- a/dvbv5_isdb-t/br-pa-Barcarena
+++ b/isdb-t/br-pa-Barcarena
diff --git a/dvbv5_isdb-t/br-pa-Belem b/isdb-t/br-pa-Belem
index faffd7a6..faffd7a6 100644
--- a/dvbv5_isdb-t/br-pa-Belem
+++ b/isdb-t/br-pa-Belem
diff --git a/dvbv5_isdb-t/br-pa-Belterra b/isdb-t/br-pa-Belterra
index e39458b9..e39458b9 100644
--- a/dvbv5_isdb-t/br-pa-Belterra
+++ b/isdb-t/br-pa-Belterra
diff --git a/dvbv5_isdb-t/br-pa-Castanhal b/isdb-t/br-pa-Castanhal
index b1ad85a7..b1ad85a7 100644
--- a/dvbv5_isdb-t/br-pa-Castanhal
+++ b/isdb-t/br-pa-Castanhal
diff --git a/dvbv5_isdb-t/br-pa-Maraba b/isdb-t/br-pa-Maraba
index 92bb0efc..92bb0efc 100644
--- a/dvbv5_isdb-t/br-pa-Maraba
+++ b/isdb-t/br-pa-Maraba
diff --git a/dvbv5_isdb-t/br-pa-Moju b/isdb-t/br-pa-Moju
index 0779572d..0779572d 100644
--- a/dvbv5_isdb-t/br-pa-Moju
+++ b/isdb-t/br-pa-Moju
diff --git a/dvbv5_isdb-t/br-pa-PontaDePedras b/isdb-t/br-pa-PontaDePedras
index 12aa73af..12aa73af 100644
--- a/dvbv5_isdb-t/br-pa-PontaDePedras
+++ b/isdb-t/br-pa-PontaDePedras
diff --git a/dvbv5_isdb-t/br-pa-Santarem b/isdb-t/br-pa-Santarem
index 6f398471..6f398471 100644
--- a/dvbv5_isdb-t/br-pa-Santarem
+++ b/isdb-t/br-pa-Santarem
diff --git a/dvbv5_isdb-t/br-pb-AlagoaGrande b/isdb-t/br-pb-AlagoaGrande
index 7197e264..7197e264 100644
--- a/dvbv5_isdb-t/br-pb-AlagoaGrande
+++ b/isdb-t/br-pb-AlagoaGrande
diff --git a/dvbv5_isdb-t/br-pb-Alagoinha b/isdb-t/br-pb-Alagoinha
index e80659de..e80659de 100644
--- a/dvbv5_isdb-t/br-pb-Alagoinha
+++ b/isdb-t/br-pb-Alagoinha
diff --git a/dvbv5_isdb-t/br-pb-Aparecida b/isdb-t/br-pb-Aparecida
index 07205791..07205791 100644
--- a/dvbv5_isdb-t/br-pb-Aparecida
+++ b/isdb-t/br-pb-Aparecida
diff --git a/dvbv5_isdb-t/br-pb-Bayeux b/isdb-t/br-pb-Bayeux
index 67c4d798..67c4d798 100644
--- a/dvbv5_isdb-t/br-pb-Bayeux
+++ b/isdb-t/br-pb-Bayeux
diff --git a/dvbv5_isdb-t/br-pb-BomJesus b/isdb-t/br-pb-BomJesus
index afc65025..afc65025 100644
--- a/dvbv5_isdb-t/br-pb-BomJesus
+++ b/isdb-t/br-pb-BomJesus
diff --git a/dvbv5_isdb-t/br-pb-Cabedelo b/isdb-t/br-pb-Cabedelo
index 600d9c9b..600d9c9b 100644
--- a/dvbv5_isdb-t/br-pb-Cabedelo
+++ b/isdb-t/br-pb-Cabedelo
diff --git a/dvbv5_isdb-t/br-pb-CachoeiraDosIndios b/isdb-t/br-pb-CachoeiraDosIndios
index d5bb4be2..d5bb4be2 100644
--- a/dvbv5_isdb-t/br-pb-CachoeiraDosIndios
+++ b/isdb-t/br-pb-CachoeiraDosIndios
diff --git a/dvbv5_isdb-t/br-pb-CacimbaDeDentro b/isdb-t/br-pb-CacimbaDeDentro
index 4bf1a6cc..4bf1a6cc 100644
--- a/dvbv5_isdb-t/br-pb-CacimbaDeDentro
+++ b/isdb-t/br-pb-CacimbaDeDentro
diff --git a/dvbv5_isdb-t/br-pb-Cajazeiras b/isdb-t/br-pb-Cajazeiras
index f0d748db..f0d748db 100644
--- a/dvbv5_isdb-t/br-pb-Cajazeiras
+++ b/isdb-t/br-pb-Cajazeiras
diff --git a/dvbv5_isdb-t/br-pb-CaldasBrandao b/isdb-t/br-pb-CaldasBrandao
index 84bff427..84bff427 100644
--- a/dvbv5_isdb-t/br-pb-CaldasBrandao
+++ b/isdb-t/br-pb-CaldasBrandao
diff --git a/dvbv5_isdb-t/br-pb-CampinaGrande b/isdb-t/br-pb-CampinaGrande
index 6bb5d7a2..6bb5d7a2 100644
--- a/dvbv5_isdb-t/br-pb-CampinaGrande
+++ b/isdb-t/br-pb-CampinaGrande
diff --git a/dvbv5_isdb-t/br-pb-Catingueira b/isdb-t/br-pb-Catingueira
index c01ecfd5..c01ecfd5 100644
--- a/dvbv5_isdb-t/br-pb-Catingueira
+++ b/isdb-t/br-pb-Catingueira
diff --git a/dvbv5_isdb-t/br-pb-Condado b/isdb-t/br-pb-Condado
index 26c97330..26c97330 100644
--- a/dvbv5_isdb-t/br-pb-Condado
+++ b/isdb-t/br-pb-Condado
diff --git a/dvbv5_isdb-t/br-pb-Cuitegi b/isdb-t/br-pb-Cuitegi
index 5aacb9d5..5aacb9d5 100644
--- a/dvbv5_isdb-t/br-pb-Cuitegi
+++ b/isdb-t/br-pb-Cuitegi
diff --git a/dvbv5_isdb-t/br-pb-Desterro b/isdb-t/br-pb-Desterro
index 72430642..72430642 100644
--- a/dvbv5_isdb-t/br-pb-Desterro
+++ b/isdb-t/br-pb-Desterro
diff --git a/dvbv5_isdb-t/br-pb-Guarabira b/isdb-t/br-pb-Guarabira
index 51a5d2af..51a5d2af 100644
--- a/dvbv5_isdb-t/br-pb-Guarabira
+++ b/isdb-t/br-pb-Guarabira
diff --git a/dvbv5_isdb-t/br-pb-Gurinhem b/isdb-t/br-pb-Gurinhem
index a683ec7a..a683ec7a 100644
--- a/dvbv5_isdb-t/br-pb-Gurinhem
+++ b/isdb-t/br-pb-Gurinhem
diff --git a/dvbv5_isdb-t/br-pb-Imaculada b/isdb-t/br-pb-Imaculada
index 76b6e784..76b6e784 100644
--- a/dvbv5_isdb-t/br-pb-Imaculada
+++ b/isdb-t/br-pb-Imaculada
diff --git a/dvbv5_isdb-t/br-pb-Itabaiana b/isdb-t/br-pb-Itabaiana
index d7f855a5..d7f855a5 100644
--- a/dvbv5_isdb-t/br-pb-Itabaiana
+++ b/isdb-t/br-pb-Itabaiana
diff --git a/dvbv5_isdb-t/br-pb-Jacarau b/isdb-t/br-pb-Jacarau
index a87f1a5c..a87f1a5c 100644
--- a/dvbv5_isdb-t/br-pb-Jacarau
+++ b/isdb-t/br-pb-Jacarau
diff --git a/dvbv5_isdb-t/br-pb-JoaoPessoa b/isdb-t/br-pb-JoaoPessoa
index ea7f6460..ea7f6460 100644
--- a/dvbv5_isdb-t/br-pb-JoaoPessoa
+++ b/isdb-t/br-pb-JoaoPessoa
diff --git a/dvbv5_isdb-t/br-pb-Juripiranga b/isdb-t/br-pb-Juripiranga
index e0d224a1..e0d224a1 100644
--- a/dvbv5_isdb-t/br-pb-Juripiranga
+++ b/isdb-t/br-pb-Juripiranga
diff --git a/dvbv5_isdb-t/br-pb-LagoaSeca b/isdb-t/br-pb-LagoaSeca
index 3ee14548..3ee14548 100644
--- a/dvbv5_isdb-t/br-pb-LagoaSeca
+++ b/isdb-t/br-pb-LagoaSeca
diff --git a/dvbv5_isdb-t/br-pb-Lucena b/isdb-t/br-pb-Lucena
index cb8a9da0..cb8a9da0 100644
--- a/dvbv5_isdb-t/br-pb-Lucena
+++ b/isdb-t/br-pb-Lucena
diff --git a/dvbv5_isdb-t/br-pb-MaeDAgua b/isdb-t/br-pb-MaeDAgua
index 5f7d74f9..5f7d74f9 100644
--- a/dvbv5_isdb-t/br-pb-MaeDAgua
+++ b/isdb-t/br-pb-MaeDAgua
diff --git a/dvbv5_isdb-t/br-pb-Mamanguape b/isdb-t/br-pb-Mamanguape
index 012c281c..012c281c 100644
--- a/dvbv5_isdb-t/br-pb-Mamanguape
+++ b/isdb-t/br-pb-Mamanguape
diff --git a/dvbv5_isdb-t/br-pb-Marizopolis b/isdb-t/br-pb-Marizopolis
index ecb7c929..ecb7c929 100644
--- a/dvbv5_isdb-t/br-pb-Marizopolis
+++ b/isdb-t/br-pb-Marizopolis
diff --git a/dvbv5_isdb-t/br-pb-Massaranduba b/isdb-t/br-pb-Massaranduba
index 66925171..66925171 100644
--- a/dvbv5_isdb-t/br-pb-Massaranduba
+++ b/isdb-t/br-pb-Massaranduba
diff --git a/dvbv5_isdb-t/br-pb-Matinhas b/isdb-t/br-pb-Matinhas
index 18343551..18343551 100644
--- a/dvbv5_isdb-t/br-pb-Matinhas
+++ b/isdb-t/br-pb-Matinhas
diff --git a/dvbv5_isdb-t/br-pb-Matureia b/isdb-t/br-pb-Matureia
index 465446ee..465446ee 100644
--- a/dvbv5_isdb-t/br-pb-Matureia
+++ b/isdb-t/br-pb-Matureia
diff --git a/dvbv5_isdb-t/br-pb-Mulungu b/isdb-t/br-pb-Mulungu
index 862f58f3..862f58f3 100644
--- a/dvbv5_isdb-t/br-pb-Mulungu
+++ b/isdb-t/br-pb-Mulungu
diff --git a/dvbv5_isdb-t/br-pb-OlhoDAgua b/isdb-t/br-pb-OlhoDAgua
index cd1eba00..cd1eba00 100644
--- a/dvbv5_isdb-t/br-pb-OlhoDAgua
+++ b/isdb-t/br-pb-OlhoDAgua
diff --git a/dvbv5_isdb-t/br-pb-Patos b/isdb-t/br-pb-Patos
index 97af8475..97af8475 100644
--- a/dvbv5_isdb-t/br-pb-Patos
+++ b/isdb-t/br-pb-Patos
diff --git a/dvbv5_isdb-t/br-pb-Pilar b/isdb-t/br-pb-Pilar
index e4ab31fb..e4ab31fb 100644
--- a/dvbv5_isdb-t/br-pb-Pilar
+++ b/isdb-t/br-pb-Pilar
diff --git a/dvbv5_isdb-t/br-pb-Piloezinhos b/isdb-t/br-pb-Piloezinhos
index 468920f7..468920f7 100644
--- a/dvbv5_isdb-t/br-pb-Piloezinhos
+++ b/isdb-t/br-pb-Piloezinhos
diff --git a/dvbv5_isdb-t/br-pb-Puxinana b/isdb-t/br-pb-Puxinana
index 6edbc052..6edbc052 100644
--- a/dvbv5_isdb-t/br-pb-Puxinana
+++ b/isdb-t/br-pb-Puxinana
diff --git a/dvbv5_isdb-t/br-pb-RioTinto b/isdb-t/br-pb-RioTinto
index b18605dd..b18605dd 100644
--- a/dvbv5_isdb-t/br-pb-RioTinto
+++ b/isdb-t/br-pb-RioTinto
diff --git a/dvbv5_isdb-t/br-pb-SantaRita b/isdb-t/br-pb-SantaRita
index 867969e7..867969e7 100644
--- a/dvbv5_isdb-t/br-pb-SantaRita
+++ b/isdb-t/br-pb-SantaRita
diff --git a/dvbv5_isdb-t/br-pb-SantaTeresinha b/isdb-t/br-pb-SantaTeresinha
index 5e3460fd..5e3460fd 100644
--- a/dvbv5_isdb-t/br-pb-SantaTeresinha
+++ b/isdb-t/br-pb-SantaTeresinha
diff --git a/dvbv5_isdb-t/br-pb-SaoFrancisco b/isdb-t/br-pb-SaoFrancisco
index f3b71d0a..f3b71d0a 100644
--- a/dvbv5_isdb-t/br-pb-SaoFrancisco
+++ b/isdb-t/br-pb-SaoFrancisco
diff --git a/dvbv5_isdb-t/br-pb-SaoJoseDePiranhas b/isdb-t/br-pb-SaoJoseDePiranhas
index 8c6fe049..8c6fe049 100644
--- a/dvbv5_isdb-t/br-pb-SaoJoseDePiranhas
+++ b/isdb-t/br-pb-SaoJoseDePiranhas
diff --git a/dvbv5_isdb-t/br-pb-SaoMamede b/isdb-t/br-pb-SaoMamede
index a0be08ea..a0be08ea 100644
--- a/dvbv5_isdb-t/br-pb-SaoMamede
+++ b/isdb-t/br-pb-SaoMamede
diff --git a/dvbv5_isdb-t/br-pb-Sape b/isdb-t/br-pb-Sape
index 788780bd..788780bd 100644
--- a/dvbv5_isdb-t/br-pb-Sape
+++ b/isdb-t/br-pb-Sape
diff --git a/dvbv5_isdb-t/br-pb-Sousa b/isdb-t/br-pb-Sousa
index fb15fe6d..fb15fe6d 100644
--- a/dvbv5_isdb-t/br-pb-Sousa
+++ b/isdb-t/br-pb-Sousa
diff --git a/dvbv5_isdb-t/br-pb-Teixeira b/isdb-t/br-pb-Teixeira
index d936a3b7..d936a3b7 100644
--- a/dvbv5_isdb-t/br-pb-Teixeira
+++ b/isdb-t/br-pb-Teixeira
diff --git a/dvbv5_isdb-t/br-pe-Agrestina b/isdb-t/br-pe-Agrestina
index 6730f4fd..6730f4fd 100644
--- a/dvbv5_isdb-t/br-pe-Agrestina
+++ b/isdb-t/br-pe-Agrestina
diff --git a/dvbv5_isdb-t/br-pe-Altinho b/isdb-t/br-pe-Altinho
index a30a31c9..a30a31c9 100644
--- a/dvbv5_isdb-t/br-pe-Altinho
+++ b/isdb-t/br-pe-Altinho
diff --git a/dvbv5_isdb-t/br-pe-Bezerros b/isdb-t/br-pe-Bezerros
index 9d25c793..9d25c793 100644
--- a/dvbv5_isdb-t/br-pe-Bezerros
+++ b/isdb-t/br-pe-Bezerros
diff --git a/dvbv5_isdb-t/br-pe-Camaragibe b/isdb-t/br-pe-Camaragibe
index b0fba57b..b0fba57b 100644
--- a/dvbv5_isdb-t/br-pe-Camaragibe
+++ b/isdb-t/br-pe-Camaragibe
diff --git a/dvbv5_isdb-t/br-pe-Caruaru b/isdb-t/br-pe-Caruaru
index 00a60907..00a60907 100644
--- a/dvbv5_isdb-t/br-pe-Caruaru
+++ b/isdb-t/br-pe-Caruaru
diff --git a/dvbv5_isdb-t/br-pe-Garanhuns b/isdb-t/br-pe-Garanhuns
index 05dadca2..05dadca2 100644
--- a/dvbv5_isdb-t/br-pe-Garanhuns
+++ b/isdb-t/br-pe-Garanhuns
diff --git a/dvbv5_isdb-t/br-pe-Jupi b/isdb-t/br-pe-Jupi
index b97b1f30..b97b1f30 100644
--- a/dvbv5_isdb-t/br-pe-Jupi
+++ b/isdb-t/br-pe-Jupi
diff --git a/dvbv5_isdb-t/br-pe-Limoeiro b/isdb-t/br-pe-Limoeiro
index 6dbb267c..6dbb267c 100644
--- a/dvbv5_isdb-t/br-pe-Limoeiro
+++ b/isdb-t/br-pe-Limoeiro
diff --git a/dvbv5_isdb-t/br-pe-Petrolina b/isdb-t/br-pe-Petrolina
index 19a8ad0c..19a8ad0c 100644
--- a/dvbv5_isdb-t/br-pe-Petrolina
+++ b/isdb-t/br-pe-Petrolina
diff --git a/dvbv5_isdb-t/br-pe-Recife b/isdb-t/br-pe-Recife
index 9661635b..9661635b 100644
--- a/dvbv5_isdb-t/br-pe-Recife
+++ b/isdb-t/br-pe-Recife
diff --git a/dvbv5_isdb-t/br-pe-SaoLourencoDaMata b/isdb-t/br-pe-SaoLourencoDaMata
index 209375ea..209375ea 100644
--- a/dvbv5_isdb-t/br-pe-SaoLourencoDaMata
+++ b/isdb-t/br-pe-SaoLourencoDaMata
diff --git a/dvbv5_isdb-t/br-pi-Teresina b/isdb-t/br-pi-Teresina
index 9389c810..9389c810 100644
--- a/dvbv5_isdb-t/br-pi-Teresina
+++ b/isdb-t/br-pi-Teresina
diff --git a/dvbv5_isdb-t/br-pr-AltoParana b/isdb-t/br-pr-AltoParana
index ff346da3..ff346da3 100644
--- a/dvbv5_isdb-t/br-pr-AltoParana
+++ b/isdb-t/br-pr-AltoParana
diff --git a/dvbv5_isdb-t/br-pr-AltoPiquiri b/isdb-t/br-pr-AltoPiquiri
index 8f39277b..8f39277b 100644
--- a/dvbv5_isdb-t/br-pr-AltoPiquiri
+++ b/isdb-t/br-pr-AltoPiquiri
diff --git a/dvbv5_isdb-t/br-pr-Antonina b/isdb-t/br-pr-Antonina
index 69ddd256..69ddd256 100644
--- a/dvbv5_isdb-t/br-pr-Antonina
+++ b/isdb-t/br-pr-Antonina
diff --git a/dvbv5_isdb-t/br-pr-Apucarana b/isdb-t/br-pr-Apucarana
index 84bb77c4..84bb77c4 100644
--- a/dvbv5_isdb-t/br-pr-Apucarana
+++ b/isdb-t/br-pr-Apucarana
diff --git a/dvbv5_isdb-t/br-pr-Arapongas b/isdb-t/br-pr-Arapongas
index 9e53c257..9e53c257 100644
--- a/dvbv5_isdb-t/br-pr-Arapongas
+++ b/isdb-t/br-pr-Arapongas
diff --git a/dvbv5_isdb-t/br-pr-AssisChateaubriand b/isdb-t/br-pr-AssisChateaubriand
index bcb84a84..bcb84a84 100644
--- a/dvbv5_isdb-t/br-pr-AssisChateaubriand
+++ b/isdb-t/br-pr-AssisChateaubriand
diff --git a/dvbv5_isdb-t/br-pr-BoaVistaDaAparecida b/isdb-t/br-pr-BoaVistaDaAparecida
index e77b88f9..e77b88f9 100644
--- a/dvbv5_isdb-t/br-pr-BoaVistaDaAparecida
+++ b/isdb-t/br-pr-BoaVistaDaAparecida
diff --git a/dvbv5_isdb-t/br-pr-Cafelandia b/isdb-t/br-pr-Cafelandia
index 1bd461fe..1bd461fe 100644
--- a/dvbv5_isdb-t/br-pr-Cafelandia
+++ b/isdb-t/br-pr-Cafelandia
diff --git a/dvbv5_isdb-t/br-pr-Cambe b/isdb-t/br-pr-Cambe
index abe11209..abe11209 100644
--- a/dvbv5_isdb-t/br-pr-Cambe
+++ b/isdb-t/br-pr-Cambe
diff --git a/dvbv5_isdb-t/br-pr-CampoLargo b/isdb-t/br-pr-CampoLargo
index 16638304..16638304 100644
--- a/dvbv5_isdb-t/br-pr-CampoLargo
+++ b/isdb-t/br-pr-CampoLargo
diff --git a/dvbv5_isdb-t/br-pr-CampoMourao b/isdb-t/br-pr-CampoMourao
index 05e725ad..05e725ad 100644
--- a/dvbv5_isdb-t/br-pr-CampoMourao
+++ b/isdb-t/br-pr-CampoMourao
diff --git a/dvbv5_isdb-t/br-pr-Carambei b/isdb-t/br-pr-Carambei
index 1daeca96..1daeca96 100644
--- a/dvbv5_isdb-t/br-pr-Carambei
+++ b/isdb-t/br-pr-Carambei
diff --git a/dvbv5_isdb-t/br-pr-Cascavel b/isdb-t/br-pr-Cascavel
index 81651fa9..81651fa9 100644
--- a/dvbv5_isdb-t/br-pr-Cascavel
+++ b/isdb-t/br-pr-Cascavel
diff --git a/dvbv5_isdb-t/br-pr-CeuAzul b/isdb-t/br-pr-CeuAzul
index 24d12fff..24d12fff 100644
--- a/dvbv5_isdb-t/br-pr-CeuAzul
+++ b/isdb-t/br-pr-CeuAzul
diff --git a/dvbv5_isdb-t/br-pr-Cianorte b/isdb-t/br-pr-Cianorte
index b9fa86b1..b9fa86b1 100644
--- a/dvbv5_isdb-t/br-pr-Cianorte
+++ b/isdb-t/br-pr-Cianorte
diff --git a/dvbv5_isdb-t/br-pr-Colombo b/isdb-t/br-pr-Colombo
index 5bc02121..5bc02121 100644
--- a/dvbv5_isdb-t/br-pr-Colombo
+++ b/isdb-t/br-pr-Colombo
diff --git a/dvbv5_isdb-t/br-pr-Corbelia b/isdb-t/br-pr-Corbelia
index fbb1fd5d..fbb1fd5d 100644
--- a/dvbv5_isdb-t/br-pr-Corbelia
+++ b/isdb-t/br-pr-Corbelia
diff --git a/dvbv5_isdb-t/br-pr-CornelioProcopio b/isdb-t/br-pr-CornelioProcopio
index f576dc9e..f576dc9e 100644
--- a/dvbv5_isdb-t/br-pr-CornelioProcopio
+++ b/isdb-t/br-pr-CornelioProcopio
diff --git a/dvbv5_isdb-t/br-pr-Curitiba b/isdb-t/br-pr-Curitiba
index 3ddfbdc7..3ddfbdc7 100644
--- a/dvbv5_isdb-t/br-pr-Curitiba
+++ b/isdb-t/br-pr-Curitiba
diff --git a/dvbv5_isdb-t/br-pr-Florestopolis b/isdb-t/br-pr-Florestopolis
index fd54dd04..fd54dd04 100644
--- a/dvbv5_isdb-t/br-pr-Florestopolis
+++ b/isdb-t/br-pr-Florestopolis
diff --git a/dvbv5_isdb-t/br-pr-FozDoIguacu b/isdb-t/br-pr-FozDoIguacu
index ba044cc6..ba044cc6 100644
--- a/dvbv5_isdb-t/br-pr-FozDoIguacu
+++ b/isdb-t/br-pr-FozDoIguacu
diff --git a/dvbv5_isdb-t/br-pr-FranciscoBeltrao b/isdb-t/br-pr-FranciscoBeltrao
index 956799f2..956799f2 100644
--- a/dvbv5_isdb-t/br-pr-FranciscoBeltrao
+++ b/isdb-t/br-pr-FranciscoBeltrao
diff --git a/dvbv5_isdb-t/br-pr-Guaraniacu b/isdb-t/br-pr-Guaraniacu
index 51965353..51965353 100644
--- a/dvbv5_isdb-t/br-pr-Guaraniacu
+++ b/isdb-t/br-pr-Guaraniacu
diff --git a/dvbv5_isdb-t/br-pr-Guarapuava b/isdb-t/br-pr-Guarapuava
index 21bafbfc..21bafbfc 100644
--- a/dvbv5_isdb-t/br-pr-Guarapuava
+++ b/isdb-t/br-pr-Guarapuava
diff --git a/dvbv5_isdb-t/br-pr-Guaratuba b/isdb-t/br-pr-Guaratuba
index 9afe1f43..9afe1f43 100644
--- a/dvbv5_isdb-t/br-pr-Guaratuba
+++ b/isdb-t/br-pr-Guaratuba
diff --git a/dvbv5_isdb-t/br-pr-HonorioSerpa b/isdb-t/br-pr-HonorioSerpa
index ec4b1089..ec4b1089 100644
--- a/dvbv5_isdb-t/br-pr-HonorioSerpa
+++ b/isdb-t/br-pr-HonorioSerpa
diff --git a/dvbv5_isdb-t/br-pr-Ibema b/isdb-t/br-pr-Ibema
index 9e371815..9e371815 100644
--- a/dvbv5_isdb-t/br-pr-Ibema
+++ b/isdb-t/br-pr-Ibema
diff --git a/dvbv5_isdb-t/br-pr-Ibipora b/isdb-t/br-pr-Ibipora
index d7cd820b..d7cd820b 100644
--- a/dvbv5_isdb-t/br-pr-Ibipora
+++ b/isdb-t/br-pr-Ibipora
diff --git a/dvbv5_isdb-t/br-pr-Imbituva b/isdb-t/br-pr-Imbituva
index 9ec4d3b6..9ec4d3b6 100644
--- a/dvbv5_isdb-t/br-pr-Imbituva
+++ b/isdb-t/br-pr-Imbituva
diff --git a/dvbv5_isdb-t/br-pr-Irati b/isdb-t/br-pr-Irati
index 43b7ca9a..43b7ca9a 100644
--- a/dvbv5_isdb-t/br-pr-Irati
+++ b/isdb-t/br-pr-Irati
diff --git a/dvbv5_isdb-t/br-pr-Ivaipora b/isdb-t/br-pr-Ivaipora
index 20d75905..20d75905 100644
--- a/dvbv5_isdb-t/br-pr-Ivaipora
+++ b/isdb-t/br-pr-Ivaipora
diff --git a/dvbv5_isdb-t/br-pr-Jacarezinho b/isdb-t/br-pr-Jacarezinho
index cf833979..cf833979 100644
--- a/dvbv5_isdb-t/br-pr-Jacarezinho
+++ b/isdb-t/br-pr-Jacarezinho
diff --git a/dvbv5_isdb-t/br-pr-Japira b/isdb-t/br-pr-Japira
index 9ad5e036..9ad5e036 100644
--- a/dvbv5_isdb-t/br-pr-Japira
+++ b/isdb-t/br-pr-Japira
diff --git a/dvbv5_isdb-t/br-pr-Jataizinho b/isdb-t/br-pr-Jataizinho
index 0a68ea12..0a68ea12 100644
--- a/dvbv5_isdb-t/br-pr-Jataizinho
+++ b/isdb-t/br-pr-Jataizinho
diff --git a/dvbv5_isdb-t/br-pr-Lapa b/isdb-t/br-pr-Lapa
index 1cf2889e..1cf2889e 100644
--- a/dvbv5_isdb-t/br-pr-Lapa
+++ b/isdb-t/br-pr-Lapa
diff --git a/dvbv5_isdb-t/br-pr-Londrina b/isdb-t/br-pr-Londrina
index bb09e38c..bb09e38c 100644
--- a/dvbv5_isdb-t/br-pr-Londrina
+++ b/isdb-t/br-pr-Londrina
diff --git a/dvbv5_isdb-t/br-pr-Maringa b/isdb-t/br-pr-Maringa
index 36147652..36147652 100644
--- a/dvbv5_isdb-t/br-pr-Maringa
+++ b/isdb-t/br-pr-Maringa
diff --git a/dvbv5_isdb-t/br-pr-Matinhos b/isdb-t/br-pr-Matinhos
index d8ba9205..d8ba9205 100644
--- a/dvbv5_isdb-t/br-pr-Matinhos
+++ b/isdb-t/br-pr-Matinhos
diff --git a/dvbv5_isdb-t/br-pr-MoreiraSales b/isdb-t/br-pr-MoreiraSales
index 3815d72b..3815d72b 100644
--- a/dvbv5_isdb-t/br-pr-MoreiraSales
+++ b/isdb-t/br-pr-MoreiraSales
diff --git a/dvbv5_isdb-t/br-pr-NovaAurora b/isdb-t/br-pr-NovaAurora
index 6c96e086..6c96e086 100644
--- a/dvbv5_isdb-t/br-pr-NovaAurora
+++ b/isdb-t/br-pr-NovaAurora
diff --git a/dvbv5_isdb-t/br-pr-Paranagua b/isdb-t/br-pr-Paranagua
index da35a351..da35a351 100644
--- a/dvbv5_isdb-t/br-pr-Paranagua
+++ b/isdb-t/br-pr-Paranagua
diff --git a/dvbv5_isdb-t/br-pr-Paranavai b/isdb-t/br-pr-Paranavai
index 281d59d0..281d59d0 100644
--- a/dvbv5_isdb-t/br-pr-Paranavai
+++ b/isdb-t/br-pr-Paranavai
diff --git a/dvbv5_isdb-t/br-pr-PatoBranco b/isdb-t/br-pr-PatoBranco
index f5a80c1f..f5a80c1f 100644
--- a/dvbv5_isdb-t/br-pr-PatoBranco
+++ b/isdb-t/br-pr-PatoBranco
diff --git a/dvbv5_isdb-t/br-pr-Perola b/isdb-t/br-pr-Perola
index a8945fd3..a8945fd3 100644
--- a/dvbv5_isdb-t/br-pr-Perola
+++ b/isdb-t/br-pr-Perola
diff --git a/dvbv5_isdb-t/br-pr-PontaGrossa b/isdb-t/br-pr-PontaGrossa
index 7b5a2e4a..7b5a2e4a 100644
--- a/dvbv5_isdb-t/br-pr-PontaGrossa
+++ b/isdb-t/br-pr-PontaGrossa
diff --git a/dvbv5_isdb-t/br-pr-PontalDoParana b/isdb-t/br-pr-PontalDoParana
index d2cf3c25..d2cf3c25 100644
--- a/dvbv5_isdb-t/br-pr-PontalDoParana
+++ b/isdb-t/br-pr-PontalDoParana
diff --git a/dvbv5_isdb-t/br-pr-Porecatu b/isdb-t/br-pr-Porecatu
index 34dc6e21..34dc6e21 100644
--- a/dvbv5_isdb-t/br-pr-Porecatu
+++ b/isdb-t/br-pr-Porecatu
diff --git a/dvbv5_isdb-t/br-pr-PrimeiroDeMaio b/isdb-t/br-pr-PrimeiroDeMaio
index ec78902e..ec78902e 100644
--- a/dvbv5_isdb-t/br-pr-PrimeiroDeMaio
+++ b/isdb-t/br-pr-PrimeiroDeMaio
diff --git a/dvbv5_isdb-t/br-pr-RioNegro b/isdb-t/br-pr-RioNegro
index f155a829..f155a829 100644
--- a/dvbv5_isdb-t/br-pr-RioNegro
+++ b/isdb-t/br-pr-RioNegro
diff --git a/dvbv5_isdb-t/br-pr-Rolandia b/isdb-t/br-pr-Rolandia
index a52d1042..a52d1042 100644
--- a/dvbv5_isdb-t/br-pr-Rolandia
+++ b/isdb-t/br-pr-Rolandia
diff --git a/dvbv5_isdb-t/br-pr-Sarandi b/isdb-t/br-pr-Sarandi
index 9ba87d40..9ba87d40 100644
--- a/dvbv5_isdb-t/br-pr-Sarandi
+++ b/isdb-t/br-pr-Sarandi
diff --git a/dvbv5_isdb-t/br-pr-Sertanopolis b/isdb-t/br-pr-Sertanopolis
index 2f0536c8..2f0536c8 100644
--- a/dvbv5_isdb-t/br-pr-Sertanopolis
+++ b/isdb-t/br-pr-Sertanopolis
diff --git a/dvbv5_isdb-t/br-pr-TeixeiraSoares b/isdb-t/br-pr-TeixeiraSoares
index 7f94577f..7f94577f 100644
--- a/dvbv5_isdb-t/br-pr-TeixeiraSoares
+++ b/isdb-t/br-pr-TeixeiraSoares
diff --git a/dvbv5_isdb-t/br-pr-TelemacoBorba b/isdb-t/br-pr-TelemacoBorba
index 1a49f34b..1a49f34b 100644
--- a/dvbv5_isdb-t/br-pr-TelemacoBorba
+++ b/isdb-t/br-pr-TelemacoBorba
diff --git a/dvbv5_isdb-t/br-pr-Toledo b/isdb-t/br-pr-Toledo
index a8704380..a8704380 100644
--- a/dvbv5_isdb-t/br-pr-Toledo
+++ b/isdb-t/br-pr-Toledo
diff --git a/dvbv5_isdb-t/br-pr-TresBarrasDoParana b/isdb-t/br-pr-TresBarrasDoParana
index 90ebf0e3..90ebf0e3 100644
--- a/dvbv5_isdb-t/br-pr-TresBarrasDoParana
+++ b/isdb-t/br-pr-TresBarrasDoParana
diff --git a/dvbv5_isdb-t/br-pr-Tupassi b/isdb-t/br-pr-Tupassi
index 31a4ed63..31a4ed63 100644
--- a/dvbv5_isdb-t/br-pr-Tupassi
+++ b/isdb-t/br-pr-Tupassi
diff --git a/dvbv5_isdb-t/br-pr-Ubirata b/isdb-t/br-pr-Ubirata
index 4310fc2a..4310fc2a 100644
--- a/dvbv5_isdb-t/br-pr-Ubirata
+++ b/isdb-t/br-pr-Ubirata
diff --git a/dvbv5_isdb-t/br-pr-Umuarama b/isdb-t/br-pr-Umuarama
index 21136907..21136907 100644
--- a/dvbv5_isdb-t/br-pr-Umuarama
+++ b/isdb-t/br-pr-Umuarama
diff --git a/dvbv5_isdb-t/br-pr-Vere b/isdb-t/br-pr-Vere
index 785d366a..785d366a 100644
--- a/dvbv5_isdb-t/br-pr-Vere
+++ b/isdb-t/br-pr-Vere
diff --git a/dvbv5_isdb-t/br-rj-AngraDosReis b/isdb-t/br-rj-AngraDosReis
index d526d745..d526d745 100644
--- a/dvbv5_isdb-t/br-rj-AngraDosReis
+++ b/isdb-t/br-rj-AngraDosReis
diff --git a/dvbv5_isdb-t/br-rj-Araruama b/isdb-t/br-rj-Araruama
index 4ee5655e..4ee5655e 100644
--- a/dvbv5_isdb-t/br-rj-Araruama
+++ b/isdb-t/br-rj-Araruama
diff --git a/dvbv5_isdb-t/br-rj-ArraialDoCabo b/isdb-t/br-rj-ArraialDoCabo
index 9c4cc3c6..9c4cc3c6 100644
--- a/dvbv5_isdb-t/br-rj-ArraialDoCabo
+++ b/isdb-t/br-rj-ArraialDoCabo
diff --git a/dvbv5_isdb-t/br-rj-BarraMansa b/isdb-t/br-rj-BarraMansa
index d36125a0..d36125a0 100644
--- a/dvbv5_isdb-t/br-rj-BarraMansa
+++ b/isdb-t/br-rj-BarraMansa
diff --git a/dvbv5_isdb-t/br-rj-CaboFrio b/isdb-t/br-rj-CaboFrio
index f05482aa..f05482aa 100644
--- a/dvbv5_isdb-t/br-rj-CaboFrio
+++ b/isdb-t/br-rj-CaboFrio
diff --git a/dvbv5_isdb-t/br-rj-CamposDosGoytacazes b/isdb-t/br-rj-CamposDosGoytacazes
index 67713af4..67713af4 100644
--- a/dvbv5_isdb-t/br-rj-CamposDosGoytacazes
+++ b/isdb-t/br-rj-CamposDosGoytacazes
diff --git a/dvbv5_isdb-t/br-rj-DuqueDeCaxias b/isdb-t/br-rj-DuqueDeCaxias
index d86bb130..d86bb130 100644
--- a/dvbv5_isdb-t/br-rj-DuqueDeCaxias
+++ b/isdb-t/br-rj-DuqueDeCaxias
diff --git a/dvbv5_isdb-t/br-rj-Itaguai b/isdb-t/br-rj-Itaguai
index e0334b21..e0334b21 100644
--- a/dvbv5_isdb-t/br-rj-Itaguai
+++ b/isdb-t/br-rj-Itaguai
diff --git a/dvbv5_isdb-t/br-rj-Itaperuna b/isdb-t/br-rj-Itaperuna
index 836ca073..836ca073 100644
--- a/dvbv5_isdb-t/br-rj-Itaperuna
+++ b/isdb-t/br-rj-Itaperuna
diff --git a/dvbv5_isdb-t/br-rj-Itatiaia b/isdb-t/br-rj-Itatiaia
index 422acc64..422acc64 100644
--- a/dvbv5_isdb-t/br-rj-Itatiaia
+++ b/isdb-t/br-rj-Itatiaia
diff --git a/dvbv5_isdb-t/br-rj-Macae b/isdb-t/br-rj-Macae
index 011ff2cc..011ff2cc 100644
--- a/dvbv5_isdb-t/br-rj-Macae
+++ b/isdb-t/br-rj-Macae
diff --git a/dvbv5_isdb-t/br-rj-Marica b/isdb-t/br-rj-Marica
index 48b51e8c..48b51e8c 100644
--- a/dvbv5_isdb-t/br-rj-Marica
+++ b/isdb-t/br-rj-Marica
diff --git a/dvbv5_isdb-t/br-rj-NovaFriburgo b/isdb-t/br-rj-NovaFriburgo
index 15885a8f..15885a8f 100644
--- a/dvbv5_isdb-t/br-rj-NovaFriburgo
+++ b/isdb-t/br-rj-NovaFriburgo
diff --git a/dvbv5_isdb-t/br-rj-NovaIguacu b/isdb-t/br-rj-NovaIguacu
index ed0d7a49..ed0d7a49 100644
--- a/dvbv5_isdb-t/br-rj-NovaIguacu
+++ b/isdb-t/br-rj-NovaIguacu
diff --git a/dvbv5_isdb-t/br-rj-Queimados b/isdb-t/br-rj-Queimados
index e7d69cd4..e7d69cd4 100644
--- a/dvbv5_isdb-t/br-rj-Queimados
+++ b/isdb-t/br-rj-Queimados
diff --git a/dvbv5_isdb-t/br-rj-Quissama b/isdb-t/br-rj-Quissama
index ab7c1a32..ab7c1a32 100644
--- a/dvbv5_isdb-t/br-rj-Quissama
+++ b/isdb-t/br-rj-Quissama
diff --git a/dvbv5_isdb-t/br-rj-Resende b/isdb-t/br-rj-Resende
index 70cea446..70cea446 100644
--- a/dvbv5_isdb-t/br-rj-Resende
+++ b/isdb-t/br-rj-Resende
diff --git a/dvbv5_isdb-t/br-rj-RioBonito b/isdb-t/br-rj-RioBonito
index a0a50106..a0a50106 100644
--- a/dvbv5_isdb-t/br-rj-RioBonito
+++ b/isdb-t/br-rj-RioBonito
diff --git a/dvbv5_isdb-t/br-rj-RioDasOstras b/isdb-t/br-rj-RioDasOstras
index de0aa5eb..de0aa5eb 100644
--- a/dvbv5_isdb-t/br-rj-RioDasOstras
+++ b/isdb-t/br-rj-RioDasOstras
diff --git a/dvbv5_isdb-t/br-rj-RioDeJaneiro b/isdb-t/br-rj-RioDeJaneiro
index 221a158b..221a158b 100644
--- a/dvbv5_isdb-t/br-rj-RioDeJaneiro
+++ b/isdb-t/br-rj-RioDeJaneiro
diff --git a/dvbv5_isdb-t/br-rj-SaoGoncalo b/isdb-t/br-rj-SaoGoncalo
index cb449ee8..cb449ee8 100644
--- a/dvbv5_isdb-t/br-rj-SaoGoncalo
+++ b/isdb-t/br-rj-SaoGoncalo
diff --git a/dvbv5_isdb-t/br-rj-SaoJoaoDaBarra b/isdb-t/br-rj-SaoJoaoDaBarra
index fe35cab4..fe35cab4 100644
--- a/dvbv5_isdb-t/br-rj-SaoJoaoDaBarra
+++ b/isdb-t/br-rj-SaoJoaoDaBarra
diff --git a/dvbv5_isdb-t/br-rj-SaoJoaoDeMeriti b/isdb-t/br-rj-SaoJoaoDeMeriti
index f3f9dbc0..f3f9dbc0 100644
--- a/dvbv5_isdb-t/br-rj-SaoJoaoDeMeriti
+++ b/isdb-t/br-rj-SaoJoaoDeMeriti
diff --git a/dvbv5_isdb-t/br-rj-SaoPedroDaAldeia b/isdb-t/br-rj-SaoPedroDaAldeia
index a26ffa27..a26ffa27 100644
--- a/dvbv5_isdb-t/br-rj-SaoPedroDaAldeia
+++ b/isdb-t/br-rj-SaoPedroDaAldeia
diff --git a/dvbv5_isdb-t/br-rj-Saquarema b/isdb-t/br-rj-Saquarema
index d56409b3..d56409b3 100644
--- a/dvbv5_isdb-t/br-rj-Saquarema
+++ b/isdb-t/br-rj-Saquarema
diff --git a/dvbv5_isdb-t/br-rj-SilvaJardim b/isdb-t/br-rj-SilvaJardim
index 2ca1d016..2ca1d016 100644
--- a/dvbv5_isdb-t/br-rj-SilvaJardim
+++ b/isdb-t/br-rj-SilvaJardim
diff --git a/dvbv5_isdb-t/br-rj-TrajanoDeMorais b/isdb-t/br-rj-TrajanoDeMorais
index 1f66c341..1f66c341 100644
--- a/dvbv5_isdb-t/br-rj-TrajanoDeMorais
+++ b/isdb-t/br-rj-TrajanoDeMorais
diff --git a/dvbv5_isdb-t/br-rj-TresRios b/isdb-t/br-rj-TresRios
index 98c10361..98c10361 100644
--- a/dvbv5_isdb-t/br-rj-TresRios
+++ b/isdb-t/br-rj-TresRios
diff --git a/dvbv5_isdb-t/br-rj-VoltaRedonda b/isdb-t/br-rj-VoltaRedonda
index f1c752d6..f1c752d6 100644
--- a/dvbv5_isdb-t/br-rj-VoltaRedonda
+++ b/isdb-t/br-rj-VoltaRedonda
diff --git a/dvbv5_isdb-t/br-rn-Extremoz b/isdb-t/br-rn-Extremoz
index 22313673..22313673 100644
--- a/dvbv5_isdb-t/br-rn-Extremoz
+++ b/isdb-t/br-rn-Extremoz
diff --git a/dvbv5_isdb-t/br-rn-Macaiba b/isdb-t/br-rn-Macaiba
index 754ebd84..754ebd84 100644
--- a/dvbv5_isdb-t/br-rn-Macaiba
+++ b/isdb-t/br-rn-Macaiba
diff --git a/dvbv5_isdb-t/br-rn-Mossoro b/isdb-t/br-rn-Mossoro
index 3f6c790a..3f6c790a 100644
--- a/dvbv5_isdb-t/br-rn-Mossoro
+++ b/isdb-t/br-rn-Mossoro
diff --git a/dvbv5_isdb-t/br-rn-Natal b/isdb-t/br-rn-Natal
index d45771d5..d45771d5 100644
--- a/dvbv5_isdb-t/br-rn-Natal
+++ b/isdb-t/br-rn-Natal
diff --git a/dvbv5_isdb-t/br-rn-SaoJoseDeMipibu b/isdb-t/br-rn-SaoJoseDeMipibu
index 2287ab29..2287ab29 100644
--- a/dvbv5_isdb-t/br-rn-SaoJoseDeMipibu
+++ b/isdb-t/br-rn-SaoJoseDeMipibu
diff --git a/dvbv5_isdb-t/br-rn-SenadorEloiDeSousa b/isdb-t/br-rn-SenadorEloiDeSousa
index 97304706..97304706 100644
--- a/dvbv5_isdb-t/br-rn-SenadorEloiDeSousa
+++ b/isdb-t/br-rn-SenadorEloiDeSousa
diff --git a/dvbv5_isdb-t/br-ro-Ariquemes b/isdb-t/br-ro-Ariquemes
index be42b8f2..be42b8f2 100644
--- a/dvbv5_isdb-t/br-ro-Ariquemes
+++ b/isdb-t/br-ro-Ariquemes
diff --git a/dvbv5_isdb-t/br-ro-Cacoal b/isdb-t/br-ro-Cacoal
index 652fde26..652fde26 100644
--- a/dvbv5_isdb-t/br-ro-Cacoal
+++ b/isdb-t/br-ro-Cacoal
diff --git a/dvbv5_isdb-t/br-ro-Jiparana b/isdb-t/br-ro-Jiparana
index 7ead05be..7ead05be 100644
--- a/dvbv5_isdb-t/br-ro-Jiparana
+++ b/isdb-t/br-ro-Jiparana
diff --git a/dvbv5_isdb-t/br-ro-PimentaBueno b/isdb-t/br-ro-PimentaBueno
index 086bb054..086bb054 100644
--- a/dvbv5_isdb-t/br-ro-PimentaBueno
+++ b/isdb-t/br-ro-PimentaBueno
diff --git a/dvbv5_isdb-t/br-ro-PortoVelho b/isdb-t/br-ro-PortoVelho
index ab681a13..ab681a13 100644
--- a/dvbv5_isdb-t/br-ro-PortoVelho
+++ b/isdb-t/br-ro-PortoVelho
diff --git a/dvbv5_isdb-t/br-rr-BoaVista b/isdb-t/br-rr-BoaVista
index 12fae306..12fae306 100644
--- a/dvbv5_isdb-t/br-rr-BoaVista
+++ b/isdb-t/br-rr-BoaVista
diff --git a/dvbv5_isdb-t/br-rs-Alegrete b/isdb-t/br-rs-Alegrete
index 44a22f10..44a22f10 100644
--- a/dvbv5_isdb-t/br-rs-Alegrete
+++ b/isdb-t/br-rs-Alegrete
diff --git a/dvbv5_isdb-t/br-rs-ArroioDoSal b/isdb-t/br-rs-ArroioDoSal
index 96b3ad22..96b3ad22 100644
--- a/dvbv5_isdb-t/br-rs-ArroioDoSal
+++ b/isdb-t/br-rs-ArroioDoSal
diff --git a/dvbv5_isdb-t/br-rs-Bage b/isdb-t/br-rs-Bage
index 34ae98c9..34ae98c9 100644
--- a/dvbv5_isdb-t/br-rs-Bage
+++ b/isdb-t/br-rs-Bage
diff --git a/dvbv5_isdb-t/br-rs-BentoGoncalves b/isdb-t/br-rs-BentoGoncalves
index 21b18f8c..21b18f8c 100644
--- a/dvbv5_isdb-t/br-rs-BentoGoncalves
+++ b/isdb-t/br-rs-BentoGoncalves
diff --git a/dvbv5_isdb-t/br-rs-CachoeiraDoSul b/isdb-t/br-rs-CachoeiraDoSul
index 034c4861..034c4861 100644
--- a/dvbv5_isdb-t/br-rs-CachoeiraDoSul
+++ b/isdb-t/br-rs-CachoeiraDoSul
diff --git a/dvbv5_isdb-t/br-rs-Camaqua b/isdb-t/br-rs-Camaqua
index 8af9e38f..8af9e38f 100644
--- a/dvbv5_isdb-t/br-rs-Camaqua
+++ b/isdb-t/br-rs-Camaqua
diff --git a/dvbv5_isdb-t/br-rs-CampoBom b/isdb-t/br-rs-CampoBom
index fa696410..fa696410 100644
--- a/dvbv5_isdb-t/br-rs-CampoBom
+++ b/isdb-t/br-rs-CampoBom
diff --git a/dvbv5_isdb-t/br-rs-Candelaria b/isdb-t/br-rs-Candelaria
index be327656..be327656 100644
--- a/dvbv5_isdb-t/br-rs-Candelaria
+++ b/isdb-t/br-rs-Candelaria
diff --git a/dvbv5_isdb-t/br-rs-Canela b/isdb-t/br-rs-Canela
index 03922954..03922954 100644
--- a/dvbv5_isdb-t/br-rs-Canela
+++ b/isdb-t/br-rs-Canela
diff --git a/dvbv5_isdb-t/br-rs-Cangucu b/isdb-t/br-rs-Cangucu
index a740b830..a740b830 100644
--- a/dvbv5_isdb-t/br-rs-Cangucu
+++ b/isdb-t/br-rs-Cangucu
diff --git a/dvbv5_isdb-t/br-rs-CapaoDaCanoa b/isdb-t/br-rs-CapaoDaCanoa
index 655361ee..655361ee 100644
--- a/dvbv5_isdb-t/br-rs-CapaoDaCanoa
+++ b/isdb-t/br-rs-CapaoDaCanoa
diff --git a/dvbv5_isdb-t/br-rs-CapaoDoLeao b/isdb-t/br-rs-CapaoDoLeao
index 8edf6c47..8edf6c47 100644
--- a/dvbv5_isdb-t/br-rs-CapaoDoLeao
+++ b/isdb-t/br-rs-CapaoDoLeao
diff --git a/dvbv5_isdb-t/br-rs-Carazinho b/isdb-t/br-rs-Carazinho
index 2b49c8a8..2b49c8a8 100644
--- a/dvbv5_isdb-t/br-rs-Carazinho
+++ b/isdb-t/br-rs-Carazinho
diff --git a/dvbv5_isdb-t/br-rs-CarlosBarbosa b/isdb-t/br-rs-CarlosBarbosa
index eea4ea3f..eea4ea3f 100644
--- a/dvbv5_isdb-t/br-rs-CarlosBarbosa
+++ b/isdb-t/br-rs-CarlosBarbosa
diff --git a/dvbv5_isdb-t/br-rs-CaxiasDoSul b/isdb-t/br-rs-CaxiasDoSul
index e1563024..e1563024 100644
--- a/dvbv5_isdb-t/br-rs-CaxiasDoSul
+++ b/isdb-t/br-rs-CaxiasDoSul
diff --git a/dvbv5_isdb-t/br-rs-Cidreira b/isdb-t/br-rs-Cidreira
index 9c354a94..9c354a94 100644
--- a/dvbv5_isdb-t/br-rs-Cidreira
+++ b/isdb-t/br-rs-Cidreira
diff --git a/dvbv5_isdb-t/br-rs-CruzAlta b/isdb-t/br-rs-CruzAlta
index e28b6303..e28b6303 100644
--- a/dvbv5_isdb-t/br-rs-CruzAlta
+++ b/isdb-t/br-rs-CruzAlta
diff --git a/dvbv5_isdb-t/br-rs-DomPedroDeAlcantara b/isdb-t/br-rs-DomPedroDeAlcantara
index ddb0f3ad..ddb0f3ad 100644
--- a/dvbv5_isdb-t/br-rs-DomPedroDeAlcantara
+++ b/isdb-t/br-rs-DomPedroDeAlcantara
diff --git a/dvbv5_isdb-t/br-rs-Erechim b/isdb-t/br-rs-Erechim
index 96839c4d..96839c4d 100644
--- a/dvbv5_isdb-t/br-rs-Erechim
+++ b/isdb-t/br-rs-Erechim
diff --git a/dvbv5_isdb-t/br-rs-Estrela b/isdb-t/br-rs-Estrela
index 1f1dbefe..1f1dbefe 100644
--- a/dvbv5_isdb-t/br-rs-Estrela
+++ b/isdb-t/br-rs-Estrela
diff --git a/dvbv5_isdb-t/br-rs-Farroupilha b/isdb-t/br-rs-Farroupilha
index 42bd4cb8..42bd4cb8 100644
--- a/dvbv5_isdb-t/br-rs-Farroupilha
+++ b/isdb-t/br-rs-Farroupilha
diff --git a/dvbv5_isdb-t/br-rs-Feliz b/isdb-t/br-rs-Feliz
index ec8b896b..ec8b896b 100644
--- a/dvbv5_isdb-t/br-rs-Feliz
+++ b/isdb-t/br-rs-Feliz
diff --git a/dvbv5_isdb-t/br-rs-FloresDaCunha b/isdb-t/br-rs-FloresDaCunha
index 4acf2d24..4acf2d24 100644
--- a/dvbv5_isdb-t/br-rs-FloresDaCunha
+++ b/isdb-t/br-rs-FloresDaCunha
diff --git a/dvbv5_isdb-t/br-rs-Gramado b/isdb-t/br-rs-Gramado
index df594179..df594179 100644
--- a/dvbv5_isdb-t/br-rs-Gramado
+++ b/isdb-t/br-rs-Gramado
diff --git a/dvbv5_isdb-t/br-rs-Ijui b/isdb-t/br-rs-Ijui
index d2208571..d2208571 100644
--- a/dvbv5_isdb-t/br-rs-Ijui
+++ b/isdb-t/br-rs-Ijui
diff --git a/dvbv5_isdb-t/br-rs-Lajeado b/isdb-t/br-rs-Lajeado
index 6e1bb166..6e1bb166 100644
--- a/dvbv5_isdb-t/br-rs-Lajeado
+++ b/isdb-t/br-rs-Lajeado
diff --git a/dvbv5_isdb-t/br-rs-MonteAlegreDosCampos b/isdb-t/br-rs-MonteAlegreDosCampos
index b4db8872..b4db8872 100644
--- a/dvbv5_isdb-t/br-rs-MonteAlegreDosCampos
+++ b/isdb-t/br-rs-MonteAlegreDosCampos
diff --git a/dvbv5_isdb-t/br-rs-Montenegro b/isdb-t/br-rs-Montenegro
index c41d58b7..c41d58b7 100644
--- a/dvbv5_isdb-t/br-rs-Montenegro
+++ b/isdb-t/br-rs-Montenegro
diff --git a/dvbv5_isdb-t/br-rs-MorroRedondo b/isdb-t/br-rs-MorroRedondo
index d25c904c..d25c904c 100644
--- a/dvbv5_isdb-t/br-rs-MorroRedondo
+++ b/isdb-t/br-rs-MorroRedondo
diff --git a/dvbv5_isdb-t/br-rs-NovaPetropolis b/isdb-t/br-rs-NovaPetropolis
index 58cf8551..58cf8551 100644
--- a/dvbv5_isdb-t/br-rs-NovaPetropolis
+++ b/isdb-t/br-rs-NovaPetropolis
diff --git a/dvbv5_isdb-t/br-rs-NovaSantaRita b/isdb-t/br-rs-NovaSantaRita
index 4840e6de..4840e6de 100644
--- a/dvbv5_isdb-t/br-rs-NovaSantaRita
+++ b/isdb-t/br-rs-NovaSantaRita
diff --git a/dvbv5_isdb-t/br-rs-NovoHamburgo b/isdb-t/br-rs-NovoHamburgo
index 9db263a4..9db263a4 100644
--- a/dvbv5_isdb-t/br-rs-NovoHamburgo
+++ b/isdb-t/br-rs-NovoHamburgo
diff --git a/dvbv5_isdb-t/br-rs-Osorio b/isdb-t/br-rs-Osorio
index 61f47fef..61f47fef 100644
--- a/dvbv5_isdb-t/br-rs-Osorio
+++ b/isdb-t/br-rs-Osorio
diff --git a/dvbv5_isdb-t/br-rs-PalmaresDoSul b/isdb-t/br-rs-PalmaresDoSul
index bb17fdeb..bb17fdeb 100644
--- a/dvbv5_isdb-t/br-rs-PalmaresDoSul
+++ b/isdb-t/br-rs-PalmaresDoSul
diff --git a/dvbv5_isdb-t/br-rs-ParaisoDoSul b/isdb-t/br-rs-ParaisoDoSul
index 3face297..3face297 100644
--- a/dvbv5_isdb-t/br-rs-ParaisoDoSul
+++ b/isdb-t/br-rs-ParaisoDoSul
diff --git a/dvbv5_isdb-t/br-rs-PassoFundo b/isdb-t/br-rs-PassoFundo
index 50965ba0..50965ba0 100644
--- a/dvbv5_isdb-t/br-rs-PassoFundo
+++ b/isdb-t/br-rs-PassoFundo
diff --git a/dvbv5_isdb-t/br-rs-Pelotas b/isdb-t/br-rs-Pelotas
index 8ac6f644..8ac6f644 100644
--- a/dvbv5_isdb-t/br-rs-Pelotas
+++ b/isdb-t/br-rs-Pelotas
diff --git a/dvbv5_isdb-t/br-rs-PicadaCafe b/isdb-t/br-rs-PicadaCafe
index f4e4292a..f4e4292a 100644
--- a/dvbv5_isdb-t/br-rs-PicadaCafe
+++ b/isdb-t/br-rs-PicadaCafe
diff --git a/dvbv5_isdb-t/br-rs-PortoAlegre b/isdb-t/br-rs-PortoAlegre
index a9543bde..a9543bde 100644
--- a/dvbv5_isdb-t/br-rs-PortoAlegre
+++ b/isdb-t/br-rs-PortoAlegre
diff --git a/dvbv5_isdb-t/br-rs-RioGrande b/isdb-t/br-rs-RioGrande
index b07dd277..b07dd277 100644
--- a/dvbv5_isdb-t/br-rs-RioGrande
+++ b/isdb-t/br-rs-RioGrande
diff --git a/dvbv5_isdb-t/br-rs-RioGrandeCassino b/isdb-t/br-rs-RioGrandeCassino
index 3927ed4b..3927ed4b 100644
--- a/dvbv5_isdb-t/br-rs-RioGrandeCassino
+++ b/isdb-t/br-rs-RioGrandeCassino
diff --git a/dvbv5_isdb-t/br-rs-SalvadorDoSul b/isdb-t/br-rs-SalvadorDoSul
index df7af786..df7af786 100644
--- a/dvbv5_isdb-t/br-rs-SalvadorDoSul
+++ b/isdb-t/br-rs-SalvadorDoSul
diff --git a/dvbv5_isdb-t/br-rs-Sananduva b/isdb-t/br-rs-Sananduva
index 864fc089..864fc089 100644
--- a/dvbv5_isdb-t/br-rs-Sananduva
+++ b/isdb-t/br-rs-Sananduva
diff --git a/dvbv5_isdb-t/br-rs-SantaCruzDoSul b/isdb-t/br-rs-SantaCruzDoSul
index 9ee36514..9ee36514 100644
--- a/dvbv5_isdb-t/br-rs-SantaCruzDoSul
+++ b/isdb-t/br-rs-SantaCruzDoSul
diff --git a/dvbv5_isdb-t/br-rs-SantaMaria b/isdb-t/br-rs-SantaMaria
index 6597bab2..6597bab2 100644
--- a/dvbv5_isdb-t/br-rs-SantaMaria
+++ b/isdb-t/br-rs-SantaMaria
diff --git a/dvbv5_isdb-t/br-rs-SantaRosa b/isdb-t/br-rs-SantaRosa
index 97708ec9..97708ec9 100644
--- a/dvbv5_isdb-t/br-rs-SantaRosa
+++ b/isdb-t/br-rs-SantaRosa
diff --git a/dvbv5_isdb-t/br-rs-SantanaDoLivramento b/isdb-t/br-rs-SantanaDoLivramento
index c1faf15c..c1faf15c 100644
--- a/dvbv5_isdb-t/br-rs-SantanaDoLivramento
+++ b/isdb-t/br-rs-SantanaDoLivramento
diff --git a/dvbv5_isdb-t/br-rs-SantoAngelo b/isdb-t/br-rs-SantoAngelo
index 92e1d928..92e1d928 100644
--- a/dvbv5_isdb-t/br-rs-SantoAngelo
+++ b/isdb-t/br-rs-SantoAngelo
diff --git a/dvbv5_isdb-t/br-rs-SantoAntonioDaPatrulha b/isdb-t/br-rs-SantoAntonioDaPatrulha
index 08cbfa4d..08cbfa4d 100644
--- a/dvbv5_isdb-t/br-rs-SantoAntonioDaPatrulha
+++ b/isdb-t/br-rs-SantoAntonioDaPatrulha
diff --git a/dvbv5_isdb-t/br-rs-SaoBorja b/isdb-t/br-rs-SaoBorja
index b9177711..b9177711 100644
--- a/dvbv5_isdb-t/br-rs-SaoBorja
+++ b/isdb-t/br-rs-SaoBorja
diff --git a/dvbv5_isdb-t/br-rs-SaoGabriel b/isdb-t/br-rs-SaoGabriel
index 9339b189..9339b189 100644
--- a/dvbv5_isdb-t/br-rs-SaoGabriel
+++ b/isdb-t/br-rs-SaoGabriel
diff --git a/dvbv5_isdb-t/br-rs-SaoJoseDoNorte b/isdb-t/br-rs-SaoJoseDoNorte
index 7119993f..7119993f 100644
--- a/dvbv5_isdb-t/br-rs-SaoJoseDoNorte
+++ b/isdb-t/br-rs-SaoJoseDoNorte
diff --git a/dvbv5_isdb-t/br-rs-SaoSepe b/isdb-t/br-rs-SaoSepe
index 63da3085..63da3085 100644
--- a/dvbv5_isdb-t/br-rs-SaoSepe
+++ b/isdb-t/br-rs-SaoSepe
diff --git a/dvbv5_isdb-t/br-rs-Sapiranga b/isdb-t/br-rs-Sapiranga
index fe4a478c..fe4a478c 100644
--- a/dvbv5_isdb-t/br-rs-Sapiranga
+++ b/isdb-t/br-rs-Sapiranga
diff --git a/dvbv5_isdb-t/br-rs-Sertao b/isdb-t/br-rs-Sertao
index 7c281f2f..7c281f2f 100644
--- a/dvbv5_isdb-t/br-rs-Sertao
+++ b/isdb-t/br-rs-Sertao
diff --git a/dvbv5_isdb-t/br-rs-Taquara b/isdb-t/br-rs-Taquara
index 4df5c731..4df5c731 100644
--- a/dvbv5_isdb-t/br-rs-Taquara
+++ b/isdb-t/br-rs-Taquara
diff --git a/dvbv5_isdb-t/br-rs-TerraDeAreia b/isdb-t/br-rs-TerraDeAreia
index fe3f04f2..fe3f04f2 100644
--- a/dvbv5_isdb-t/br-rs-TerraDeAreia
+++ b/isdb-t/br-rs-TerraDeAreia
diff --git a/dvbv5_isdb-t/br-rs-Torres b/isdb-t/br-rs-Torres
index 4b446d50..4b446d50 100644
--- a/dvbv5_isdb-t/br-rs-Torres
+++ b/isdb-t/br-rs-Torres
diff --git a/dvbv5_isdb-t/br-rs-Tramandai b/isdb-t/br-rs-Tramandai
index 70942174..70942174 100644
--- a/dvbv5_isdb-t/br-rs-Tramandai
+++ b/isdb-t/br-rs-Tramandai
diff --git a/dvbv5_isdb-t/br-rs-TresCachoeiras b/isdb-t/br-rs-TresCachoeiras
index 11a67dd5..11a67dd5 100644
--- a/dvbv5_isdb-t/br-rs-TresCachoeiras
+++ b/isdb-t/br-rs-TresCachoeiras
diff --git a/dvbv5_isdb-t/br-rs-TresCoroas b/isdb-t/br-rs-TresCoroas
index e6b16290..e6b16290 100644
--- a/dvbv5_isdb-t/br-rs-TresCoroas
+++ b/isdb-t/br-rs-TresCoroas
diff --git a/dvbv5_isdb-t/br-rs-TresDeMaio b/isdb-t/br-rs-TresDeMaio
index febb6aa3..febb6aa3 100644
--- a/dvbv5_isdb-t/br-rs-TresDeMaio
+++ b/isdb-t/br-rs-TresDeMaio
diff --git a/dvbv5_isdb-t/br-rs-Triunfo b/isdb-t/br-rs-Triunfo
index 0ca9fd45..0ca9fd45 100644
--- a/dvbv5_isdb-t/br-rs-Triunfo
+++ b/isdb-t/br-rs-Triunfo
diff --git a/dvbv5_isdb-t/br-rs-Tucunduva b/isdb-t/br-rs-Tucunduva
index 0e43fa16..0e43fa16 100644
--- a/dvbv5_isdb-t/br-rs-Tucunduva
+++ b/isdb-t/br-rs-Tucunduva
diff --git a/dvbv5_isdb-t/br-rs-Uruguaiana b/isdb-t/br-rs-Uruguaiana
index 6e6422ab..6e6422ab 100644
--- a/dvbv5_isdb-t/br-rs-Uruguaiana
+++ b/isdb-t/br-rs-Uruguaiana
diff --git a/dvbv5_isdb-t/br-rs-Vacaria b/isdb-t/br-rs-Vacaria
index 7cc4ca6f..7cc4ca6f 100644
--- a/dvbv5_isdb-t/br-rs-Vacaria
+++ b/isdb-t/br-rs-Vacaria
diff --git a/dvbv5_isdb-t/br-rs-VenancioAires b/isdb-t/br-rs-VenancioAires
index a96543da..a96543da 100644
--- a/dvbv5_isdb-t/br-rs-VenancioAires
+++ b/isdb-t/br-rs-VenancioAires
diff --git a/dvbv5_isdb-t/br-rs-VilaNovaDoSul b/isdb-t/br-rs-VilaNovaDoSul
index f50918f0..f50918f0 100644
--- a/dvbv5_isdb-t/br-rs-VilaNovaDoSul
+++ b/isdb-t/br-rs-VilaNovaDoSul
diff --git a/dvbv5_isdb-t/br-rs-Xangrila b/isdb-t/br-rs-Xangrila
index fc6e77b3..fc6e77b3 100644
--- a/dvbv5_isdb-t/br-rs-Xangrila
+++ b/isdb-t/br-rs-Xangrila
diff --git a/dvbv5_isdb-t/br-sc-Agronomica b/isdb-t/br-sc-Agronomica
index 0017983d..0017983d 100644
--- a/dvbv5_isdb-t/br-sc-Agronomica
+++ b/isdb-t/br-sc-Agronomica
diff --git a/dvbv5_isdb-t/br-sc-AguasMornas b/isdb-t/br-sc-AguasMornas
index a712ad27..a712ad27 100644
--- a/dvbv5_isdb-t/br-sc-AguasMornas
+++ b/isdb-t/br-sc-AguasMornas
diff --git a/dvbv5_isdb-t/br-sc-AntonioCarlos b/isdb-t/br-sc-AntonioCarlos
index f31eb4ca..f31eb4ca 100644
--- a/dvbv5_isdb-t/br-sc-AntonioCarlos
+++ b/isdb-t/br-sc-AntonioCarlos
diff --git a/dvbv5_isdb-t/br-sc-Ararangua b/isdb-t/br-sc-Ararangua
index 62371323..62371323 100644
--- a/dvbv5_isdb-t/br-sc-Ararangua
+++ b/isdb-t/br-sc-Ararangua
diff --git a/dvbv5_isdb-t/br-sc-Aurora b/isdb-t/br-sc-Aurora
index f0967b16..f0967b16 100644
--- a/dvbv5_isdb-t/br-sc-Aurora
+++ b/isdb-t/br-sc-Aurora
diff --git a/dvbv5_isdb-t/br-sc-BalnearioCamboriu b/isdb-t/br-sc-BalnearioCamboriu
index 4cb85076..4cb85076 100644
--- a/dvbv5_isdb-t/br-sc-BalnearioCamboriu
+++ b/isdb-t/br-sc-BalnearioCamboriu
diff --git a/dvbv5_isdb-t/br-sc-BarraVelha b/isdb-t/br-sc-BarraVelha
index 6b648881..6b648881 100644
--- a/dvbv5_isdb-t/br-sc-BarraVelha
+++ b/isdb-t/br-sc-BarraVelha
diff --git a/dvbv5_isdb-t/br-sc-Blumenau b/isdb-t/br-sc-Blumenau
index a2a27fa8..a2a27fa8 100644
--- a/dvbv5_isdb-t/br-sc-Blumenau
+++ b/isdb-t/br-sc-Blumenau
diff --git a/dvbv5_isdb-t/br-sc-Brusque b/isdb-t/br-sc-Brusque
index bc600000..bc600000 100644
--- a/dvbv5_isdb-t/br-sc-Brusque
+++ b/isdb-t/br-sc-Brusque
diff --git a/dvbv5_isdb-t/br-sc-Cacador b/isdb-t/br-sc-Cacador
index 8da453bf..8da453bf 100644
--- a/dvbv5_isdb-t/br-sc-Cacador
+++ b/isdb-t/br-sc-Cacador
diff --git a/dvbv5_isdb-t/br-sc-Canoinhas b/isdb-t/br-sc-Canoinhas
index b56416bf..b56416bf 100644
--- a/dvbv5_isdb-t/br-sc-Canoinhas
+++ b/isdb-t/br-sc-Canoinhas
diff --git a/dvbv5_isdb-t/br-sc-CapaoAlto b/isdb-t/br-sc-CapaoAlto
index 43f19298..43f19298 100644
--- a/dvbv5_isdb-t/br-sc-CapaoAlto
+++ b/isdb-t/br-sc-CapaoAlto
diff --git a/dvbv5_isdb-t/br-sc-CapivariDeBaixo b/isdb-t/br-sc-CapivariDeBaixo
index 79b10153..79b10153 100644
--- a/dvbv5_isdb-t/br-sc-CapivariDeBaixo
+++ b/isdb-t/br-sc-CapivariDeBaixo
diff --git a/dvbv5_isdb-t/br-sc-Chapeco b/isdb-t/br-sc-Chapeco
index 3dc1d833..3dc1d833 100644
--- a/dvbv5_isdb-t/br-sc-Chapeco
+++ b/isdb-t/br-sc-Chapeco
diff --git a/dvbv5_isdb-t/br-sc-Concordia b/isdb-t/br-sc-Concordia
index 49fb3d5d..49fb3d5d 100644
--- a/dvbv5_isdb-t/br-sc-Concordia
+++ b/isdb-t/br-sc-Concordia
diff --git a/dvbv5_isdb-t/br-sc-CorreiaPinto b/isdb-t/br-sc-CorreiaPinto
index b3dca616..b3dca616 100644
--- a/dvbv5_isdb-t/br-sc-CorreiaPinto
+++ b/isdb-t/br-sc-CorreiaPinto
diff --git a/dvbv5_isdb-t/br-sc-Corupa b/isdb-t/br-sc-Corupa
index 41751abe..41751abe 100644
--- a/dvbv5_isdb-t/br-sc-Corupa
+++ b/isdb-t/br-sc-Corupa
diff --git a/dvbv5_isdb-t/br-sc-Criciuma b/isdb-t/br-sc-Criciuma
index 61b53db7..61b53db7 100644
--- a/dvbv5_isdb-t/br-sc-Criciuma
+++ b/isdb-t/br-sc-Criciuma
diff --git a/dvbv5_isdb-t/br-sc-Florianopolis b/isdb-t/br-sc-Florianopolis
index 03e38139..03e38139 100644
--- a/dvbv5_isdb-t/br-sc-Florianopolis
+++ b/isdb-t/br-sc-Florianopolis
diff --git a/dvbv5_isdb-t/br-sc-FlorianopolisCanasvieiras b/isdb-t/br-sc-FlorianopolisCanasvieiras
index 1a55f9e9..1a55f9e9 100644
--- a/dvbv5_isdb-t/br-sc-FlorianopolisCanasvieiras
+++ b/isdb-t/br-sc-FlorianopolisCanasvieiras
diff --git a/dvbv5_isdb-t/br-sc-FlorianopolisIngleses b/isdb-t/br-sc-FlorianopolisIngleses
index 11e37407..11e37407 100644
--- a/dvbv5_isdb-t/br-sc-FlorianopolisIngleses
+++ b/isdb-t/br-sc-FlorianopolisIngleses
diff --git a/dvbv5_isdb-t/br-sc-Garopaba b/isdb-t/br-sc-Garopaba
index f504a6c8..f504a6c8 100644
--- a/dvbv5_isdb-t/br-sc-Garopaba
+++ b/isdb-t/br-sc-Garopaba
diff --git a/dvbv5_isdb-t/br-sc-Garuva b/isdb-t/br-sc-Garuva
index a6ca745f..a6ca745f 100644
--- a/dvbv5_isdb-t/br-sc-Garuva
+++ b/isdb-t/br-sc-Garuva
diff --git a/dvbv5_isdb-t/br-sc-Gaspar b/isdb-t/br-sc-Gaspar
index bba29eb5..bba29eb5 100644
--- a/dvbv5_isdb-t/br-sc-Gaspar
+++ b/isdb-t/br-sc-Gaspar
diff --git a/dvbv5_isdb-t/br-sc-GovernadorCelsoRamos b/isdb-t/br-sc-GovernadorCelsoRamos
index a800eeb0..a800eeb0 100644
--- a/dvbv5_isdb-t/br-sc-GovernadorCelsoRamos
+++ b/isdb-t/br-sc-GovernadorCelsoRamos
diff --git a/dvbv5_isdb-t/br-sc-Guabiruba b/isdb-t/br-sc-Guabiruba
index 9ff426af..9ff426af 100644
--- a/dvbv5_isdb-t/br-sc-Guabiruba
+++ b/isdb-t/br-sc-Guabiruba
diff --git a/dvbv5_isdb-t/br-sc-Guaramirim b/isdb-t/br-sc-Guaramirim
index b6385876..b6385876 100644
--- a/dvbv5_isdb-t/br-sc-Guaramirim
+++ b/isdb-t/br-sc-Guaramirim
diff --git a/dvbv5_isdb-t/br-sc-HervalDOeste b/isdb-t/br-sc-HervalDOeste
index 82efa228..82efa228 100644
--- a/dvbv5_isdb-t/br-sc-HervalDOeste
+++ b/isdb-t/br-sc-HervalDOeste
diff --git a/dvbv5_isdb-t/br-sc-Icara b/isdb-t/br-sc-Icara
index 9b4dee0b..9b4dee0b 100644
--- a/dvbv5_isdb-t/br-sc-Icara
+++ b/isdb-t/br-sc-Icara
diff --git a/dvbv5_isdb-t/br-sc-Itajai b/isdb-t/br-sc-Itajai
index de51dee5..de51dee5 100644
--- a/dvbv5_isdb-t/br-sc-Itajai
+++ b/isdb-t/br-sc-Itajai
diff --git a/dvbv5_isdb-t/br-sc-Itapema b/isdb-t/br-sc-Itapema
index ed023efe..ed023efe 100644
--- a/dvbv5_isdb-t/br-sc-Itapema
+++ b/isdb-t/br-sc-Itapema
diff --git a/dvbv5_isdb-t/br-sc-Itapoa b/isdb-t/br-sc-Itapoa
index 305e28b8..305e28b8 100644
--- a/dvbv5_isdb-t/br-sc-Itapoa
+++ b/isdb-t/br-sc-Itapoa
diff --git a/dvbv5_isdb-t/br-sc-JaraguaDoSul b/isdb-t/br-sc-JaraguaDoSul
index 28c89452..28c89452 100644
--- a/dvbv5_isdb-t/br-sc-JaraguaDoSul
+++ b/isdb-t/br-sc-JaraguaDoSul
diff --git a/dvbv5_isdb-t/br-sc-Joacaba b/isdb-t/br-sc-Joacaba
index 074f6adc..074f6adc 100644
--- a/dvbv5_isdb-t/br-sc-Joacaba
+++ b/isdb-t/br-sc-Joacaba
diff --git a/dvbv5_isdb-t/br-sc-Joinville b/isdb-t/br-sc-Joinville
index 4afe24d9..4afe24d9 100644
--- a/dvbv5_isdb-t/br-sc-Joinville
+++ b/isdb-t/br-sc-Joinville
diff --git a/dvbv5_isdb-t/br-sc-Lages b/isdb-t/br-sc-Lages
index 74a08162..74a08162 100644
--- a/dvbv5_isdb-t/br-sc-Lages
+++ b/isdb-t/br-sc-Lages
diff --git a/dvbv5_isdb-t/br-sc-Laguna b/isdb-t/br-sc-Laguna
index 35dafa42..35dafa42 100644
--- a/dvbv5_isdb-t/br-sc-Laguna
+++ b/isdb-t/br-sc-Laguna
diff --git a/dvbv5_isdb-t/br-sc-Laurentino b/isdb-t/br-sc-Laurentino
index f458f5f0..f458f5f0 100644
--- a/dvbv5_isdb-t/br-sc-Laurentino
+++ b/isdb-t/br-sc-Laurentino
diff --git a/dvbv5_isdb-t/br-sc-Lontras b/isdb-t/br-sc-Lontras
index 28ecd578..28ecd578 100644
--- a/dvbv5_isdb-t/br-sc-Lontras
+++ b/isdb-t/br-sc-Lontras
diff --git a/dvbv5_isdb-t/br-sc-Mafra b/isdb-t/br-sc-Mafra
index db5d9088..db5d9088 100644
--- a/dvbv5_isdb-t/br-sc-Mafra
+++ b/isdb-t/br-sc-Mafra
diff --git a/dvbv5_isdb-t/br-sc-Massaranduba b/isdb-t/br-sc-Massaranduba
index 40609166..40609166 100644
--- a/dvbv5_isdb-t/br-sc-Massaranduba
+++ b/isdb-t/br-sc-Massaranduba
diff --git a/dvbv5_isdb-t/br-sc-Navegantes b/isdb-t/br-sc-Navegantes
index 99d93d7b..99d93d7b 100644
--- a/dvbv5_isdb-t/br-sc-Navegantes
+++ b/isdb-t/br-sc-Navegantes
diff --git a/dvbv5_isdb-t/br-sc-NovaVeneza b/isdb-t/br-sc-NovaVeneza
index f91b7d72..f91b7d72 100644
--- a/dvbv5_isdb-t/br-sc-NovaVeneza
+++ b/isdb-t/br-sc-NovaVeneza
diff --git a/dvbv5_isdb-t/br-sc-Painel b/isdb-t/br-sc-Painel
index 2b5961ff..2b5961ff 100644
--- a/dvbv5_isdb-t/br-sc-Painel
+++ b/isdb-t/br-sc-Painel
diff --git a/dvbv5_isdb-t/br-sc-PassoDeTorres b/isdb-t/br-sc-PassoDeTorres
index 69358d4c..69358d4c 100644
--- a/dvbv5_isdb-t/br-sc-PassoDeTorres
+++ b/isdb-t/br-sc-PassoDeTorres
diff --git a/dvbv5_isdb-t/br-sc-Penha b/isdb-t/br-sc-Penha
index 2c87c35c..2c87c35c 100644
--- a/dvbv5_isdb-t/br-sc-Penha
+++ b/isdb-t/br-sc-Penha
diff --git a/dvbv5_isdb-t/br-sc-Picarras b/isdb-t/br-sc-Picarras
index e66170cf..e66170cf 100644
--- a/dvbv5_isdb-t/br-sc-Picarras
+++ b/isdb-t/br-sc-Picarras
diff --git a/dvbv5_isdb-t/br-sc-RioDoSul b/isdb-t/br-sc-RioDoSul
index f4ee07a9..f4ee07a9 100644
--- a/dvbv5_isdb-t/br-sc-RioDoSul
+++ b/isdb-t/br-sc-RioDoSul
diff --git a/dvbv5_isdb-t/br-sc-RioNegrinho b/isdb-t/br-sc-RioNegrinho
index b41f4d02..b41f4d02 100644
--- a/dvbv5_isdb-t/br-sc-RioNegrinho
+++ b/isdb-t/br-sc-RioNegrinho
diff --git a/dvbv5_isdb-t/br-sc-SantaRosaDoSul b/isdb-t/br-sc-SantaRosaDoSul
index ad173073..ad173073 100644
--- a/dvbv5_isdb-t/br-sc-SantaRosaDoSul
+++ b/isdb-t/br-sc-SantaRosaDoSul
diff --git a/dvbv5_isdb-t/br-sc-SantoAmaroDaImperatriz b/isdb-t/br-sc-SantoAmaroDaImperatriz
index a84f3a3b..a84f3a3b 100644
--- a/dvbv5_isdb-t/br-sc-SantoAmaroDaImperatriz
+++ b/isdb-t/br-sc-SantoAmaroDaImperatriz
diff --git a/dvbv5_isdb-t/br-sc-SaoBentoDoSul b/isdb-t/br-sc-SaoBentoDoSul
index 33f1d4b0..33f1d4b0 100644
--- a/dvbv5_isdb-t/br-sc-SaoBentoDoSul
+++ b/isdb-t/br-sc-SaoBentoDoSul
diff --git a/dvbv5_isdb-t/br-sc-Schroeder b/isdb-t/br-sc-Schroeder
index 66c1f20b..66c1f20b 100644
--- a/dvbv5_isdb-t/br-sc-Schroeder
+++ b/isdb-t/br-sc-Schroeder
diff --git a/dvbv5_isdb-t/br-sc-Sombrio b/isdb-t/br-sc-Sombrio
index 0de9962b..0de9962b 100644
--- a/dvbv5_isdb-t/br-sc-Sombrio
+++ b/isdb-t/br-sc-Sombrio
diff --git a/dvbv5_isdb-t/br-sc-Tijucas b/isdb-t/br-sc-Tijucas
index 24648d7f..24648d7f 100644
--- a/dvbv5_isdb-t/br-sc-Tijucas
+++ b/isdb-t/br-sc-Tijucas
diff --git a/dvbv5_isdb-t/br-sc-Tubarao b/isdb-t/br-sc-Tubarao
index d7e45702..d7e45702 100644
--- a/dvbv5_isdb-t/br-sc-Tubarao
+++ b/isdb-t/br-sc-Tubarao
diff --git a/dvbv5_isdb-t/br-se-Aquidaba b/isdb-t/br-se-Aquidaba
index 622e871c..622e871c 100644
--- a/dvbv5_isdb-t/br-se-Aquidaba
+++ b/isdb-t/br-se-Aquidaba
diff --git a/dvbv5_isdb-t/br-se-Aracaju b/isdb-t/br-se-Aracaju
index 4455e7dd..4455e7dd 100644
--- a/dvbv5_isdb-t/br-se-Aracaju
+++ b/isdb-t/br-se-Aracaju
diff --git a/dvbv5_isdb-t/br-se-Araua b/isdb-t/br-se-Araua
index 94022b32..94022b32 100644
--- a/dvbv5_isdb-t/br-se-Araua
+++ b/isdb-t/br-se-Araua
diff --git a/dvbv5_isdb-t/br-se-AreiaBranca b/isdb-t/br-se-AreiaBranca
index 37bef045..37bef045 100644
--- a/dvbv5_isdb-t/br-se-AreiaBranca
+++ b/isdb-t/br-se-AreiaBranca
diff --git a/dvbv5_isdb-t/br-se-BarraDosCoqueiros b/isdb-t/br-se-BarraDosCoqueiros
index b36e596f..b36e596f 100644
--- a/dvbv5_isdb-t/br-se-BarraDosCoqueiros
+++ b/isdb-t/br-se-BarraDosCoqueiros
diff --git a/dvbv5_isdb-t/br-se-Boquim b/isdb-t/br-se-Boquim
index d1216e35..d1216e35 100644
--- a/dvbv5_isdb-t/br-se-Boquim
+++ b/isdb-t/br-se-Boquim
diff --git a/dvbv5_isdb-t/br-se-CampoDoBrito b/isdb-t/br-se-CampoDoBrito
index 19729edb..19729edb 100644
--- a/dvbv5_isdb-t/br-se-CampoDoBrito
+++ b/isdb-t/br-se-CampoDoBrito
diff --git a/dvbv5_isdb-t/br-se-CanindeDeSaoFrancisco b/isdb-t/br-se-CanindeDeSaoFrancisco
index 42840be1..42840be1 100644
--- a/dvbv5_isdb-t/br-se-CanindeDeSaoFrancisco
+++ b/isdb-t/br-se-CanindeDeSaoFrancisco
diff --git a/dvbv5_isdb-t/br-se-Capela b/isdb-t/br-se-Capela
index 4fd2e02b..4fd2e02b 100644
--- a/dvbv5_isdb-t/br-se-Capela
+++ b/isdb-t/br-se-Capela
diff --git a/dvbv5_isdb-t/br-se-Carira b/isdb-t/br-se-Carira
index 4ebfab95..4ebfab95 100644
--- a/dvbv5_isdb-t/br-se-Carira
+++ b/isdb-t/br-se-Carira
diff --git a/dvbv5_isdb-t/br-se-Carmopolis b/isdb-t/br-se-Carmopolis
index 13aa4539..13aa4539 100644
--- a/dvbv5_isdb-t/br-se-Carmopolis
+++ b/isdb-t/br-se-Carmopolis
diff --git a/dvbv5_isdb-t/br-se-Cristinapolis b/isdb-t/br-se-Cristinapolis
index 4a8a9912..4a8a9912 100644
--- a/dvbv5_isdb-t/br-se-Cristinapolis
+++ b/isdb-t/br-se-Cristinapolis
diff --git a/dvbv5_isdb-t/br-se-DivinaPastora b/isdb-t/br-se-DivinaPastora
index 150a2d2d..150a2d2d 100644
--- a/dvbv5_isdb-t/br-se-DivinaPastora
+++ b/isdb-t/br-se-DivinaPastora
diff --git a/dvbv5_isdb-t/br-se-Estancia b/isdb-t/br-se-Estancia
index f3ca108e..f3ca108e 100644
--- a/dvbv5_isdb-t/br-se-Estancia
+++ b/isdb-t/br-se-Estancia
diff --git a/dvbv5_isdb-t/br-se-FeiraNova b/isdb-t/br-se-FeiraNova
index dd97b9d2..dd97b9d2 100644
--- a/dvbv5_isdb-t/br-se-FeiraNova
+++ b/isdb-t/br-se-FeiraNova
diff --git a/dvbv5_isdb-t/br-se-FreiPaulo b/isdb-t/br-se-FreiPaulo
index 024c6631..024c6631 100644
--- a/dvbv5_isdb-t/br-se-FreiPaulo
+++ b/isdb-t/br-se-FreiPaulo
diff --git a/dvbv5_isdb-t/br-se-Gararu b/isdb-t/br-se-Gararu
index ca125577..ca125577 100644
--- a/dvbv5_isdb-t/br-se-Gararu
+++ b/isdb-t/br-se-Gararu
diff --git a/dvbv5_isdb-t/br-se-GeneralMaynard b/isdb-t/br-se-GeneralMaynard
index f895dd5b..f895dd5b 100644
--- a/dvbv5_isdb-t/br-se-GeneralMaynard
+++ b/isdb-t/br-se-GeneralMaynard
diff --git a/dvbv5_isdb-t/br-se-Itabaiana b/isdb-t/br-se-Itabaiana
index 99d85bf1..99d85bf1 100644
--- a/dvbv5_isdb-t/br-se-Itabaiana
+++ b/isdb-t/br-se-Itabaiana
diff --git a/dvbv5_isdb-t/br-se-Itabaianinha b/isdb-t/br-se-Itabaianinha
index e6341ebe..e6341ebe 100644
--- a/dvbv5_isdb-t/br-se-Itabaianinha
+++ b/isdb-t/br-se-Itabaianinha
diff --git a/dvbv5_isdb-t/br-se-Itabi b/isdb-t/br-se-Itabi
index 8bee1597..8bee1597 100644
--- a/dvbv5_isdb-t/br-se-Itabi
+++ b/isdb-t/br-se-Itabi
diff --git a/dvbv5_isdb-t/br-se-ItaporangaDAjuda b/isdb-t/br-se-ItaporangaDAjuda
index ee7c1415..ee7c1415 100644
--- a/dvbv5_isdb-t/br-se-ItaporangaDAjuda
+++ b/isdb-t/br-se-ItaporangaDAjuda
diff --git a/dvbv5_isdb-t/br-se-Japaratuba b/isdb-t/br-se-Japaratuba
index 5401eb55..5401eb55 100644
--- a/dvbv5_isdb-t/br-se-Japaratuba
+++ b/isdb-t/br-se-Japaratuba
diff --git a/dvbv5_isdb-t/br-se-Lagarto b/isdb-t/br-se-Lagarto
index 608d124c..608d124c 100644
--- a/dvbv5_isdb-t/br-se-Lagarto
+++ b/isdb-t/br-se-Lagarto
diff --git a/dvbv5_isdb-t/br-se-Laranjeiras b/isdb-t/br-se-Laranjeiras
index df76603c..df76603c 100644
--- a/dvbv5_isdb-t/br-se-Laranjeiras
+++ b/isdb-t/br-se-Laranjeiras
diff --git a/dvbv5_isdb-t/br-se-Macambira b/isdb-t/br-se-Macambira
index aa91bebd..aa91bebd 100644
--- a/dvbv5_isdb-t/br-se-Macambira
+++ b/isdb-t/br-se-Macambira
diff --git a/dvbv5_isdb-t/br-se-Malhador b/isdb-t/br-se-Malhador
index 1981c4b6..1981c4b6 100644
--- a/dvbv5_isdb-t/br-se-Malhador
+++ b/isdb-t/br-se-Malhador
diff --git a/dvbv5_isdb-t/br-se-Maruim b/isdb-t/br-se-Maruim
index 1a4f37a5..1a4f37a5 100644
--- a/dvbv5_isdb-t/br-se-Maruim
+++ b/isdb-t/br-se-Maruim
diff --git a/dvbv5_isdb-t/br-se-MoitaBonita b/isdb-t/br-se-MoitaBonita
index ac474261..ac474261 100644
--- a/dvbv5_isdb-t/br-se-MoitaBonita
+++ b/isdb-t/br-se-MoitaBonita
diff --git a/dvbv5_isdb-t/br-se-MonteAlegreDeSergipe b/isdb-t/br-se-MonteAlegreDeSergipe
index 1a393a5a..1a393a5a 100644
--- a/dvbv5_isdb-t/br-se-MonteAlegreDeSergipe
+++ b/isdb-t/br-se-MonteAlegreDeSergipe
diff --git a/dvbv5_isdb-t/br-se-NossaSenhoraAparecida b/isdb-t/br-se-NossaSenhoraAparecida
index 67d4b1de..67d4b1de 100644
--- a/dvbv5_isdb-t/br-se-NossaSenhoraAparecida
+++ b/isdb-t/br-se-NossaSenhoraAparecida
diff --git a/dvbv5_isdb-t/br-se-NossaSenhoraDaGloria b/isdb-t/br-se-NossaSenhoraDaGloria
index 2c45e5e0..2c45e5e0 100644
--- a/dvbv5_isdb-t/br-se-NossaSenhoraDaGloria
+++ b/isdb-t/br-se-NossaSenhoraDaGloria
diff --git a/dvbv5_isdb-t/br-se-NossaSenhoraDoSocorro b/isdb-t/br-se-NossaSenhoraDoSocorro
index 61692952..61692952 100644
--- a/dvbv5_isdb-t/br-se-NossaSenhoraDoSocorro
+++ b/isdb-t/br-se-NossaSenhoraDoSocorro
diff --git a/dvbv5_isdb-t/br-se-Pedrinhas b/isdb-t/br-se-Pedrinhas
index a7072e66..a7072e66 100644
--- a/dvbv5_isdb-t/br-se-Pedrinhas
+++ b/isdb-t/br-se-Pedrinhas
diff --git a/dvbv5_isdb-t/br-se-PocoRedondo b/isdb-t/br-se-PocoRedondo
index 4524cf74..4524cf74 100644
--- a/dvbv5_isdb-t/br-se-PocoRedondo
+++ b/isdb-t/br-se-PocoRedondo
diff --git a/dvbv5_isdb-t/br-se-RiachaoDoDantas b/isdb-t/br-se-RiachaoDoDantas
index b927170c..b927170c 100644
--- a/dvbv5_isdb-t/br-se-RiachaoDoDantas
+++ b/isdb-t/br-se-RiachaoDoDantas
diff --git a/dvbv5_isdb-t/br-se-Riachuelo b/isdb-t/br-se-Riachuelo
index 9732dcdb..9732dcdb 100644
--- a/dvbv5_isdb-t/br-se-Riachuelo
+++ b/isdb-t/br-se-Riachuelo
diff --git a/dvbv5_isdb-t/br-se-Ribeiropolis b/isdb-t/br-se-Ribeiropolis
index 2d5a6589..2d5a6589 100644
--- a/dvbv5_isdb-t/br-se-Ribeiropolis
+++ b/isdb-t/br-se-Ribeiropolis
diff --git a/dvbv5_isdb-t/br-se-RosarioDoCatete b/isdb-t/br-se-RosarioDoCatete
index 72d66005..72d66005 100644
--- a/dvbv5_isdb-t/br-se-RosarioDoCatete
+++ b/isdb-t/br-se-RosarioDoCatete
diff --git a/dvbv5_isdb-t/br-se-Salgado b/isdb-t/br-se-Salgado
index 99cd4955..99cd4955 100644
--- a/dvbv5_isdb-t/br-se-Salgado
+++ b/isdb-t/br-se-Salgado
diff --git a/dvbv5_isdb-t/br-se-SantaLuziaDoIntanhy b/isdb-t/br-se-SantaLuziaDoIntanhy
index c4baaf2d..c4baaf2d 100644
--- a/dvbv5_isdb-t/br-se-SantaLuziaDoIntanhy
+++ b/isdb-t/br-se-SantaLuziaDoIntanhy
diff --git a/dvbv5_isdb-t/br-se-SantoAmaroDasBrotas b/isdb-t/br-se-SantoAmaroDasBrotas
index 7de40038..7de40038 100644
--- a/dvbv5_isdb-t/br-se-SantoAmaroDasBrotas
+++ b/isdb-t/br-se-SantoAmaroDasBrotas
diff --git a/dvbv5_isdb-t/br-se-SaoCristovao b/isdb-t/br-se-SaoCristovao
index 59cbf178..59cbf178 100644
--- a/dvbv5_isdb-t/br-se-SaoCristovao
+++ b/isdb-t/br-se-SaoCristovao
diff --git a/dvbv5_isdb-t/br-se-SaoDomingos b/isdb-t/br-se-SaoDomingos
index 9e7b82ec..9e7b82ec 100644
--- a/dvbv5_isdb-t/br-se-SaoDomingos
+++ b/isdb-t/br-se-SaoDomingos
diff --git a/dvbv5_isdb-t/br-se-SaoMiguelDoAleixo b/isdb-t/br-se-SaoMiguelDoAleixo
index 346b38ef..346b38ef 100644
--- a/dvbv5_isdb-t/br-se-SaoMiguelDoAleixo
+++ b/isdb-t/br-se-SaoMiguelDoAleixo
diff --git a/dvbv5_isdb-t/br-se-TomarDoGeru b/isdb-t/br-se-TomarDoGeru
index abfd8232..abfd8232 100644
--- a/dvbv5_isdb-t/br-se-TomarDoGeru
+++ b/isdb-t/br-se-TomarDoGeru
diff --git a/dvbv5_isdb-t/br-se-Umbauba b/isdb-t/br-se-Umbauba
index e2dbb4e3..e2dbb4e3 100644
--- a/dvbv5_isdb-t/br-se-Umbauba
+++ b/isdb-t/br-se-Umbauba
diff --git a/dvbv5_isdb-t/br-sp-Aguai b/isdb-t/br-sp-Aguai
index f2c2aa2a..f2c2aa2a 100644
--- a/dvbv5_isdb-t/br-sp-Aguai
+++ b/isdb-t/br-sp-Aguai
diff --git a/dvbv5_isdb-t/br-sp-AguasDeLindoia b/isdb-t/br-sp-AguasDeLindoia
index c94d83ca..c94d83ca 100644
--- a/dvbv5_isdb-t/br-sp-AguasDeLindoia
+++ b/isdb-t/br-sp-AguasDeLindoia
diff --git a/dvbv5_isdb-t/br-sp-AguasDeSaoPedro b/isdb-t/br-sp-AguasDeSaoPedro
index 0a3b901d..0a3b901d 100644
--- a/dvbv5_isdb-t/br-sp-AguasDeSaoPedro
+++ b/isdb-t/br-sp-AguasDeSaoPedro
diff --git a/dvbv5_isdb-t/br-sp-Agudos b/isdb-t/br-sp-Agudos
index 46f9ce72..46f9ce72 100644
--- a/dvbv5_isdb-t/br-sp-Agudos
+++ b/isdb-t/br-sp-Agudos
diff --git a/dvbv5_isdb-t/br-sp-Americana b/isdb-t/br-sp-Americana
index 0732de43..0732de43 100644
--- a/dvbv5_isdb-t/br-sp-Americana
+++ b/isdb-t/br-sp-Americana
diff --git a/dvbv5_isdb-t/br-sp-AmericoBrasiliense b/isdb-t/br-sp-AmericoBrasiliense
index b0d977bb..b0d977bb 100644
--- a/dvbv5_isdb-t/br-sp-AmericoBrasiliense
+++ b/isdb-t/br-sp-AmericoBrasiliense
diff --git a/dvbv5_isdb-t/br-sp-Amparo b/isdb-t/br-sp-Amparo
index 42e5b5e4..42e5b5e4 100644
--- a/dvbv5_isdb-t/br-sp-Amparo
+++ b/isdb-t/br-sp-Amparo
diff --git a/dvbv5_isdb-t/br-sp-Andradina b/isdb-t/br-sp-Andradina
index 349d4bac..349d4bac 100644
--- a/dvbv5_isdb-t/br-sp-Andradina
+++ b/isdb-t/br-sp-Andradina
diff --git a/dvbv5_isdb-t/br-sp-Aparecida b/isdb-t/br-sp-Aparecida
index 74cccf11..74cccf11 100644
--- a/dvbv5_isdb-t/br-sp-Aparecida
+++ b/isdb-t/br-sp-Aparecida
diff --git a/dvbv5_isdb-t/br-sp-AparecidaDOeste b/isdb-t/br-sp-AparecidaDOeste
index 83046e98..83046e98 100644
--- a/dvbv5_isdb-t/br-sp-AparecidaDOeste
+++ b/isdb-t/br-sp-AparecidaDOeste
diff --git a/dvbv5_isdb-t/br-sp-Apiai b/isdb-t/br-sp-Apiai
index a9c5fe8a..a9c5fe8a 100644
--- a/dvbv5_isdb-t/br-sp-Apiai
+++ b/isdb-t/br-sp-Apiai
diff --git a/dvbv5_isdb-t/br-sp-Aracatuba b/isdb-t/br-sp-Aracatuba
index a6210ab5..a6210ab5 100644
--- a/dvbv5_isdb-t/br-sp-Aracatuba
+++ b/isdb-t/br-sp-Aracatuba
diff --git a/dvbv5_isdb-t/br-sp-Araraquara b/isdb-t/br-sp-Araraquara
index a22e0bc4..a22e0bc4 100644
--- a/dvbv5_isdb-t/br-sp-Araraquara
+++ b/isdb-t/br-sp-Araraquara
diff --git a/dvbv5_isdb-t/br-sp-Araras b/isdb-t/br-sp-Araras
index 1dd4ca43..1dd4ca43 100644
--- a/dvbv5_isdb-t/br-sp-Araras
+++ b/isdb-t/br-sp-Araras
diff --git a/dvbv5_isdb-t/br-sp-Arealva b/isdb-t/br-sp-Arealva
index 28c56696..28c56696 100644
--- a/dvbv5_isdb-t/br-sp-Arealva
+++ b/isdb-t/br-sp-Arealva
diff --git a/dvbv5_isdb-t/br-sp-Assis b/isdb-t/br-sp-Assis
index 2a6c2dbf..2a6c2dbf 100644
--- a/dvbv5_isdb-t/br-sp-Assis
+++ b/isdb-t/br-sp-Assis
diff --git a/dvbv5_isdb-t/br-sp-Atibaia b/isdb-t/br-sp-Atibaia
index 9e1aae1c..9e1aae1c 100644
--- a/dvbv5_isdb-t/br-sp-Atibaia
+++ b/isdb-t/br-sp-Atibaia
diff --git a/dvbv5_isdb-t/br-sp-Auriflama b/isdb-t/br-sp-Auriflama
index 3d46f1b8..3d46f1b8 100644
--- a/dvbv5_isdb-t/br-sp-Auriflama
+++ b/isdb-t/br-sp-Auriflama
diff --git a/dvbv5_isdb-t/br-sp-BarraBonita b/isdb-t/br-sp-BarraBonita
index c33dc1bf..c33dc1bf 100644
--- a/dvbv5_isdb-t/br-sp-BarraBonita
+++ b/isdb-t/br-sp-BarraBonita
diff --git a/dvbv5_isdb-t/br-sp-Barretos b/isdb-t/br-sp-Barretos
index 755698c7..755698c7 100644
--- a/dvbv5_isdb-t/br-sp-Barretos
+++ b/isdb-t/br-sp-Barretos
diff --git a/dvbv5_isdb-t/br-sp-Batatais b/isdb-t/br-sp-Batatais
index d32c6d2d..d32c6d2d 100644
--- a/dvbv5_isdb-t/br-sp-Batatais
+++ b/isdb-t/br-sp-Batatais
diff --git a/dvbv5_isdb-t/br-sp-Bauru b/isdb-t/br-sp-Bauru
index 20cbcde6..20cbcde6 100644
--- a/dvbv5_isdb-t/br-sp-Bauru
+++ b/isdb-t/br-sp-Bauru
diff --git a/dvbv5_isdb-t/br-sp-Bebedouro b/isdb-t/br-sp-Bebedouro
index 9ad600b6..9ad600b6 100644
--- a/dvbv5_isdb-t/br-sp-Bebedouro
+++ b/isdb-t/br-sp-Bebedouro
diff --git a/dvbv5_isdb-t/br-sp-Bertioga b/isdb-t/br-sp-Bertioga
index 9cac5327..9cac5327 100644
--- a/dvbv5_isdb-t/br-sp-Bertioga
+++ b/isdb-t/br-sp-Bertioga
diff --git a/dvbv5_isdb-t/br-sp-Birigui b/isdb-t/br-sp-Birigui
index 7ea07ca5..7ea07ca5 100644
--- a/dvbv5_isdb-t/br-sp-Birigui
+++ b/isdb-t/br-sp-Birigui
diff --git a/dvbv5_isdb-t/br-sp-Boituva b/isdb-t/br-sp-Boituva
index 197b3eba..197b3eba 100644
--- a/dvbv5_isdb-t/br-sp-Boituva
+++ b/isdb-t/br-sp-Boituva
diff --git a/dvbv5_isdb-t/br-sp-Botucatu b/isdb-t/br-sp-Botucatu
index e26392d1..e26392d1 100644
--- a/dvbv5_isdb-t/br-sp-Botucatu
+++ b/isdb-t/br-sp-Botucatu
diff --git a/dvbv5_isdb-t/br-sp-BragancaPaulista b/isdb-t/br-sp-BragancaPaulista
index 9ea89842..9ea89842 100644
--- a/dvbv5_isdb-t/br-sp-BragancaPaulista
+++ b/isdb-t/br-sp-BragancaPaulista
diff --git a/dvbv5_isdb-t/br-sp-Brodowski b/isdb-t/br-sp-Brodowski
index a6ca4aa8..a6ca4aa8 100644
--- a/dvbv5_isdb-t/br-sp-Brodowski
+++ b/isdb-t/br-sp-Brodowski
diff --git a/dvbv5_isdb-t/br-sp-CachoeiraPaulista b/isdb-t/br-sp-CachoeiraPaulista
index 8e3cc4b4..8e3cc4b4 100644
--- a/dvbv5_isdb-t/br-sp-CachoeiraPaulista
+++ b/isdb-t/br-sp-CachoeiraPaulista
diff --git a/dvbv5_isdb-t/br-sp-Cajamar b/isdb-t/br-sp-Cajamar
index 7aa391c4..7aa391c4 100644
--- a/dvbv5_isdb-t/br-sp-Cajamar
+++ b/isdb-t/br-sp-Cajamar
diff --git a/dvbv5_isdb-t/br-sp-Cajati b/isdb-t/br-sp-Cajati
index 16d8eb5d..16d8eb5d 100644
--- a/dvbv5_isdb-t/br-sp-Cajati
+++ b/isdb-t/br-sp-Cajati
diff --git a/dvbv5_isdb-t/br-sp-Cajobi b/isdb-t/br-sp-Cajobi
index 1ea6a5e4..1ea6a5e4 100644
--- a/dvbv5_isdb-t/br-sp-Cajobi
+++ b/isdb-t/br-sp-Cajobi
diff --git a/dvbv5_isdb-t/br-sp-Campinas b/isdb-t/br-sp-Campinas
index 1cdd7c5a..1cdd7c5a 100644
--- a/dvbv5_isdb-t/br-sp-Campinas
+++ b/isdb-t/br-sp-Campinas
diff --git a/dvbv5_isdb-t/br-sp-CampoLimpoPaulista b/isdb-t/br-sp-CampoLimpoPaulista
index 98ffb8c9..98ffb8c9 100644
--- a/dvbv5_isdb-t/br-sp-CampoLimpoPaulista
+++ b/isdb-t/br-sp-CampoLimpoPaulista
diff --git a/dvbv5_isdb-t/br-sp-CamposDoJordao b/isdb-t/br-sp-CamposDoJordao
index 69cf5d0d..69cf5d0d 100644
--- a/dvbv5_isdb-t/br-sp-CamposDoJordao
+++ b/isdb-t/br-sp-CamposDoJordao
diff --git a/dvbv5_isdb-t/br-sp-Capivari b/isdb-t/br-sp-Capivari
index 67ab34b7..67ab34b7 100644
--- a/dvbv5_isdb-t/br-sp-Capivari
+++ b/isdb-t/br-sp-Capivari
diff --git a/dvbv5_isdb-t/br-sp-Caraguatatuba b/isdb-t/br-sp-Caraguatatuba
index 29eaf65d..29eaf65d 100644
--- a/dvbv5_isdb-t/br-sp-Caraguatatuba
+++ b/isdb-t/br-sp-Caraguatatuba
diff --git a/dvbv5_isdb-t/br-sp-Carapicuiba b/isdb-t/br-sp-Carapicuiba
index 75ad8671..75ad8671 100644
--- a/dvbv5_isdb-t/br-sp-Carapicuiba
+++ b/isdb-t/br-sp-Carapicuiba
diff --git a/dvbv5_isdb-t/br-sp-CassiaDosCoqueiros b/isdb-t/br-sp-CassiaDosCoqueiros
index ef6c51ca..ef6c51ca 100644
--- a/dvbv5_isdb-t/br-sp-CassiaDosCoqueiros
+++ b/isdb-t/br-sp-CassiaDosCoqueiros
diff --git a/dvbv5_isdb-t/br-sp-Catanduva b/isdb-t/br-sp-Catanduva
index 7654787f..7654787f 100644
--- a/dvbv5_isdb-t/br-sp-Catanduva
+++ b/isdb-t/br-sp-Catanduva
diff --git a/dvbv5_isdb-t/br-sp-Colina b/isdb-t/br-sp-Colina
index f665c644..f665c644 100644
--- a/dvbv5_isdb-t/br-sp-Colina
+++ b/isdb-t/br-sp-Colina
diff --git a/dvbv5_isdb-t/br-sp-Colombia b/isdb-t/br-sp-Colombia
index 1daa82dd..1daa82dd 100644
--- a/dvbv5_isdb-t/br-sp-Colombia
+++ b/isdb-t/br-sp-Colombia
diff --git a/dvbv5_isdb-t/br-sp-Cravinhos b/isdb-t/br-sp-Cravinhos
index 9585163b..9585163b 100644
--- a/dvbv5_isdb-t/br-sp-Cravinhos
+++ b/isdb-t/br-sp-Cravinhos
diff --git a/dvbv5_isdb-t/br-sp-CristaisPaulista b/isdb-t/br-sp-CristaisPaulista
index b0e1a0e3..b0e1a0e3 100644
--- a/dvbv5_isdb-t/br-sp-CristaisPaulista
+++ b/isdb-t/br-sp-CristaisPaulista
diff --git a/dvbv5_isdb-t/br-sp-Cruzeiro b/isdb-t/br-sp-Cruzeiro
index f205a0ac..f205a0ac 100644
--- a/dvbv5_isdb-t/br-sp-Cruzeiro
+++ b/isdb-t/br-sp-Cruzeiro
diff --git a/dvbv5_isdb-t/br-sp-Cubatao b/isdb-t/br-sp-Cubatao
index e860fd5f..e860fd5f 100644
--- a/dvbv5_isdb-t/br-sp-Cubatao
+++ b/isdb-t/br-sp-Cubatao
diff --git a/dvbv5_isdb-t/br-sp-Diadema b/isdb-t/br-sp-Diadema
index 913c9ba3..913c9ba3 100644
--- a/dvbv5_isdb-t/br-sp-Diadema
+++ b/isdb-t/br-sp-Diadema
diff --git a/dvbv5_isdb-t/br-sp-Dracena b/isdb-t/br-sp-Dracena
index 741cccbe..741cccbe 100644
--- a/dvbv5_isdb-t/br-sp-Dracena
+++ b/isdb-t/br-sp-Dracena
diff --git a/dvbv5_isdb-t/br-sp-Dumont b/isdb-t/br-sp-Dumont
index 9df50946..9df50946 100644
--- a/dvbv5_isdb-t/br-sp-Dumont
+++ b/isdb-t/br-sp-Dumont
diff --git a/dvbv5_isdb-t/br-sp-Eldorado b/isdb-t/br-sp-Eldorado
index 5f5003ab..5f5003ab 100644
--- a/dvbv5_isdb-t/br-sp-Eldorado
+++ b/isdb-t/br-sp-Eldorado
diff --git a/dvbv5_isdb-t/br-sp-EmbuDasArtes b/isdb-t/br-sp-EmbuDasArtes
index d756a90b..d756a90b 100644
--- a/dvbv5_isdb-t/br-sp-EmbuDasArtes
+++ b/isdb-t/br-sp-EmbuDasArtes
diff --git a/dvbv5_isdb-t/br-sp-EstivaGerbi b/isdb-t/br-sp-EstivaGerbi
index 905e0fc2..905e0fc2 100644
--- a/dvbv5_isdb-t/br-sp-EstivaGerbi
+++ b/isdb-t/br-sp-EstivaGerbi
diff --git a/dvbv5_isdb-t/br-sp-EstrelaDOeste b/isdb-t/br-sp-EstrelaDOeste
index a5df2ebc..a5df2ebc 100644
--- a/dvbv5_isdb-t/br-sp-EstrelaDOeste
+++ b/isdb-t/br-sp-EstrelaDOeste
diff --git a/dvbv5_isdb-t/br-sp-Fernandopolis b/isdb-t/br-sp-Fernandopolis
index 787e97f6..787e97f6 100644
--- a/dvbv5_isdb-t/br-sp-Fernandopolis
+++ b/isdb-t/br-sp-Fernandopolis
diff --git a/dvbv5_isdb-t/br-sp-FerrazDeVasconcelos b/isdb-t/br-sp-FerrazDeVasconcelos
index 494990e7..494990e7 100644
--- a/dvbv5_isdb-t/br-sp-FerrazDeVasconcelos
+++ b/isdb-t/br-sp-FerrazDeVasconcelos
diff --git a/dvbv5_isdb-t/br-sp-Franca b/isdb-t/br-sp-Franca
index f54e1a56..f54e1a56 100644
--- a/dvbv5_isdb-t/br-sp-Franca
+++ b/isdb-t/br-sp-Franca
diff --git a/dvbv5_isdb-t/br-sp-FrancoDaRocha b/isdb-t/br-sp-FrancoDaRocha
index a7fab7b9..a7fab7b9 100644
--- a/dvbv5_isdb-t/br-sp-FrancoDaRocha
+++ b/isdb-t/br-sp-FrancoDaRocha
diff --git a/dvbv5_isdb-t/br-sp-Garca b/isdb-t/br-sp-Garca
index 9bd6e536..9bd6e536 100644
--- a/dvbv5_isdb-t/br-sp-Garca
+++ b/isdb-t/br-sp-Garca
diff --git a/dvbv5_isdb-t/br-sp-Guapiacu b/isdb-t/br-sp-Guapiacu
index 0b541c8d..0b541c8d 100644
--- a/dvbv5_isdb-t/br-sp-Guapiacu
+++ b/isdb-t/br-sp-Guapiacu
diff --git a/dvbv5_isdb-t/br-sp-GuaraniDOeste b/isdb-t/br-sp-GuaraniDOeste
index cf2f4dbe..cf2f4dbe 100644
--- a/dvbv5_isdb-t/br-sp-GuaraniDOeste
+++ b/isdb-t/br-sp-GuaraniDOeste
diff --git a/dvbv5_isdb-t/br-sp-Guaratingueta b/isdb-t/br-sp-Guaratingueta
index 481335ad..481335ad 100644
--- a/dvbv5_isdb-t/br-sp-Guaratingueta
+++ b/isdb-t/br-sp-Guaratingueta
diff --git a/dvbv5_isdb-t/br-sp-Guaruja b/isdb-t/br-sp-Guaruja
index 646b110d..646b110d 100644
--- a/dvbv5_isdb-t/br-sp-Guaruja
+++ b/isdb-t/br-sp-Guaruja
diff --git a/dvbv5_isdb-t/br-sp-Guarulhos b/isdb-t/br-sp-Guarulhos
index e5710030..e5710030 100644
--- a/dvbv5_isdb-t/br-sp-Guarulhos
+++ b/isdb-t/br-sp-Guarulhos
diff --git a/dvbv5_isdb-t/br-sp-Guzolandia b/isdb-t/br-sp-Guzolandia
index 2533bd56..2533bd56 100644
--- a/dvbv5_isdb-t/br-sp-Guzolandia
+++ b/isdb-t/br-sp-Guzolandia
diff --git a/dvbv5_isdb-t/br-sp-Hortolandia b/isdb-t/br-sp-Hortolandia
index 88f47e26..88f47e26 100644
--- a/dvbv5_isdb-t/br-sp-Hortolandia
+++ b/isdb-t/br-sp-Hortolandia
diff --git a/dvbv5_isdb-t/br-sp-Iacanga b/isdb-t/br-sp-Iacanga
index 47d85a87..47d85a87 100644
--- a/dvbv5_isdb-t/br-sp-Iacanga
+++ b/isdb-t/br-sp-Iacanga
diff --git a/dvbv5_isdb-t/br-sp-Ibate b/isdb-t/br-sp-Ibate
index a82edefa..a82edefa 100644
--- a/dvbv5_isdb-t/br-sp-Ibate
+++ b/isdb-t/br-sp-Ibate
diff --git a/dvbv5_isdb-t/br-sp-Ibitinga b/isdb-t/br-sp-Ibitinga
index eb8600a1..eb8600a1 100644
--- a/dvbv5_isdb-t/br-sp-Ibitinga
+++ b/isdb-t/br-sp-Ibitinga
diff --git a/dvbv5_isdb-t/br-sp-Ibiuna b/isdb-t/br-sp-Ibiuna
index 43b6d657..43b6d657 100644
--- a/dvbv5_isdb-t/br-sp-Ibiuna
+++ b/isdb-t/br-sp-Ibiuna
diff --git a/dvbv5_isdb-t/br-sp-IgaracuDoTiete b/isdb-t/br-sp-IgaracuDoTiete
index 261a0316..261a0316 100644
--- a/dvbv5_isdb-t/br-sp-IgaracuDoTiete
+++ b/isdb-t/br-sp-IgaracuDoTiete
diff --git a/dvbv5_isdb-t/br-sp-Iguape b/isdb-t/br-sp-Iguape
index 73f3c728..73f3c728 100644
--- a/dvbv5_isdb-t/br-sp-Iguape
+++ b/isdb-t/br-sp-Iguape
diff --git a/dvbv5_isdb-t/br-sp-IlhaComprida b/isdb-t/br-sp-IlhaComprida
index 1981c68a..1981c68a 100644
--- a/dvbv5_isdb-t/br-sp-IlhaComprida
+++ b/isdb-t/br-sp-IlhaComprida
diff --git a/dvbv5_isdb-t/br-sp-IlhaSolteira b/isdb-t/br-sp-IlhaSolteira
index adb2d1dd..adb2d1dd 100644
--- a/dvbv5_isdb-t/br-sp-IlhaSolteira
+++ b/isdb-t/br-sp-IlhaSolteira
diff --git a/dvbv5_isdb-t/br-sp-Ilhabela b/isdb-t/br-sp-Ilhabela
index 75e81d9c..75e81d9c 100644
--- a/dvbv5_isdb-t/br-sp-Ilhabela
+++ b/isdb-t/br-sp-Ilhabela
diff --git a/dvbv5_isdb-t/br-sp-Indaiatuba b/isdb-t/br-sp-Indaiatuba
index 52d35e35..52d35e35 100644
--- a/dvbv5_isdb-t/br-sp-Indaiatuba
+++ b/isdb-t/br-sp-Indaiatuba
diff --git a/dvbv5_isdb-t/br-sp-Ipero b/isdb-t/br-sp-Ipero
index 97a86e34..97a86e34 100644
--- a/dvbv5_isdb-t/br-sp-Ipero
+++ b/isdb-t/br-sp-Ipero
diff --git a/dvbv5_isdb-t/br-sp-Itanhaem b/isdb-t/br-sp-Itanhaem
index 3bfd3129..3bfd3129 100644
--- a/dvbv5_isdb-t/br-sp-Itanhaem
+++ b/isdb-t/br-sp-Itanhaem
diff --git a/dvbv5_isdb-t/br-sp-Itapetininga b/isdb-t/br-sp-Itapetininga
index 04740906..04740906 100644
--- a/dvbv5_isdb-t/br-sp-Itapetininga
+++ b/isdb-t/br-sp-Itapetininga
diff --git a/dvbv5_isdb-t/br-sp-Itapeva b/isdb-t/br-sp-Itapeva
index 0ee1e8cd..0ee1e8cd 100644
--- a/dvbv5_isdb-t/br-sp-Itapeva
+++ b/isdb-t/br-sp-Itapeva
diff --git a/dvbv5_isdb-t/br-sp-Itapevi b/isdb-t/br-sp-Itapevi
index 3e925625..3e925625 100644
--- a/dvbv5_isdb-t/br-sp-Itapevi
+++ b/isdb-t/br-sp-Itapevi
diff --git a/dvbv5_isdb-t/br-sp-Itapolis b/isdb-t/br-sp-Itapolis
index ef5dd006..ef5dd006 100644
--- a/dvbv5_isdb-t/br-sp-Itapolis
+++ b/isdb-t/br-sp-Itapolis
diff --git a/dvbv5_isdb-t/br-sp-Itaquaquecetuba b/isdb-t/br-sp-Itaquaquecetuba
index 9e251f16..9e251f16 100644
--- a/dvbv5_isdb-t/br-sp-Itaquaquecetuba
+++ b/isdb-t/br-sp-Itaquaquecetuba
diff --git a/dvbv5_isdb-t/br-sp-Itu b/isdb-t/br-sp-Itu
index 5c434f77..5c434f77 100644
--- a/dvbv5_isdb-t/br-sp-Itu
+++ b/isdb-t/br-sp-Itu
diff --git a/dvbv5_isdb-t/br-sp-Jaborandi b/isdb-t/br-sp-Jaborandi
index 6a7c1527..6a7c1527 100644
--- a/dvbv5_isdb-t/br-sp-Jaborandi
+++ b/isdb-t/br-sp-Jaborandi
diff --git a/dvbv5_isdb-t/br-sp-Jaboticabal b/isdb-t/br-sp-Jaboticabal
index 44d7d439..44d7d439 100644
--- a/dvbv5_isdb-t/br-sp-Jaboticabal
+++ b/isdb-t/br-sp-Jaboticabal
diff --git a/dvbv5_isdb-t/br-sp-Jacarei b/isdb-t/br-sp-Jacarei
index 2554b0f5..2554b0f5 100644
--- a/dvbv5_isdb-t/br-sp-Jacarei
+++ b/isdb-t/br-sp-Jacarei
diff --git a/dvbv5_isdb-t/br-sp-Jaci b/isdb-t/br-sp-Jaci
index 5a58b262..5a58b262 100644
--- a/dvbv5_isdb-t/br-sp-Jaci
+++ b/isdb-t/br-sp-Jaci
diff --git a/dvbv5_isdb-t/br-sp-Jacupiranga b/isdb-t/br-sp-Jacupiranga
index 3698676d..3698676d 100644
--- a/dvbv5_isdb-t/br-sp-Jacupiranga
+++ b/isdb-t/br-sp-Jacupiranga
diff --git a/dvbv5_isdb-t/br-sp-Jaguariuna b/isdb-t/br-sp-Jaguariuna
index e5f5224d..e5f5224d 100644
--- a/dvbv5_isdb-t/br-sp-Jaguariuna
+++ b/isdb-t/br-sp-Jaguariuna
diff --git a/dvbv5_isdb-t/br-sp-Jales b/isdb-t/br-sp-Jales
index f6eb2e47..f6eb2e47 100644
--- a/dvbv5_isdb-t/br-sp-Jales
+++ b/isdb-t/br-sp-Jales
diff --git a/dvbv5_isdb-t/br-sp-Jandira b/isdb-t/br-sp-Jandira
index c404be95..c404be95 100644
--- a/dvbv5_isdb-t/br-sp-Jandira
+++ b/isdb-t/br-sp-Jandira
diff --git a/dvbv5_isdb-t/br-sp-Jardinopolis b/isdb-t/br-sp-Jardinopolis
index 905f2213..905f2213 100644
--- a/dvbv5_isdb-t/br-sp-Jardinopolis
+++ b/isdb-t/br-sp-Jardinopolis
diff --git a/dvbv5_isdb-t/br-sp-Jau b/isdb-t/br-sp-Jau
index 1149125d..1149125d 100644
--- a/dvbv5_isdb-t/br-sp-Jau
+++ b/isdb-t/br-sp-Jau
diff --git a/dvbv5_isdb-t/br-sp-Jeriquara b/isdb-t/br-sp-Jeriquara
index 7f9ab42a..7f9ab42a 100644
--- a/dvbv5_isdb-t/br-sp-Jeriquara
+++ b/isdb-t/br-sp-Jeriquara
diff --git a/dvbv5_isdb-t/br-sp-JoseBonifacio b/isdb-t/br-sp-JoseBonifacio
index 3932887b..3932887b 100644
--- a/dvbv5_isdb-t/br-sp-JoseBonifacio
+++ b/isdb-t/br-sp-JoseBonifacio
diff --git a/dvbv5_isdb-t/br-sp-Jundiai b/isdb-t/br-sp-Jundiai
index 1efd6d49..1efd6d49 100644
--- a/dvbv5_isdb-t/br-sp-Jundiai
+++ b/isdb-t/br-sp-Jundiai
diff --git a/dvbv5_isdb-t/br-sp-Leme b/isdb-t/br-sp-Leme
index 28f30d82..28f30d82 100644
--- a/dvbv5_isdb-t/br-sp-Leme
+++ b/isdb-t/br-sp-Leme
diff --git a/dvbv5_isdb-t/br-sp-LencoisPaulista b/isdb-t/br-sp-LencoisPaulista
index e8b03db5..e8b03db5 100644
--- a/dvbv5_isdb-t/br-sp-LencoisPaulista
+++ b/isdb-t/br-sp-LencoisPaulista
diff --git a/dvbv5_isdb-t/br-sp-Limeira b/isdb-t/br-sp-Limeira
index db7219c3..db7219c3 100644
--- a/dvbv5_isdb-t/br-sp-Limeira
+++ b/isdb-t/br-sp-Limeira
diff --git a/dvbv5_isdb-t/br-sp-Lins b/isdb-t/br-sp-Lins
index bdca503b..bdca503b 100644
--- a/dvbv5_isdb-t/br-sp-Lins
+++ b/isdb-t/br-sp-Lins
diff --git a/dvbv5_isdb-t/br-sp-Lorena b/isdb-t/br-sp-Lorena
index 073c4f98..073c4f98 100644
--- a/dvbv5_isdb-t/br-sp-Lorena
+++ b/isdb-t/br-sp-Lorena
diff --git a/dvbv5_isdb-t/br-sp-LuizAntonio b/isdb-t/br-sp-LuizAntonio
index e31474f5..e31474f5 100644
--- a/dvbv5_isdb-t/br-sp-LuizAntonio
+++ b/isdb-t/br-sp-LuizAntonio
diff --git a/dvbv5_isdb-t/br-sp-Macatuba b/isdb-t/br-sp-Macatuba
index 1ef38b51..1ef38b51 100644
--- a/dvbv5_isdb-t/br-sp-Macatuba
+++ b/isdb-t/br-sp-Macatuba
diff --git a/dvbv5_isdb-t/br-sp-MarabaPaulista b/isdb-t/br-sp-MarabaPaulista
index c2ab93a9..c2ab93a9 100644
--- a/dvbv5_isdb-t/br-sp-MarabaPaulista
+++ b/isdb-t/br-sp-MarabaPaulista
diff --git a/dvbv5_isdb-t/br-sp-Marilia b/isdb-t/br-sp-Marilia
index 4b4b21d2..4b4b21d2 100644
--- a/dvbv5_isdb-t/br-sp-Marilia
+++ b/isdb-t/br-sp-Marilia
diff --git a/dvbv5_isdb-t/br-sp-Matao b/isdb-t/br-sp-Matao
index 14b421d5..14b421d5 100644
--- a/dvbv5_isdb-t/br-sp-Matao
+++ b/isdb-t/br-sp-Matao
diff --git a/dvbv5_isdb-t/br-sp-MiranteDoParanapanema b/isdb-t/br-sp-MiranteDoParanapanema
index 557dff49..557dff49 100644
--- a/dvbv5_isdb-t/br-sp-MiranteDoParanapanema
+++ b/isdb-t/br-sp-MiranteDoParanapanema
diff --git a/dvbv5_isdb-t/br-sp-Mirassol b/isdb-t/br-sp-Mirassol
index c1c96ba3..c1c96ba3 100644
--- a/dvbv5_isdb-t/br-sp-Mirassol
+++ b/isdb-t/br-sp-Mirassol
diff --git a/dvbv5_isdb-t/br-sp-Mococa b/isdb-t/br-sp-Mococa
index e7a1640f..e7a1640f 100644
--- a/dvbv5_isdb-t/br-sp-Mococa
+++ b/isdb-t/br-sp-Mococa
diff --git a/dvbv5_isdb-t/br-sp-MogiDasCruzes b/isdb-t/br-sp-MogiDasCruzes
index 6a2c7b3e..6a2c7b3e 100644
--- a/dvbv5_isdb-t/br-sp-MogiDasCruzes
+++ b/isdb-t/br-sp-MogiDasCruzes
diff --git a/dvbv5_isdb-t/br-sp-Mogiguacu b/isdb-t/br-sp-Mogiguacu
index 6692b750..6692b750 100644
--- a/dvbv5_isdb-t/br-sp-Mogiguacu
+++ b/isdb-t/br-sp-Mogiguacu
diff --git a/dvbv5_isdb-t/br-sp-Mongagua b/isdb-t/br-sp-Mongagua
index 3754bd05..3754bd05 100644
--- a/dvbv5_isdb-t/br-sp-Mongagua
+++ b/isdb-t/br-sp-Mongagua
diff --git a/dvbv5_isdb-t/br-sp-MonteAzulPaulista b/isdb-t/br-sp-MonteAzulPaulista
index ea645d26..ea645d26 100644
--- a/dvbv5_isdb-t/br-sp-MonteAzulPaulista
+++ b/isdb-t/br-sp-MonteAzulPaulista
diff --git a/dvbv5_isdb-t/br-sp-NevesPaulista b/isdb-t/br-sp-NevesPaulista
index de877889..de877889 100644
--- a/dvbv5_isdb-t/br-sp-NevesPaulista
+++ b/isdb-t/br-sp-NevesPaulista
diff --git a/dvbv5_isdb-t/br-sp-NovoHorizonte b/isdb-t/br-sp-NovoHorizonte
index aca0119e..aca0119e 100644
--- a/dvbv5_isdb-t/br-sp-NovoHorizonte
+++ b/isdb-t/br-sp-NovoHorizonte
diff --git a/dvbv5_isdb-t/br-sp-Nuporanga b/isdb-t/br-sp-Nuporanga
index c2320829..c2320829 100644
--- a/dvbv5_isdb-t/br-sp-Nuporanga
+++ b/isdb-t/br-sp-Nuporanga
diff --git a/dvbv5_isdb-t/br-sp-Orlandia b/isdb-t/br-sp-Orlandia
index f30f37a4..f30f37a4 100644
--- a/dvbv5_isdb-t/br-sp-Orlandia
+++ b/isdb-t/br-sp-Orlandia
diff --git a/dvbv5_isdb-t/br-sp-Ourinhos b/isdb-t/br-sp-Ourinhos
index 286f1f27..286f1f27 100644
--- a/dvbv5_isdb-t/br-sp-Ourinhos
+++ b/isdb-t/br-sp-Ourinhos
diff --git a/dvbv5_isdb-t/br-sp-Paraibuna b/isdb-t/br-sp-Paraibuna
index 15dd5f7c..15dd5f7c 100644
--- a/dvbv5_isdb-t/br-sp-Paraibuna
+++ b/isdb-t/br-sp-Paraibuna
diff --git a/dvbv5_isdb-t/br-sp-PariqueraAcu b/isdb-t/br-sp-PariqueraAcu
index eff6c203..eff6c203 100644
--- a/dvbv5_isdb-t/br-sp-PariqueraAcu
+++ b/isdb-t/br-sp-PariqueraAcu
diff --git a/dvbv5_isdb-t/br-sp-Paulinia b/isdb-t/br-sp-Paulinia
index a51ca3e7..a51ca3e7 100644
--- a/dvbv5_isdb-t/br-sp-Paulinia
+++ b/isdb-t/br-sp-Paulinia
diff --git a/dvbv5_isdb-t/br-sp-Pederneiras b/isdb-t/br-sp-Pederneiras
index e1768504..e1768504 100644
--- a/dvbv5_isdb-t/br-sp-Pederneiras
+++ b/isdb-t/br-sp-Pederneiras
diff --git a/dvbv5_isdb-t/br-sp-Pedregulho b/isdb-t/br-sp-Pedregulho
index 3bc0d7f1..3bc0d7f1 100644
--- a/dvbv5_isdb-t/br-sp-Pedregulho
+++ b/isdb-t/br-sp-Pedregulho
diff --git a/dvbv5_isdb-t/br-sp-Penapolis b/isdb-t/br-sp-Penapolis
index 4dc95315..4dc95315 100644
--- a/dvbv5_isdb-t/br-sp-Penapolis
+++ b/isdb-t/br-sp-Penapolis
diff --git a/dvbv5_isdb-t/br-sp-Peruibe b/isdb-t/br-sp-Peruibe
index ab080604..ab080604 100644
--- a/dvbv5_isdb-t/br-sp-Peruibe
+++ b/isdb-t/br-sp-Peruibe
diff --git a/dvbv5_isdb-t/br-sp-Piedade b/isdb-t/br-sp-Piedade
index 0633b44c..0633b44c 100644
--- a/dvbv5_isdb-t/br-sp-Piedade
+++ b/isdb-t/br-sp-Piedade
diff --git a/dvbv5_isdb-t/br-sp-Pindamonhangaba b/isdb-t/br-sp-Pindamonhangaba
index bbf70cc3..bbf70cc3 100644
--- a/dvbv5_isdb-t/br-sp-Pindamonhangaba
+++ b/isdb-t/br-sp-Pindamonhangaba
diff --git a/dvbv5_isdb-t/br-sp-Piquete b/isdb-t/br-sp-Piquete
index 191056ce..191056ce 100644
--- a/dvbv5_isdb-t/br-sp-Piquete
+++ b/isdb-t/br-sp-Piquete
diff --git a/dvbv5_isdb-t/br-sp-Piracicaba b/isdb-t/br-sp-Piracicaba
index ccac06f6..ccac06f6 100644
--- a/dvbv5_isdb-t/br-sp-Piracicaba
+++ b/isdb-t/br-sp-Piracicaba
diff --git a/dvbv5_isdb-t/br-sp-Pirangi b/isdb-t/br-sp-Pirangi
index 653605a6..653605a6 100644
--- a/dvbv5_isdb-t/br-sp-Pirangi
+++ b/isdb-t/br-sp-Pirangi
diff --git a/dvbv5_isdb-t/br-sp-Pirassununga b/isdb-t/br-sp-Pirassununga
index 1e176b4c..1e176b4c 100644
--- a/dvbv5_isdb-t/br-sp-Pirassununga
+++ b/isdb-t/br-sp-Pirassununga
diff --git a/dvbv5_isdb-t/br-sp-Pitangueiras b/isdb-t/br-sp-Pitangueiras
index 72f6e263..72f6e263 100644
--- a/dvbv5_isdb-t/br-sp-Pitangueiras
+++ b/isdb-t/br-sp-Pitangueiras
diff --git a/dvbv5_isdb-t/br-sp-Poa b/isdb-t/br-sp-Poa
index 258c48ae..258c48ae 100644
--- a/dvbv5_isdb-t/br-sp-Poa
+++ b/isdb-t/br-sp-Poa
diff --git a/dvbv5_isdb-t/br-sp-Pontal b/isdb-t/br-sp-Pontal
index 1852db14..1852db14 100644
--- a/dvbv5_isdb-t/br-sp-Pontal
+++ b/isdb-t/br-sp-Pontal
diff --git a/dvbv5_isdb-t/br-sp-PortoFeliz b/isdb-t/br-sp-PortoFeliz
index 711d1930..711d1930 100644
--- a/dvbv5_isdb-t/br-sp-PortoFeliz
+++ b/isdb-t/br-sp-PortoFeliz
diff --git a/dvbv5_isdb-t/br-sp-PortoFerreira b/isdb-t/br-sp-PortoFerreira
index 8cc4d1bb..8cc4d1bb 100644
--- a/dvbv5_isdb-t/br-sp-PortoFerreira
+++ b/isdb-t/br-sp-PortoFerreira
diff --git a/dvbv5_isdb-t/br-sp-PraiaGrande b/isdb-t/br-sp-PraiaGrande
index efd3c6bb..efd3c6bb 100644
--- a/dvbv5_isdb-t/br-sp-PraiaGrande
+++ b/isdb-t/br-sp-PraiaGrande
diff --git a/dvbv5_isdb-t/br-sp-PresidenteBernardes b/isdb-t/br-sp-PresidenteBernardes
index e7c204fe..e7c204fe 100644
--- a/dvbv5_isdb-t/br-sp-PresidenteBernardes
+++ b/isdb-t/br-sp-PresidenteBernardes
diff --git a/dvbv5_isdb-t/br-sp-PresidentePrudente b/isdb-t/br-sp-PresidentePrudente
index bd52b69e..bd52b69e 100644
--- a/dvbv5_isdb-t/br-sp-PresidentePrudente
+++ b/isdb-t/br-sp-PresidentePrudente
diff --git a/dvbv5_isdb-t/br-sp-PresidenteVenceslau b/isdb-t/br-sp-PresidenteVenceslau
index 13880308..13880308 100644
--- a/dvbv5_isdb-t/br-sp-PresidenteVenceslau
+++ b/isdb-t/br-sp-PresidenteVenceslau
diff --git a/dvbv5_isdb-t/br-sp-RedencaoDaSerra b/isdb-t/br-sp-RedencaoDaSerra
index fb4a984b..fb4a984b 100644
--- a/dvbv5_isdb-t/br-sp-RedencaoDaSerra
+++ b/isdb-t/br-sp-RedencaoDaSerra
diff --git a/dvbv5_isdb-t/br-sp-Reginopolis b/isdb-t/br-sp-Reginopolis
index fb98f1fe..fb98f1fe 100644
--- a/dvbv5_isdb-t/br-sp-Reginopolis
+++ b/isdb-t/br-sp-Reginopolis
diff --git a/dvbv5_isdb-t/br-sp-Registro b/isdb-t/br-sp-Registro
index 3bd9bc03..3bd9bc03 100644
--- a/dvbv5_isdb-t/br-sp-Registro
+++ b/isdb-t/br-sp-Registro
diff --git a/dvbv5_isdb-t/br-sp-Restinga b/isdb-t/br-sp-Restinga
index ac010417..ac010417 100644
--- a/dvbv5_isdb-t/br-sp-Restinga
+++ b/isdb-t/br-sp-Restinga
diff --git a/dvbv5_isdb-t/br-sp-RibeiraoCorrente b/isdb-t/br-sp-RibeiraoCorrente
index 07dbb60f..07dbb60f 100644
--- a/dvbv5_isdb-t/br-sp-RibeiraoCorrente
+++ b/isdb-t/br-sp-RibeiraoCorrente
diff --git a/dvbv5_isdb-t/br-sp-RibeiraoPreto b/isdb-t/br-sp-RibeiraoPreto
index a27b7dda..a27b7dda 100644
--- a/dvbv5_isdb-t/br-sp-RibeiraoPreto
+++ b/isdb-t/br-sp-RibeiraoPreto
diff --git a/dvbv5_isdb-t/br-sp-RioClaro b/isdb-t/br-sp-RioClaro
index f419a05a..f419a05a 100644
--- a/dvbv5_isdb-t/br-sp-RioClaro
+++ b/isdb-t/br-sp-RioClaro
diff --git a/dvbv5_isdb-t/br-sp-Roseira b/isdb-t/br-sp-Roseira
index 08c4d973..08c4d973 100644
--- a/dvbv5_isdb-t/br-sp-Roseira
+++ b/isdb-t/br-sp-Roseira
diff --git a/dvbv5_isdb-t/br-sp-SalesOliveira b/isdb-t/br-sp-SalesOliveira
index 275120a2..275120a2 100644
--- a/dvbv5_isdb-t/br-sp-SalesOliveira
+++ b/isdb-t/br-sp-SalesOliveira
diff --git a/dvbv5_isdb-t/br-sp-Salto b/isdb-t/br-sp-Salto
index deee5006..deee5006 100644
--- a/dvbv5_isdb-t/br-sp-Salto
+++ b/isdb-t/br-sp-Salto
diff --git a/dvbv5_isdb-t/br-sp-SantaBarbaraDOeste b/isdb-t/br-sp-SantaBarbaraDOeste
index 4eaa22c9..4eaa22c9 100644
--- a/dvbv5_isdb-t/br-sp-SantaBarbaraDOeste
+++ b/isdb-t/br-sp-SantaBarbaraDOeste
diff --git a/dvbv5_isdb-t/br-sp-SantaCruzDaConceicao b/isdb-t/br-sp-SantaCruzDaConceicao
index 6a408c72..6a408c72 100644
--- a/dvbv5_isdb-t/br-sp-SantaCruzDaConceicao
+++ b/isdb-t/br-sp-SantaCruzDaConceicao
diff --git a/dvbv5_isdb-t/br-sp-SantaCruzDaEsperanca b/isdb-t/br-sp-SantaCruzDaEsperanca
index e5030a52..e5030a52 100644
--- a/dvbv5_isdb-t/br-sp-SantaCruzDaEsperanca
+++ b/isdb-t/br-sp-SantaCruzDaEsperanca
diff --git a/dvbv5_isdb-t/br-sp-SantaCruzDasPalmeiras b/isdb-t/br-sp-SantaCruzDasPalmeiras
index d7902c5e..d7902c5e 100644
--- a/dvbv5_isdb-t/br-sp-SantaCruzDasPalmeiras
+++ b/isdb-t/br-sp-SantaCruzDasPalmeiras
diff --git a/dvbv5_isdb-t/br-sp-SantaGertrudes b/isdb-t/br-sp-SantaGertrudes
index 3820f6ca..3820f6ca 100644
--- a/dvbv5_isdb-t/br-sp-SantaGertrudes
+++ b/isdb-t/br-sp-SantaGertrudes
diff --git a/dvbv5_isdb-t/br-sp-SantaLucia b/isdb-t/br-sp-SantaLucia
index 37ea2dd4..37ea2dd4 100644
--- a/dvbv5_isdb-t/br-sp-SantaLucia
+++ b/isdb-t/br-sp-SantaLucia
diff --git a/dvbv5_isdb-t/br-sp-SantaRitaDoPassaQuatro b/isdb-t/br-sp-SantaRitaDoPassaQuatro
index 9463e07c..9463e07c 100644
--- a/dvbv5_isdb-t/br-sp-SantaRitaDoPassaQuatro
+++ b/isdb-t/br-sp-SantaRitaDoPassaQuatro
diff --git a/dvbv5_isdb-t/br-sp-SantaRosaDeViterbo b/isdb-t/br-sp-SantaRosaDeViterbo
index ceb14ad6..ceb14ad6 100644
--- a/dvbv5_isdb-t/br-sp-SantaRosaDeViterbo
+++ b/isdb-t/br-sp-SantaRosaDeViterbo
diff --git a/dvbv5_isdb-t/br-sp-SantoAnastacio b/isdb-t/br-sp-SantoAnastacio
index b10358da..b10358da 100644
--- a/dvbv5_isdb-t/br-sp-SantoAnastacio
+++ b/isdb-t/br-sp-SantoAnastacio
diff --git a/dvbv5_isdb-t/br-sp-SantoAndre b/isdb-t/br-sp-SantoAndre
index 73cf9401..73cf9401 100644
--- a/dvbv5_isdb-t/br-sp-SantoAndre
+++ b/isdb-t/br-sp-SantoAndre
diff --git a/dvbv5_isdb-t/br-sp-Santos b/isdb-t/br-sp-Santos
index 66b02eab..66b02eab 100644
--- a/dvbv5_isdb-t/br-sp-Santos
+++ b/isdb-t/br-sp-Santos
diff --git a/dvbv5_isdb-t/br-sp-SaoCarlos b/isdb-t/br-sp-SaoCarlos
index b6719157..b6719157 100644
--- a/dvbv5_isdb-t/br-sp-SaoCarlos
+++ b/isdb-t/br-sp-SaoCarlos
diff --git a/dvbv5_isdb-t/br-sp-SaoJoaoDaBoaVista b/isdb-t/br-sp-SaoJoaoDaBoaVista
index 0617e469..0617e469 100644
--- a/dvbv5_isdb-t/br-sp-SaoJoaoDaBoaVista
+++ b/isdb-t/br-sp-SaoJoaoDaBoaVista
diff --git a/dvbv5_isdb-t/br-sp-SaoJoseDaBelaVista b/isdb-t/br-sp-SaoJoseDaBelaVista
index 0990db41..0990db41 100644
--- a/dvbv5_isdb-t/br-sp-SaoJoseDaBelaVista
+++ b/isdb-t/br-sp-SaoJoseDaBelaVista
diff --git a/dvbv5_isdb-t/br-sp-SaoJoseDoRioPardo b/isdb-t/br-sp-SaoJoseDoRioPardo
index e6b68562..e6b68562 100644
--- a/dvbv5_isdb-t/br-sp-SaoJoseDoRioPardo
+++ b/isdb-t/br-sp-SaoJoseDoRioPardo
diff --git a/dvbv5_isdb-t/br-sp-SaoJoseDoRioPreto b/isdb-t/br-sp-SaoJoseDoRioPreto
index 469c2540..469c2540 100644
--- a/dvbv5_isdb-t/br-sp-SaoJoseDoRioPreto
+++ b/isdb-t/br-sp-SaoJoseDoRioPreto
diff --git a/dvbv5_isdb-t/br-sp-SaoJoseDosCampos b/isdb-t/br-sp-SaoJoseDosCampos
index 660ad008..660ad008 100644
--- a/dvbv5_isdb-t/br-sp-SaoJoseDosCampos
+++ b/isdb-t/br-sp-SaoJoseDosCampos
diff --git a/dvbv5_isdb-t/br-sp-SaoPaulo b/isdb-t/br-sp-SaoPaulo
index 2f4d8d77..2f4d8d77 100644
--- a/dvbv5_isdb-t/br-sp-SaoPaulo
+++ b/isdb-t/br-sp-SaoPaulo
diff --git a/dvbv5_isdb-t/br-sp-SaoPedro b/isdb-t/br-sp-SaoPedro
index 5a6075f7..5a6075f7 100644
--- a/dvbv5_isdb-t/br-sp-SaoPedro
+++ b/isdb-t/br-sp-SaoPedro
diff --git a/dvbv5_isdb-t/br-sp-SaoRoque b/isdb-t/br-sp-SaoRoque
index 1c34ed51..1c34ed51 100644
--- a/dvbv5_isdb-t/br-sp-SaoRoque
+++ b/isdb-t/br-sp-SaoRoque
diff --git a/dvbv5_isdb-t/br-sp-SaoSebastiao b/isdb-t/br-sp-SaoSebastiao
index 0f34cbb2..0f34cbb2 100644
--- a/dvbv5_isdb-t/br-sp-SaoSebastiao
+++ b/isdb-t/br-sp-SaoSebastiao
diff --git a/dvbv5_isdb-t/br-sp-SaoSimao b/isdb-t/br-sp-SaoSimao
index 13d51b6d..13d51b6d 100644
--- a/dvbv5_isdb-t/br-sp-SaoSimao
+++ b/isdb-t/br-sp-SaoSimao
diff --git a/dvbv5_isdb-t/br-sp-SaoVicente b/isdb-t/br-sp-SaoVicente
index aafec48e..aafec48e 100644
--- a/dvbv5_isdb-t/br-sp-SaoVicente
+++ b/isdb-t/br-sp-SaoVicente
diff --git a/dvbv5_isdb-t/br-sp-SerraAzul b/isdb-t/br-sp-SerraAzul
index 67ba24e7..67ba24e7 100644
--- a/dvbv5_isdb-t/br-sp-SerraAzul
+++ b/isdb-t/br-sp-SerraAzul
diff --git a/dvbv5_isdb-t/br-sp-Serrana b/isdb-t/br-sp-Serrana
index 552a7c99..552a7c99 100644
--- a/dvbv5_isdb-t/br-sp-Serrana
+++ b/isdb-t/br-sp-Serrana
diff --git a/dvbv5_isdb-t/br-sp-Sertaozinho b/isdb-t/br-sp-Sertaozinho
index 785e0ed5..785e0ed5 100644
--- a/dvbv5_isdb-t/br-sp-Sertaozinho
+++ b/isdb-t/br-sp-Sertaozinho
diff --git a/dvbv5_isdb-t/br-sp-SeteBarras b/isdb-t/br-sp-SeteBarras
index 72077d14..72077d14 100644
--- a/dvbv5_isdb-t/br-sp-SeteBarras
+++ b/isdb-t/br-sp-SeteBarras
diff --git a/dvbv5_isdb-t/br-sp-Sorocaba b/isdb-t/br-sp-Sorocaba
index 27c4b3df..27c4b3df 100644
--- a/dvbv5_isdb-t/br-sp-Sorocaba
+++ b/isdb-t/br-sp-Sorocaba
diff --git a/dvbv5_isdb-t/br-sp-Sumare b/isdb-t/br-sp-Sumare
index 8e1df824..8e1df824 100644
--- a/dvbv5_isdb-t/br-sp-Sumare
+++ b/isdb-t/br-sp-Sumare
diff --git a/dvbv5_isdb-t/br-sp-Suzano b/isdb-t/br-sp-Suzano
index a7d78d09..a7d78d09 100644
--- a/dvbv5_isdb-t/br-sp-Suzano
+++ b/isdb-t/br-sp-Suzano
diff --git a/dvbv5_isdb-t/br-sp-Taiacu b/isdb-t/br-sp-Taiacu
index f8fa59be..f8fa59be 100644
--- a/dvbv5_isdb-t/br-sp-Taiacu
+++ b/isdb-t/br-sp-Taiacu
diff --git a/dvbv5_isdb-t/br-sp-Taiuva b/isdb-t/br-sp-Taiuva
index 55d314ce..55d314ce 100644
--- a/dvbv5_isdb-t/br-sp-Taiuva
+++ b/isdb-t/br-sp-Taiuva
diff --git a/dvbv5_isdb-t/br-sp-Tambau b/isdb-t/br-sp-Tambau
index 822e9334..822e9334 100644
--- a/dvbv5_isdb-t/br-sp-Tambau
+++ b/isdb-t/br-sp-Tambau
diff --git a/dvbv5_isdb-t/br-sp-Tanabi b/isdb-t/br-sp-Tanabi
index 54cc95f8..54cc95f8 100644
--- a/dvbv5_isdb-t/br-sp-Tanabi
+++ b/isdb-t/br-sp-Tanabi
diff --git a/dvbv5_isdb-t/br-sp-Taquaritinga b/isdb-t/br-sp-Taquaritinga
index f30c652c..f30c652c 100644
--- a/dvbv5_isdb-t/br-sp-Taquaritinga
+++ b/isdb-t/br-sp-Taquaritinga
diff --git a/dvbv5_isdb-t/br-sp-Tatui b/isdb-t/br-sp-Tatui
index 90c320ce..90c320ce 100644
--- a/dvbv5_isdb-t/br-sp-Tatui
+++ b/isdb-t/br-sp-Tatui
diff --git a/dvbv5_isdb-t/br-sp-Taubate b/isdb-t/br-sp-Taubate
index 0b38bd43..0b38bd43 100644
--- a/dvbv5_isdb-t/br-sp-Taubate
+++ b/isdb-t/br-sp-Taubate
diff --git a/dvbv5_isdb-t/br-sp-TerraRoxa b/isdb-t/br-sp-TerraRoxa
index 85511ce8..85511ce8 100644
--- a/dvbv5_isdb-t/br-sp-TerraRoxa
+++ b/isdb-t/br-sp-TerraRoxa
diff --git a/dvbv5_isdb-t/br-sp-Tupa b/isdb-t/br-sp-Tupa
index 3c86496c..3c86496c 100644
--- a/dvbv5_isdb-t/br-sp-Tupa
+++ b/isdb-t/br-sp-Tupa
diff --git a/dvbv5_isdb-t/br-sp-TupiPaulista b/isdb-t/br-sp-TupiPaulista
index c751cb88..c751cb88 100644
--- a/dvbv5_isdb-t/br-sp-TupiPaulista
+++ b/isdb-t/br-sp-TupiPaulista
diff --git a/dvbv5_isdb-t/br-sp-Ubatuba b/isdb-t/br-sp-Ubatuba
index 43799220..43799220 100644
--- a/dvbv5_isdb-t/br-sp-Ubatuba
+++ b/isdb-t/br-sp-Ubatuba
diff --git a/dvbv5_isdb-t/br-sp-Valinhos b/isdb-t/br-sp-Valinhos
index daaa3a9b..daaa3a9b 100644
--- a/dvbv5_isdb-t/br-sp-Valinhos
+++ b/isdb-t/br-sp-Valinhos
diff --git a/dvbv5_isdb-t/br-sp-VarzeaPaulista b/isdb-t/br-sp-VarzeaPaulista
index 30933865..30933865 100644
--- a/dvbv5_isdb-t/br-sp-VarzeaPaulista
+++ b/isdb-t/br-sp-VarzeaPaulista
diff --git a/dvbv5_isdb-t/br-sp-Viradouro b/isdb-t/br-sp-Viradouro
index 7b7b9dba..7b7b9dba 100644
--- a/dvbv5_isdb-t/br-sp-Viradouro
+++ b/isdb-t/br-sp-Viradouro
diff --git a/dvbv5_isdb-t/br-sp-Votorantim b/isdb-t/br-sp-Votorantim
index c0fef599..c0fef599 100644
--- a/dvbv5_isdb-t/br-sp-Votorantim
+++ b/isdb-t/br-sp-Votorantim
diff --git a/dvbv5_isdb-t/br-sp-Votuporanga b/isdb-t/br-sp-Votuporanga
index f2179312..f2179312 100644
--- a/dvbv5_isdb-t/br-sp-Votuporanga
+++ b/isdb-t/br-sp-Votuporanga
diff --git a/dvbv5_isdb-t/br-to-Aragominas b/isdb-t/br-to-Aragominas
index 80176e78..80176e78 100644
--- a/dvbv5_isdb-t/br-to-Aragominas
+++ b/isdb-t/br-to-Aragominas
diff --git a/dvbv5_isdb-t/br-to-Araguaina b/isdb-t/br-to-Araguaina
index 39dcbfc0..39dcbfc0 100644
--- a/dvbv5_isdb-t/br-to-Araguaina
+++ b/isdb-t/br-to-Araguaina
diff --git a/dvbv5_isdb-t/br-to-Babaculandia b/isdb-t/br-to-Babaculandia
index c41e297d..c41e297d 100644
--- a/dvbv5_isdb-t/br-to-Babaculandia
+++ b/isdb-t/br-to-Babaculandia
diff --git a/dvbv5_isdb-t/br-to-BrejinhoDeNazare b/isdb-t/br-to-BrejinhoDeNazare
index 428d90ca..428d90ca 100644
--- a/dvbv5_isdb-t/br-to-BrejinhoDeNazare
+++ b/isdb-t/br-to-BrejinhoDeNazare
diff --git a/dvbv5_isdb-t/br-to-ChapadaDeAreia b/isdb-t/br-to-ChapadaDeAreia
index f955f193..f955f193 100644
--- a/dvbv5_isdb-t/br-to-ChapadaDeAreia
+++ b/isdb-t/br-to-ChapadaDeAreia
diff --git a/dvbv5_isdb-t/br-to-Darcinopolis b/isdb-t/br-to-Darcinopolis
index ab68a997..ab68a997 100644
--- a/dvbv5_isdb-t/br-to-Darcinopolis
+++ b/isdb-t/br-to-Darcinopolis
diff --git a/dvbv5_isdb-t/br-to-Fatima b/isdb-t/br-to-Fatima
index 2f39fa04..2f39fa04 100644
--- a/dvbv5_isdb-t/br-to-Fatima
+++ b/isdb-t/br-to-Fatima
diff --git a/dvbv5_isdb-t/br-to-Filadelfia b/isdb-t/br-to-Filadelfia
index bd476113..bd476113 100644
--- a/dvbv5_isdb-t/br-to-Filadelfia
+++ b/isdb-t/br-to-Filadelfia
diff --git a/dvbv5_isdb-t/br-to-Gurupi b/isdb-t/br-to-Gurupi
index 71ef4bcd..71ef4bcd 100644
--- a/dvbv5_isdb-t/br-to-Gurupi
+++ b/isdb-t/br-to-Gurupi
diff --git a/dvbv5_isdb-t/br-to-MiracemaDoTocantins b/isdb-t/br-to-MiracemaDoTocantins
index 19b11982..19b11982 100644
--- a/dvbv5_isdb-t/br-to-MiracemaDoTocantins
+++ b/isdb-t/br-to-MiracemaDoTocantins
diff --git a/dvbv5_isdb-t/br-to-Miranorte b/isdb-t/br-to-Miranorte
index 4614931b..4614931b 100644
--- a/dvbv5_isdb-t/br-to-Miranorte
+++ b/isdb-t/br-to-Miranorte
diff --git a/dvbv5_isdb-t/br-to-MonteSantoDoTocantins b/isdb-t/br-to-MonteSantoDoTocantins
index 8bdde599..8bdde599 100644
--- a/dvbv5_isdb-t/br-to-MonteSantoDoTocantins
+++ b/isdb-t/br-to-MonteSantoDoTocantins
diff --git a/dvbv5_isdb-t/br-to-OliveiraDeFatima b/isdb-t/br-to-OliveiraDeFatima
index 3c4e8e19..3c4e8e19 100644
--- a/dvbv5_isdb-t/br-to-OliveiraDeFatima
+++ b/isdb-t/br-to-OliveiraDeFatima
diff --git a/dvbv5_isdb-t/br-to-Palmas b/isdb-t/br-to-Palmas
index a3e8f21a..a3e8f21a 100644
--- a/dvbv5_isdb-t/br-to-Palmas
+++ b/isdb-t/br-to-Palmas
diff --git a/dvbv5_isdb-t/br-to-ParaisoDoTocantins b/isdb-t/br-to-ParaisoDoTocantins
index ba1c92b6..ba1c92b6 100644
--- a/dvbv5_isdb-t/br-to-ParaisoDoTocantins
+++ b/isdb-t/br-to-ParaisoDoTocantins
diff --git a/dvbv5_isdb-t/br-to-PortoNacional b/isdb-t/br-to-PortoNacional
index 043dd6da..043dd6da 100644
--- a/dvbv5_isdb-t/br-to-PortoNacional
+++ b/isdb-t/br-to-PortoNacional