From cdf01bdd4a74a7dca3fc0925ab659f298cdb5142 Mon Sep 17 00:00:00 2001
From: F640 <92260436+F640@users.noreply.github.com>
Date: Thu, 12 Jan 2023 16:36:37 +0700
Subject: [PATCH 1/3] Update mncvision.id.channels.xml

---
 sites/mncvision.id/mncvision.id.channels.xml | 80 ++++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/sites/mncvision.id/mncvision.id.channels.xml b/sites/mncvision.id/mncvision.id.channels.xml
index 22b956f5..03169cfc 100644
--- a/sites/mncvision.id/mncvision.id.channels.xml
+++ b/sites/mncvision.id/mncvision.id.channels.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="mncvision.id">
   <channels>
-    <channel lang="en" xmltv_id="ABCAustralia.au" site_id="350">ABC Australia Asia</channel>
-    <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="331">Aljazeera English</channel>
+    <channel lang="en" xmltv_id="ABCAustralia.au" site_id="350">ABC Australia</channel>
+    <channel lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="331">Aljazeera</channel>
     <channel lang="en" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="203">Animal Planet</channel>
     <channel lang="en" xmltv_id="AnimaxAsia.sg" site_id="157">Animax Asia</channel>
     <channel lang="en" xmltv_id="ANTV.id" site_id="115">ANTV</channel>
-    <channel lang="en" xmltv_id="ArirangWorld.kr" site_id="351">Arirang World</channel>
+    <channel lang="en" xmltv_id="ArirangWorld.kr" site_id="351">Arirang</channel>
     <channel lang="en" xmltv_id="AsianFoodNetwork.sg" site_id="240">Asian Food Network</channel>
-    <channel lang="en" xmltv_id="AXNIndonesia.id" site_id="154">AXN East Asia</channel>
-    <channel lang="en" xmltv_id="BabyTV.uk" site_id="40">Baby TV Asia</channel>
-    <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="200">BBC Earth Asia</channel>
-    <channel lang="en" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="332">BBC World News Asia Pacific</channel>
-    <channel lang="en" xmltv_id="beINSports1Indonesia.id" site_id="305">BeIn Sports 1 Indonesia</channel>
-    <channel lang="en" xmltv_id="beINSports3Indonesia.id" site_id="306">BeIn Sports 3 Indonesia</channel>
-    <channel lang="en" xmltv_id="BeritaSatu.id" site_id="103">Berita Satu</channel>
+    <channel lang="en" xmltv_id="AXNIndonesia.id" site_id="154">AXN</channel>
+    <channel lang="en" xmltv_id="BabyTV.uk" site_id="40">Baby TV</channel>
+    <channel lang="en" xmltv_id="BBCEarthAsia.uk" site_id="200">BBC Earth</channel>
+    <channel lang="en" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="332">BBC World News</channel>
+    <channel lang="en" xmltv_id="beINSports1Indonesia.id" site_id="305">BeIn Sports 1</channel>
+    <channel lang="en" xmltv_id="beINSports3Indonesia.id" site_id="306">BeIn Sports 3</channel>
+    <channel lang="en" xmltv_id="BeritaSatu.id" site_id="103">BTV</channel>
     <channel lang="en" xmltv_id="Besmart.id" site_id="112">Besmart</channel>
-    <channel lang="en" xmltv_id="BloombergTVAsia.hk" site_id="338">Bloomberg TV Asia</channel>
-    <channel lang="en" xmltv_id="BoomerangSoutheastAsia.us" site_id="39">Boomerang South East Asia</channel>
-    <channel lang="en" xmltv_id="CartoonNetworkAsia.sg" site_id="47">Cartoon Network Asia</channel>
-    <channel lang="en" xmltv_id="CBeebiesAsia.uk" site_id="41">CBeebies Asia</channel>
+    <channel lang="en" xmltv_id="BloombergTVAsia.hk" site_id="338">Bloomberg TV</channel>
+    <channel lang="en" xmltv_id="BoomerangSoutheastAsia.us" site_id="39">Boomerang</channel>
+    <channel lang="en" xmltv_id="CartoonNetworkAsia.sg" site_id="47">Cartoon</channel>
+    <channel lang="en" xmltv_id="CBeebiesAsia.uk" site_id="41">CBeebies</channel>
     <channel lang="en" xmltv_id="CCM.hk" site_id="22">Celestial Classic Movies</channel>
-    <channel lang="en" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies Indonesia</channel>
+    <channel lang="en" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies</channel>
     <channel lang="en" xmltv_id="CGTN.cn" site_id="353">CGTN</channel>
     <channel lang="en" xmltv_id="CGTNDocumentary.cn" site_id="205">CGTN Documentary</channel>
-    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax Asia</channel>
-    <channel lang="en" xmltv_id="CNA.sg" site_id="330">CNA</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax</channel>
+    <channel lang="en" xmltv_id="CNAInternational.sg" site_id="330">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
-    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
-    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation Asia</channel>
-    <channel lang="en" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel Southeast Asia</channel>
-    <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
+    <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International</channel>
+    <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation</channel>
+    <channel lang="en" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel</channel>
+    <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW</channel>
     <channel lang="en" xmltv_id="Entertainment.id" site_id="86">Ent</channel>
     <channel lang="en" xmltv_id="FightSports.us" site_id="304">Fight Sports</channel>
     <channel lang="en" xmltv_id="FMN.id" site_id="150">FMN</channel>
     <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="335">Fox News Channel</channel>
-    <channel lang="en" xmltv_id="France24English.fr" site_id="352">France 24 English</channel>
+    <channel lang="en" xmltv_id="France24English.fr" site_id="352">France 24</channel>
     <channel lang="en" xmltv_id="Galaxy.id" site_id="13">Galaxy</channel>
     <channel lang="en" xmltv_id="GalaxyPremium.id" site_id="12">Galaxy Premium</channel>
     <channel lang="en" xmltv_id="GTV.id" site_id="81">GTV</channel>
@@ -44,7 +44,7 @@
     <channel lang="en" xmltv_id="HBOHitsAsia.sg" site_id="10">HBO Hits</channel>
     <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="6">HBO Signature Asia</channel>
     <channel lang="en" xmltv_id="HGTVAsia.us" site_id="245">HGTV Asia</channel>
-    <channel lang="en" xmltv_id="HistoryAsia.us" site_id="206">History Asia</channel>
+    <channel lang="en" xmltv_id="HistoryAsia.us" site_id="206">History</channel>
     <channel lang="en" xmltv_id="HITS.sg" site_id="160">Hits</channel>
     <channel lang="en" xmltv_id="HITSMovies.sg" site_id="11">Hits Movies</channel>
     <channel lang="en" xmltv_id="IDXChannel.id" site_id="100">IDX Channel</channel>
@@ -88,17 +88,17 @@
     <channel lang="en" xmltv_id="SPOTV2.kr" site_id="308">SPOTV 2</channel>
     <channel lang="en" xmltv_id="TawafTV.id" site_id="105">Tawaf TV</channel>
     <channel lang="en" xmltv_id="Thrill.hk" site_id="19">Thrill</channel>
-    <channel lang="en" xmltv_id="TLCSoutheastAsia.sg" site_id="248">TLC Southeast Asia</channel>
+    <channel lang="en" xmltv_id="TLCSoutheastAsia.sg" site_id="248">TLC</channel>
     <channel lang="en" xmltv_id="Trans7.id" site_id="110">Trans 7</channel>
     <channel lang="en" xmltv_id="TransTV.id" site_id="87">Trans TV</channel>
-    <channel lang="en" xmltv_id="tvNAsia.hk" site_id="158">TVN Premium Indonesia</channel>
-    <channel lang="en" xmltv_id="tvNMoviesAsia.hk" site_id="25">TVN Movies Indonesia</channel>
+    <channel lang="en" xmltv_id="tvNAsia.hk" site_id="158">tvN</channel>
+    <channel lang="en" xmltv_id="tvNMoviesAsia.hk" site_id="25">tvN Movies</channel>
     <channel lang="en" xmltv_id="tvOne.id" site_id="97">TVOne</channel>
     <channel lang="en" xmltv_id="TVRINasional.id" site_id="118">TVRI Nasional</channel>
     <channel lang="en" xmltv_id="VisionPrime.id" site_id="94">Vision Prime</channel>
-    <channel lang="en" xmltv_id="WarnerTVAsia.us" site_id="163">Warner TV Southeast Asia</channel>
+    <channel lang="en" xmltv_id="WarnerTVAsia.us" site_id="163">Warner TV</channel>
     <channel lang="en" xmltv_id="ZeeBioskop.id" site_id="23">Zee Bioskop</channel>
-    <channel lang="id" xmltv_id="ABCAustralia.au" site_id="350">ABC Australia Asia</channel>
+    <channel lang="id" xmltv_id="ABCAustralia.au" site_id="350">ABC Australia</channel>
     <channel lang="id" xmltv_id="AlJazeeraEnglish.qa" site_id="331">Aljazeera</channel>
     <channel lang="id" xmltv_id="AnimalPlanetSoutheastAsia.sg" site_id="203">Animal Planet</channel>
     <channel lang="id" xmltv_id="AnimaxAsia.sg" site_id="157">Animax</channel>
@@ -109,20 +109,20 @@
     <channel lang="id" xmltv_id="BabyTV.uk" site_id="40">Baby TV</channel>
     <channel lang="id" xmltv_id="BBCEarthAsia.uk" site_id="200">BBC Earth</channel>
     <channel lang="id" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="332">BBC World News</channel>
-    <channel lang="id" xmltv_id="beINSports1Indonesia.id" site_id="305">BeIn Sports 1 Indonesia</channel>
-    <channel lang="id" xmltv_id="beINSports3Indonesia.id" site_id="306">BeIn Sports 3 Indonesia</channel>
-    <channel lang="id" xmltv_id="BeritaSatu.id" site_id="103">Berita Satu</channel>
+    <channel lang="id" xmltv_id="beINSports1Indonesia.id" site_id="305">BeIn Sports 1</channel>
+    <channel lang="id" xmltv_id="beINSports3Indonesia.id" site_id="306">BeIn Sports 3</channel>
+    <channel lang="id" xmltv_id="BeritaSatu.id" site_id="103">BTV</channel>
     <channel lang="id" xmltv_id="Besmart.id" site_id="112">Besmart</channel>
-    <channel lang="id" xmltv_id="BloombergTVAsia.hk" site_id="338">Bloomberg TV Asia</channel>
-    <channel lang="id" xmltv_id="BoomerangSoutheastAsia.us" site_id="39">Boomerang South East Asia</channel>
-    <channel lang="id" xmltv_id="CartoonNetworkAsia.sg" site_id="47">Cartoon Network Asia</channel>
+    <channel lang="id" xmltv_id="BloombergTVAsia.hk" site_id="338">Bloomberg TV</channel>
+    <channel lang="id" xmltv_id="BoomerangSoutheastAsia.us" site_id="39">Boomerang</channel>
+    <channel lang="id" xmltv_id="CartoonNetworkAsia.sg" site_id="47">Cartoon Network</channel>
     <channel lang="id" xmltv_id="CBeebiesAsia.uk" site_id="41">CBeebies Asia</channel>
     <channel lang="id" xmltv_id="CCM.hk" site_id="22">Celestial Classic Movies</channel>
-    <channel lang="id" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies Indonesia</channel>
+    <channel lang="id" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies</channel>
     <channel lang="id" xmltv_id="CGTN.cn" site_id="353">CGTN</channel>
     <channel lang="id" xmltv_id="CGTNDocumentary.cn" site_id="205">CGTN Documentary</channel>
     <channel lang="id" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax Asia</channel>
-    <channel lang="id" xmltv_id="CNA.sg" site_id="330">CNA</channel>
+    <channel lang="id" xmltv_id="CNAInternational.sg" site_id="330">CNA</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="337">CNBC</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN</channel>
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation</channel>
@@ -132,7 +132,7 @@
     <channel lang="id" xmltv_id="FightSports.us" site_id="304">Fight Sports</channel>
     <channel lang="id" xmltv_id="FMN.id" site_id="150">FMN</channel>
     <channel lang="id" xmltv_id="FoxNewsChannel.us" site_id="335">Fox News Channel</channel>
-    <channel lang="id" xmltv_id="France24English.fr" site_id="352">France 24 English</channel>
+    <channel lang="id" xmltv_id="France24English.fr" site_id="352">France 24</channel>
     <channel lang="id" xmltv_id="Galaxy.id" site_id="13">Galaxy</channel>
     <channel lang="id" xmltv_id="GalaxyPremium.id" site_id="12">Galaxy Premium</channel>
     <channel lang="id" xmltv_id="GTV.id" site_id="81">GTV</channel>
@@ -188,12 +188,12 @@
     <channel lang="id" xmltv_id="TLCSoutheastAsia.sg" site_id="248">TLC</channel>
     <channel lang="id" xmltv_id="Trans7.id" site_id="110">Trans 7</channel>
     <channel lang="id" xmltv_id="TransTV.id" site_id="87">Trans TV</channel>
-    <channel lang="id" xmltv_id="tvNAsia.hk" site_id="158">TVN Premium Indonesia</channel>
-    <channel lang="id" xmltv_id="tvNMoviesAsia.hk" site_id="25">TVN Movies Indonesia</channel>
+    <channel lang="id" xmltv_id="tvNAsia.hk" site_id="158">tvN</channel>
+    <channel lang="id" xmltv_id="tvNMoviesAsia.hk" site_id="25">tvN Movies</channel>
     <channel lang="id" xmltv_id="tvOne.id" site_id="97">TVOne</channel>
     <channel lang="id" xmltv_id="TVRINasional.id" site_id="118">TVRI Nasional</channel>
     <channel lang="id" xmltv_id="VisionPrime.id" site_id="94">Vision Prime</channel>
-    <channel lang="id" xmltv_id="WarnerTVAsia.us" site_id="163">Warner TV Southeast Asia</channel>
+    <channel lang="id" xmltv_id="WarnerTVAsia.us" site_id="163">Warner TV</channel>
     <channel lang="id" xmltv_id="ZeeBioskop.id" site_id="23">Zee Bioskop</channel>
   </channels>
 </site>

From c9b12a673f26df3fa19d764a90497e76bf2451e5 Mon Sep 17 00:00:00 2001
From: F640 <92260436+F640@users.noreply.github.com>
Date: Thu, 12 Jan 2023 16:46:26 +0700
Subject: [PATCH 2/3] Improved naming consistency

---
 sites/mncvision.id/mncvision.id.channels.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sites/mncvision.id/mncvision.id.channels.xml b/sites/mncvision.id/mncvision.id.channels.xml
index 03169cfc..c0fc67e7 100644
--- a/sites/mncvision.id/mncvision.id.channels.xml
+++ b/sites/mncvision.id/mncvision.id.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="en" xmltv_id="CGTNDocumentary.cn" site_id="205">CGTN Documentary</channel>
     <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax</channel>
     <channel lang="en" xmltv_id="CNAInternational.sg" site_id="330">CNA</channel>
-    <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
+    <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="337">CNBC</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International</channel>
     <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel</channel>
@@ -124,7 +124,7 @@
     <channel lang="id" xmltv_id="CinemaxAsia.sg" site_id="8">Cinemax Asia</channel>
     <channel lang="id" xmltv_id="CNAInternational.sg" site_id="330">CNA</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="337">CNBC</channel>
-    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN</channel>
+    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International</channel>
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation</channel>
     <channel lang="id" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel</channel>
     <channel lang="id" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>

From 924caa2a04f06d0563a21febfd13f158474988ec Mon Sep 17 00:00:00 2001
From: F640 <92260436+F640@users.noreply.github.com>
Date: Thu, 12 Jan 2023 16:50:08 +0700
Subject: [PATCH 3/3] Improved naming consistency pt 2

---
 sites/mncvision.id/mncvision.id.channels.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/mncvision.id/mncvision.id.channels.xml b/sites/mncvision.id/mncvision.id.channels.xml
index c0fc67e7..c01defef 100644
--- a/sites/mncvision.id/mncvision.id.channels.xml
+++ b/sites/mncvision.id/mncvision.id.channels.xml
@@ -30,7 +30,7 @@
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International</channel>
     <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.sg" site_id="207">Crime + Investigation</channel>
     <channel lang="en" xmltv_id="DiscoveryChannelIndonesia.id" site_id="201">Discovery Channel</channel>
-    <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW</channel>
+    <channel lang="en" xmltv_id="DWEnglish.de" site_id="357">DW English</channel>
     <channel lang="en" xmltv_id="Entertainment.id" site_id="86">Ent</channel>
     <channel lang="en" xmltv_id="FightSports.us" site_id="304">Fight Sports</channel>
     <channel lang="en" xmltv_id="FMN.id" site_id="150">FMN</channel>