Local only mark for RAI links and more url fixes from bunanson

diff --git a/data/WorldTV99.xml b/data/WorldTV99.xml
index ffdcb8a..031269d 100644 (file)
--- a/data/WorldTV99.xml
+++ b/data/WorldTV99.xml
@@ -91,11 +91,13 @@
   <link url="mms://online.ntdtvcast.com/Stream-Live" aspectRatio="15:9" title="China USA NTDTV NYC" country="China" category="TV"/>
   <link title="WDEVN-All about living World-Asia, China Taipei" aspectRatio="15:9" url="http://www.wdevn.com/wdevn.xml" country="China" category="travel"/>
   <!--Czech-->
   <link url="mms://online.ntdtvcast.com/Stream-Live" aspectRatio="15:9" title="China USA NTDTV NYC" country="China" category="TV"/>
   <link title="WDEVN-All about living World-Asia, China Taipei" aspectRatio="15:9" url="http://www.wdevn.com/wdevn.xml" country="China" category="travel"/>
   <!--Czech-->

+  <link url="mms://wmedia.siol.net/paprika/live" aspectRatio="15:9" title="Czech Slovenia Paprika TV VH1" country="Czech" category="musicvideo"/>
+  <link url="mms://81.89.49.210/musicbox" aspectRatio="15:9" title="Czech Slovkia Music Box" country="Czech" category="musicvideo"/>

   <link url="http://feeds.feedburner.com/Travelvlog" aspectRatio="15:9" title="Czech Travelvlog" country="Czech" category="travel"/>
   <link url="http://feeds.feedburner.com/Travelvlog" aspectRatio="15:9" title="Czech Travelvlog" country="Czech" category="travel"/>

-  <!--Denmark LOCAL ONLY-->
-  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786405" aspectRatio="15:9" title="DR1" country="Denmark LOCAL ONLY" category="TV"/>
-  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786410" aspectRatio="15:9" title="DR2" country="Denmark LOCAL ONLY" category="TV"/>
-  <link url="http://www.dr.dk/tjenester/podcast/update.asx?qid=288417" aspectRatio="15:9" title="DR Update" country="Denmark LOCAL ONLY" category="TV"/>
+  <!--Denmark Local-->
+  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786405" aspectRatio="15:9" title="Denmark DR1" country="Denmark Local" category="TV"/>
+  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786410" aspectRatio="15:9" title="Denmark DR2" country="Denmark Local" category="TV"/>
+  <link url="http://www.dr.dk/tjenester/podcast/update.asx?qid=288417" aspectRatio="15:9" title="Denmark DR Update" country="Denmark Local" category="TV"/>

   <!--Finland NOKIA-->
   <link url="mms://62.41.56.32/PUBLIC_votv_fi" aspectRatio="15:9" title="The Voice" country="Finland NOKIA" category="musicvideo"/>
   <!--France-->
   <!--Finland NOKIA-->
   <link url="mms://62.41.56.32/PUBLIC_votv_fi" aspectRatio="15:9" title="The Voice" country="Finland NOKIA" category="musicvideo"/>
   <!--France-->

@@ -142,38 +144,40 @@
   <link url="http://balialive.blip.tv/rss/" aspectRatio="15:9" title="Bali alive" country="Indonesia" category="travel"/>
   <!--International-->
   <link url="http://forgiss.libsyn.com/rss" aspectRatio="15:9" title="Shoots Images" country="International" category="entertainment"/>
   <link url="http://balialive.blip.tv/rss/" aspectRatio="15:9" title="Bali alive" country="Indonesia" category="travel"/>
   <!--International-->
   <link url="http://forgiss.libsyn.com/rss" aspectRatio="15:9" title="Shoots Images" country="International" category="entertainment"/>

+  <link url="mms://soleiltv.impek.tv/soleiltv" aspectRatio="15:9" title="Soleil TV Mystic, Antille" country="International" category="musicvideo"/>

   <!--Italy-->
   <!--Italy-->

-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=983" aspectRatio="15:9" title="Italy RaiUno diretta" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4154" aspectRatio="15:9" title="Italy RaiUno diretta LB" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=984" aspectRatio="15:9" title="Italy RaiDue diretta" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4155" aspectRatio="15:9" title="Italy RaiDue diretta LB" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=986" aspectRatio="15:9" title="Italy RaiTre diretta" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4137" aspectRatio="15:9" title="Italy RaiTre diretta LB" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72386" aspectRatio="15:9" title="Italy Rai 4 diretta LB" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=75708" aspectRatio="15:9" title="Italy Rai 4 diretta" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72382" aspectRatio="15:9" title="Italy RaiSat Extra2" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72926" aspectRatio="15:9" title="Italy RaiSat Extra6" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72916" aspectRatio="15:9" title="Italy RaiSat Premium6" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72383" aspectRatio="15:9" title="Italy RaiSat Premium3" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72381" aspectRatio="15:9" title="Italy RaiSat Cinema" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72920" aspectRatio="15:9" title="Italy RaiSat Cinema0" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72918" aspectRatio="15:9" title="Italy RaiSat YoYo" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72384" aspectRatio="15:9" title="Italy RaiSat YoYo4" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4119" aspectRatio="15:9" title="Italy diretta rai gulp FULL" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4120" aspectRatio="15:9" title="Italy rai gulp wall" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=681" aspectRatio="15:9" title="Italy rai gulp prev" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=1" aspectRatio="15:9" title="Italy Rainews24 diretta full" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4145" aspectRatio="15:9" title="Italy RaiSport+ diretta full" country="Italy" category="sport"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=17190" aspectRatio="15:9" title="Italy RaiSport+ diretta LB" country="Italy" category="sport"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=24269" aspectRatio="15:9" title="Italy RaiStoria diretta full" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4153" aspectRatio="15:9" title="Italy RaiStoria diretta LB" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=24268" aspectRatio="15:9" title="Italy RaiEdu1 - diretta full" country="Italy" category="TV"/>
-  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4152" aspectRatio="15:9" title="Italy RaiEdu1 - diretta LB" country="Italy" category="TV"/>

   <link url="mms://iptv.telecard.it/3Channel" aspectRatio="15:9" title="Italy 3Channel" country="Italy" category="TV"/>
   <link url="mms://iptv.telecard.it/3Channel" aspectRatio="15:9" title="Italy 3Channel" country="Italy" category="TV"/>

-  <link url="mms://iptv.primocanale.it/primocanalesport" aspectRatio="15:9" title="Italy primocanalesport" country="Italy" category="sport"/>

   <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=1" aspectRatio="15:9" title="Italy RAI News 24" country="Italy" category="news"/>
   <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=1" aspectRatio="15:9" title="Italy RAI News 24" country="Italy" category="news"/>

-  <link url="mms://mms.cdn-tiscali.com/sportitalia" aspectRatio="15:9" title="Italy Sport" country="Italy" category="sport"/>

   <link url="mms://wmlive.telemolise.com/multicast_stream2" aspectRatio="15:9" title="Italy telemolise" country="Italy" category="TV"/>
   <link url="mms://wmlive.telemolise.com/multicast_stream2" aspectRatio="15:9" title="Italy telemolise" country="Italy" category="TV"/>

+  <!--Italy Local-->
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=983" aspectRatio="15:9" title="Italy RaiUno diretta" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4154" aspectRatio="15:9" title="Italy RaiUno diretta LB" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=984" aspectRatio="15:9" title="Italy RaiDue diretta" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4155" aspectRatio="15:9" title="Italy RaiDue diretta LB" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=986" aspectRatio="15:9" title="Italy RaiTre diretta" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4137" aspectRatio="15:9" title="Italy RaiTre diretta LB" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72386" aspectRatio="15:9" title="Italy Rai 4 diretta LB" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=75708" aspectRatio="15:9" title="Italy Rai 4 diretta" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72382" aspectRatio="15:9" title="Italy RaiSat Extra2" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72926" aspectRatio="15:9" title="Italy RaiSat Extra6" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72916" aspectRatio="15:9" title="Italy RaiSat Premium6" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72383" aspectRatio="15:9" title="Italy RaiSat Premium3" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72381" aspectRatio="15:9" title="Italy RaiSat Cinema" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72920" aspectRatio="15:9" title="Italy RaiSat Cinema0" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72918" aspectRatio="15:9" title="Italy RaiSat YoYo" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=72384" aspectRatio="15:9" title="Italy RaiSat YoYo4" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4119" aspectRatio="15:9" title="Italy diretta rai gulp FULL" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4120" aspectRatio="15:9" title="Italy rai gulp wall" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=681" aspectRatio="15:9" title="Italy rai gulp prev" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=1" aspectRatio="15:9" title="Italy Rainews24 diretta full" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4145" aspectRatio="15:9" title="Italy RaiSport+ diretta full" country="Italy Local" category="sport"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=17190" aspectRatio="15:9" title="Italy RaiSport+ diretta LB" country="Italy Local" category="sport"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=24269" aspectRatio="15:9" title="Italy RaiStoria diretta full" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4153" aspectRatio="15:9" title="Italy RaiStoria diretta LB" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=24268" aspectRatio="15:9" title="Italy RaiEdu1 - diretta full" country="Italy Local" category="TV"/>
+  <link url="http://mediapolis.rai.it/relinker/relinkerServlet.htm?cont=4152" aspectRatio="15:9" title="Italy RaiEdu1 - diretta LB" country="Italy Local" category="TV"/>
+  <link url="mms://iptv.primocanale.it/primocanalesport" aspectRatio="15:9" title="Italy primocanalesport" country="Italy Local" category="sport"/>
+  <link url="mms://mms.cdn-tiscali.com/sportitalia" aspectRatio="15:9" title="Italy Sport" country="Italy Local" category="sport"/>

   <!--Japan-->
   <link url="http://allneedgocco.com/podcast/rss.xml" aspectRatio="15:9" title="Japan All Need Gocco" country="Japan" category="TV"/>
   <link url="http://feeds.feedburner.com/cavinginjapan" aspectRatio="15:9" title="Japan Caving" country="Japan" category="newsmagazine"/>
   <!--Japan-->
   <link url="http://allneedgocco.com/podcast/rss.xml" aspectRatio="15:9" title="Japan All Need Gocco" country="Japan" category="TV"/>
   <link url="http://feeds.feedburner.com/cavinginjapan" aspectRatio="15:9" title="Japan Caving" country="Japan" category="newsmagazine"/>

@@ -185,7 +189,7 @@
   <link url="http://feeds.feedburner.com/tokyodv" aspectRatio="15:9" title="Japan TokyoDV" country="Japan" category="entertainment"/>
   <link url="http://podfeed.podcastjuice.jp/app/rss_convert.cgi?url=http%3A%2F%2Fyurikamome-clips.cocolog-nifty.com%2Fblog%2F" aspectRatio="15:9" title="Japan Yurikamome" country="Japan" category="TV"/>
   <!--Luxembourg-->
   <link url="http://feeds.feedburner.com/tokyodv" aspectRatio="15:9" title="Japan TokyoDV" country="Japan" category="entertainment"/>
   <link url="http://podfeed.podcastjuice.jp/app/rss_convert.cgi?url=http%3A%2F%2Fyurikamome-clips.cocolog-nifty.com%2Fblog%2F" aspectRatio="15:9" title="Japan Yurikamome" country="Japan" category="TV"/>
   <!--Luxembourg-->

-  <link url="mms://streaming.newmedia.lu/telehighres" aspectRatio="15:9" title="Luxembourg RTL" country="Luxembourg RTL" category="news"/>
+  <link url="mms://streaming.newmedia.lu/telehighres" aspectRatio="15:9" title="Luxembourg RTL" country="Luxembourg" category="news"/>

   <!--Mexico-->
   <link url="rtsp://148.240.229.63/broadcast/canal28.rm" aspectRatio="15:9" title="Mexico Cadena Tres (28 live)" country="Mexico" category="TV"/>
   <link url="mms://stream2.terra.es/wm2live1" title="Mexico Canal del Congreso" aspectRatio="15:9" country="Mexico" category="TV"/>
   <!--Mexico-->
   <link url="rtsp://148.240.229.63/broadcast/canal28.rm" aspectRatio="15:9" title="Mexico Cadena Tres (28 live)" country="Mexico" category="TV"/>
   <link url="mms://stream2.terra.es/wm2live1" title="Mexico Canal del Congreso" aspectRatio="15:9" country="Mexico" category="TV"/>

@@ -194,7 +198,7 @@
   <link url="rtsp://148.240.229.63/broadcast/imagentv.rm" aspectRatio="15:9" title="Mexico Imagen Informativa (live)" country="Mexico" category="TV"/>
   <link url="mms://201.130.192.49:8000/" title="Mexico OchoTV" aspectRatio="15:9" country="Mexico" category="TV"/>
   <link url="rtsp://realvitor.sicomnet.edu.mx:554/broadcast/live.rm" title="Mexico 132|SCJN|Supreme Court of Justice" aspectRatio="15:9" country="Mexico" category="TV"/>
   <link url="rtsp://148.240.229.63/broadcast/imagentv.rm" aspectRatio="15:9" title="Mexico Imagen Informativa (live)" country="Mexico" category="TV"/>
   <link url="mms://201.130.192.49:8000/" title="Mexico OchoTV" aspectRatio="15:9" country="Mexico" category="TV"/>
   <link url="rtsp://realvitor.sicomnet.edu.mx:554/broadcast/live.rm" title="Mexico 132|SCJN|Supreme Court of Justice" aspectRatio="15:9" country="Mexico" category="TV"/>

-  <link url="http://201.147.20.2/pm/mexicochannel.wmv"    aspectRatio="15:9" title="Mexico Travel Channel" country="Mexico" category="TV"/>
+  <link url="http://201.147.20.2/pm/mexicochannel.wmv" aspectRatio="15:9" title="Mexico Travel Channel" country="Mexico" category="TV"/>

   <link url="http://201.147.20.2/pm/tvunam.wmv" aspectRatio="15:9" title="Mexico Tv UNAM" country="Mexico" category="TV"/>
   <link url="rtsp://200.52.193.75:554/encoder/videorola.rm?cloakport=6060,554,7070" title="Mexico|Music|450|VideoRola|Music TV" aspectRatio="15:9" country="Mexico" category="TV"/>
   <!--Netherlands-->
   <link url="http://201.147.20.2/pm/tvunam.wmv" aspectRatio="15:9" title="Mexico Tv UNAM" country="Mexico" category="TV"/>
   <link url="rtsp://200.52.193.75:554/encoder/videorola.rm?cloakport=6060,554,7070" title="Mexico|Music|450|VideoRola|Music TV" aspectRatio="15:9" country="Mexico" category="TV"/>
   <!--Netherlands-->

@@ -210,11 +214,12 @@
   <link url="mms://livemedia2.omroep.nl/vpro3voor12tvcentral-sb" aspectRatio="15:9" title="Netherlands VPRO" country="Netherlands" category="TV"/>
   <!--Norway-->
   <link url="http://rss.mac.com/oasen/iWeb/Websted/Podcast/rss.xml" aspectRatio="15:9" title="Norway Oasen Studio" country="Norway" category="arts"/>
   <link url="mms://livemedia2.omroep.nl/vpro3voor12tvcentral-sb" aspectRatio="15:9" title="Netherlands VPRO" country="Netherlands" category="TV"/>
   <!--Norway-->
   <link url="http://rss.mac.com/oasen/iWeb/Websted/Podcast/rss.xml" aspectRatio="15:9" title="Norway Oasen Studio" country="Norway" category="arts"/>

-  <link url="mms://straumV.nrk.no/nrk_tv_svisj24_mbr" aspectRatio="15:9" title="Norway NRK Svisj" country="Norway" category="TV"/>
-  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk1_m" aspectRatio="15:9" title="Norway NRK1" country="Norway" category="TV"/>
-  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk2_m" aspectRatio="15:9" title="Norway NRK2" country="Norway" category="TV"/>
-  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk3_m" aspectRatio="15:9" title="Norway NRK3" country="Norway" category="TV"/>

   <link url="http://yogababy.blip.tv/rss" aspectRatio="15:9" title="Norway Yogababy" country="Norway" category="health"/>
   <link url="http://yogababy.blip.tv/rss" aspectRatio="15:9" title="Norway Yogababy" country="Norway" category="health"/>

+  <!--Norway Local-->
+  <link url="mms://straumV.nrk.no/nrk_tv_svisj24_mbr" aspectRatio="15:9" title="Norway NRK Svisj" country="Norway Local" category="TV"/>
+  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk1_m" aspectRatio="15:9" title="Norway NRK1" country="Norway Local" category="TV"/>
+  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk2_m" aspectRatio="15:9" title="Norway NRK2" country="Norway Local" category="TV"/>
+  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk3_m" aspectRatio="15:9" title="Norway NRK3" country="Norway Local" category="TV"/>

   <!--Phillipine-->
   <!--Poland-->
   <link url="mms://av.wp.pl/wptv-lifestyle" aspectRatio="15:9" title="Poland WPTV" country="Poland" category="TV"/>
   <!--Phillipine-->
   <!--Poland-->
   <link url="mms://av.wp.pl/wptv-lifestyle" aspectRatio="15:9" title="Poland WPTV" country="Poland" category="TV"/>

@@ -239,11 +244,7 @@
   <link url="mms://mms.tvsme.ru/high" aspectRatio="15:9" title="Russia TV SME" country="Russia" category="TV"/>
   <!--Saudi Arabia-->
   <link url="mms://201.12.119.29/tvjangadeiro/" aspectRatio="15:9" title="Ekhbariya TV" country="Saudi Arabia" category="TV"/>
   <link url="mms://mms.tvsme.ru/high" aspectRatio="15:9" title="Russia TV SME" country="Russia" category="TV"/>
   <!--Saudi Arabia-->
   <link url="mms://201.12.119.29/tvjangadeiro/" aspectRatio="15:9" title="Ekhbariya TV" country="Saudi Arabia" category="TV"/>

-  <!--Misc-->
-  <link url="mms://live1.wm.skynews.servecast.net/skynews_wmlz_live300k" aspectRatio="15:9" title="Skynews" category="news"/>
-  <link url="mms://wmedia.siol.net/paprika/live" aspectRatio="15:9" title="Slovenia Paprika TV VH1" category="TV"/>
-  <link url="mms://81.89.49.210/musicbox" aspectRatio="15:9" title="Slovkia Music Box" category="musicvideo"/>
-  <link url="mms://soleiltv.impek.tv/soleiltv" aspectRatio="15:9" title="Soleil TV Mystic, Antille" category="musicvideo"/>
+

   <!--Spain-->
   <link url="http://studentstudios.blip.tv/?skin=rss" aspectRatio="15:9" title="Spain clickTV" country="Spain" category="TV"/>
   <link url="http://feeds.feedburner.com/hombreloboTV" aspectRatio="15:9" title="Spain HombreLobo" country="Spain" category="travel"/>
   <!--Spain-->
   <link url="http://studentstudios.blip.tv/?skin=rss" aspectRatio="15:9" title="Spain clickTV" country="Spain" category="TV"/>
   <link url="http://feeds.feedburner.com/hombreloboTV" aspectRatio="15:9" title="Spain HombreLobo" country="Spain" category="travel"/>

@@ -288,15 +289,16 @@
   <link title="TV5" aspectRatio="15:9" url="mms://212.156.63.226/TV5" country="Turkey" category="TV"/>
   <link title="TURK" aspectRatio="15:9" url="mms://212.156.63.226/TRTTURK" country="Turkey" category="TV"/>
   <link title="Ulke TV" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=3" country="Turkey" category="TV"/>
   <link title="TV5" aspectRatio="15:9" url="mms://212.156.63.226/TV5" country="Turkey" category="TV"/>
   <link title="TURK" aspectRatio="15:9" url="mms://212.156.63.226/TRTTURK" country="Turkey" category="TV"/>
   <link title="Ulke TV" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=3" country="Turkey" category="TV"/>

-  <link title="Ulke TV HQ" aspectRatio="15:9" url="[url]http://www.yayin.tv.tr/play.stream.php?id=21" country="Turkey" category="TV"/>
+  <link title="Ulke TV HQ" aspectRatio="15:9" url="http://www.yayin.tv.tr/play.stream.php?id=21" country="Turkey" category="TV"/>

   <link title="Yirmidort TV" aspectRatio="15:9" url="http://www.yirmidort.tv/dosya/canliyayin.html" country="Turkey" category="TV"/>
   <link title="Yumurcak TV" aspectRatio="15:9" url="http://live0.stv.com.tr/yumurcak" country="Turkey" category="TV"/>
   <!--UK-->
   <link url="http://www.adveni.tv/clips/adidas-jose-and-pedro-impossible-team-football-world-cup-ENG/rss" aspectRatio="15:9" title="UK Adidas Football Ad" country="UK" category="comedy"/>
   <link url="mms://wm.bbc.net.uk/england/looknorthyorkslincs/nb/looknorth_16x9_nb.wmv" aspectRatio="15:9" title="UK BBC Looknorth" country="UK" category="news"/>
   <link url="http://lltv.libsyn.com/rss" aspectRatio="15:9" title="UK London Landscape" country="UK" category="travel"/>
   <link title="Yirmidort TV" aspectRatio="15:9" url="http://www.yirmidort.tv/dosya/canliyayin.html" country="Turkey" category="TV"/>
   <link title="Yumurcak TV" aspectRatio="15:9" url="http://live0.stv.com.tr/yumurcak" country="Turkey" category="TV"/>
   <!--UK-->
   <link url="http://www.adveni.tv/clips/adidas-jose-and-pedro-impossible-team-football-world-cup-ENG/rss" aspectRatio="15:9" title="UK Adidas Football Ad" country="UK" category="comedy"/>
   <link url="mms://wm.bbc.net.uk/england/looknorthyorkslincs/nb/looknorth_16x9_nb.wmv" aspectRatio="15:9" title="UK BBC Looknorth" country="UK" category="news"/>
   <link url="http://lltv.libsyn.com/rss" aspectRatio="15:9" title="UK London Landscape" country="UK" category="travel"/>

+  <link url="mms://live1.wm.skynews.servecast.net/skynews_wmlz_live300k" aspectRatio="15:9" title="Skynews" country="UK" category="news"/>

   <link url="http://skyscape.sky.com/skynewsradio/NEWS/spotlight.xml" aspectRatio="15:9" title="UK SkyNews Showbiz" country="UK" category="entertainment"/>
   <link url="http://skyscape.sky.com/skynewsradio/NEWS/spotlight.xml" aspectRatio="15:9" title="UK SkyNews Showbiz" country="UK" category="entertainment"/>

-  <link url="http://skyscape.sky.com/skynewsradio/NEWS/boultonsunday.xml" aspectRatio="15:9" title="UK SkyNews Sunday live: Highlights" country="UK" category="newsmagazine"/>
+  <!--link url="http://skyscape.sky.com/skynewsradio/NEWS/boultonsunday.xml" aspectRatio="15:9" title="UK SkyNews Sunday live: Highlights" country="UK" category="newsmagazine"/-->

   <!--USA-->
   <link url="http://feeds.feedburner.com/AccessHollywoodPodcast" aspectRatio="15:9" title="USA Access Hollywood" country="USA" category="entertainment"/>
   <link url="http://feeds.feedburner.com/alaskahdtv" aspectRatio="15:9" title="USA Alaska HD" country="USA" category="travel"/>
   <!--USA-->
   <link url="http://feeds.feedburner.com/AccessHollywoodPodcast" aspectRatio="15:9" title="USA Access Hollywood" country="USA" category="entertainment"/>
   <link url="http://feeds.feedburner.com/alaskahdtv" aspectRatio="15:9" title="USA Alaska HD" country="USA" category="travel"/>

@@ -312,7 +314,7 @@
   <link title="USA Cool music video" aspectRatio="15:9" url="http://feeds.feedburner.com/antcast" country="USA" category="musicvideo"/>
   <link title="USA Daily planet TV" aspectRatio="15:9" url="http://feeds.feedburner.com/dailyplanettv" country="USA" category="entertainment"/>
   <link title="USA Dentistry NY" aspectRatio="15:9" url="http://minidentalimplants.podbean.com/feed" country="USA" category="health"/>
   <link title="USA Cool music video" aspectRatio="15:9" url="http://feeds.feedburner.com/antcast" country="USA" category="musicvideo"/>
   <link title="USA Daily planet TV" aspectRatio="15:9" url="http://feeds.feedburner.com/dailyplanettv" country="USA" category="entertainment"/>
   <link title="USA Dentistry NY" aspectRatio="15:9" url="http://minidentalimplants.podbean.com/feed" country="USA" category="health"/>

-  <link title="USA Dilbert animation" aspectRatio="15:9" url="http://ringtales.com/dilbert.xml" country="USA" category="movie"/> 
+  <link title="USA Dilbert animation" aspectRatio="15:9" url="http://ringtales.com/dilbert.xml" country="USA" category="movie"/>

   <link title="USA Estelle travel" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1258" country="USA" category="travel"/>
   <link url="http://feeds.feedburner.com/fitlife" aspectRatio="15:9" title="USA Fit Life Tennessee" country="USA" category="health"/>
   <link title="USA French Maid TV" aspectRatio="15:9" url="http://feeds.feedburner.com/FrenchMaidTV" country="USA" category="entertainment"/>
   <link title="USA Estelle travel" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1258" country="USA" category="travel"/>
   <link url="http://feeds.feedburner.com/fitlife" aspectRatio="15:9" title="USA Fit Life Tennessee" country="USA" category="health"/>
   <link title="USA French Maid TV" aspectRatio="15:9" url="http://feeds.feedburner.com/FrenchMaidTV" country="USA" category="entertainment"/>

@@ -407,8 +409,6 @@
   <link title="USA Fashion Iconique" aspectRatio="15:9" url="http://www.iconique.com/flash/fashion-podcast.xml" country="USA Fashion" category="fashion"/>
   <!--USA Fox-->
   <link url="mms://a195.l2307334194.c23073.g.lm.akamaistream.net/D/195/23073/v0001/reflector:34194" aspectRatio="15:9" title="USA Fox Los Angeles 11" country="USA Fox" category="news"/>
   <link title="USA Fashion Iconique" aspectRatio="15:9" url="http://www.iconique.com/flash/fashion-podcast.xml" country="USA Fashion" category="fashion"/>
   <!--USA Fox-->
   <link url="mms://a195.l2307334194.c23073.g.lm.akamaistream.net/D/195/23073/v0001/reflector:34194" aspectRatio="15:9" title="USA Fox Los Angeles 11" country="USA Fox" category="news"/>

-
-  <link title="USA FOX News Blast" aspectRatio="15:9" url="http://www.foxnews.com/xmlfeed/videopodcasting/0,4975,88,00.xml" country="USA Fox" category="newsmagazine"/>

   <link title="USA FOX News Flash" aspectRatio="15:9" url="http://www.foxnews.com/xmlfeed/videopodcasting/0,4975,150,00.xml" country="USA Fox" category="newsmagazine"/>
   <!--USA Google-->
   <link title="Google movie trailer" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:movie_trailer&so=1&num=100" country="USA Google" category="trailer"/>
   <link title="USA FOX News Flash" aspectRatio="15:9" url="http://www.foxnews.com/xmlfeed/videopodcasting/0,4975,150,00.xml" country="USA Fox" category="newsmagazine"/>
   <!--USA Google-->
   <link title="Google movie trailer" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:movie_trailer&so=1&num=100" country="USA Google" category="trailer"/>

@@ -473,6 +473,5 @@
   <link title="USA VH1 Today in music" aspectRatio="15:9" url="http://www.vh1.com/rss/today_in_music/index.jhtml" country="USA VH1" category="entertainment"/>
   <!--Venezuela-->
   <link url="mms://streaming3.arcoiris.tv/vive-adsl" aspectRatio="15:9" title="Venezuela Vive" country="Venezuela" category="TV"/>
   <link title="USA VH1 Today in music" aspectRatio="15:9" url="http://www.vh1.com/rss/today_in_music/index.jhtml" country="USA VH1" category="entertainment"/>
   <!--Venezuela-->
   <link url="mms://streaming3.arcoiris.tv/vive-adsl" aspectRatio="15:9" title="Venezuela Vive" country="Venezuela" category="TV"/>

-

   <!-- tags: comedy, documentary, entertainment, food, musicvideo, news, newsmagazine, religion, shop, talkshow, trailer, travel, TV-->
 </playlist>
   <!-- tags: comedy, documentary, entertainment, food, musicvideo, news, newsmagazine, religion, shop, talkshow, trailer, travel, TV-->
 </playlist>