From: Koos Vriezen <koos.vriezen@gmail.com>
Date: Mon, 15 Feb 2010 18:37:15 +0000 (+0100)
Subject: Fix some spaces in urls and add Rai links
X-Git-Url: http://git.maemo.org/git/?p=worldtv99;a=commitdiff_plain;h=caa475844ff9c1dcd297236dd237e448ca3879ff

Fix some spaces in urls and add Rai links

All from bunanson
---

diff --git a/data/WorldTV99.xml b/data/WorldTV99.xml
index 2e2a86a..f7b6f6e 100644
--- a/data/WorldTV99.xml
+++ b/data/WorldTV99.xml
@@ -76,7 +76,7 @@
   <link url="mms://a821.l1253936820.c12539.g.lm.akamaistream.net/D/821/12539/v0001/reflector:36820" aspectRatio="15:9" title="CBC Toronto Pulse24" country="Canada" category="news"/>
   <link url="mms://74.116.200.251:8090/" aspectRatio="15:9" title="CBC Toronto TV500 ch 5" country="Canada" category="news"/>
   <link url="mms://72.58.251.249:8090/" aspectRatio="15:9" title="CBC Toronto TV500 ch 5a" country="Canada" category="news"/>
-  <link url="http://media.tsn.ca/av/update hi.wmv" aspectRatio="15:9" title="CBC TSN Sport" country="Canada" category="sport"/>
+  <link url="http://media.tsn.ca/av/update_hi.wmv" aspectRatio="15:9" title="CBC TSN Sport" country="Canada" category="sport"/>
   <link url="mms://24.212.0.123/direct" aspectRatio="15:9" title="CBC TVC9" country="Canada" category="news"/>
   <link url="mmsh://207.253.121.82/TVAStream" aspectRatio="15:9" title="CBC TVA Quebec" country="Canada" category="news"/>
   <link url="http://www.cbc.ca/mrl3/8752/newsatsix/vancouver.wmv" aspectRatio="15:9" title="CBC Vancouver" country="Canada" category="news"/>
@@ -85,8 +85,8 @@
   <!--China-->
   <link url="http://www.videowebtown.com/jingyouzi/video/9106/9106.xml" aspectRatio="15:9" title="China Anything for power" country="China" category="documentary"/>
   <link url="mms://72.166.136.132/cctv4-200" aspectRatio="15:9" title="China CCTV4 Beijing" country="China" category="TV"/>
-  <link url="http://podcast.rthk.org.hk/podcast/dessert i.xml" aspectRatio="15:9" title="China HK Desert and Bakery DIY" country="China" category="food"/>
-  <link url="http://www.momenteye.com/podcast/momenteye feed.xml" aspectRatio="15:9" title="China HK MomentEye" country="China" category="entertainment"/>
+  <link url="http://podcast.rthk.org.hk/podcast/dessert_i.xml" aspectRatio="15:9" title="China HK Desert and Bakery DIY" country="China" category="food"/>
+  <link url="http://www.momenteye.com/podcast/momenteye_feed.xml" aspectRatio="15:9" title="China HK MomentEye" country="China" category="entertainment"/>
   <link url="http://simplyming.dreamhosters.com/rss/vodcast.xml" aspectRatio="15:9" title="China HK Simply Ming" country="China" category="food"/>
   <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"/>
@@ -97,23 +97,35 @@
   <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"/>
   <!--Finland NOKIA-->
-  <link url="mms://62.41.56.32/PUBLIC votv fi" aspectRatio="15:9" title="The Voice" country="Finland NOKIA" category="musicvideo"/>
+  <link url="mms://62.41.56.32/PUBLIC_votv_fi" aspectRatio="15:9" title="The Voice" country="Finland NOKIA" category="musicvideo"/>
   <!--France-->
-  <link url="mms://vipmms9.yacast.net/bfm bfmtv" aspectRatio="15:9" title="France BFMTV" country="France" category="news"/>
-  <link url="http://www.euronews.net/podcasts/nocomment/no comment.xml" aspectRatio="15:9" title="France EuroNews No Comment" country="France" category="newsmagazine"/>
+  <link url="mms://vipmms9.yacast.net/bfm_bfmtv" aspectRatio="15:9" title="France BFMTV" country="France" category="news"/>
+  <link url="http://www.euronews.net/podcasts/nocomment/no_comment.xml" aspectRatio="15:9" title="France EuroNews No Comment" country="France" category="newsmagazine"/>
   <link url="mms://www.labelletv.net/labelleTV" aspectRatio="15:9" title="France LabelleTV" country="France" category="musicvideo"/>
   <link url="mms://88.191.23.167/mboatv" aspectRatio="15:9" title="France MBOA webTV" country="France" category="musicvideo"/>
   <link url="mms://195.95.225.110/telenight" aspectRatio="15:9" title="France Telenight.com" country="France" category="TV"/>
+  <link url="http://www.france24.com/en/asie-pacifique/rss" aspectRatio="15:9" title="France24 Asia Pacific" country="France" category="news"/>
+  <link url="http://www.france24.com/en/afrique/rss" aspectRatio="15:9" title="France24 Africa" country="France" category="news"/>
+  <link url="http://www.france24.com/en/ameriques/rss" aspectRatio="15:9" title="France24 Americas" country="France" category="news"/>
+  <link url="http://www.france24.com/en/economie/rss" aspectRatio="15:9" title="France24 Business" country="France" category="news"/>
+  <link url="http://www.france24.com/en/culture/rss" aspectRatio="15:9" title="France24 Culture" country="France" category="newsmagazine"/>
+  <link url="http://www.france24.com/en/europe/rss" aspectRatio="15:9" title="France24 Europe" country="France" category="news"/>
+  <link url="http://www.france24.com/en/france/rss" aspectRatio="15:9" title="France24 France" country="France" category="news"/>
+  <link url="http://www.france24.com/en/derniere-nouvelle/rss" aspectRatio="15:9" title="France24 Late News" country="France" category="news"/>
+  <link url="http://www.france24.com/en/moyen-orient/rss" aspectRatio="15:9" title="France24 Middle-East" country="France" category="news"/>
+  <link url="http://www.france24.com/en/sciences/rss" aspectRatio="15:9" title="France24 Science" country="France" category="documentary"/>
+  <link url="http://www.france24.com/en/sports/rss" aspectRatio="15:9" title="France24 Sports" country="France" category="sport"/>
+  <link url="http://www.france24.com/en/monde/rss" aspectRatio="15:9" title="France24 World" country="France" category="news"/>
   <!--Germany-->
-  <link url="http://feeds.feedburner.com/bmw tv" aspectRatio="15:9" title="Germany BMW TV" country="Germany" category="entertainment"/>
+  <link url="http://feeds.feedburner.com/bmw_tv" aspectRatio="15:9" title="Germany BMW TV" country="Germany" category="entertainment"/>
   <link url="http://www.muenchen-day.de/feed" aspectRatio="15:9" title="Germany Discovery Munich by Film" country="Germany" category="travel"/>
   <link url="http://www.elbekanal.de/ek/sendung.wmv" aspectRatio="15:9" title="Germany Elbekanal Sch&amp;#246;nebeck" country="Germany" category="TV"/>
-  <link url="http://www.flott-tv.de/reginalfernsehen/FLOTT DSL.wmv" aspectRatio="15:9" title="Germany Euro 3 Bodensee" country="Germany" category="TV"/>
+  <link url="http://www.flott-tv.de/reginalfernsehen/FLOTT_DSL.wmv" aspectRatio="15:9" title="Germany Euro 3 Bodensee" country="Germany" category="TV"/>
   <link url="mms://d8019013969.w.glx.core006.cdn.streamfarm.net/11008bmt/live/3338s09tvfranken/300.wmv?cid=60751&amp;dummy=.wmv" aspectRatio="15:9" title="Germany Franken TV (Nurnberg)" country="Germany" category="TV"/>
   <link url="mms://wm.broadcast.tneg.de/kanaltelemedial" aspectRatio="15:9" title="Germany Fresh 4U" country="Germany" category="TV"/>
   <link url="mms://wm.broadcast.tneg.de/AstroTV" aspectRatio="15:9" title="Germany German/French culture channel" country="Germany" category="TV"/>
   <link url="mms://d8019013969.w.glx.core006.cdn.streamfarm.net/11008bmt/live/3338s15muenchentv/300.wmv?cid=60919&amp;dummy=.wmv" aspectRatio="15:9" title="Germany muenchen.tv" country="Germany" category="TV"/>
-  <link url="mms://213.254.239.66/ndrfernsehen$ndr hh" title="Germany NDR Fernsehen" panZoom="0,20,240,140" country="Germany" category="TV"/>
+  <link url="mms://213.254.239.66/ndrfernsehen$ndr_hh" title="Germany NDR Fernsehen" panZoom="0,20,240,140" country="Germany" category="TV"/>
   <link url="http://stream.n-tv.de/ntvlive" aspectRatio="15:9" title="Germany NRW Dortmund for Nordrhein-Westfalen" country="Germany" category="TV"/>
   <link url="mms://80.237.157.98/moviechannel" aspectRatio="15:9" title="Germany PETN Moviechannel" country="Germany" category="movie"/>
   <link url="http://80.237.157.98/musicchannel" aspectRatio="15:9" title="Germany PETN Musicchannel" country="Germany" category="musicvideo"/>
@@ -131,11 +143,37 @@
   <!--International-->
   <link url="http://forgiss.libsyn.com/rss" aspectRatio="15:9" title="Shoots Images" country="International" category="entertainment"/>
   <!--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.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="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"/>
   <!--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"/>
@@ -143,10 +181,10 @@
   <link url="http://feeds.feedburner.com/herroflomjapan" aspectRatio="15:9" title="Japan Herro Flom Japan" country="Japan" category="travel"/>
   <link url="http://powdertv.blip.tv/rss" aspectRatio="15:9" title="Japan Nisedo PowderTV" country="Japan" category="TV"/>
   <link url="http://www.nisekopodcasting.com/NisekoArea/index.xml" aspectRatio="15:9" title="Japan Nisedo PowderTV New" country="Japan" category="TV"/>
-  <link url="http://feeds.feedburner.com/revver/aFbw" aspectRatio="15:9" title="Japan Omama Japan Cooking" country="Japan" category="food"/>   
+  <link url="http://feeds.feedburner.com/revver/aFbw" aspectRatio="15:9" title="Japan Omama Japan Cooking" country="Japan" category="food"/>
   <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 RTL-->
+  <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"/>
   <!--Mexico-->
   <link url="rtsp://148.240.229.63/broadcast/canal28.rm" aspectRatio="15:9" title="Mexico Cadena Tres (28 live)" country="Mexico" category="TV"/>
@@ -162,21 +200,22 @@
   <!--Netherlands-->
   <link url="http://www.geobrief.tv/podcasts/movies/wmv.xml" aspectRatio="15:9" title="Netherlands Amsterdam" country="Netherlands" category="travel"/>
   <link url="http://cgi.omroep.nl/cgi-bin/streams?/nos/journaal/laatstejournaalSB.wmv" aspectRatio="15:9" title="Netherlands Laatste NOS Journaal" country="Netherlands" category="newsmagazine"/>
-  <link url="http://ndr-fs-nds-hi-wmv.wm.llnwd.net/ndr fs nds hi wmv" aspectRatio="15:9" title="Netherlands NDR" country="Netherlands" category="news"/>
+  <link url="http://ndr-fs-nds-hi-wmv.wm.llnwd.net/ndr_fs_nds_hi_wmv" aspectRatio="15:9" title="Netherlands NDR" country="Netherlands" category="news"/>
   <link url="mms://213.75.12.108/encoder11" aspectRatio="15:9" title="Nostalgie Net" country="Netherlands" category="TV"/>
   <link url="mms://www.rtvchannel.tv:8080" aspectRatio="15:9" title="Netherlands RTV Channel" country="Netherlands" category="TV"/>
   <link url="mms://stream03.wm.slamtv.true.nl/slamtv?MSWMExt=.asf" aspectRatio="15:9" title="Netherlands SlamTV" country="Netherlands" category="TV"/>
-  <link url="mms://81.173.117.20/MTV Low 004" aspectRatio="15:9" title="Netherlands TMF FIRE IT UP" country="Netherlands" category="TV"/>
-  <link url="mms://81.173.117.20/MTV LOW 006" aspectRatio="15:9" title="Netherlands TMF HOLLANDS GLORIE" country="Netherlands" category="TV"/>
-  <link url="mms://81.173.117.20/MTV Low 007" aspectRatio="15:9" title="Netherlands TMF Pure" country="Netherlands" category="TV"/>
+  <link url="mms://81.173.117.20/MTV_Low_004" aspectRatio="15:9" title="Netherlands TMF FIRE IT UP" country="Netherlands" category="TV"/>
+  <link url="mms://81.173.117.20/MTV_LOW_006" aspectRatio="15:9" title="Netherlands TMF HOLLANDS GLORIE" country="Netherlands" category="TV"/>
+  <link url="mms://81.173.117.20/MTV_Low_007" aspectRatio="15:9" title="Netherlands TMF Pure" country="Netherlands" category="TV"/>
   <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="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"/>
+  <!--Phillipine-->
   <!--Poland-->
   <link url="mms://av.wp.pl/wptv-lifestyle" aspectRatio="15:9" title="Poland WPTV" country="Poland" category="TV"/>
   <link url="mms://tvfly.server-tv.com/TVFLY" aspectRatio="15:9" title="Poland TVFLY" country="Poland" category="musicvideo"/>
@@ -194,14 +233,14 @@
   <link title="Russia 1TV documentary" aspectRatio="15:9" url="http://live.1internet.tv/doc-efir?wmbitrate=500000" country="Russia" category="documentary"/>
   <link url="http://mfile.akamai.com/45346/live/reflector:59936.asx" aspectRatio="15:9" title="Russia e-Televizor MAD" country="Russia" category="musicvideo"/>
   <link title="Russia MAD TV" aspectRatio="15:9" url="mms://mediaserver.mad.tv/madtv" country="Russia" category="entertainment"/>
-  <link url="mms://213.232.226.11/MIRTV 300" aspectRatio="15:9" title="Russia Mir TV" country="Russia" category="TV"/>
-  <link url="mms://live.rfn.ru/rtr-planeta 128" aspectRatio="15:9" title="RTR Planeta" country="Russia" category="TV"/>
-  <link url="mms://81.13.20.10/sr video" aspectRatio="15:9" title="Russia Special Radio" country="Russia" category="TV"/>
+  <link url="mms://213.232.226.11/MIRTV_300" aspectRatio="15:9" title="Russia Mir TV" country="Russia" category="TV"/>
+  <link url="mms://live.rfn.ru/rtr-planeta_128" aspectRatio="15:9" title="RTR Planeta" country="Russia" category="TV"/>
+  <link url="mms://81.13.20.10/sr_video" aspectRatio="15:9" title="Russia Special Radio" country="Russia" 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"/>
-  <!--*** ???Untagged **-->
-  <link url="mms://live1.wm.skynews.servecast.net/skynews wmlz live300k" aspectRatio="15:9" title="Skynews" category="news"/>
+  <!--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"/>
@@ -209,17 +248,17 @@
   <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"/>
   <!--Sweden-->
-  <link url="mms://213.80.127.1/Canal7 4" aspectRatio="15:9" title="Sweden Canal 7" country="Sweden" category="TV"/>
-  <link url="mms://62.41.56.32/PUBLIC SWE" aspectRatio="15:9" title="Sweden The Voice" country="Sweden" category="TV"/>
+  <link url="mms://213.80.127.1/Canal7_4" aspectRatio="15:9" title="Sweden Canal 7" country="Sweden" category="TV"/>
+  <link url="mms://62.41.56.32/PUBLIC_SWE" aspectRatio="15:9" title="Sweden The Voice" country="Sweden" category="TV"/>
   <!--Switzerland-->
   <link url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1446" aspectRatio="15:9" title="DBC radioTV" country="Swiss" category="jazz"/>
-  <link url="http://www.podtrac.com/pts/redirect.m4v?http://www.uefa.com/multimediafiles/flvvn/magazineeditions/editions/94/63/35/946335 video.m4v" aspectRatio="15:9" title="Europe Football" country="Swiss" category="sport"/>
+  <link url="http://www.podtrac.com/pts/redirect.m4v?http://www.uefa.com/multimediafiles/flvvn/magazineeditions/editions/94/63/35/946335_video.m4v" aspectRatio="15:9" title="Europe Football" country="Swiss" category="sport"/>
   <!--Thailand-->
   <link url="mms://broadcast.issp.co.th/11news1" aspectRatio="15:9" title="Thailand News1" country="Thailand" category="TV"/>
-  <link url="mms://61.19.248.196/mvtv 3?WMContentBitrate=256000&amp;MSWMExt=.asf" aspectRatio="15:9" title="Thailand MVTV 3" country="Thailand" category="TV"/>
+  <link url="mms://61.19.248.196/mvtv_3?WMContentBitrate=256000&amp;MSWMExt=.asf" aspectRatio="15:9" title="Thailand MVTV 3" country="Thailand" category="TV"/>
   <link url="mms://mediaii.mcot.net/tv9" aspectRatio="15:9" title="Thailand TV9" country="Thailand" category="TV"/>
   <!--Turkey-->
-  <link title="ATV" aspectRatio="15:9" url="http://atv.com.tr/canli yayin" country="Turkey" category="TV"/>
+  <link title="ATV" aspectRatio="15:9" url="http://atv.com.tr/canli_yayin" country="Turkey" category="TV"/>
   <link title="AVAZ" aspectRatio="15:9" url="mms://212.156.63.226/TRTAVAZ" country="Turkey" category="TV"/>
   <link title="Belgesel" aspectRatio="15:9" url="mms://212.156.63.226/TRTBELGESEL" country="Turkey" category="TV"/>
   <link title="Kanal D" aspectRatio="15:9" url="http://webtv.kanald.com.tr/CanliYayin/" country="Turkey" category="TV"/>
@@ -234,7 +273,7 @@
   <link title="Samanyolu America" aspectRatio="15:9" url="http://live0.stv.com.tr/syg" country="Turkey" category="TV"/>
   <link title="Samanyolu Haber" aspectRatio="15:9" url="http://live0.stv.com.tr/shaber" country="Turkey" category="TV"/>
   <link title="Samanyolu TV" aspectRatio="15:9" url="http://live0.stv.com.tr/stv" country="Turkey" category="TV"/>
-  <link title="Samanyolu TV Europe" aspectRatio="15:9" url="mms://live.samanyolutv.de/stv avrupa" country="Turkey" category="TV"/>
+  <link title="Samanyolu TV Europe" aspectRatio="15:9" url="mms://live.samanyolutv.de/stv_avrupa" country="Turkey" category="TV"/>
   <link title="Show TV" aspectRatio="15:9" url="http://www.showtv.com.tr/asx/SAlone.asp?product=showtv&pType=1" country="Turkey" category="TV"/>
   <link title="Show TV Europe" aspectRatio="15:9" url="http://www.showturk.tv/asx/default1.asp?product=showturk" country="Turkey" category="TV"/>
   <link title="Star TV" aspectRatio="15:9" url="http://startv.com.tr/CanliYayin.aspx" country="Turkey" category="TV"/>
@@ -254,9 +293,10 @@
   <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="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="http://www.realbuzz.com/rss/vodcasts.xml" aspectRatio="15:9" title="UK Realbuzz" country="UK" category="health"/>
+  <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"/>
   <!--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"/>
@@ -264,7 +304,7 @@
   <link url="http://archiveclassicmovies.com/acm.rss" aspectRatio="15:9" title="USA Archive classic movie" country="USA" category="movie"/>
   <link title="USA Art of the Drink TV" aspectRatio="15:9" url="http://feeds.feedburner.com/artofthedrink" country="USA" category="food"/>
   <link url="mms://mid.video.csupomona.edu/liveOne-245" aspectRatio="15:9" title="USA ARTS Cal Poly Pomona" country="USA" category="arts"/>
-  <link title="USA BMW Detroit Autoshow" aspectRatio="15:9" url="http://feeds.feedburner.com/Vodcast BMW" country="USA" category="auto"/>
+  <link title="USA BMW Detroit Autoshow" aspectRatio="15:9" url="http://feeds.feedburner.com/Vodcast_BMW" country="USA" category="auto"/>
   <link url="http://media1.tempe.gov/tempe11high" aspectRatio="15:9" title="USA CCM County Cable Montgomery-TV 6" country="USA" category="TV"/>
   <link title="USA Chicago Independent TV" aspectRatio="15:9" url="http://chicago.indymedia.org/rss/tv.xml" country="USA" category="documentary"/>
   <link title="USA Classic Animation" aspectRatio="15:9" url="http://feeds.feedburner.com/classicanimation" country="USA" category="movie"/>
@@ -282,33 +322,33 @@
   <link title="USA Independent TV, Seatle, Wahshington" aspectRatio="15:9" url="http://www.itvnw.com/ITV/Podcasts/ITVPodcast1.xml" country="USA" category="TV"/>
   <link title="USA MicrobeWorld" aspectRatio="15:9" url="http://feeds.feedburner.com/asm" country="USA" category="documentary"/>
   <link title="USA Microsoft" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=22" country="USA" category="documentary"/>
-  <link title="USA Miller light" aspectRatio="15:9" url="http://www.mixdown.com/podcasts/0608 manlaws.xml" country="USA" category="entertainment"/>
+  <link title="USA Miller light" aspectRatio="15:9" url="http://www.mixdown.com/podcasts/0608_anlaws.xml" country="USA" category="entertainment"/>
   <link url="mms://a1053.l2277456292.c22774.n.lm.akamaistream.net/D/1053/22774/v0001/reflector:56292" aspectRatio="15:9" title="USA MMNW Broadcasts GMTN" country="USA" category="religion"/>
-  <link title="USA NASA news" aspectRatio="15:9" url="http://www.nasa.gov/rss/NASAcast vodcast.rss" country="USA" category="documentary"/>
+  <link title="USA NASA news" aspectRatio="15:9" url="http://www.nasa.gov/rss/NASAcast_vodcast.rss" country="USA" category="documentary"/>
   <link title="USA National Geographics" aspectRatio="15:9" url="http://podcast.nationalgeographic.com/dog-whisperer/" country="USA" category="documentary"/>
   <link title="USA NewYorker Animation" aspectRatio="15:9" url="http://ringtales.com/nyrss.xml" country="USA" category="movie"/>
   <link url="http://nikefootball.nike.com/nikefootball/podcast/nikefootball.xml" aspectRatio="15:9" title="USA Nike Football" country="USA" category="sport"/>
   <link title="USA NPR KCRW" aspectRatio="15:9" url="http://media.kcrw.com/podcast/video/mb" country="USA" category="musicvideo"/>
-  <link title="USA Oregon Zoo" aspectRatio="15:9" url="http://www.oregonzoo.org/podcast/zoo podcast.xml" country="USA" category="documentary"/>
+  <link title="USA Oregon Zoo" aspectRatio="15:9" url="http://www.oregonzoo.org/podcast/zoo_podcast.xml" country="USA" category="documentary"/>
   <link url="http://inet-server.enet.hlpusd.k12.ca.us/go/tv/edtv.wvx" aspectRatio="15:9" title="USA PCTV 26 Government TV" country="USA" category="TV"/>
   <link url="http://feeds.feedburner.com/PilatesOnFifth" aspectRatio="15:9" title="USA Pilates NY" country="USA" category="health"/>
   <link title="USA PodShow TV" aspectRatio="15:9" url="http://www.podshow.com/feeds/nokia-n800.xml" country="USA" category="entertainment"/>
   <link title="USA Quince Jones Show" aspectRatio="15:9" url="http://podcast.quincyjones.com/rss" country="USA" category="entertainment"/>
-  <link title="USA Rocketboom" aspectRatio="15:9" url="http://www.rocketboom.com/vlog/tele daily enclosures.xml" country="USA" category="entertainment"/>
+  <link title="USA Rocketboom" aspectRatio="15:9" url="http://www.rocketboom.com/vlog/tele_daily_enclosures.xml" country="USA" category="entertainment"/>
   <link title="USA RooftopComedy" aspectRatio="15:9" url="http://www.rooftopcomedy.com/rss/nokia.mrss" country="USA" category="comedy"/>
-  <link url="mms://207.7.154.94/saccounty channel14" aspectRatio="15:9" title="USA Sacramento county TV" country="USA" category="TV"/>
+  <link url="mms://207.7.154.94/saccounty_channel14" aspectRatio="15:9" title="USA Sacramento county TV" country="USA" category="TV"/>
   <link url="mms://webcast.palomar.edu:7007" aspectRatio="15:9" title="USA San Diego News City Council" country="USA" category="TV"/>
   <link url="mms://media.scctv.net/SCCtv%20Broadband" aspectRatio="15:9" title="USA SCCtv Broadband Movies" country="USA" category="movie"/>
-  <link url="mms://207.7.154.95/sanfrancisco encoder7?wmcache=0" aspectRatio="15:9" title="USA SFGTV2 San Francisco" country="USA" category="news"/>
+  <link url="mms://207.7.154.95/sanfrancisco_encoder7?wmcache=0" aspectRatio="15:9" title="USA SFGTV2 San Francisco" country="USA" category="news"/>
   <link title="USA SonyPictures Inside Sony Pictures" aspectRatio="15:9" url="http://www.sonypictures.com/mobile/nokia/rss/sonypictures.rss" country="USA" category="trailer"/>
   <link title="USA The Magic Sock" aspectRatio="15:9" url="http://www.losoil.com/themagicsock/feed.xml" country="USA" category="musicvideo"/>
   <link url="http://feeds.feedburner.com/veganagogo" aspectRatio="15:9" title="USA Vegan" country="USA" category="food"/>
   <link title="USA VetVid" aspectRatio="15:9" url="http://feeds2.feedburner.com/VetvidPodcastFeed" country="USA" category="health"/>
   <link title="USA Walt Disney Inside Magic" aspectRatio="15:9" url="http://www.distantcreations.com/insidethemagic/inside.xml" country="USA" category="entertainment"/>
-  <link title="USA Warner Brs" aspectRatio="15:9" url="http://pdl.warnerbros.com/wbol/us/whv/med/wbreelnews/podcast/wbreelnews main.xml" country="USA" category="entertainment"/>
-  <link title="USA Warner Brs Animation" aspectRatio="15:9" url="http://pdl.warnerbros.com/wbol/us/whv/med/wbreelnews/podcast/wbreelnews podcast animation vol2.xml" country="USA" category="entertainment"/>
-  <link title="USA Wild life Country" aspectRatio="15:9" url="http://streaming.i2i-technology.com/wlc 31000" country="USA" category="nature"/>
-  <link url="mms://wm.videorelay.com/wmty 1" aspectRatio="15:9" title="USA WMTY Public access TV" country="USA" category="TV"/>
+  <link title="USA Warner Brs" aspectRatio="15:9" url="http://pdl.warnerbros.com/wbol/us/whv/med/wbreelnews/podcast/wbreelnews_main.xml" country="USA" category="entertainment"/>
+  <link title="USA Warner Brs Animation" aspectRatio="15:9" url="http://pdl.warnerbros.com/wbol/us/whv/med/wbreelnews/podcast/wbreelnews_podcast_animation_vol2.xml" country="USA" category="entertainment"/>
+  <link title="USA Wild life Country" aspectRatio="15:9" url="http://streaming.i2i-technology.com/wlc_31000" country="USA" category="nature"/>
+  <link url="mms://wm.videorelay.com/wmty_1" aspectRatio="15:9" title="USA WMTY Public access TV" country="USA" category="TV"/>
   <link title="USA WSTV" aspectRatio="15:9" url="http://whitesprings.cstreaming.com/wsm?MSWMExt=.asf" country="USA" category="movie"/>
   <link url="mms://yumaco.ecstreams.com/YumaLive" aspectRatio="15:9" title="USA Yuma 77 Yuma County TV" country="USA" category="TV"/>
   <link title="USA ZooVision mp4" aspectRatio="15:9" url="http://cdn.zoovision.com/zoovision/KibaEp1N900.mp4" country="USA" category="movie"/>
@@ -321,15 +361,15 @@
   <link title="USA ABC News Medical Minute" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1713" country="USA ABC" category="health"/>
   <link title="USA ABC News Money Minute" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1709" country="USA ABC" category="newsmagazine"/>
   <link title="USA ABC News Nightline Online" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=2102937" country="USA ABC" category="newsmagazine"/>
-  <link title="USA ABC News Top Videos" aspectRatio="15:9" url="http://feeds.feedburner.com/AbcNews Top Videos?format=xml" country="USA ABC" category="news"/>
+  <link title="USA ABC News Top Videos" aspectRatio="15:9" url="http://feeds.feedburner.com/AbcNews_Top_Videos?format=xml" country="USA ABC" category="news"/>
   <link title="USA ABC News Whats the Buzz" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=1456657" country="USA ABC" category="entertainment"/>
   <link title="USA ABC News World News" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=1478958" country="USA ABC" category="news"/>
   <!--USA CBS-->
-  <link title="USA CBS Evening News with Katie Couric" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast eveningnews video 1" country="USA CBS" category="news"/>
-  <link title="USA CBS Eye to Eye with Katie Couric" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast kceye video 1" country="USA CBS" category="newsmagazine"/>
-  <link title="USA CBS Face the Nation" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast nation video 1" country="USA CBS" category="newsmagazine"/>
+  <link title="USA CBS Evening News with Katie Couric" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast_eveningnews_video_1" country="USA CBS" category="news"/>
+  <link title="USA CBS Eye to Eye with Katie Couric" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast_kceye_video_1" country="USA CBS" category="newsmagazine"/>
+  <link title="USA CBS Face the Nation" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast_nation_video_1" country="USA CBS" category="newsmagazine"/>
   <link title="USA CBS Fast Draw" aspectRatio="15:9" url="http://feeds.cbsnews.com/VideoFastDraw?tag=contentMain%3bcontentBody" country="USA CBS" category="newsmagazine"/>
-  <link title="USA CBS Katie Couric's Notebook" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast kcnotebook video 1" country="USA CBS" category="newsmagazine"/>
+  <link title="USA CBS Katie Couric's Notebook" aspectRatio="15:9" url="http://feeds.cbsnews.com/podcast_kcnotebook_video_1" country="USA CBS" category="newsmagazine"/>
   <link url="mms://a1832.l731147410.c7311.n.lm.akamaistream.net/D/1832/7311/v0001/reflector:47410" aspectRatio="15:9" title="USA CBS Kentucky 27" country="USA CBS" category="news"/>
   <link title="USA CBS SuperBowl" aspectRatio="15:9" url="mms://webstv5.bbtv.cn/webstv5" country="USA CBS" category="sport"/>
   <!--USA CC Comdey Central-->
@@ -338,32 +378,47 @@
   <link url="http://feeds.feedburner.com/comedycentral/standup" aspectRatio="15:9" title="USA CC Standup" country="USA CC" category="comedy"/>
   <link url="http://feeds.feedburner.com/comedycentral/whatsnew" aspectRatio="15:9" title="USA CC Whatsnew" country="USA CC" category="comedy"/>
   <!--USA CNN-->
+  <link title="USA CNN Amanpour" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/amanpour_video/rss?format=xml" country="USA CNN" category="news"/>
   <link title="USA CNN Anderson Cooper 360° Daily" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/ac360/rss.xml" country="USA CNN" category="newsmagazine"/>
   <link title="USA CNN Daily" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/cnnnewsroom/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Fareed Zakaria GPS" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/fareedzakaria/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN In case you missed it" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/incaseyoumissed/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Larry King" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/lkl/rss?format=xml" country="USA CNN" category="news"/>
   <link title="USA CNN Late Edition with Wolf Blitzer (video)" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/lateedition/rss.xml" country="USA CNN" category="newsmagazine"/>
+  <link title="USA CNN Latino in America" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/inamerica/rss?format=xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Nancy Grace" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/nancygrace/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN News of the Absurd" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/absurd/rss.xml" country="USA CNN" category="news"/>
   <link title="USA CNN Now in the News (video)" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/nitn/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Politics Daily" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/bestpolitics/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Reliable Source" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/reliablesources/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Robin Meade Expressed" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/robinmeade/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Sanjay Gupta" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/gupta/rss.xml" country="USA CNN" category="health"/>
+  <link title="USA CNN Screening Room" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/thescreeningroom/rss.xml" country="USA CNN" category="news"/>
+  <link title="USA CNN Showbiz Tonight" aspectRatio="15:9" url="http://rss.cnn.com/services/podcasting/ShowbizTonight/rss.xml" country="USA CNN" category="entertainment"/>
   <!--USA Discovery-->
-  <link title="USA Discovery Channel Radio Video podcast" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/apl podcasts.xml" country="USA Discovery" category="documentary"/>
-  <link title="USA Discovery Channel Video podcast" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/discovery video.xml" country="USA Discovery" category="documentary"/>
-  <link title="USA Discovery News" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/news video.xml" country="USA Discovery" category="newsmagazine"/>
+  <link title="USA Discovery Channel Radio Video podcast" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/apl_podcasts.xml" country="USA Discovery" category="documentary"/>
+  <link title="USA Discovery Channel Video podcast" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/discovery_video.xml" country="USA Discovery" category="documentary"/>
+  <link title="USA Discovery News" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/news_video.xml" country="USA Discovery" category="newsmagazine"/>
   <!--USA Fashion-->
   <link title="USA Fashion Sexy Bikini Models " aspectRatio="15:9" url="http://rss.omptv.com/modelfeatures.rss" country="USA Fashion" category="fashion"/>
   <link title="USA Fashion Rocks" aspectRatio="15:9" url="http://feeds.feedburner.com/fashionrocks" country="USA Fashion" category="fashion"/>
-  <link title="USA Fashion TV Weekly" aspectRatio="15:9" url="http://podcast.chumcity.net/specialty/ft/2006/04/Fashion Television Weekly Podcast.xml" country="USA Fashion" category="fashion"/>
-  <link url="http://www.mod-tv.com/podcasts/modtv/modtv podcast.xml" aspectRatio="15:9" title="USA Fashion mod-tv" country="USA Fashion" category="fashion"/>
+  <link title="USA Fashion TV Weekly" aspectRatio="15:9" url="http://podcast.chumcity.net/specialty/ft/2006/04/Fashion_Television_Weekly_Podcast.xml" country="USA Fashion" category="fashion"/>
+  <link url="http://www.mod-tv.com/podcasts/modtv/modtv_podcast.xml" aspectRatio="15:9" title="USA Fashion mod-tv" country="USA Fashion" category="fashion"/>
   <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="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="Google video comedy" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&q=genre:comedy&so=1&num=100" country="USA Google" category="comedy"/>
   <!--USA LinkTV-->
   <link title="USA LinkTV Best of Link TV" aspectRatio="15:9" url="http://www.linktv.org/rss/itunes/best.xml" country="USA LinkTV" category="documentary"/>
   <link title="USA LinkTV Earth Focus" aspectRatio="15:9" url="http://www.linktv.org/rss/general/earth.xml" country="USA LinkTV" category="documentary"/>
   <link title="USA LinkTV Explore: Specials" aspectRatio="15:9" url="http://www.linktv.org/rss/itunes/explorespecial1.xml" country="USA LinkTV" category="documentary"/>
   <link title="USA LinkTV Global Pulse" aspectRatio="15:9" url="http://www.linktv.org/rss/general/globalpulse.xml" country="USA LinkTV" category="documentary"/>
-  <link title="USA LinkTV Latin Pulse/Pulso Latino" aspectRatio="15:9" url="http://www.linktv.org/rss/general/latin pulse.xml" country="USA LinkTV" category="documentary"/>
+  <link title="USA LinkTV Latin Pulse/Pulso Latino" aspectRatio="15:9" url="http://www.linktv.org/rss/general/latin_pulse.xml" country="USA LinkTV" category="documentary"/>
   <link title="USA LinkTV Mosaic Intelligence Report" aspectRatio="15:9" url="http://www.linktv.org/rss/general/MIR.xml" country="USA LinkTV" category="documentary"/>
   <link title="USA LinkTV Mosaic: World News From The Middle East" aspectRatio="15:9" url="http://www.linktv.org/rss/general/mosaic.xml" country="USA LinkTV" category="newsmagazine"/>
   <!--USA MSNBC-->
@@ -375,10 +430,10 @@
   <link title="USA NBC TODAY show" aspectRatio="15:9" url="http://podcast.msnbc.com/audio/podcast/MSNBC-TDY-PODCAST-M4V.xml" country="USA NBC" category="talkshow"/>
   <!--USA NIH-->
   <link url="http://www.nih.gov/news/vodcast/nihvodcast.xml" aspectRatio="15:9" title="USA NIH i on NIH" country="USA NIH" category="documentary"/>
-  <link url="http://videocast.nih.gov/rss/podcasts.asp?type=V" aspectRatio="15:9" title="USA NIH videopodcast" country="USA NIH" category="documentary"/> 
+  <link url="http://videocast.nih.gov/rss/podcasts.asp?type=V" aspectRatio="15:9" title="USA NIH videopodcast" country="USA NIH" category="documentary"/>
   <!--USA PBS-->
   <link title="USA PBS Archived All-American Presidential Forums" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/kcet/tavissmiley/allamericanforums-video" country="USA PBS" category="documentary"/>
-  <link title="USA PBS Archived DragonflyTV" aspectRatio="15:9" url="http://pbskids.org/dragonflytv/rss/DragonFlyTV rss.xml" country="USA PBS" category="documentary"/>
+  <link title="USA PBS Archived DragonflyTV" aspectRatio="15:9" url="http://pbskids.org/dragonflytv/rss/DragonFlyTV_rss.xml" country="USA PBS" category="documentary"/>
   <link title="USA PBS Archived e2" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/e2-video" country="USA PBS" category="documentary"/>
   <link title="USA PBS Archived Science Pilots" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/science-video" country="USA PBS" category="documentary"/>
   <link title="USA PBS Archived Share the Earth" aspectRatio="15:9" url="http://pbskids.org/earthday/rss/podcast.xml" country="USA PBS" category="documentary"/>
@@ -415,7 +470,7 @@
   <link title="USA VH1 News" aspectRatio="15:9" url="http://www.vh1.com/rss/podcast/vh1news.jhtml" country="USA VH1" category="entertainment"/>
   <link title="USA VH1 News latest" aspectRatio="15:9" url="http://www.vh1.com/rss/news/latest.jhtml" country="USA VH1" category="entertainment"/>
   <link title="USA VH1 The Best of VH1" aspectRatio="15:9" url="http://www.vh1.com/rss/podcast/bestofvh1.jhtml" country="USA VH1" category="entertainment"/>
-  <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"/>
+  <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"/>