Merge branch 'iptv-org:master' into master

Author: theshoeshiner

data/channels.csv

@@ -1204,6 +1204,7 @@ Altai.kz,Altai,,,,KZ,,Ust-Kamenogorsk,c/KZ,kaz,general,FALSE,,,,https://altaitv.
 AltaleaaTV.iq,Altaleaa TV,,,,IQ,,Baghdad,c/IQ,ara,,FALSE,,,,,https://i.imgur.com/Uo5NaLZ.png
 AltantoTV.do,Altanto TV,,,,DO,,,c/DO,spa,general,FALSE,,,,https://altanto.com.do/,https://i.imgur.com/KWvVLhc.png
 AltarofDivineMercyTV.ng,Altar of Divine Mercy TV,,,,NG,,Uromi,c/NG,eng,religious,FALSE,,,,https://altarofdivinemercy.com/,https://i.imgur.com/3bicv1D.png
+AltarTV.gh,Altar TV,,,,GH,,Kumasi,c/GH,eng,religious,FALSE,,,,https://altartvgh.com/,https://i.imgur.com/CKsqlk2.png
 AltasTV.tr,Altas TV,,,,TR,,Ankara,c/TR,tur,general,FALSE,,,,http://www.altastv.com.tr/,https://i.imgur.com/XaJ7fp6.png
 AltenaTV.nl,Altena TV,,,Altena Group B.V.,NL,,Waalwijk,c/NL,nld,,FALSE,,,,,https://i.imgur.com/0wblu0I.png
 AltenburgTV.de,Altenburg TV,,,,DE,,Altenburg,c/DE,deu,general,FALSE,,,,https://www.altenburg.tv/,https://i.imgur.com/3JriZGR.png
@@ -1549,7 +1550,7 @@ AppanTV.np,Appan TV,खबरको सहि यात्रा ।।,,,NP,,Ja
 Apple68TV.us,Apple68 TV,,,,US,US-NY,New York City,c/US;c/GH,eng,entertainment,FALSE,,,,,https://i.imgur.com/xQct5s2.jpg
 AppleTV.gh,Apple TV,,,,GH,,Kumasi,c/GH,eng,,FALSE,,,,,https://i.imgur.com/5cjSPVE.png
 AppleValleyChannel180.us,Apple Valley Channel 180,,,,US,US-MN,Apple Valley,s/US-MN,eng,legislative,FALSE,,,,https://www.ci.apple-valley.mn.us/491/Meeting-Webstream,https://i.imgur.com/3h9RkFA.png
-ApprovalTV.ng,Approval TV,God's Approval TV,,God's Approval Campaign,NG,,Lagos,r/INT,eng,general;religious,FALSE,,2025-04-20,,https://live.approvaltv.com,https://live.approvaltv.com/approvaltv-logo.png
+ApprovalTV.ng,Approval TV,God's Approval TV,,God's Approval Campaign,NG,,Lagos,r/INT,eng,general;religious,FALSE,2025-04-21,,,https://live.approvaltv.com,https://live.approvaltv.com/logov.png
 AprelTV.kg,Aprel TV,Апрель ТВ,,,KG,,,c/KG,kir;rus,general,FALSE,2018-04-02,,,https://april.kg/,https://i.imgur.com/5f3kc0m.jpeg
 Aprendeencasa32.mx,Aprende en casa 3.2,,,Instituto Latinoamericano de la Comunicacion Educativa,MX,,Mexico City,c/MX,spa,education,FALSE,,,,https://aprendeencasa.sep.gob.mx/,https://i.imgur.com/VOPPmpy.png
 AprendeTV.mx,Aprende TV,,,Instituto Latinoamericano de la Comunicacion Educativa,MX,,Mexico City,c/MX,spa,education,FALSE,,,,https://aprende.gob.mx/,https://i.imgur.com/nK194u8.png
@@ -1735,7 +1736,7 @@ ARTV.pt,ARTV,Canal Parlamento,,,PT,,Lisbon,c/PT,por,legislative,FALSE,1998-01-01
 ARTVKano.ng,ARTV Kano,Abubakar Rimi Television,,,NG,,Kano,c/NG,eng,,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/artv-kano-ng.png
 ArubaTouristChannel.aw,Aruba Tourist Channel,,,Mr. Ishwar Daryanani,AW,,Oranjestad,c/AW,eng,travel,FALSE,,,,https://arubatouristchannel.com/,https://i.imgur.com/PGM2mw3.png
 ArubaTV.aw,Aruba.TV,,,,AW,,Savaneta,c/AW,eng;spa,travel,FALSE,,,,https://aruba.tv/,https://i.imgur.com/9fWY09U.png
-ArubaTVPlus.aw,ArubaTV +,ArubaTV Plus,,,AW,,Noord,c/AW,nld;pap;eng,entertainment,FALSE,,,,https://www.arubatvplus.com/,https://i.imgur.com/9s6LZJZ.png
+ArubaTVPlus.aw,ArubaTV +,ArubaTV Plus,,VOA MEDIA,AW,,Noord,c/AW,nld;pap;eng,entertainment,FALSE,,,,https://www.arubatvplus.com/,https://i.imgur.com/9s6LZJZ.png
 ArundelTV.us,Arundel TV,,,,US,US-MD,Glen Burnie,s/US-MD,eng,legislative,FALSE,,,,https://www.aacounty.org/services-and-programs/government-television,https://i.imgur.com/Vo9lRuk.png
 ARUTV.ee,ARU.TV,,,,EE,,Tallinn,c/EE,rus,news,FALSE,2015-01-28,,,https://aru.tv/,https://i.imgur.com/LBZip3s.jpg
 ArutzHaYeladim.il,Arutz HaYeladim,,,RGE Group;NOGA Communications,IL,,Tel Aviv,c/IL,heb,kids,FALSE,1989-11-08,,,https://www.kidstv.co.il/,https://i.imgur.com/n1KusFW.png
@@ -8201,7 +8202,7 @@ FidesTV.bo,Fides TV,,,Grupo Fides,BO,,La Paz,c/BO,spa,general,FALSE,,,,https://w
 FidoTV.us,Fido TV,,,,US,US-OK,Oklahoma City,c/US,eng,entertainment,FALSE,,,,http://www.fidotvchannel.com/,https://i.imgur.com/p13E4cf.png
 FieldStream.us,Field & Stream,,,,US,US-TN,Nashville,c/US,eng,outdoor,FALSE,,,,https://www.fieldandstream.com/,https://i.imgur.com/9ApEFXx.png
 FiestaMax.ve,Fiesta Max,,,,VE,,,c/VE,spa,music,FALSE,,,,http://fiestamaxchannel.com/,https://i.imgur.com/8am0c5E.png
-FIFAPlus.pl,FIFA+,,,,PL,,,c/PL;r/EUR,eng,,FALSE,,,,,https://images-2.rakuten.tv/storage/global-live-channel/translation/artwork/a27208c4-021a-45e8-a250-11f8ffab36c8-width200-quality90.jpeg
+FIFAPlus.pl,FIFA+,,Rakuten TV,,PL,,,c/PL;r/EUR,eng,sports,FALSE,2023-07-11,,,,https://i.imgur.com/l5iax42.png
 FifthGear.us,Fifth Gear,,Pluto TV,,US,,,c/UK,eng,auto,FALSE,,,,https://pluto.tv/en/live-tv/fifth-gear-gb,https://i.imgur.com/AsB4op8.png
 Fight.us,Fight,,Pluto TV,,US,,,c/US,eng,sports,FALSE,,,,https://pluto.tv/en/live-tv/fight,https://i.imgur.com/bBv4p5K.png
 FightBox.nl,FightBox,,,SPI International Inc.,NL,,The Hague,r/INT,eng,sports,FALSE,2012-06-01,,,http://www.fightbox.com,https://i.imgur.com/mRsnztA.png
@@ -8933,8 +8934,8 @@ GikuyuTV.ke,Gikuyu TV,,,,KE,,Nairobi,c/KE,eng,religious,FALSE,,,,,https://i.imgu
 GillettePublicAccessTelevisionChannel189.us,Gillette Public Access Television Channel 189,GPA-TV Channel 189,,,US,US-WY,Gillette,s/US-WY,eng,education,FALSE,,,,https://play.champds.com/gillettewy/live/7,https://yt3.googleusercontent.com/ytc/AGIKgqMoPQ32FU8R2lR71LXhYrC3tCHfjJEXcm6E9PEO=s176-c-k-c0x00ffffff-no-rj
 GillettePublicAccessTelevisionChannel190.us,Gillette Public Access Television Channel 190,GPA-TV Channel 190,,,US,US-WY,Gillette,s/US-WY,eng,general,FALSE,,,,https://play.champds.com/gillettewy/live/5,https://yt3.googleusercontent.com/ytc/AGIKgqMoPQ32FU8R2lR71LXhYrC3tCHfjJEXcm6E9PEO=s176-c-k-c0x00ffffff-no-rj
 GillettePublicAccessTelevisionChannel192.us,Gillette Public Access Television Channel 192,GPA-TV Channel 192,,,US,US-WY,Gillette,s/US-WY,eng,legislative,FALSE,,,,https://play.champds.com/gillettewy/live/6,https://yt3.googleusercontent.com/ytc/AGIKgqMoPQ32FU8R2lR71LXhYrC3tCHfjJEXcm6E9PEO=s176-c-k-c0x00ffffff-no-rj
-GINXEsportsTV.uk,GINX Esports TV,,,,UK,,London,c/UK,eng,sports,FALSE,2008-01-01,,,https://www.ginx.media/television,https://i.imgur.com/ZeOPwcw.png
 GINXEsportsTVCanada.ca,GINX Esports TV Canada,Super Channel 4,,Allarco Entertainment,CA,CA-AB,Edmonton,c/CA,eng,sports,FALSE,2007-01-01,,,https://www.superchannel.ca/Ginx,https://i.imgur.com/6rlGu3V.png
+GINXTV.uk,GINX TV,GINX Esports TV,,GINX TV Ltd,UK,,London,c/UK,eng,sports,FALSE,2008-08-01,,,https://www.ginx.tv/en/,https://i.imgur.com/diw20TN.png
 GiornaleRadioNewsTV.it,Giornale Radio News TV,,,,IT,,Milan,c/IT,ita,news,FALSE,,,,https://giornaleradio.fm/canali-tv/giornale-radio-news-tv,https://i.imgur.com/2Y5qiao.png
 GiornaleRadioTV.it,Giornale Radio TV,,,,IT,,Milan,c/IT,ita,news,FALSE,,,,https://giornaleradio.fm/canali-tv/giornaleradio-tv,https://i.imgur.com/2Y5qiao.png
 GiovanniPaoloTV.it,Giovanni Paolo TV,,,,IT,,Parma,c/IT,ita,religious,FALSE,,,,https://diretta.giovannipaolotv.it/,https://www.lyngsat.com/logo/tv/gg/giovanni-paolo-tv-it.png
@@ -17523,6 +17524,7 @@ LogosTVKids.es,Logos TV Kids,,,,ES,US-MD,Columbia,c/US;c/ES,spa,religious;kids,F
 LogosTVSalud.es,Logos TV Salud,,,,ES,US-MD,Columbia,c/US;c/ES,spa,lifestyle,FALSE,,,,https://logostv.es/,https://i.imgur.com/qkHrttj.png
 LohasChannel.tw,Lohas Channel,樂活頻道,,Lexi International Co. Ltd.,TW,,Taipei,c/TW,jpn;eng,xxx,TRUE,,,,http://www.goldentv.com.tw/index.php?m=Product&a=index&pc_code=1080113&pop=false,https://i.imgur.com/mXxR9RN.png
 LoHermidaTelevision.cl,Lo Hermida Television,Lo Hermida Televisión,,,CL,CL-RM,Penalolen,s/CL-RM,spa,,FALSE,,,,https://lhtv.cl/,https://i2.paste.pics/2cfcf32766eb75a8fec96086bc741ec2.png
+Lokaal7.nl,Lokaal 7,,,Jos Heerkens,NL,,Sint-Michielsgestel,c/NL,nld,general,FALSE,,,,https://www.lokaal7.nl/,https://i.imgur.com/kMTEqFn.png
 LokaleOmroepZeewolde.nl,Lokale Omroep Zeewolde,LOZ,,,NL,,Zeewolde,c/NL,nld,general,FALSE,,,,https://www.lokaleomroepzeewolde.nl/,https://i.imgur.com/Dw4u9wT.png
 LokalTVUddevalla.se,Lokal-TV Uddevalla,Fyrbodal-TV,,,SE,,Uddevalla,c/SE,swe,general,FALSE,,,,https://ltvu.se/,https://i.imgur.com/Hfm1rI3.png
 LokSabhaTV.in,Lok Sabha TV,,,Lok Sabha,IN,,New Delhi,c/IN,eng,legislative,FALSE,,,,https://loksabhatv.nic.in/,https://i.imgur.com/QavgfiK.png
@@ -20311,7 +20313,7 @@ NosStudios.pt,Nos Studios,,,,PT,,Lisbon,c/PT,por,entertainment,FALSE,,,,https://
 Nostalgia.bg,Nostalgia,,,,BG,,Sofia,c/BG,bul,classic,FALSE,,,,http://nostalgia.bg/,https://i.imgur.com/JU1dFfK.png
 Nostalgia.ru,Nostalgia,Ностальгия,,Veriselintel,RU,,Moscow,c/RU,rus,classic,FALSE,2004-11-04,,,http://www.nostalgiatv.ru/,https://i.imgur.com/YBdBc0J.png
 NosTelevision.es,Nos Television,Nós Televisión,,Diego Frey,ES,ES-GA,Madrid,c/ES,glg,culture,FALSE,,,,https://nostelevision.gal/,https://i.imgur.com/qofxGmk.png
-NosTVBonaire.bq,Nos TV Bonaire,,,,BQ,,Kralendijk,c/BQ,pap;nld,general,FALSE,,,,http://www.nostvbonaire.com/,https://i.ibb.co/R6kb44B/cropped-LOGO-NOSTV-WEBSITE-2019-1.png
+NosTVBonaire.bq,Nos TV Bonaire,,,Flamingo TV,BQ,,Kralendijk,c/BQ,pap;nld,general,FALSE,,,,http://www.nostvbonaire.com/,https://i.ibb.co/R6kb44B/cropped-LOGO-NOSTV-WEBSITE-2019-1.png
 Notele.be,Notele,No Télé,,,BE,,Kain,c/BE,nld,general,FALSE,1977-11-12,,,https://www.notele.be/,https://i.imgur.com/fGS55nR.png
 NothingScripted.us,Nothing Scripted,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/QSH4Z4p.png
 Noticias16.do,Noticias 16,El Canal de las Noticias,,,DO,,Santo Domingo,c/DO,spa,news,FALSE,,,,https://noticias16.com.do/en-vivo/,https://www.lyngsat.com/logo/tv/nn/noticias-16-do.png
@@ -22239,7 +22241,7 @@ PottaDivineTVUK.uk,Potta-Divine TV UK,,,,UK,,,c/UK,eng,religious,FALSE,,,,https:
 PottaDivineTVUSA.us,Potta-Divine TV USA,,,,US,,,c/US,mal,religious,FALSE,,,,https://dvnonline.org/,https://i.imgur.com/Yx0AnLW.png
 POTV.bg,POTV,,,,BG,,,c/BG,bul,,FALSE,,,,,https://i.id24.bg/i/1203689.jpg
 PourimRTV.cd,Pourim RTV,,,,CD,,Matadi,c/CD,fra,religious,FALSE,,,,http://radiopourim.com/,https://i.imgur.com/8P7pYrY.png
-Power1017FM.aw,Power 101.7 FM,,,,AW,,,c/AW,nld;pap;eng,music,FALSE,,,,http://www.powerfm1017.com/,https://i.imgur.com/bkQrXjB.png
+Power1017FM.aw,Power 101.7 FM,,,,AW,,Oranjestad,c/AW,nld;pap;eng,music,FALSE,,,,http://www.powerfm1017.com/,https://i.imgur.com/bkQrXjB.png
 PowerDance.tr,Power Dance,,,,TR,,,c/TR,tur,music,FALSE,,,,https://www.powerapp.com.tr/radios/powerdance/,https://i.imgur.com/QpPteBO.png
 PowerHD.ar,PowerHD,,,,AR,AR-B,Pinamar,c/AR,eng;spa,,FALSE,,,,https://www.radiopower.com.ar/powerhd/webroot/index.php?altvideoplayer=1,https://i.imgur.com/15gMDG0.png
 PowerHitRadio.lt,Power Hit Radio,,,,LT,,,c/LT,lit,music,FALSE,,,,https://powerhitradio.tv3.lt/,https://i.imgur.com/GOlQbfC.png
@@ -28413,7 +28415,7 @@ TV24.mk,TV 24,,,,MK,,,c/MK,mkd,,FALSE,,,,https://www.24.mk/,https://i.imgur.com/
 TV24.mn,TV 24,,,,MN,,,c/MN,mon,,FALSE,,,,,https://i.imgur.com/bhAGdqR.png
 TV25.ch,TV 25,,,,CH,,,c/CH,deu,,FALSE,,,,https://www.oneplus.ch/,https://i.imgur.com/cggutzP.png
 TV25.ge,TV 25,,,,GE,,,c/GE,kat,,FALSE,,,,https://www.tv25.ge/,https://www.magticom.ge/images/channels/MjAxOC8wOS8xMC9lNWU0YmY2OC1iNjgzLTQ1NWMtYTQzZi00YmZmYWFiYTcyYTguanBn.jpg
-TV25.mn,TV 25,,,,MN,,,c/MN,mon,,FALSE,,,,http://www.tv25.mn/,https://i.imgur.com/F3MMJMd.png
+TV25.mn,TV 25,,,,MN,,,c/MN,mon,general,FALSE,,,,http://www.tv25.mn/,https://i.imgur.com/F3MMJMd.png
 TV264.tr,TV 264,,,,TR,,,c/TR,tur,,FALSE,,,,https://tv264.com.tr/,https://i.imgur.com/tudXdOZ.png
 TV28.us,TV28,,,,US,US-CA,Pleasanton,s/US-CA,eng,general,FALSE,,,,https://www.tri-valleytv.org/?q=node/33,https://i.imgur.com/I4avwto.png
 TV29.us,TV29,,,,US,US-CA,Pleasanton,s/US-CA,eng,legislative,FALSE,,,,https://www.tri-valleytv.org/?q=node/34,https://i.imgur.com/I4avwto.png
@@ -30634,7 +30636,7 @@ VintageMusic.cr,Vintage Music,,,,CR,,,c/CR,spa,music,FALSE,,,,,https://i2.paste.
 VinxTV.es,Vinx TV,,,,ES,ES-AS,,s/ES-AS,spa,sports,FALSE,,,,https://www.vinxtv.es/,https://i.imgur.com/6EGV2eo.png
 VIOTV.sk,VIO TV,,,,SK,,,c/SK,slk,,FALSE,,,,http://viotv.sk/,https://i.imgur.com/7EL3VZ5.png
 VIPNews.in,VIP News,,,,IN,,,c/IN,hin,news,FALSE,,,,,https://i.imgur.com/84kRaW1.png
-VIPTV.aw,VIP TV,,,,AW,,,c/AW,nld;pap;eng,music,FALSE,,,,http://www.viponlineradio.com/vip-tv/,https://i.imgur.com/6N0qITv.png
+VIPTV.aw,VIP TV,,,,AW,,Noord,c/AW,nld;pap;eng,music,FALSE,,,,http://www.viponlineradio.com/vip-tv/,https://i.imgur.com/6N0qITv.png
 VipTV.th,Vip TV,,,,TH,,,c/TH,tha,,FALSE,,,,,https://i.imgur.com/qe9ga2L.png
 VirgendeChiquinquira.co,Virgen de Chiquinquira,Virgen de Chiquinquirá,,,CO,,Chiquinquirá,c/CO,spa,religious,FALSE,,,,https://virgendechiquinquira.com/,https://i.imgur.com/LySnDQ7.png
 VirgendeNatividaddeParuro.pe,Virgen de Natividad de Paruro,,,,PE,PE-PUN,Paruro,c/PE,spa,religious,FALSE,,,,https://virgendenatividadparuro.net.pe/,https://i.imgur.com/AP3PLHz.png

data/feeds.csv

@@ -1378,6 +1378,7 @@ Altai.kz,SD,SD,TRUE,c/KZ,Asia/Almaty,kaz,576i
 AltaleaaTV.iq,SD,SD,TRUE,c/IQ,Asia/Baghdad,ara,576i
 AltantoTV.do,SD,SD,TRUE,c/DO,America/Santo_Domingo,spa,480i
 AltarofDivineMercyTV.ng,SD,SD,TRUE,c/NG,Africa/Lagos,eng,576i
+AltarTV.gh,SD,SD,TRUE,c/GH,Africa/Accra,eng,576i
 AltasTV.tr,SD,SD,TRUE,c/TR,Europe/Istanbul,tur,576i
 AltenaTV.nl,SD,SD,TRUE,c/NL,Europe/Amsterdam,nld,576i
 AltenburgTV.de,SD,SD,TRUE,c/DE,Europe/Berlin,deu,576i
@@ -10002,8 +10003,8 @@ GikuyuTV.ke,SD,SD,TRUE,c/KE,Africa/Nairobi,eng,576i
 GillettePublicAccessTelevisionChannel189.us,SD,SD,TRUE,s/US-WY,America/Denver,eng,480i
 GillettePublicAccessTelevisionChannel190.us,SD,SD,TRUE,s/US-WY,America/Denver,eng,480i
 GillettePublicAccessTelevisionChannel192.us,SD,SD,TRUE,s/US-WY,America/Denver,eng,480i
-GINXEsportsTV.uk,SD,SD,TRUE,c/UK,America/Toronto,eng,576i
 GINXEsportsTVCanada.ca,SD,SD,TRUE,c/CA,America/Edmonton,eng,480i
+GINXTV.uk,SD,SD,TRUE,c/UK,America/Toronto,eng,576i
 GiornaleRadioNewsTV.it,SD,SD,TRUE,c/IT,Europe/Rome,ita,576i
 GiornaleRadioTV.it,SD,SD,TRUE,c/IT,Europe/Rome,ita,576i
 GiovanniPaoloTV.it,SD,SD,TRUE,c/IT,Europe/Rome,ita,576i
@@ -18807,6 +18808,7 @@ LogosTVKids.es,SD,SD,TRUE,c/US;c/ES,America/New_York,spa,576i
 LogosTVSalud.es,SD,SD,TRUE,c/US;c/ES,America/New_York,spa,576i
 LohasChannel.tw,SD,SD,TRUE,c/TW,Asia/Taipei,jpn;eng,480i
 LoHermidaTelevision.cl,SD,SD,TRUE,s/CL-RM,America/Santiago,spa,480i
+Lokaal7.nl,SD,SD,TRUE,c/NL,Europe/Amsterdam,nld,576i
 LokaleOmroepZeewolde.nl,SD,SD,TRUE,c/NL,Europe/Amsterdam,nld,576i
 LokalTVUddevalla.se,SD,SD,TRUE,c/SE,Europe/Stockholm,swe,576i
 LokSabhaTV.in,SD,SD,TRUE,c/IN,Asia/Kolkata,eng,576i