Merge pull request #5162 from iptv-org/change-language-names

Replace the names of the languages with short ones
2024-07-05 12:02:35 +02:00 · 2021-10-24 16:35:59 +03:00 · 2021-10-24 16:35:59 +03:00 · 6fd2235ef0
commit 6fd2235ef0
parent 41e67b71a4 295705deab
8 changed files with 72 additions and 72 deletions
--- a/channels/bn.m3u
+++ b/channels/bn.m3u
@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="RTBSukmaindera.bn" tvg-country="BN" tvg-language="Malay (macrolanguage);English" tvg-logo="https://i.imgur.com/wRzyzPA.png" group-title="",RTB Sukmaindera (1080p) [Offline]
+#EXTINF:-1 tvg-id="RTBSukmaindera.bn" tvg-country="BN" tvg-language="Malay;English" tvg-logo="https://i.imgur.com/wRzyzPA.png" group-title="",RTB Sukmaindera (1080p) [Offline]
 https://rtb-channel.glue.live/smil:rtb1/playlist.m3u8
--- a/channels/cy.m3u
+++ b/channels/cy.m3u
@ -3,9 +3,9 @@
 http://kuzeykibris.tv/m3u8/tv_ada.m3u8
 #EXTINF:-1 tvg-id="AdaTV.cy" tvg-country="CY" tvg-language="Turkish" tvg-logo="https://i.imgur.com/d8op3Wh.jpg" group-title="",Ada TV (1080p) [Not 24/7]
 https://59cba4d34b678.streamlock.net/canlitv/kibrisadatv/playlist.m3u8
-#EXTINF:-1 tvg-id="AlfaSport.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/Vq4YBIA.png" group-title="Sports",Alfa Sport (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlfaSport.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/Vq4YBIA.png" group-title="Sports",Alfa Sport (1080p) [Not 24/7]
 https://dev.aftermind.xyz/edge-hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="AlfaSport.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/Vq4YBIA.png" group-title="Sports",Alfa Sport (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlfaSport.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/Vq4YBIA.png" group-title="Sports",Alfa Sport (1080p) [Not 24/7]
 https://dev.aftermind.xyz/hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrzqEqu
 #EXTINF:-1 tvg-id="ASTTV1.cy" tvg-country="CY" tvg-language="English" tvg-logo="https://i.imgur.com/KmokZz8.jpg" group-title="XXX",AST TV 1 (PC) (1080p) [Not 24/7]
 https://www.ast.tv/stream/1/master.m3u8
@ -21,23 +21,23 @@ http://wms.brtk.net:1935/live/BRTHD/playlist.m3u8
 http://wms.brtk.net:1935/live/brt1/playlist.m3u8
 #EXTINF:-1 tvg-id="BRT3.cy" tvg-country="CY" tvg-language="Turkish" tvg-logo="https://i.imgur.com/P3ibIye.png" group-title="",BRT 3 (406p) [Not 24/7]
 http://wms.brtk.net:1935/live/brt2/playlist.m3u8
-#EXTINF:-1 tvg-id="CityChannel.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/Jo6jIP1.jpg" group-title="",City Channel (720p)
+#EXTINF:-1 tvg-id="CityChannel.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/Jo6jIP1.jpg" group-title="",City Channel (720p)
 https://dev.aftermind.xyz/edge-hls/unitrust/citychannel/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="CityChannel.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/Jo6jIP1.jpg" group-title="",City Channel (720p)
+#EXTINF:-1 tvg-id="CityChannel.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/Jo6jIP1.jpg" group-title="",City Channel (720p)
 https://dev.aftermind.xyz/hls/unitrust/citychannel/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="DigitalTV.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",Digital TV (720p)
+#EXTINF:-1 tvg-id="DigitalTV.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="" group-title="",Digital TV (720p)
 https://l8.cloudskep.com/digital/dtv/playlist.m3u8
 #EXTINF:-1 tvg-id="KuzeyKibrisTV.cy" tvg-country="CY" tvg-language="" tvg-logo="" group-title="",Kuzey Kibris TV (720p) [Not 24/7]
 http://kuzeykibris.tv/m3u8/tv_kktv.m3u8
-#EXTINF:-1 tvg-id="Reload.cy" tvg-country="CY" tvg-language="English;Modern Greek (1453-)" tvg-logo="" group-title="Music",Reload (720p)
+#EXTINF:-1 tvg-id="Reload.cy" tvg-country="CY" tvg-language="English;Greek" tvg-logo="" group-title="Music",Reload (720p)
 http://web.onair-radio.eu:1935/video/video/playlist.m3u8
-#EXTINF:-1 tvg-id="RIK1CYBC1.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="http://cybc.com.cy/wp-content/uploads/daphne-lopezcybc-com-cy/2018/02/RIK1-4.png" group-title="",RIK 1 (CYBC 1) [Geo-blocked]
+#EXTINF:-1 tvg-id="RIK1CYBC1.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="http://cybc.com.cy/wp-content/uploads/daphne-lopezcybc-com-cy/2018/02/RIK1-4.png" group-title="",RIK 1 (CYBC 1) [Geo-blocked]
 http://l6.cloudskep.com/rikcy/rik1/playlist.m3u8
-#EXTINF:-1 tvg-id="RIK2CYBC2.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="http://cybc.com.cy/wp-content/uploads/daphne-lopezcybc-com-cy/2018/03/RIK2.png" group-title="",RIK 2 (CYBC 2) [Geo-blocked]
+#EXTINF:-1 tvg-id="RIK2CYBC2.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="http://cybc.com.cy/wp-content/uploads/daphne-lopezcybc-com-cy/2018/03/RIK2.png" group-title="",RIK 2 (CYBC 2) [Geo-blocked]
 http://l6.cloudskep.com/rikcy/rik2/playlist.m3u8
-#EXTINF:-1 tvg-id="RIKHDCYBCHD.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="http://cybc.com.cy/wp-content/uploads/admin/2018/10/rik-hd-bubble-border.png" group-title="",RIK HD (CYBC HD) [Geo-blocked]
+#EXTINF:-1 tvg-id="RIKHDCYBCHD.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="http://cybc.com.cy/wp-content/uploads/admin/2018/10/rik-hd-bubble-border.png" group-title="",RIK HD (CYBC HD) [Geo-blocked]
 http://l6.cloudskep.com/rikcy/rikhd/playlist.m3u8
-#EXTINF:-1 tvg-id="RIKSat.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/YAn5BJZ.png" group-title="",RΙΚ Sat (CYBC S) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RIKSat.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/YAn5BJZ.png" group-title="",RΙΚ Sat (CYBC S) (720p) [Not 24/7]
 https://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
 #EXTINF:-1 tvg-id="SAT7ARABIC.cy" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="Religious",SAT-7 ARABIC (720p)
 https://svs.itworkscdn.net/sat7arabiclive/sat7arabic.smil/playlist_dvr.m3u8
@ -47,11 +47,11 @@ https://svs.itworkscdn.net/sat7kidslive/sat7kids.smil/playlist_dvr.m3u8
 https://svs.itworkscdn.net/sat7parslive/sat7pars.smil/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="SAT7TURK.cy" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="Religious",SAT-7 TÜRK (720p)
 https://svs.itworkscdn.net/sat7turklive/sat7turk.smil/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="Sigma.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",Sigma (576p)
+#EXTINF:-1 tvg-id="Sigma.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="" group-title="",Sigma (576p)
 https://sl2.sigmatv.com/hls/live.m3u8
 #EXTINF:-1 tvg-id="TV2020.cy" tvg-country="CY" tvg-language="" tvg-logo="" group-title="",TV 2020 (720p)
 http://kuzeykibris.tv/m3u8/tv_dialog.m3u8
-#EXTINF:-1 tvg-id="VOULITV.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/rIt5pfv.png" group-title="",Vouli TV (1080p)
+#EXTINF:-1 tvg-id="VOULITV.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/rIt5pfv.png" group-title="",Vouli TV (1080p)
 https://dev.aftermind.xyz/edge-hls/unitrust/voulitv/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="VOULITV.cy" tvg-country="CY" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/rIt5pfv.png" group-title="",Vouli TV (1080p)
+#EXTINF:-1 tvg-id="VOULITV.cy" tvg-country="CY" tvg-language="Greek" tvg-logo="https://i.imgur.com/rIt5pfv.png" group-title="",Vouli TV (1080p)
 https://dev.aftermind.xyz/hls/unitrust/voulitv/index.m3u8?token=8TXWzhY3h6jrzqEqu
--- a/channels/gl.m3u
+++ b/channels/gl.m3u
@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="KNR1.gl" tvg-country="GL" tvg-language="Greenlandic (Kalaallisut);Danish" tvg-logo="https://i.imgur.com/uQ50JUX.jpg" group-title="",KNR1 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="KNR1.gl" tvg-country="GL" tvg-language="Greenlandic;Danish" tvg-logo="https://i.imgur.com/uQ50JUX.jpg" group-title="",KNR1 (1080p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCIjOAtv53RHerlfl98fZmcQ/live
-#EXTINF:-1 tvg-id="KNR2.gl" tvg-country="GL" tvg-language="Greenlandic (Kalaallisut);Danish" tvg-logo="https://i.imgur.com/uQ50JUX.jpg" group-title="",KNR2 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="KNR2.gl" tvg-country="GL" tvg-language="Greenlandic;Danish" tvg-logo="https://i.imgur.com/uQ50JUX.jpg" group-title="",KNR2 (720p) [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UC6D225YIMCwVBiBktEeV-vQ/live
--- a/channels/gr.m3u
+++ b/channels/gr.m3u
@ -3,7 +3,7 @@
 http://eu2.tv4e.gr:554/live/smil:myStream.sdp.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="34100TV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/Fo1I0dt.jpg" group-title="",34100 TV (720p) [Offline]
 https://s1.cystream.net/live/34100/playlist.m3u8
-#EXTINF:-1 tvg-id="AcheloosTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://goo.gl/mNqHoo" group-title="",Acheloos TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="AcheloosTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://goo.gl/mNqHoo" group-title="",Acheloos TV (576p) [Not 24/7]
 http://srv.viiideo.gr:1935/axeloos/live/playlist.m3u8
 #EXTINF:-1 tvg-id="AkritasTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/aYgRkkB.jpg" group-title="",Akritas TV (1080p) [Not 24/7]
 http://akritastv1.flashmediacast.com:1935/akritastv1/livestream/playlist.m3u8
@ -17,7 +17,7 @@ https://vdo.alphaserver.gr:3989/stream/play.m3u8
 https://alphalive-i.akamaihd.net/hls/live/682300/live/master.m3u8
 #EXTINF:-1 tvg-id="AlphaBUP.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Alpha BUP [Offline]
 http://78.83.87.222:9999/play/a011/index.m3u8
-#EXTINF:-1 tvg-id="ANT1.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1 (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ANT1.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1 (1080p) [Geo-blocked]
 https://antennaamdnoenc.akamaized.net/ant1_akamai/abr/playlist.m3u8
 #EXTINF:-1 tvg-id="APT.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",APT (480p) [Not 24/7]
 http://tv3.streampulse.eu:1935/tilesport/movie2/playlist.m3u8
@ -27,11 +27,11 @@ http://176.9.123.140:1935/arttv/arttv/playlist.m3u8
 https://e-e.cyou:8222/atticatv/atticatv/playlist.m3u8
 #EXTINF:-1 tvg-id="BananaTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/RwETfPc.jpg" group-title="",Banana TV (360p) [Offline]
 https://web.onair-radio.eu/bananachannel/bananachannel/playlist.m3u8
-#EXTINF:-1 tvg-id="BarazaTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV (1080p)
+#EXTINF:-1 tvg-id="BarazaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV (1080p)
 https://eco.streams.ovh/BarazaTV/BarazarazaTV/BarazaTV/playlist.m3u8
-#EXTINF:-1 tvg-id="BarazaTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV (1080p)
+#EXTINF:-1 tvg-id="BarazaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV (1080p)
 https://eco.streams.ovh/BarazaTV/BarazaTV/playlist.m3u8
-#EXTINF:-1 tvg-id="BarazaTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV (1080p)
+#EXTINF:-1 tvg-id="BarazaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV (1080p)
 https://panik.cast-control.eu:1936/Admin_1/Admin_1/playlist.m3u8
 #EXTINF:-1 tvg-id="BCI24News.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/aZpv6l9.png" group-title="Local",BCI 24 News (720p)
 https://live.streams.ovh/netmedia/netmedia/playlist.m3u8
@ -39,13 +39,13 @@ https://live.streams.ovh/netmedia/netmedia/playlist.m3u8
 https://nrpus.bozztv.com/36bay2/gusa-camerasmile/index.m3u8
 #EXTINF:-1 tvg-id="CanaliTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/bGIdE9N.png" group-title="",Canali TV (720p)
 http://live.streams.ovh:1935/cannali/cannali/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel9.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9 (720p)
+#EXTINF:-1 tvg-id="Channel9.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9 (720p)
 http://176.9.123.140:1935/channel9/channel9/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel9.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9 (720p)
+#EXTINF:-1 tvg-id="Channel9.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9 (720p)
 https://e-e.cyou:8222/channel9/channel9/playlist.m3u8
 #EXTINF:-1 tvg-id="Choice.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/6Yr0Axp.png" group-title="",Choice (1080p)
 https://vod.streams.ovh:3528/stream/play.m3u8
-#EXTINF:-1 tvg-id="CorfuTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/G7LHkTE.jpg" group-title="",Corfu TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="CorfuTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/G7LHkTE.jpg" group-title="",Corfu TV (576p) [Not 24/7]
 https://itv.streams.ovh/corfuchannel/corfuchannel/playlist.m3u8
 #EXTINF:-1 tvg-id="Creta.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Creta (540p) [Not 24/7]
 http://live.streams.ovh:1935/tvcreta/tvcreta/playlist.m3u8
@ -57,15 +57,15 @@ https://www.hellasnet.tv/rest.live.hn/diktyo1r/playlist.m3u8
 https://live.cast-control.eu/ekpdipso/ekpdipso/playlist.m3u8
 #EXTINF:-1 tvg-id="EllasTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/rovfMvn.jpg" group-title="",Ellas TV (1080p)
 http://ellastv.gotdns.com:88/freetv/promo/index.m3u8
-#EXTINF:-1 tvg-id="EnaChannel.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="Local",Ena Channel (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EnaChannel.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="Local",Ena Channel (720p) [Not 24/7]
 http://176.9.123.140:1935/1c/stream/master.m3u8
-#EXTINF:-1 tvg-id="EpirusTV1.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="Local",Epirus TV1 (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="EpirusTV1.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="Local",Epirus TV1 (576p) [Not 24/7]
 http://176.9.123.140:1935/radioepirus/radioepirus/playlist.m3u8
-#EXTINF:-1 tvg-id="ERT1.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 1 (720p) [Offline]
+#EXTINF:-1 tvg-id="ERT1.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",ERT 1 (720p) [Offline]
 http://ert-live-bcbs15228.siliconweb.com/media/ert_1/ert_1.m3u8
-#EXTINF:-1 tvg-id="ERT2.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 2 (720p) [Offline]
+#EXTINF:-1 tvg-id="ERT2.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",ERT 2 (720p) [Offline]
 http://ert-live-bcbs15228.siliconweb.com/media/ert_2/ert_2.m3u8
-#EXTINF:-1 tvg-id="ERT3.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 3 (720p) [Offline]
+#EXTINF:-1 tvg-id="ERT3.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",ERT 3 (720p) [Offline]
 http://ert-live-bcbs15228.siliconweb.com/media/ert_3/ert_3.m3u8
 #EXTINF:-1 tvg-id="ERTNews.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/ujTPC3J.jpg" group-title="News",ERT News (720p) [Offline]
 http://ert-live-bcbs15228.siliconweb.com/media/ert_news/ert_news.m3u8
@ -93,7 +93,7 @@ https://vdo.alphaserver.gr:3613/stream/play.m3u8
 https://vdo3.alphaserver.gr:3466/stream/play.m3u8
 #EXTINF:-1 tvg-id="GreekTVLondon.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/YhwbcwE.png" group-title="",Greek TV London (720p) [Not 24/7]
 https://vdo3.alphaserver.gr:3466/live/greektvlondonlive.m3u8
-#EXTINF:-1 tvg-id="GroovyTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/0iklNh2.png" group-title="Movies",Groovy TV (532p)
+#EXTINF:-1 tvg-id="GroovyTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/0iklNh2.png" group-title="Movies",Groovy TV (532p)
 http://web.onair-radio.eu:1935/groovytv/groovytv/playlist.m3u8
 #EXTINF:-1 tvg-id="HellenicTV.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Hellenic TV (360p)
 https://l5.cloudskep.com/hellenictv/htv/playlist.m3u8
@ -105,13 +105,13 @@ https://odiehls-i.akamaihd.net/hls/live/233406/odie3/odie_1000.m3u8
 http://stream.ioniantv.gr:8081/ionian/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IonianChannel.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Ionian Channel (720p)
 https://stream.ioniantv.gr/ionian/live_abr/playlist.m3u8
-#EXTINF:-1 tvg-id="IridaTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/gn5sdCt.png" group-title="Local",Irida TV (226p) [Not 24/7]
+#EXTINF:-1 tvg-id="IridaTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/gn5sdCt.png" group-title="Local",Irida TV (226p) [Not 24/7]
 https://www.hellasnet.tv/rest.live.hn/ws.iri/playlist.m3u8
 #EXTINF:-1 tvg-id="KidsTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/7sUmqv2.png" group-title="Kids",Kids TV (480p)
 http://wpso.com:1936/hls/kidshd.m3u8
-#EXTINF:-1 tvg-id="KontraChannel.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",Kontra Channel (1080p)
+#EXTINF:-1 tvg-id="KontraChannel.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Kontra Channel (1080p)
 http://kontralive.siliconweb.com/live/kontratv/playlist.m3u8
-#EXTINF:-1 tvg-id="KontraChannel.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",Kontra Channel (400p)
+#EXTINF:-1 tvg-id="KontraChannel.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Kontra Channel (400p)
 http://flashcloud.mediacdn.com/live/kontratv/.m3u8
 #EXTINF:-1 tvg-id="KPHTHTV.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",KPHTH TV (720p)
 http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8
@ -121,7 +121,7 @@ https://vod.streams.ovh:3829/stream/play.m3u8
 http://78.83.87.222:9999/play/a015/index.m3u8
 #EXTINF:-1 tvg-id="MadGreekz.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="Music",Mad Greekζ (240p) [Not 24/7]
 http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8
-#EXTINF:-1 tvg-id="MagicTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/QZQhg6C.png" group-title="Music",Magic TV (360p)
+#EXTINF:-1 tvg-id="MagicTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/QZQhg6C.png" group-title="Music",Magic TV (360p)
 https://itv.streams.ovh/magictv/magictv/playlist.m3u8
 #EXTINF:-1 tvg-id="MaroussiotikaTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/8coUyPX.png" group-title="",Maroussiotika TV (720p) [Not 24/7]
 http://maroussiotika.dynu.com:8000/greektv/FZlHCCdBHL1/359142
@ -135,45 +135,45 @@ https://vdo.alphaserver.gr:3305/stream/play.m3u8
 https://live.neatv.gr:8888/hls/neatv.m3u8
 #EXTINF:-1 tvg-id="NetmaxTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/Wad6CD4.png" group-title="",Netmax TV (720p) [Not 24/7]
 http://live.netmaxtv.com:8080/live/live/playlist.m3u8
-#EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (612p)
+#EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (612p)
 http://live.streams.ovh:1935/NGradio/NGradio/playlist.m3u8
-#EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (612p)
+#EXTINF:-1 tvg-id="NG.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (612p)
 https://live.streams.ovh/NGradio/NGradio/playlist.m3u8
 #EXTINF:-1 tvg-id="NotioiTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/dW1bcD2.jpg" group-title="",Notioi TV (720p)
 https://live.streams.ovh/YourStreaming/YourStreaming/playlist.m3u8
-#EXTINF:-1 tvg-id="NRG91.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (720p)
+#EXTINF:-1 tvg-id="NRG91.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (720p)
 http://tv.nrg91.gr:1935/onweb/live/master.m3u8
 #EXTINF:-1 tvg-id="NRGTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG TV (720p)
 https://5c389faa13be3.streamlock.net:9553/onweb/live/playlist.m3u8
 #EXTINF:-1 tvg-id="NSTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/tZnziRp.jpg" group-title="",NS TV (720p) [Not 24/7]
 http://176.9.123.140:1935/nstv1/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="OpenTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/M6XG03v.png" group-title="",Open TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="OpenTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/M6XG03v.png" group-title="",Open TV (576p) [Not 24/7]
 https://liveopencloud.siliconweb.com/1/ZlRza2R6L2tFRnFJ/eWVLSlQx/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="OpenTVBUP.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/c9hgL1c.jpg" group-title="",Open TV BUP [Offline]
 http://78.83.87.222:9999/play/a013/index.m3u8
 #EXTINF:-1 tvg-id="PellaTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/9YFieqB.jpg" group-title="",Pella TV (576p)
 https://video.streams.ovh:1936/pellatv/pellatv/master.m3u8
-#EXTINF:-1 tvg-id="PlayTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/100uuWA.png" group-title="Music",Play TV (480p)
+#EXTINF:-1 tvg-id="PlayTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/100uuWA.png" group-title="Music",Play TV (480p)
 http://web.onair-radio.eu:1935/Alpha-Host/Alpha-Host/playlist.m3u8
-#EXTINF:-1 tvg-id="PLP.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/qa3Lurc.png" group-title="Local",PLP (226p) [Not 24/7]
+#EXTINF:-1 tvg-id="PLP.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/qa3Lurc.png" group-title="Local",PLP (226p) [Not 24/7]
 https://www.hellasnet.tv/rest.live.hn/ws.plp/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioEpistrofi.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/T0zL9ov.jpg" group-title="",Radio Epistrofi (540p) [Offline]
 https://s1.cystream.net/live/epistrofi/playlist.m3u8
-#EXTINF:-1 tvg-id="ReloadPlay.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://reloadplay.com/wp-content/uploads/2017/04/logo-foto-tv.jpg" group-title="",Reload Play (536p)
+#EXTINF:-1 tvg-id="ReloadPlay.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://reloadplay.com/wp-content/uploads/2017/04/logo-foto-tv.jpg" group-title="",Reload Play (536p)
 http://web.onair-radio.eu:1935/video/video/playlist.m3u8
-#EXTINF:-1 tvg-id="SamiakiTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",Samiaki TV (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="SamiakiTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="" group-title="",Samiaki TV (540p) [Not 24/7]
 http://live.cast-control.eu:1935/samiaki/samiaki/playlist.m3u8
 #EXTINF:-1 tvg-id="Sigma.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Sigma [Not 24/7]
 https://sl2.sigmatv.com/hls/live.m3u8
-#EXTINF:-1 tvg-id="Skai.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/44RsYnf.jpg" group-title="",Skai (720p)
+#EXTINF:-1 tvg-id="Skai.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/44RsYnf.jpg" group-title="",Skai (720p)
 https://skai-live-back.siliconweb.com/media/cambria4/index.m3u8
-#EXTINF:-1 tvg-id="Skai.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai (720p)
+#EXTINF:-1 tvg-id="Skai.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai (720p)
 https://skai-live.siliconweb.com/media/cambria4/index.m3u8
 #EXTINF:-1 tvg-id="SkaiBUP.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai BUP [Offline]
 http://78.83.87.222:9999/play/a016/index.m3u8
 #EXTINF:-1 tvg-id="SmileTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/DOOVBu5.png" group-title="",Smile TV (360p) [Offline]
 https://s1.cystream.net/live/smile/playlist.m3u8
-#EXTINF:-1 tvg-id="Star.gr" tvg-country="GR" tvg-language="Modern Greek (1453 -)" tvg-logo="https://i.imgur.com/4HSJigE.png" group-title="",Star (720p)
+#EXTINF:-1 tvg-id="Star.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/4HSJigE.png" group-title="",Star (720p)
 https://livestar.siliconweb.com/media/star1/star1mediumhd.m3u8
 #EXTINF:-1 tvg-id="StarBUP.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Star BUP [Offline]
 http://78.83.87.222:9999/play/a017/index.m3u8
@ -185,9 +185,9 @@ https://vdo.alphaserver.gr:3587/stream/play.m3u8
 http://wpso.com:1936/hls/music1.m3u8
 #EXTINF:-1 tvg-id="TV100.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",TV 100 (576p)
 https://live.fm100.gr/hls/tv100/index.m3u8
-#EXTINF:-1 tvg-id="TVCreta.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/dUH5Mfw.jpg" group-title="Local",TV Creta (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVCreta.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/dUH5Mfw.jpg" group-title="Local",TV Creta (576p) [Not 24/7]
 https://live.streams.ovh/tvcreta/tvcreta/chunklist.m3u8
-#EXTINF:-1 tvg-id="TVFilopoli.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/GdgekUL.png" group-title="",TV Filopoli (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVFilopoli.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/GdgekUL.png" group-title="",TV Filopoli (360p) [Not 24/7]
 http://live.streams.ovh:1935/tvfilopoli/tvfilopoli/playlist.m3u8
 #EXTINF:-1 tvg-id="TVNotos.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/wtW3zkz.png" group-title="",TV Notos (720p) [Not 24/7]
 https://eco.streams.ovh/notos/notos/chunklist_w1265351016.m3u8
@ -195,9 +195,9 @@ https://eco.streams.ovh/notos/notos/chunklist_w1265351016.m3u8
 https://video.connect4.gr/live/tvrodopi/chunklist_w962288216.m3u8
 #EXTINF:-1 tvg-id="TVRodopi.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/UZeSUN2.png" group-title="",TV Rodopi (720p) [Offline]
 https://video.connect4.gr/live/tvrodopi/playlist.m3u8
-#EXTINF:-1 tvg-id="Wixlar.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/hfia0wN.png" group-title="Movies",Wixlar (720p)
+#EXTINF:-1 tvg-id="Wixlar.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/hfia0wN.png" group-title="Movies",Wixlar (720p)
 http://web.onair-radio.eu:1935/wixlar/wixlar/playlist.m3u8
-#EXTINF:-1 tvg-id="XalastraTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/LgQBtTh.jpg" group-title="Music",Xalastra TV (240p)
+#EXTINF:-1 tvg-id="XalastraTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="http://i.imgur.com/LgQBtTh.jpg" group-title="Music",Xalastra TV (240p)
 https://live.cast-control.eu/xalastratv/xalastratv/playlist.m3u8
 #EXTINF:-1 tvg-id="Xplore.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/ErFj6rR.png" group-title="",Xplore (714p)
 http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
@ -205,13 +205,13 @@ http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
 http://5db313b643fd8.streamlock.net:1935/ZerounoTV/ZerounoTV/playlist.m3u8
 #EXTINF:-1 tvg-id="ZouglaTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/AmW9d6H.jpg" group-title="",Zougla TV (480p)
 https://zouglalive-lh.akamaihd.net/i/zouglalive_1@340792/master.m3u8
-#EXTINF:-1 tvg-id="VoyliTileorasi.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση (540p)
+#EXTINF:-1 tvg-id="VoyliTileorasi.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση (540p)
 http://streamer-cache.grnet.gr/parliament/hls/webtv.m3u8
-#EXTINF:-1 tvg-id="VoyliTileorasi.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση (360p)
+#EXTINF:-1 tvg-id="VoyliTileorasi.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση (360p)
 https://streamer-cache.grnet.gr/parliament/parltv.sdp/master.m3u8
-#EXTINF:-1 tvg-id="VoyliTileorasi2.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 2 (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="VoyliTileorasi2.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 2 (360p) [Not 24/7]
 https://streamer-cache.grnet.gr/parliament/hls/webtv2_640_640x360/index.m3u8
-#EXTINF:-1 tvg-id="VoyliTileorasi3.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 3 (360p)
+#EXTINF:-1 tvg-id="VoyliTileorasi3.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Βουλή Τηλεόραση 3 (360p)
 https://streamer-cache.grnet.gr/parliament/hls/webtv3_4/index.m3u8
 #EXTINF:-1 tvg-id="EgnatiaTileorasi.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/XQyysct.jpg" group-title="",Εγνατία Τηλεόραση (576p)
 https://video.streams.ovh:1936/egnatiatv/egnatiatv/index.m3u8
@ -219,7 +219,7 @@ https://video.streams.ovh:1936/egnatiatv/egnatiatv/index.m3u8
 https://liveopen.siliconweb.com/openTvLive/openEcclessia/playlist.m3u8
 #EXTINF:-1 tvg-id="Ilektra.gr" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Ηλέκτρα TV (1080p) [Not 24/7]
 http://167.86.89.20:5080/LiveApp/streams/064918158666216168224216.m3u8
-#EXTINF:-1 tvg-id="KritiTV.gr" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/Ldt07Lh.png" group-title="",Κρήτη TV (720p)
+#EXTINF:-1 tvg-id="KritiTV.gr" tvg-country="GR" tvg-language="Greek" tvg-logo="https://i.imgur.com/Ldt07Lh.png" group-title="",Κρήτη TV (720p)
 http://live.cretetv.gr:1935/cretetv/myStream/f1tv.m3u8
 #EXTINF:-1 tvg-id="MessatidaTV.gr" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/y3pUxXe.png" group-title="",Μεσσάτιδα TV (720p)
 https://vod.streams.ovh:3037/stream/play.m3u8
--- a/channels/hk.m3u
+++ b/channels/hk.m3u
@ -5,9 +5,9 @@ https://15813114727637862976168173814320.live.prod.hkatv.com/a1_cbr_lo.m3u8
 http://50.7.161.82:8278/streams/d/Celestial2/playlist.m3u8
 #EXTINF:-1 tvg-id="CelestialMovies.hk" tvg-country="HK;SG;MY;ID;TW;BN;BD" tvg-language="Chinese" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/322_300.png" group-title="Movies",Celestial Movies (480p) [Geo-blocked]
 http://210.210.155.35/qwr9ew/s/s33/index.m3u8
-#EXTINF:-1 tvg-id="Kix.hk" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/mX1nnGy.png" group-title="Entertainment",Kix [Geo-blocked]
+#EXTINF:-1 tvg-id="Kix.hk" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/mX1nnGy.png" group-title="Entertainment",Kix [Geo-blocked]
 http://210.210.155.35/uq2663/h/h07/01.m3u8
-#EXTINF:-1 tvg-id="Kix.hk" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/705_300.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Entertainment",Kix (720p) [Offline]
+#EXTINF:-1 tvg-id="Kix.hk" tvg-country="MY" tvg-language="Malay" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/705_300.png" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36" group-title="Entertainment",Kix (720p) [Offline]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/76.0.3809.25 Safari/537.36
 https://livecdn.fptplay.net/hda/kixhd_hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RTHKGangTaiDianShi31.hk" tvg-country="HK" tvg-language="" tvg-logo="http://tv.sason.xyz/logo/rthk31.png" group-title="",RTHK (港台電視31) (1080p) [Offline]
--- a/channels/my.m3u
+++ b/channels/my.m3u
@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="8TV.my" tvg-country="MY" tvg-language="" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv8.png" group-title="",8TV (720p)
 http://50.7.161.82:8278/streams/d/TV8/playlist.m3u8
-#EXTINF:-1 tvg-id="AstroAArena.my" tvg-country="MY" tvg-language="English;Malay (macrolanguage)" tvg-logo="" group-title="",Astro Arena (720p)
+#EXTINF:-1 tvg-id="AstroArena.my" tvg-country="MY" tvg-language="English;Malay" tvg-logo="" group-title="Sports",Astro Arena (720p)
 http://50.7.161.82:8278/streams/d/arena_pye/playlist.m3u8
-#EXTINF:-1 tvg-id="AstroAwani.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani (1080p)
+#EXTINF:-1 tvg-id="AstroAwani.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani (1080p)
 https://awanitv.akamaized.net/hls/live/2017836/LiveTV1/index.m3u8
-#EXTINF:-1 tvg-id="AstroAwani.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani [Not 24/7]
+#EXTINF:-1 tvg-id="AstroAwani.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani [Not 24/7]
 http://50.7.161.82:8278/streams/d/Awani/playlist.m3u8
 #EXTINF:-1 tvg-id="AstroCeria.my" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",Astro Ceria (720p) [Not 24/7]
 http://50.7.161.82:8278/streams/d/Ceria/playlist.m3u8
@ -26,7 +26,7 @@ https://rtmbes.secureswiftcontent.com/Origin03/ngrp:RTM3/playlist.m3u8
 http://50.7.161.82:8278/streams/d/Bernama/playlist.m3u8
 #EXTINF:-1 tvg-id="Boo.my" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",Boo (720p) [Not 24/7]
 http://50.7.161.82:8278/streams/d/Boo/playlist.m3u8
-#EXTINF:-1 tvg-id="CinemaWorld.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/gHCOcuF.png" group-title="",CinemaWorld (576p) [Geo-blocked]
+#EXTINF:-1 tvg-id="CinemaWorld.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/gHCOcuF.png" group-title="",CinemaWorld (576p) [Geo-blocked]
 http://210.210.155.35/uq2663/h/h04/index.m3u8
 #EXTINF:-1 tvg-id="Hello.my" tvg-country="MY" tvg-language="English" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/702_300.png" group-title="",Hello [Offline]
 https://agsplayback01.astro.com.my/CH1/master_HELLOGOSHOP6.m3u8
@ -57,11 +57,11 @@ https://rtm-olympic05.secureswiftcontent.com/rtm/olympic05_1080.m3u8
 #EXTINF:-1 tvg-id="SukanRTM.my" tvg-country="MY" tvg-language="" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/tvSUKANlogo_NEW.jpg" group-title="",Sukan RTM (1080p) [Offline]
 #EXTVLCOPT:http-referrer=https://rtmklik.rtm.gov.my
 https://rtmlive02.secureswiftcontent.com/rtmchannel/02_1080.m3u8
-#EXTINF:-1 tvg-id="TV1.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/Logo-TV1-May21-JPG.jpg" group-title="",TV1 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV1.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://myklikstatic.secureswiftcontent.com/image/Logo-TV1-May21-JPG.jpg" group-title="",TV1 (720p) [Not 24/7]
 http://50.7.161.82:8278/streams/d/TV1/playlist.m3u8
-#EXTINF:-1 tvg-id="TV2.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://tv2.rtm.gov.my/assets/img/TV2.png" group-title="",TV2 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV2.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://tv2.rtm.gov.my/assets/img/TV2.png" group-title="",TV2 (720p) [Not 24/7]
 http://50.7.161.82:8278/streams/d/TV2/playlist.m3u8
-#EXTINF:-1 tvg-id="TV2.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://tv2.rtm.gov.my/assets/img/TV2.png" group-title="",TV2 (1080p) [Offline]
+#EXTINF:-1 tvg-id="TV2.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://tv2.rtm.gov.my/assets/img/TV2.png" group-title="",TV2 (1080p) [Offline]
 #EXTVLCOPT:http-referrer=https://rtmklik.rtm.gov.my
 https://rtm1.secureswiftcontent.com/Origin01/ngrp:RTM1/playlist.m3u8
 #EXTINF:-1 tvg-id="TV3.my" tvg-country="MY" tvg-language="" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv3.png" group-title="",TV3 (720p)
@ -73,7 +73,7 @@ https://rtm6.secureswiftcontent.com/Origin03/ngrp:RTM3/playlist.m3u8
 http://50.7.161.82:8278/streams/d/TV9/playlist.m3u8
 #EXTINF:-1 tvg-id="TVAlhijrah.my" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",TV Alhijrah (480p) [Not 24/7]
 http://50.7.161.82:8278/streams/d/Alhijrah/playlist.m3u8
-#EXTINF:-1 tvg-id="TVIKIM.my" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TVIKIM (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVIKIM.my" tvg-country="MY" tvg-language="Malay" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TVIKIM (720p) [Not 24/7]
 http://edge.vediostream.com/abr/tvikim/playlist.m3u8
 #EXTINF:-1 tvg-id="TVS.my" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",TVS (576p) [Offline]
 https://agsplayback01.astro.com.my/CH1/master_AGS_TVS.m3u8
--- a/channels/np.m3u
+++ b/channels/np.m3u
@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AvenuesKhabar.np" tvg-country="NP" tvg-language="Nepali (macrolanguage)" tvg-logo="https://i.imgur.com/GDetViR.jpg" group-title="News",Avenues Khabar [Not 24/7]
+#EXTINF:-1 tvg-id="AvenuesKhabar.np" tvg-country="NP" tvg-language="Nepali" tvg-logo="https://i.imgur.com/GDetViR.jpg" group-title="News",Avenues Khabar [Not 24/7]
 https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.youtube.com/channel/UCMDzPE_7fcZSRJgpwIVor_A/live
-#EXTINF:-1 tvg-id="KantipurTV.np" tvg-country="NP" tvg-language="Nepali (macrolanguage)" tvg-logo="http://jcss-cdn.ekantipur.com//kantipur-tv/images/ktv-hd.png" group-title="Entertainment",Kantipur TV (1080p) [Offline]
+#EXTINF:-1 tvg-id="KantipurTV.np" tvg-country="NP" tvg-language="Nepali" tvg-logo="http://jcss-cdn.ekantipur.com//kantipur-tv/images/ktv-hd.png" group-title="Entertainment",Kantipur TV (1080p) [Offline]
 https://ktvhdnpicc.ekantipur.com/ktv_desktop_02347834/hd/kantipurtv/hd_1080/chunks.m3u8
--- a/scripts/data/languages.json
+++ b/scripts/data/languages.json
@ -7532,11 +7532,11 @@
    "code": "elk"
  },
  {
-    "name": "Modern Greek (1453-)",
+    "name": "Greek",
    "code": "ell"
  },
  {
-    "name": "Greek",
+    "name": "Modern Greek (1453-)",
    "code": "ell"
  },
  {
@ -17864,11 +17864,11 @@
    "code": "mrz"
  },
  {
-    "name": "Malay (macrolanguage)",
+    "name": "Malay",
    "code": "msa"
  },
  {
-    "name": "Malay",
+    "name": "Malay (macrolanguage)",
    "code": "msa"
  },
  {
@ -19092,11 +19092,11 @@
    "code": "neo"
  },
  {
-    "name": "Nepali (macrolanguage)",
+    "name": "Nepali",
    "code": "nep"
  },
  {
-    "name": "Nepali",
+    "name": "Nepali (macrolanguage)",
    "code": "nep"
  },
  {