Merge branch 'iptv-org:master' into master

data/channels.csv

@@ -6642,6 +6642,7 @@ FilmBoxBaltics.nl,FilmBox Baltics,,,,NL,,,c/EE;c/LV;c/LT,eng,movies,FALSE,,,,htt
 FilmBoxCzechRepublicSlovakia.cz,FilmBox Czech Republic & Slovakia,,,,CZ,,,c/CZ;c/SK,ces,movies,FALSE,,,,http://www.sledujfilmbox.cz/,https://i.imgur.com/KTZUugz.png
 FilmBoxExtraBulgaria.bg,FilmBox Extra Bulgaria,,,,BG,,,c/BG,bul,movies,FALSE,,,,http://bg.filmbox.pl/,https://i.imgur.com/kXYd18E.png
 FilmBoxExtraCzechRepublicSlovakia.cz,FilmBox Extra Czech Republic & Slovakia,,,,CZ,,,c/CZ;c/SK,ces,movies,FALSE,,,,http://www.sledujfilmbox.cz/,https://i.imgur.com/kXYd18E.png
+FilmBoxExtraHungary.hu,FilmBox Extra Hungary,,,,HU,,,c/HU,hun,movies,FALSE,,,,,https://i.imgur.com/kXYd18E.png
 FilmBoxExtraPoland.pl,FilmBox Extra Poland,,,,PL,,,c/PL,pol,movies,FALSE,,,,https://spiintl.com/channels/filmbox-extra-hd,https://i.imgur.com/kXYd18E.png
 FilmBoxFamily.nl,FilmBox Family,,,,NL,,,c/PL;c/SK;c/RO;c/CZ;c/HU;r/AFR,eng,movies,FALSE,,,,https://spiintl.com/channels/filmbox-family,https://i.imgur.com/CGFyAyc.png
 FilmBoxNetherlands.nl,FilmBox Netherlands,,,,NL,,,c/NL,nld,movies,FALSE,,,,http://www.filmbox.nl/,https://i.imgur.com/KTZUugz.png
@@ -7550,7 +7551,8 @@ HadiTV6.iq,Hadi TV 6,,,,IQ,,,c/IQ,ara,,FALSE,,,,https://en.haditv.co.uk/,https:/
 HadramoutTV.ye,Hadramout TV,,,,YE,,,c/YE,ara,,FALSE,,,,https://www.hadhramaut.tv/,https://i.imgur.com/i8TjKpC.png
 HagerieTV.us,Hagerie TV,,,,US,,,c/US,amh,,FALSE,,,,,https://www.lyngsat.com/logo/tv/hh/hagerie-tv-us.png
 HaGiangTV.vn,Ha Giang TV,,,,VN,,,c/VN,vie,,FALSE,,,,http://hagiangtv.vn/,https://i.imgur.com/UVDBocZ.png
-HaHa.rs,Ha Ha,,,,RS,,,c/RS,srp,,FALSE,,,,http://www.pink.rs/haha,https://www.sms.cz/kategorie/televize/bmp/loga/velka/hahatv.png
+HaHa.rs,Ha Ha,,,,RS,,,c/RS,srp,,FALSE,,,,http://www.pink.rs/haha,https://i.imgur.com/xyzH7b6.png
+HAHATV.sk,HAHA TV,,,Antik Telecom,SK,,,c/CZ;c/SK,slk,entertainment,FALSE,,,,,https://www.sms.cz/kategorie/televize/bmp/loga/velka/hahatv.png
 HainanSatelliteTV.cn,Hainan Satellite TV,,,,CN,,,c/CN,zho,,FALSE,,,,http://www.hnntv.cn/,https://www.lyngsat.com/logo/tv/hh/hainan-satellite-tv-cn.png
 HaiPhongTV.vn,Hai Phong TV,,,,VN,,,c/VN,vie,,FALSE,,,,https://thhp.vn/,https://www.lyngsat.com/logo/tv/hh/hai-phong-tv-vn.png
 HaitiHD.ca,Haiti HD,,,,CA,,,c/CA,eng,,FALSE,2014-12-05,,,http://www.afrotainment.us/,https://i.imgur.com/9BT7xlR.png
@@ -8663,7 +8665,7 @@ JOIXDTV.jp,JOIX-DTV,,NNN,,JP,,,c/JP,jpn,,FALSE,,,,https://www.ytv.co.jp/,https:/
 JOJ24.sk,JOJ 24,,,,SK,,,c/SK,slk,news,FALSE,2022-10-02,,,https://joj.sk/,https://i.imgur.com/Tv12wOd.png
 JOJCinema.sk,JOJ Cinema,,,,SK,,,c/SK,slk;ces,movies,FALSE,,,,http://jojcinema.cz/,https://i.imgur.com/5Auduch.png
 JOJCinemaPlus1.sk,JOJ Cinema +1,,,,SK,,,c/SK,slk;ces,movies,FALSE,,,,http://jojcinema.cz/,https://i.imgur.com/5Auduch.png
-JOJFamily.sk,JOJ Family,,,,SK,,,c/SK,slk;ces,family,FALSE,,,,http://jojfamily.blesk.cz/,https://i.imgur.com/k1COMHi.png
+JOJFamily.sk,JOJ Family,,,,SK,,,c/CZ,slk;ces,family,FALSE,,,,http://jojfamily.blesk.cz/,https://i.imgur.com/k1COMHi.png
 Jojko.sk,Jojko,,,,SK,,,c/SK,slk,kids,FALSE,,,,https://jojko.joj.sk/,https://upload.wikimedia.org/wikipedia/commons/thumb/0/01/Jojko.png/512px-Jojko.png
 JOJPlus.sk,JOJ Plus,,,,SK,,,c/SK,slk,,FALSE,,,,https://plus.joj.sk/,https://i.imgur.com/1LHa0EI.png
 JOJSport.sk,JOJ Sport,JOJ Šport,,,SK,,,c/SK,slk,sports,FALSE,2021-10-06,,,https://jojsport.joj.sk/,https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Logo_JOJ_%C5%A0port.png/512px-Logo_JOJ_%C5%A0port.png
@@ -14571,7 +14573,7 @@ MarjaeyatTVPersian.ir,Marjaeyat TV Persian,,,,IR,,,c/IR,fas,religious,FALSE,,,,h
 Markiza.sk,Markiza,Markíza,,,SK,,,c/SK,slk,,FALSE,,,,http://www.markiza.sk/,https://upload.wikimedia.org/wikipedia/commons/thumb/5/5b/Mark%C3%ADza_%282022%29.svg/512px-Mark%C3%ADza_%282022%29.svg.png
 MarkizaDajto.sk,Markiza Dajto,Markíza Dajto,,,SK,,,c/SK,slk,,FALSE,2012-08-20,,,http://dajto.markiza.sk/,https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Mark%C3%ADza_Dajto_%282022%29.svg/512px-Mark%C3%ADza_Dajto_%282022%29.svg.png
 MarkizaDoma.sk,Markiza Doma,Markíza Doma,,,SK,,,c/SK,slk,,FALSE,2009-08-31,,,http://doma.markiza.sk/,https://upload.wikimedia.org/wikipedia/commons/thumb/4/40/Mark%C3%ADza_Doma_%282022%29.svg/512px-Mark%C3%ADza_Doma_%282022%29.svg.png
-MarkizaInternational.sk,Markiza International,Markíza International,,,SK,,,c/SK,slk,,FALSE,,,,http://international.markiza.sk/,https://i.imgur.com/HHdDWOS.png
+MarkizaInternational.sk,Markiza International,Markíza International,,,SK,,,c/CZ,slk,,FALSE,,,,http://international.markiza.sk/,https://i.imgur.com/HHdDWOS.png
 MarkizaKrimi.sk,Markiza Krimi,Markíza Krimi,,,SK,,,c/SK,slk,,FALSE,,,,https://krimi.markiza.sk/,https://www.sms.cz/kategorie/televize/bmp/loga/velka/markiza_krimi.png
 MarkizaPlus1.sk,Markiza +1,Markíza +1,,,SK,,,c/SK,slk,,FALSE,,,,http://www.markiza.sk/,https://i.imgur.com/V79rvHd.png
 MarneuliTV.ge,Marneuli TV,,,,GE,,,c/GE,kat,,FALSE,,,,http://www.marneulitv.ge/,https://www.lyngsat.com/logo/tv/mm/marneuli_tv_ge.png
@@ -15731,6 +15733,7 @@ NashKinomir.de,Nash Kinomir,Наш Киномир,,,DE,,,c/DE,rus,movies,FALSE,,
 NashKinopokaz.ru,Nash Kinopokaz,Наш Кинопоказ,,,RU,,,c/RU,rus,movies,FALSE,,,,https://www.tricolor.tv/channels/nash-kinopokaz/,https://i.imgur.com/iwTMl8O.png
 NashKinoroman.ru,Nash Kinoroman,Наш Кинороман,,,RU,,,c/RU,rus,movies,FALSE,,,,,https://i.imgur.com/ri22Rn1.png
 Nasim.ir,Nasim,,,,IR,,,c/IR,fas,,FALSE,,,,https://tvnasim.ir/,https://s3.ott.tva.tv/rosing-tva-production/f5a6ea5dd15e5fb562a3_512x512c.png
+NasRegionTV.cz,Nas Region TV,Náš region TV,,,CZ,,,c/CZ,ces,,FALSE,,,,https://www.regionalnitelevize.cz/,https://i.imgur.com/T2ikUQv.png
 NasulTV.ro,Nasul TV,,,,RO,,,c/RO,ron,,FALSE,,,,https://www.nasul.tv/,https://static.cinemagia.ro/img/tv_station/nasul-tv.jpg
 Natali.ua,Natali,,,,UA,,,c/UA;c/RU,ukr,,FALSE,,,,,https://i.imgur.com/qpNSTvS.png
 NatGeoKidsAbuDhabi.ae,Nat Geo Kids Abu Dhabi,,,National Geographic Society;The Walt Disney Company EMEA;Abu Dhabi Media Company,AE,,,r/ARAB,ara,documentary,FALSE,2017-11-20,2020-01-01,,http://natgeotv.com/me/page/natgeokidsabudhabi,https://i.imgur.com/dN0UOwV.png
@@ -16499,7 +16502,7 @@ Novacinema4.gr,Novacinema 4,,,Nova,GR,,,c/GR,ell,movies,FALSE,,,,http://www.nova
 NovaEraTV.br,Nova Era TV,,,,BR,,,c/BR,por,,FALSE,,,,,https://i.imgur.com/IK3F9Uq.png
 NovaFun.cz,Nova Fun,,,,CZ,,,c/CZ,ces,,FALSE,,,,https://tv.nova.cz/,https://i.imgur.com/eBSqowv.png
 NovaGold.cz,Nova Gold,,,,CZ,,,c/CZ,ces,,FALSE,,,,http://gold.nova.cz/,https://i.imgur.com/edtP4JI.png
-NovaInternational.cz,Nova International,,,,CZ,,,c/CZ,ces,,FALSE,,,,http://tv.nova.cz/,https://i.imgur.com/lr26NsQ.png
+NovaInternational.cz,Nova International,,,,CZ,,,c/SK,ces,,FALSE,,,,http://tv.nova.cz/,https://i.imgur.com/lr26NsQ.png
 NovaLady.cz,Nova Lady,,,,CZ,,,c/CZ,ces,,FALSE,,,,,https://i.imgur.com/GynWxB2.png
 Novalife.gr,Novalife,Novalifε,,Nova,GR,,,c/GR,ell,,FALSE,2013-05-13,,,http://www.nova.gr/,https://i.imgur.com/cOom8BU.png
 NovaM.me,Nova M,,,,ME,,,c/ME,srp,,FALSE,,,,https://novam.tv/,https://i.imgur.com/PTq2Tv1.png
@@ -18222,7 +18225,7 @@ PrimaCool.cz,Prima Cool,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,2009-04-01,,,http://coo
 PrimaKrimi.cz,Prima Krimi,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,,,,https://krimi.iprima.cz/,https://upload.wikimedia.org/wikipedia/commons/thumb/2/2d/Prima_Krimi.png/512px-Prima_Krimi.png
 PrimaLove.cz,Prima Love,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,2011-03-08,,,http://love.iprima.cz/,https://upload.wikimedia.org/wikipedia/commons/thumb/e/ec/Prima_Love_logo_2018.png/512px-Prima_Love_logo_2018.png
 PrimaMax.cz,Prima Max,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,,,,http://max.iprima.cz/,https://i.imgur.com/ePrdyLi.png
-PrimaPlus.cz,Prima Plus,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,,,,http://www.iprima.cz/prima-plus,https://i.imgur.com/is4GddN.png
+PrimaPlus.cz,Prima Plus,,,FTV Prima,CZ,,,c/SK,ces,,FALSE,,,,http://www.iprima.cz/prima-plus,https://i.imgur.com/is4GddN.png
 PrimaPlus1.cz,Prima +1,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,,,,http://www.iprima.cz/,https://www.lyngsat.com/logo/tv/pp/prima_tv_cz_plus1.png
 PrimaShow.cz,Prima Show,,,FTV Prima,CZ,,,c/CZ,ces,,FALSE,,,,https://show.iprima.cz/,https://i.imgur.com/XbwAwkp.png
 PrimaSport1.ro,Prima Sport 1,,,,RO,,,c/RO,ron,sports,FALSE,2022-04-19,,,http://primasport.ro/,https://i.imgur.com/MnBWGDC.png
@@ -18909,7 +18912,7 @@ ReggioTV.it,ReggioTV,,,,IT,,,c/IT,ita,,FALSE,,,,,https://upload.wikimedia.org/wi
 Regio8TV.nl,Regio8 TV,,,,NL,,,c/NL,nld,,FALSE,,,,https://www.regio8.nl/,https://i.imgur.com/EA8lB8J.png
 Regio90TV.nl,Regio90 TV,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/b8Re9Xd.png
 Region29.ru,Region29,Регион29,,,RU,,Arkhangelsk,c/RU,rus,,FALSE,,,,https://region29.ru/,https://i.imgur.com/pULU44E.png
-RegionalniTV.cz,Regionalni TV,Regionální TV,,,CZ,,,c/CZ,ces,,FALSE,,,,http://www.regionalnitelevize.cz/,https://www.sms.cz/kategorie/televize/bmp/loga/velka/regionalnitelevize.png
+RegionalniTV.cz,Regionalni TV,Regionální TV,,,CZ,,,c/CZ,ces,,FALSE,,2022-11-01,NasRegionTV.cz,http://www.regionalnitelevize.cz/,https://www.sms.cz/kategorie/televize/bmp/loga/velka/regionalnitelevize.png
 RegionTVCallao.pe,Region TV Callao,Región TV Callao,,,PE,,,c/PE,spa,,FALSE,,,,https://regionteve.com/,https://i.imgur.com/I4grcqk.png
 RegioTVBodensee.de,Regio TV Bodensee,,,,DE,,,c/DE,deu,,FALSE,,,,https://www.regio-tv.de/,https://i.imgur.com/3koyLef.png
 RegioTVNieuws.nl,Regio TV Nieuws,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/PIUI2zZ.png
@@ -18959,7 +18962,7 @@ Retro.ru,Retro,Ретро,,,RU,,,c/RU,rus,,FALSE,,,,http://tv-stream.ru/channels
 RetroCartoon.br,Retro Cartoon,Retrô Cartoon,,,BR,,,c/BR,por,classic,FALSE,,,,,https://i.imgur.com/cyfu3qP.png
 RetroCrush.us,RetroCrush,,,,US,,,c/US,eng,classic;animation,FALSE,,,,https://www.retrocrush.tv/,https://i.imgur.com/M40b4YI.png
 RetroMagico.ar,Retro Magico,Retro Mágico,,,AR,,,c/AR,spa,entertainment,FALSE,,,,https://www.solumedia.com.ar/video/retromagico/,https://i.imgur.com/Dd8KMvI.png
-RetroMusicTV.cz,Retro Music TV,,,,CZ,,,c/CZ;c/SK,ces,music,FALSE,,,,https://retromusic.cz/,https://i.postimg.cc/C53XtK5f/zaltv.png
+RetroMusicTV.cz,Retro Music TV,,,,CZ,,,c/CZ;c/SK,ces,music,FALSE,,,,https://retromusic.cz/,https://i.imgur.com/AcoDMqs.png
 RetroPlexEast.us,RetroPlex East,,,,US,,,c/US,eng;spa,movies,FALSE,,,,https://www.starz.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/1/10/Retroplex_logo.svg/512px-Retroplex_logo.svg.png
 RetroPlexWest.us,RetroPlex West,,,,US,,,c/US,eng;spa,movies,FALSE,,,,https://www.starz.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/1/10/Retroplex_logo.svg/512px-Retroplex_logo.svg.png
 RetroPlus.cl,Retro Plus,,Retro Plus,,CL,,,c/CL;c/PE,eng;spa,music,FALSE,,,,https://www.retroplustv.com/,https://i.imgur.com/i0rZsgG.png