Merge branch 'master' into wtv-patch

streams/ca.m3u

@@ -85,7 +85,7 @@ https://cdn.appv.jagobd.com:444/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeF
 http://cdn12.henico.net:8080/live/dncal/index.m3u8
 #EXTINF:-1 tvg-id="EawazTV.ca" status="online",Eawaz TV (720p) [Not 24/7]
 https://streamer12.vdn.dstreamone.net/saazoawaz/saazoawaz/playlist.m3u8
-#EXTINF:-1 tvg-id="EEntertainment.ca" status="error",E! Canada (720p)
+#EXTINF:-1 tvg-id="ECanada.ca" status="error",E! Canada (720p)
 http://encodercdn1.frontline.ca/vantrix/ltv/Bell_E!HD_AtopItci_2015_01_12_HD/hls_hd.m3u8
 #EXTINF:-1 tvg-id="EETTV.ca" status="online",EET TV (1080p) [Not 24/7]
 https://eu.streamjo.com/eetlive/eettv.m3u8

streams/fr_samsung.m3u

@@ -15,7 +15,7 @@ https://fashiontv-fashiontv-loriginal-fr.samsung.wurl.com/manifest/playlist.m3u8
 https://fueltv-fueltv-8-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Humanity.fr" status="error",Humanity (720p)
 https://alchimie-humanity-1-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="LuxeTV.fr" status="error",Luxe TV (720p)
+#EXTINF:-1 tvg-id="LuxeTV.lu" status="error",Luxe TV (720p)
 https://alchimie-luxe-1-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Moods.fr" status="error",Moods (720p)
 https://alchimie-moods-1-fr.samsung.wurl.com/manifest/playlist.m3u8

streams/it.m3u

@@ -81,7 +81,7 @@ https://5f22d76e220e1.streamlock.net/eurotv/eurotv/playlist.m3u8
 https://stream7.xdevel.com/video0s975817-411/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Gold78.it" status="online",Gold 78 (1080p)
 https://stream2.xdevel.com/video1s86-22/stream/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="GoldTVItalia.it" status="timeout",Gold TV Italia (576p)
+#EXTINF:-1 tvg-id="GoldTVItaly.it" status="timeout",Gold TV Italia (576p)
 http://151.0.207.99:1935/GoldTV/GOLD_17/playlist.m3u8
 #EXTINF:-1 tvg-id="HalowKidsHD.it" status="error",Halow Kids HD (480p)
 http://halowtv.online:8080/HalowTV/FSyzHfEhvb/139
@@ -404,9 +404,9 @@ http://streaming.senecadot.com/live/flv:tv7.sdp/playlist.m3u8
 http://217.61.26.46:8080/hls/news.m3u8
 #EXTINF:-1 tvg-id="TV7Triveneta.it" status="online",TV7 Triveneta (270p) [Not 24/7]
 http://217.61.26.46:8080/hls/triveneta.m3u8
-#EXTINF:-1 tvg-id="TV2000.it" status="online",TV 2000 (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV2000.va" status="online",TV 2000 (360p) [Not 24/7]
 http://cld04wz.tv2000.it/tv2000_main.m3u8
-#EXTINF:-1 tvg-id="TV2000.it" status="error",TV 2000 (540p)
+#EXTINF:-1 tvg-id="TV2000.va" status="error",TV 2000 (540p)
 http://mi1.wz.tv2000.it/mirror/High/playlist.m3u8
 #EXTINF:-1 tvg-id="TVAVicenza.it" status="online",TVA (Vicenza) (720p)
 http://fms.tvavicenza.it:1935/live/diretta_1/playlist.m3u8

streams/it_samsung.m3u

@@ -59,7 +59,7 @@ https://gto2000-sportoutdoortv-1-it.samsung.wurl.com/manifest/playlist.m3u8
 https://kedoo-supertoonstv-4-it.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Teletubbies.it" status="error",Teletubbies (720p)
 https://dhx-teletubbies-2-it.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="ThePetCollectiveItalia.us" status="error",The Pet Collective Italy (720p)
+#EXTINF:-1 tvg-id="ThePetCollectiveItaly.us" status="error",The Pet Collective Italy (720p)
 https://the-pet-collective-international-it.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="YamatoAnimation.it" status="error",Yamato Animation (720p)
 https://yamatovideo-yamatoanimation-1-it.samsung.wurl.com/manifest/playlist.m3u8

streams/ph.m3u

@@ -35,7 +35,7 @@ http://stream.gmanews.tv/ioslive/livestream/chunklist.m3u8?wowzasessionid=693701
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/TVMariaLIVE/live
 #EXTINF:-1 tvg-id="UNTV.ph" status="",UNTV (1080p)
 https://vid.untv.co/live-stream/untvweb.m3u8
-#EXTINF:-1 tvg-id="Teleradyo.ph" status="online",TeleRadyo
+#EXTINF:-1 tvg-id="TeleRadyo.ph" status="online",TeleRadyo
 https://abscbn-ono.akamaized.net/midroll/amagi_hls_data_abscbnAAA-abscbn-teleradyo-oando/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="NET25.ph" status="",NET 25 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Net25.ph" status="",NET 25 (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/Net25Tv/live

streams/uk_samsung.m3u

@@ -39,7 +39,7 @@ https://insighttv-samsung-uk.amagi.tv/playlist.m3u8
 https://inwild-samsung-uk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="InWonder.nl" status="online",InWonder (720p)
 https://inwonder-samsung-uk.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="LuxeTV.fr" status="error",Luxe TV (720p)
+#EXTINF:-1 tvg-id="LuxeTV.lu" status="error",Luxe TV (720p)
 https://alchimie-luxe-2-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MavTVUK.us" status="error",MavTV UK (720p)
 https://mavtv-mavtvglobal-1-gb.samsung.wurl.com/manifest/playlist.m3u8

streams/us.m3u

@@ -1006,7 +1006,7 @@ https://lsqvc1uscln-lh.akamaihd.net/i/lsqvc1uscln_01@809410/master.m3u8
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_main_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="QVCBeauty.uk" status="online",QVC Beauty (German) (540p)
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_beauty_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="QVCItalia.it" status="online",QVC Italia (540p)
+#EXTINF:-1 tvg-id="QVCItaly.it" status="online",QVC Italia (540p)
 https://qrg.akamaized.net/hls/live/2017383/lsqvc1it/master.m3u8
 #EXTINF:-1 tvg-id="QVCJapan.jp" status="online",QVC Japan (720p)
 https://cdn-live1.qvc.jp/iPhone/1501/1501.m3u8