From a87d57f8fa263d483d76a8cda29f8799b419cdb5 Mon Sep 17 00:00:00 2001
From: RevGear <95308545+RevGear@users.noreply.github.com>
Date: Sun, 18 Sep 2022 16:00:33 +0100
Subject: [PATCH 1/3] HBO Asia

Remove Asian country-specific HBO/Cinemax and replace with regional HBO Asia / Cinemax Asia
---
 sites/astro.com.my/astro.com.my_my.channels.xml              | 4 ++--
 sites/clickthecity.com/clickthecity.com_ph.channels.xml      | 4 ++--
 sites/mewatch.sg/mewatch.sg_sg.channels.xml                  | 4 ++--
 sites/mncvision.id/mncvision.id_id-en.channels.xml           | 4 ++--
 sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml | 2 +-
 sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml | 2 +-
 sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml    | 4 ++--
 sites/transvision.co.id/transvision.co.id_id.channels.xml    | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sites/astro.com.my/astro.com.my_my.channels.xml b/sites/astro.com.my/astro.com.my_my.channels.xml
index 22f92dc6..5385de7a 100644
--- a/sites/astro.com.my/astro.com.my_my.channels.xml
+++ b/sites/astro.com.my/astro.com.my_my.channels.xml
@@ -70,7 +70,7 @@
     <channel lang="ms" xmltv_id="CelestialClassicMovies.hk" site_id="187">Celestial Classic Movies</channel>
     <channel lang="ms" xmltv_id="CelestialMoviesMalaysia.my" site_id="134">Celestial Movies</channel>
     <channel lang="ms" xmltv_id="ChuttiTVMalaysia.my" site_id="51">Chutti TV</channel>
-    <channel lang="ms" xmltv_id="CinemaxMalaysia.my" site_id="337">Cinemax</channel>
+    <channel lang="ms" xmltv_id="CinemaxAsia.sg" site_id="337">Cinemax</channel>
     <channel lang="ms" xmltv_id="Colors.in" site_id="365">Colors</channel>
     <channel lang="ms" xmltv_id="ColorsTamil.in" site_id="298">Colors Tamil</channel>
     <channel lang="ms" xmltv_id="CrimePlusInvestigationAsia.us" site_id="369">Crime + Investigation</channel>
@@ -89,7 +89,7 @@
     <channel lang="ms" xmltv_id="GolfChannelMalaysia.my" site_id="189">Golf Channel</channel>
     <channel lang="ms" xmltv_id="HBOFamilyAsia.sg" site_id="450">HBO Family</channel>
     <channel lang="ms" xmltv_id="HBOHitsAsia.sg" site_id="449">HBO Hits</channel>
-    <channel lang="ms" xmltv_id="HBOMalaysia.my" site_id="143">HBO</channel>
+    <channel lang="ms" xmltv_id="HBOAsia.sg" site_id="143">HBO</channel>
     <channel lang="ms" xmltv_id="HGTVAsia.us" site_id="198">HGTV</channel>
     <channel lang="ms" xmltv_id="HistoryAsia.us" site_id="144">History</channel>
     <channel lang="ms" xmltv_id="Hits.sg" site_id="179">Hits</channel>
diff --git a/sites/clickthecity.com/clickthecity.com_ph.channels.xml b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
index 449c7b06..676799ea 100644
--- a/sites/clickthecity.com/clickthecity.com_ph.channels.xml
+++ b/sites/clickthecity.com/clickthecity.com_ph.channels.xml
@@ -7,7 +7,7 @@
     <channel lang="en" xmltv_id="AXNPhilippines.ph" site_id="axn">AXN</channel>
     <channel lang="en" xmltv_id="CelestialMoviesPinoy.hk" site_id="celestial-movies-pinoy">Celestial Movies Pinoy</channel>
     <channel lang="en" xmltv_id="CinemaOneGlobal.ph" site_id="cinema-one">Cinema One</channel>
-    <channel lang="en" xmltv_id="CinemaxSingapore.sg" site_id="cinemax">Cinemax</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="cinemax">Cinemax</channel>
     <channel lang="en" xmltv_id="CNNPhilippines.ph" site_id="cnn-philippines">CNN Philippines</channel>
     <channel lang="en" xmltv_id="CrimePlusInvestigationAsia.us" site_id="crime-investigation">Crime &amp; Investigation</channel>
     <channel lang="en" xmltv_id="IBC13.ph" site_id="ibc-tv-13">IBC 13</channel>
@@ -16,7 +16,7 @@
     <channel lang="en" xmltv_id="GMANewsTV.ph" site_id="gma-news-tv">GMA News TV</channel>
     <channel lang="en" xmltv_id="GMATV.ph" site_id="gma">GMA</channel>
     <channel lang="en" xmltv_id="GTV.ph" site_id="gtv">GTV</channel>
-    <channel lang="en" xmltv_id="HBOSingapore.sg" site_id="hbo-asia">HBO Asia</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="hbo-asia">HBO Asia</channel>
     <channel lang="en" xmltv_id="HistoryPhilippines.ph" site_id="history">History</channel>
     <channel lang="en" xmltv_id="JeepneyTV.ph" site_id="jeepney-tv">Jeepney TV</channel>
     <channel lang="en" xmltv_id="KapamilyaChannel.ph" site_id="kapamilya-channel">Kapamilya Channel</channel>
diff --git a/sites/mewatch.sg/mewatch.sg_sg.channels.xml b/sites/mewatch.sg/mewatch.sg_sg.channels.xml
index 00530a20..a2883a8d 100644
--- a/sites/mewatch.sg/mewatch.sg_sg.channels.xml
+++ b/sites/mewatch.sg/mewatch.sg_sg.channels.xml
@@ -11,11 +11,11 @@
     <channel lang="en" xmltv_id="eGGNetwork.my" site_id="206958">eGG Network</channel>
     <channel lang="en" xmltv_id="AnimaxAsia.sg" site_id="242030">Animax</channel>
     <channel lang="en" xmltv_id="GEM.sg" site_id="242036">GEM</channel>
-    <channel lang="en" xmltv_id="HBOSingapore.sg" site_id="97137">HBO</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="97137">HBO</channel>
     <channel lang="en" xmltv_id="HBOHitsAsia.sg" site_id="97140">HBO Hits</channel>
     <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="97147">HBO Family</channel>
     <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="97146">HBO Signature</channel>
-    <channel lang="en" xmltv_id="CinemaxSingapore.sg" site_id="97155">Cinemax</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="97155">Cinemax</channel>
     <channel lang="en" xmltv_id="meWATCHLIVE1.sg" site_id="97073">LIVE 1</channel>
     <channel lang="en" xmltv_id="meWATCHLIVE2.sg" site_id="97078">LIVE 2</channel>
   </channels>
diff --git a/sites/mncvision.id/mncvision.id_id-en.channels.xml b/sites/mncvision.id/mncvision.id_id-en.channels.xml
index c84b668e..ddc6b0d9 100644
--- a/sites/mncvision.id/mncvision.id_id-en.channels.xml
+++ b/sites/mncvision.id/mncvision.id_id-en.channels.xml
@@ -25,7 +25,7 @@
     <channel lang="en" xmltv_id="CelestialMoviesIndonesia.id" site_id="20">Celestial Movies Indonesia</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="CinemaxSingapore.sg" site_id="8">Cinemax Asia</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="CNBCAsia.sg" site_id="337">CNBC Asia-Pacific</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="333">CNN International Asia Pacific</channel>
@@ -40,7 +40,7 @@
     <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>
-    <channel lang="en" xmltv_id="HBOSingapore.sg" site_id="7">HBO Asia</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="7">HBO Asia</channel>
     <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="9">HBO Family Asia</channel>
     <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>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
index d05404da..2b4fe2fe 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
@@ -47,7 +47,7 @@
     <channel lang="en" xmltv_id="GMALifeTV.ph" site_id="721">GMA Life TV</channel>
     <channel lang="en" xmltv_id="GMANewsTVInternational.ph" site_id="722">GMA News TV International</channel>
     <channel lang="en" xmltv_id="GMAPinoyTVAsiaPacific.ph" site_id="720">GMA Pinoy TV Asia-Pacific</channel>
-    <channel lang="en" xmltv_id="HBOSingapore.sg" site_id="115">HBO</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="115">HBO</channel>
     <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="112">HBO Family</channel>
     <channel lang="en" xmltv_id="HBOHitsAsia.sg" site_id="111">HBO Hits</channel>
     <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="114">HBO Signature</channel>
diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
index 51fbdc60..2fda2d1d 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
@@ -44,7 +44,7 @@
     <channel lang="zh" xmltv_id="GMALifeTV.ph" site_id="721">GMA Life TV</channel>
     <channel lang="zh" xmltv_id="GMANewsTVInternational.ph" site_id="722">GMA News TV International</channel>
     <channel lang="zh" xmltv_id="GMAPinoyTVAsiaPacific.ph" site_id="720">GMA Pinoy TV Asia-Pacific</channel>
-    <channel lang="zh" xmltv_id="HBOHongKong.hk" site_id="115">HBO Asia</channel>
+    <channel lang="zh" xmltv_id="HBOAsia.sg" site_id="115">HBO Asia</channel>
     <channel lang="zh" xmltv_id="HBOFamilyAsia.sg" site_id="112">HBO Family Asia</channel>
     <channel lang="zh" xmltv_id="HBOHitsAsia.sg" site_id="111">HBO Hits</channel>
     <channel lang="zh" xmltv_id="HBOSignatureAsia.sg" site_id="114">HBO Signature Asia</channel>
diff --git a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
index cf0a4a3b..5197aa47 100644
--- a/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
+++ b/sites/starhubtvplus.com/starhubtvplus.com_sg.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="en" xmltv_id="ChannelU.sg" site_id="107">Channel U HD</channel>
     <channel lang="en" xmltv_id="CinemaOneGlobal.ph" site_id="145">Cinema One Global</channel>
     <channel lang="en" xmltv_id="CinemaWorld.my" site_id="613">CinemaWorld HD</channel>
-    <channel lang="en" xmltv_id="CinemaxSingapore.sg" site_id="611">Cinemax HD</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="611">Cinemax HD</channel>
     <channel lang="en" xmltv_id="CitraEntertainment.id" site_id="115">Citra Entertainment</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="106">Channel NewsAsia HD</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="707">CNBC HD</channel>
@@ -54,7 +54,7 @@
     <channel lang="en" xmltv_id="GEM.sg" site_id="814">GEM HD</channel>
     <channel lang="en" xmltv_id="GMALifeTV.ph" site_id="147">GMA Life TV</channel>
     <channel lang="en" xmltv_id="GMAPinoyTV.ph" site_id="146">GMA Pinoy TV</channel>
-    <channel lang="en" xmltv_id="HBOSingapore.sg" site_id="601">HBO HD</channel>
+    <channel lang="en" xmltv_id="HBOAsia.sg" site_id="601">HBO HD</channel>
     <channel lang="en" xmltv_id="HBOFamilyAsia.sg" site_id="604">HBO Family HD</channel>
     <channel lang="en" xmltv_id="HBOHitsAsia.sg" site_id="605">HBO Hits HD</channel>
     <channel lang="en" xmltv_id="HBOSignatureAsia.sg" site_id="603">HBO Signature HD</channel>
diff --git a/sites/transvision.co.id/transvision.co.id_id.channels.xml b/sites/transvision.co.id/transvision.co.id_id.channels.xml
index 61133215..0f4e3f21 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="id" xmltv_id="CGTNDocumentary.cn" site_id="CC9">CGTN Documentary</channel>
     <channel lang="id" xmltv_id="CNA.sg" site_id="NAC">Channel NewsAsia</channel>
     <channel lang="id" xmltv_id="CinemaWorld.my" site_id="CIWO">Cinema World HD</channel>
-    <channel lang="id" xmltv_id="CinemaxHDIndonesia.id" site_id="CMX">CINEMAX HD</channel>
+    <channel lang="id" xmltv_id="CinemaxAsia.sg" site_id="CMX">CINEMAX</channel>
     <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="CNBC">CNBC Asia</channel>
     <channel lang="id" xmltv_id="CNNIndonesia.id" site_id="CNI">CNN Indonesia HD</channel>
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="CNN">CNN International HD</channel>
@@ -43,7 +43,7 @@
     <channel lang="id" xmltv_id="GEM.sg" site_id="GEM">GEM HD</channel>
     <channel lang="id" xmltv_id="GTV.id" site_id="GLO">GLOBAL TV</channel>
     <channel lang="id" xmltv_id="HBOFamilyAsia.sg" site_id="HBF">HBO Family HD</channel>
-    <channel lang="id" xmltv_id="HBOHDIndonesia.id" site_id="HBO">HBO HD</channel>
+    <channel lang="id" xmltv_id="HBOAsia.sg" site_id="HBO">HBO</channel>
     <channel lang="id" xmltv_id="HBOHitsHDAsia.sg" site_id="HBH">HBO Hits HD</channel>
     <channel lang="id" xmltv_id="HBOSignatureAsia.sg" site_id="HBOS">HBO Signature HD</channel>
     <channel lang="id" xmltv_id="HistoryAsia.us" site_id="HIS">History HD</channel>

From 8ba69d0a9b3a5196dc0b22cd2f61740a2cdf577c Mon Sep 17 00:00:00 2001
From: RevGear <95308545+RevGear@users.noreply.github.com>
Date: Sun, 18 Sep 2022 19:41:07 +0100
Subject: [PATCH 2/3] Update nowplayer.now.com_hk-zh.channels.xml

Missed CinemaxHongKong.hk
---
 sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
index 2fda2d1d..50e59e2c 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-zh.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="zh" xmltv_id="CCTV1.cn" site_id="541">CCTV 1</channel>
     <channel lang="zh" xmltv_id="CCTV4Asia.cn" site_id="542">CCTV 4 Asia</channel>
     <channel lang="zh" xmltv_id="ChannelAdult.hk" site_id="903">Channel Adult</channel>
-    <channel lang="zh" xmltv_id="CinemaxHongKong.hk" site_id="113">Cinemax Asia</channel>
+    <channel lang="zh" xmltv_id="CinemaxAsia.sg" site_id="113">Cinemax Asia</channel>
     <channel lang="zh" xmltv_id="CNA.sg" site_id="322">CNA</channel>
     <channel lang="zh" xmltv_id="CNBCAsia.sg" site_id="319">CNBC Asia-Pacific</channel>
     <channel lang="zh" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="316">CNN International Asia Pacific</channel>

From 9ab29e2c6af509c82093bdb5624ed4fddb6d933d Mon Sep 17 00:00:00 2001
From: RevGear <95308545+RevGear@users.noreply.github.com>
Date: Sun, 18 Sep 2022 19:43:18 +0100
Subject: [PATCH 3/3] Update nowplayer.now.com_hk-en.channels.xml

Missed CinemaxSingapore.sg
---
 sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
index 2b4fe2fe..1b33d71c 100644
--- a/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
+++ b/sites/nowplayer.now.com/nowplayer.now.com_hk-en.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="en" xmltv_id="CCTV1.cn" site_id="541">CCTV 1</channel>
     <channel lang="en" xmltv_id="CCTV4Asia.cn" site_id="542">CCTV 4 Asia</channel>
     <channel lang="en" xmltv_id="ChannelAdult.hk" site_id="903">Channel Adult</channel>
-    <channel lang="en" xmltv_id="CinemaxSingapore.sg" site_id="113">Cinemax</channel>
+    <channel lang="en" xmltv_id="CinemaxAsia.sg" site_id="113">Cinemax</channel>
     <channel lang="en" xmltv_id="CNA.sg" site_id="322">CNA</channel>
     <channel lang="en" xmltv_id="CNBCAsia.sg" site_id="319">CNBC</channel>
     <channel lang="en" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="316">CNN</channel>