Merge branch 'iptv-org:master' into master

data/channels.csv

@@ -2956,7 +2956,7 @@ BergamoTV.it,Bergamo TV,BTV,,Sesaab,IT,,Bergamo,c/IT,ita,general,FALSE,1976-01-0
 Bergblick.de,Bergblick,,,HV Fernsehenbetriebs GmbH,DE,,,c/CH;c/DE,deu,,FALSE,2021-09-01,,,https://www.bergblick-tv.de/,https://i.imgur.com/j5YiyXc.png
 BergblickHD.de,Bergblick HD,,,HV Fernsehenbetriebs GmbH,DE,,,c/CH;c/DE,deu,,FALSE,2021-09-01,,,https://www.bergblick-tv.de/,https://i.imgur.com/RcLUghT.png
 BeritaRTM.my,Berita RTM,,,Radio Televisyen Malaysia,MY,,,c/MY,msa,,FALSE,2020-06-25,,,https://www.rtm.gov.my/,https://i.imgur.com/1Xzxsgl.png
-BeritaSatuEnglish.id,BeritaSatu English,,,,ID,,,c/ID,eng,news,FALSE,,,,https://www.beritasatu.com/,https://i.imgur.com/SIgwO6M.png
+BeritaSatuEnglish.id,BeritaSatu English,,,,ID,,,c/ID,eng,news,FALSE,,2015-02-01,,https://www.beritasatu.com/,https://i.postimg.cc/SRDWxRGs/13092012142252.jpg
 BeritaSatuWorld.id,BeritaSatu World,,,B Universe,ID,,,r/INT,ind;eng,news,FALSE,,,IDTV.id,https://www.beritasatu.com/livestream/world,https://i.imgur.com/gHBxpyc.png
 BerkahShopTV.id,Berkah Shop TV,,,,ID,,,c/ID,ind,shop,FALSE,,,iBerkah.id,https://berkahshopping.com/,https://i.imgur.com/IsSw1rO.png
 BerksCommunityTV.us,Berks Community TV,BCTV,,,US,US-PA,Reading,s/US-PA,eng,general,FALSE,,,,https://www.bctv.org/,https://i.imgur.com/vQ6a4VL.png
@@ -11169,6 +11169,7 @@ JahanbinTV.ir,Jahanbin TV,,,,IR,,,c/IR,fas,,FALSE,,,,http://chb.irib.ir/tv,https
 Jahonnamo.tj,Jahonnamo,,,,TJ,,,c/TJ,tgk,general,FALSE,,,,http://www.jahonnamo.tj/,https://i.imgur.com/ffqdD8W.png
 JaihindTV.in,Jaihind TV,,,,IN,,,c/IN,mal,entertainment,FALSE,,,,,https://i.imgur.com/NaiA73p.png
 JaiMaharashtra.in,Jai Maharashtra,,,Amruta Khanvilkar,IN,,,c/IN,mar,,FALSE,,,,https://www.jaimaharashtranews.com/,https://i.imgur.com/nAv3icS.png
+JakartaGlobeNewsChannel.id,Jakarta Globe News Channel,,,,ID,,,c/ID,ind;eng,,FALSE,,,,,https://i.imgur.com/SIgwO6M.png
 JakTV.id,Jak TV,,,,ID,ID-JK,DKI Jakarta,s/ID-JK,ind,,FALSE,2005-03-16,,,https://jak-tv.com/,https://i.imgur.com/xyLLLOi.png
 JaliscoTV.mx,Jalisco TV,,,Sistema Jalisciense de Radio y Televisión,MX,,,c/MX,spa,,FALSE,1991-01-16,,,https://jaliscotv.com/,https://i.imgur.com/N4meE8I.png
 JalshaMovies.in,Jalsha Movies,Star Jalsha Movies,Disney Star,Disney India,IN,,Kolkata,c/IN;c/BD,ben,movies,FALSE,2012-12-16,,,http://www.jalshamovies.com/,https://i.imgur.com/25eWjX2.png
@@ -14627,7 +14628,7 @@ KNBCDT2.us,KNBC-DT2,,Cozi TV,,US,US-CA,Los Angeles,s/US-CA,eng,,FALSE,,,,,https:
 KNBCDT3.us,KNBC-DT3,,LX Network,,US,US-CA,Los Angeles,s/US-CA,eng,,FALSE,,,,,https://i.imgur.com/GPoucaV.png
 KNBNDT1.us,KNBN-DT1,,NBC,,US,US-SD,Rapid City,s/US-SD,eng,,FALSE,,,,http://www.newscenter1.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/7/7a/NBC_logo_2022_%28vertical%29.svg/512px-NBC_logo_2022_%28vertical%29.svg.png
 KNBNDT2.us,KNBN-DT2,,MyNetworkTV,,US,US-SD,Rapid City,s/US-SD,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/3/38/MyNetworkTV_2D_Logo.svg/512px-MyNetworkTV_2D_Logo.svg.png
-KNBXCD1.us,KNBX-CD1,,Armount TV,,US,US-NV,Las Vegas,s/US-NV,eng,,FALSE,,,,,https://i.imgur.com/xBDJ5VG.png
+KNBXCD1.us,KNBX-CD1,Armount TV,Armount TV,,US,US-NV,Las Vegas,s/US-NV,hye;eng,general,FALSE,,,,https://armount.com/,https://i.imgur.com/xBDJ5VG.png
 KNBXCD2.us,KNBX-CD2,,The Walk TV,,US,US-NV,Las Vegas,s/US-NV,eng,,FALSE,,,,,https://i.imgur.com/F5qqJPe.png
 KNBXCD3.us,KNBX-CD3,,ONTV4U,,US,US-NV,Las Vegas,s/US-NV,eng,,FALSE,,,,,https://i.imgur.com/EOP6DCS.png
 KNBXCD4.us,KNBX-CD4,,Mainstreet TV,,US,US-NV,Las Vegas,s/US-NV,eng,,FALSE,,,,,https://cdn.tvpassport.com/image/station/100x100/mainstreet-tv.png
@@ -19303,7 +19304,7 @@ MuzikasVideoKanals.lv,Muzikas Video Kanals,Mūzikas Video Kanāls,,,LV,,,c/LV,la
 MuzLife.kz,MuzLife,,,,KZ,,,c/KZ,kaz,music,FALSE,,,,,https://i.imgur.com/IIoSxHl.png
 MuzsikaTV.hu,Muzsika TV,,,Magyar RTL Televízió Zrt.,HU,,,c/HU,hun,music,FALSE,,,,https://rtl.hu/,https://i.imgur.com/kmQ5vYC.png
 MuzSoyuz.ru,Muz Soyuz,Муз Союз,,,RU,,Yekaterinburg,c/RU,rus,music;religious,FALSE,,,,https://muz.tv-soyuz.ru/,https://i.imgur.com/Puk1Bhx.png
-MuzTV.az,Muz TV,,,,AZ,,,c/AZ,aze,music,FALSE,,,,http://www.muz-tv.az/,https://i.imgur.com/CjySP1V.png
+MuzTV.az,Muz TV,MTV Azərbaycan,,,AZ,,Baku,c/AZ,aze,music,FALSE,2012-05-11,,,http://www.muz-tv.az/,https://i.imgur.com/lSBMeBU.png
 MuzTV.ru,Muz-TV,Муз-ТВ,,UTH Russia,RU,,,c/RU,rus,music,FALSE,,,,https://muz-tv.ru/,https://i.imgur.com/BtqrHmz.png
 Muzvar.ua,Muzvar,Музвар,,Oleksiy Dontsov;Yulian Novak,UA,,,c/UA,ukr,music,FALSE,,,,,https://i.imgur.com/Klu5k9U.png
 MuzykaPervogo.ru,Muzyka Pervogo,Музыка Первого;MuzikaPervogo,,Government of Russia,RU,,,c/RU,rus;ukr,music,FALSE,2005-12-01,,,https://www.muz1.tv/,https://i.imgur.com/U0vKj3P.png
@@ -29460,11 +29461,11 @@ TVJSID.br,TV J.SID,,,,BR,BR-BA,,s/BR-BA,por,entertainment,FALSE,,,,https://tvjsi
 TVJSportsNetwork.jm,TVJ Sports Network,,,RJRGleaner Communications Group,JM,,Kingston,c/JM,eng,sports,FALSE,,,,https://www.televisionjamaica.com/,https://i.imgur.com/WtTvRH1.png
 TVJurmala.lv,TV Jurmala,TV Jūrmala,,,LV,,Jurmala,c/LV,lav,general,FALSE,,,,https://jurmala.tv/tiesraide/,https://i.imgur.com/tQHkHD0.png
 TVJustica.br,TV Justica,TV Justiça,,Brazilian Judicial Branch,BR,,,c/BR,por,,FALSE,2002-08-11,,,http://www.tvjustica.jus.br/,https://i.imgur.com/rOQKiMO.png
-TVK.kh,TVK,,,,KH,,,c/KH,khm,,FALSE,,,,,https://i.imgur.com/5hPxjcl.png
+TVK.kh,TVK,,,Government of Cambodia,KH,,Phnom Penh,c/KH,khm,general,FALSE,1966-02-02,,,https://www.tvk.gov.kh/,https://i.imgur.com/5hPxjcl.png
 TVK.ru,TVK,ТВК,,,RU,,Krasnoyarsk,c/RU,rus,,FALSE,,,,https://www.tvk6.ru/,https://i.imgur.com/rW1BeJC.png
 tvK.us,tvK,,,,US,,,c/US,kor,entertainment;music,FALSE,,,,http://www.tvk24.com/,https://i.imgur.com/1b1TM8e.png
 TVK1.rs,TV K-1,ТВ К-1,,Dejan Živković,RS,,Leskovac,c/RS,srp,,FALSE,,,,,https://i.imgur.com/ulhhWEt.png
-TVK2.kh,TVK 2,,,,KH,,,c/KH,khm,,FALSE,,,,,https://i.imgur.com/FYqvxUM.png
+TVK2.kh,TVK 2,,,Government of Cambodia,KH,,Phnom Penh,c/KH,khm,education,FALSE,2020-04-20,,,https://www.tvk.gov.kh/,https://i.imgur.com/L36ptO2.png
 tvK2.us,tvK2,,,,US,,,c/US,kor,entertainment;music,FALSE,,,,http://www.tvk24.com/,https://i.imgur.com/jPCZJGc.png
 TVK23.rs,TV K23,ТВ К23,,Janoš Pap,RS,,Subotica,c/RS,srp,,FALSE,,,,http://www.k23tv.com/,https://i.imgur.com/LnAdduG.png
 TVK6.kz,TVK-6,ТВК-6,,,KZ,,Semey,c/KZ,kaz;rus,general,FALSE,,,,https://tvk-6.kz/,https://i.imgur.com/RKiHIeK.png
@@ -36891,4 +36892,4 @@ ZvezdaPlus.ru,Zvezda Plus,Звезда Плюс,,Zvezda;Red Media,RU,,Moscow,c/R
 ZvezdaTV.rs,Zvezda TV,Звезда ТВ,,Fudbalski klub Crvena zvezda,RS,,Belgrade,c/RS,srp,sports,FALSE,,,,http://crvenazvezdafk.com/,https://i.imgur.com/oxHaNOZ.png
 ZVTAVS.nl,ZVT-AVS,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/KwBBHpZ.png
 ZweiMusicTelevision.de,Zwei Music Television,,Folx Network,,DE,,,c/DE,deu,music,FALSE,,,,https://folx.network/zwei-music-television/,https://i.imgur.com/RbdpCNf.png
-ZZTV.rs,ZZ TV,,,Original Film d.o.o.,RS,,Belgrade,c/RS,eng,music,FALSE,,,,https://muzzik.co.uk/,https://i.imgur.com/9dz8MsD.png
+ZZTV.rs,ZZ TV,,,Original Film d.o.o.,RS,,Belgrade,c/RS,eng,music,FALSE,,,,https://muzzik.co.uk/,https://i.imgur.com/9dz8MsD.png