From d74d06608bee526ae4d33ebbe7137a10402cd522 Mon Sep 17 00:00:00 2001
From: Koos Vriezen <koos.vriezen@gmail.com>
Date: Tue, 9 Mar 2010 20:40:20 +0100
Subject: [PATCH] Updates from bunanson

---
 data/WorldTV99.xml |   48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/data/WorldTV99.xml b/data/WorldTV99.xml
index a4f9e16..b826e77 100644
--- a/data/WorldTV99.xml
+++ b/data/WorldTV99.xml
@@ -37,7 +37,6 @@
       <view title="Geographical restricted" show="/link[@access]" groupBy="string-join(@country | @access, ' accessible from ')"/>
     </views>
   </meta>
-  <!--Africa-->
   <!--Australia-->
   <link url="http://www.hdvunderwater.com/podcasts/podcast.xml" aspectRatio="15:9" title="Australia Advantures Underwater Lingaloo Reef" country="Australia" category="nature"/>
   <link url="http://feeds.feedburner.com/ofpod" aspectRatio="15:9" title="Australia News" country="Australia" category="news"/>
@@ -52,6 +51,7 @@
   <!--Bulgaria-->
   <link title="Bulgaria HipHop TV" aspectRatio="15:9" url="http://91.121.179.127/shiphop" country="Bulgaria" category="musicvideo"/>
   <!--Canada-->
+  <link url="http://www.canada.com/globaltv/national/podcastbeta/vodcast.xml" aspectRatio="15:9" title="Canada Global National News" country="Canada" category="news"/>
   <link url="http://stream2.canal.qc.ca/enOndes_haut_debit" aspectRatio="15:9" title="CBC Canal Savoir Scientific talk" country="Canada" category="documentary"/>
   <link url="http://www.cbc.ca/mrl3/8752/newsatsix/calgary.wmv" aspectRatio="15:9" title="CBC Calgary" country="Canada" category="news"/>
   <link url="http://www.cbc.ca/mrl3/8752/newsatsix/edmonton.wmv" aspectRatio="15:9" title="CBC Edmonton" country="Canada" category="news"/>
@@ -133,24 +133,25 @@
   <link url="http://www.flott-tv.de/reginalfernsehen/FLOTT_DSL.wmv" aspectRatio="15:9" title="Germany Euro 3 Bodensee" country="Germany" category="tv1"/>
   <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="tv1"/>
   <link url="mms://wm.broadcast.tneg.de/AstroTV" aspectRatio="15:9" title="Germany German/French culture channel" country="Germany" category="shop"/>
-  <link title="Germany Harald Schmidt" aspectRatio="15:9" url="http://www.daserste.de/podcasts/mam_dyn~id,510~haraldschmidt.xml" country="Germany" category="entertainment"/>
+  <link title="Germany Harald Schmidt" aspectRatio="15:9" url="http://www.daserste.de/podcasts/mam_dyn~id,510~haraldschmidt.xml" country="Germany" category="comedy"/>
   <link title="Germany IfranzTV" aspectRatio="15:9" url="http://ifranz.podspot.de/rss" country="Germany" category="entertainment"/>
   <link title="Germany ISightseeing" aspectRatio="15:9" url="http://www.isightseeing.de/rss.xml" country="Germany" category="travel"/>
   <link title="Germany KIKA" aspectRatio="15:9" url="http://85.239.122.162/mk3v-3faw-3rqf-enc0-kika" country="Germany" category="kid"/>
-  <link title="Germany Kino: Das Deutsche Filmmagazin" aspectRatio="15:9" url="http://rss.dw-world.de/xml/podcast_kino" country="Germany" category="sport"/>
+  <link title="Germany Kino: Das Deutsche Filmmagazin" aspectRatio="15:9" url="http://rss.dw-world.de/xml/podcast_kino" country="Germany" category="entertainment"/>
   <link title="Germany Massive Mag" aspectRatio="15:9" url="mms://stream01.massive-mag.tv/massivemag_mq" country="Germany" category="sport"/>
   <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="news"/>
   <link url="http://www3.ndr.de/resources/metadaten/ndr_fs_nds_hi_wmv.asx" title="Germany NDR Fernsehen" panZoom="0,20,240,140" country="Germany" category="tv1"/>
   <link url="http://stream.n-tv.de/ntvlive" aspectRatio="15:9" title="Germany NRW Dortmund for Nordrhein-Westfalen" country="Germany" category="tv1"/>
-  <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"/>
-  <link url="http://80.237.157.98/sportschannel" aspectRatio="15:9" title="Germany PETN Sportschannel Sports TV" country="Germany" category="sport"/>
   <link url="mms://87.106.49.185/RFH_Stream" aspectRatio="15:9" title="Germany Phoenix Bonn" country="Germany" category="tv1"/>
   <link url="mms://streaming.rtl.de/rtlshop" aspectRatio="15:9" title="Germany RTL Shop" country="Germany" category="shop"/>
   <link url="mms://85.214.21.233/potok" aspectRatio="15:9" title="Germany Ruparty TV russian german" country="Germany" category="tv1"/>
   <link url="mms://wm.broadcast.tneg.de/TelespassDSL" aspectRatio="15:9" title="Germany Sportswin Online" country="Germany" category="sport"/>
   <link url="mms://141.28.122.100/TuneSpoon" aspectRatio="15:9" title="Germany Tunespoon Music Videos" country="Germany" category="musicvideo"/>
   <link url="mms://wms.global-streaming.net/04988" aspectRatio="15:9" title="Germany Worm TV" country="Germany" category="musicvideo"/>
+  <!--Germany PETN-->
+  <link url="mms://80.237.157.98/moviechannel" aspectRatio="15:9" title="Germany PETN Moviechannel" country="Germany PETN" category="movie"/>
+  <link url="http://80.237.157.98/musicchannel" aspectRatio="15:9" title="Germany PETN Musicchannel" country="Germany PETN" category="musicvideo"/>
+  <link url="http://80.237.157.98/sportschannel" aspectRatio="15:9" title="Germany PETN Sportschannel" country="Germany PETN" category="sport"/>
   <!--Germany WDR-->
   <link url="http://podcast.wdr.de/angeklickt.xml" aspectRatio="15:9" title="Germany WDR Angeklickt" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/ratgeberheimundgarten.xml" aspectRatio="15:9" title="Germany WDR ARD Ratgeber Heim+Garten" country="Germany WDR" category="documentary"/>
@@ -166,10 +167,10 @@
   <link url="http://podcast.wdr.de/monitor.xml" aspectRatio="15:9" title="Germany WDR Monitor" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/neuneinhalb.xml" aspectRatio="15:9" title="Germany WDR neuneinhalb" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/planetwissen.xml" aspectRatio="15:9" title="Germany WDR Planet Wissen" country="Germany WDR" category="documentary"/>
-  <link url="http://podcast.wdr.de/quarks.xml" aspectRatio="15:9" title="Germany WDR Quarks & Co" country="Germany WDR" category="entertainment"/>
+  <link url="http://podcast.wdr.de/quarks.xml" aspectRatio="15:9" title="Germany WDR Quarks &amp; Co" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/schoenhier.xml" aspectRatio="15:9" title="Germany WDR Schon hier" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/maus.xml" aspectRatio="15:9" title="Germany WDR Sendung mit der Maus" country="Germany WDR" category="kid"/>
-  <link url="http://podcast.wdr.de/szessentrinken.xml" aspectRatio="15:9" title="Germany WDR Servicezeit :Essen & Trinken" country="Germany WDR" category="entertainment"/>
+  <link url="http://podcast.wdr.de/szessentrinken.xml" aspectRatio="15:9" title="Germany WDR Servicezeit :Essen &amp; Trinken" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/szkompakt.xml" aspectRatio="15:9" title="Germany WDR Servicezeit :kompakt" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/sztiere.xml" aspectRatio="15:9" title="Germany WDR Tiere suchen ein Zuhause" country="Germany WDR" category="entertainment"/>
   <link url="http://podcast.wdr.de/wissenmachtah.xml" aspectRatio="15:9" title="Germany WDR Wissen macht Ah!" country="Germany WDR" category="entertainment"/>
@@ -344,7 +345,7 @@
   <link url="http://listpod.tv/search/rss?query=angelina%20jolie&page=1" aspectRatio="15:9" title="USA Angelina Jolie" country="USA 1" category="entertainment"/>
   <link url="http://anxietyslayer.podbean.com/feed/" aspectRatio="15:9" title="USA Anxiety Slayer" country="USA 1" category="health"/>
   <link url="http://archiveclassicmovies.com/acm.rss" aspectRatio="15:9" title="USA Archive classic movie" country="USA 1" category="movie"/>
-  <link title="USA Art of the Drink TV" aspectRatio="15:9" url="http://feeds.feedburner.com/artofthedrink" country="USA 1" category="food"/>
+  <link title="USA Art of the Drink" aspectRatio="15:9" url="http://feeds.feedburner.com/artofthedrink" country="USA 1" category="food"/>
   <link url="mms://mid.video.csupomona.edu/liveOne-245" aspectRatio="15:9" title="USA Arts Cal Poly Pomona" country="USA 1" category="arts"/>
   <link url="http://www.autoweek.com/apps/pbcs.dll/section?category=rss07" aspectRatio="15:9" title="USA AutoNews" country="USA 1" category="auto"/>
   <link url="http://www.aaae.org/fs03/video/podcasts/antoday.xml" aspectRatio="15:9" title="USA Aviation News Today" country="USA 1" category="news"/>
@@ -379,6 +380,7 @@
   <link title="USA Echoplex Park" aspectRatio="15:9" url="http://feeds.feedburner.com/EchoplexPark" country="USA 1" category="tv1"/>
   <link title="USA Escape Adulthood" aspectRatio="15:9" url="http://feeds.feedburner.com/EscapeAdulthood" country="USA 1" category="health"/>
   <link title="USA Estelle travel" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1258" country="USA 1" category="travel"/>
+  <link url="http://familyfun.go.com/Resources/global/fftv-archive/podcasts/feed.xml?CMP=BAC-PR0798733213" aspectRatio="15:9" title="USA Family Fun" country="USA 1" category="kid"/>
   <link title="USA Fearless Cooking" aspectRatio="15:9" url="http://fearlesscooking.blip.tv/?skin=rss" country="USA 1" category="food"/>
   <link title="USA Feedburner" aspectRatio="15:9" url="http://feeds.feedburner.com/vlogme05" country="USA 1" category="movie"/>
   <link title="USA French Maid TV" aspectRatio="15:9" url="http://feeds.feedburner.com/FrenchMaidTV" country="USA 1" category="entertainment"/>
@@ -395,7 +397,6 @@
   <link title="USA Hound TV" aspectRatio="15:9" url="http://houndtv.com/feed" country="USA 1" category="documentary"/>
   <link title="USA InnerCompass" aspectRatio="15:9" url="http://www.calvin.edu/innercompass/icvideo_feed.xml" country="USA 1" category="documentary"/>
   <link url="http://thetravelguide.podbean.com/feed/" aspectRatio="15:9" title="USA Inspector Travel Guide" country="USA 1" category="travel"/>
-
   <!--USA 2-->
   <link title="USA Karmagrrrl" aspectRatio="15:9" url="http://feeds.feedburner.com/Karmagrrrl" country="USA 2" category="entertainment"/>
   <link title="USA KiteSites" aspectRatio="15:9" url="http://kitesites.libsyn.com/rss.xml" country="USA 2" category="sport"/>
@@ -538,11 +539,19 @@
   <link title="USA Discovery Science" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/sciencevideo.xml" country="USA Discovery" category="newsmagazine"/>
   <link title="USA Discovery Video" aspectRatio="15:9" url="http://www.discovery.com/radio/xml/discovery_video.xml" country="USA Discovery" category="documentary"/>
   <!--USA ESPN-->
-  <link title="USA ESPN Around the Horn" aspectRatio="15:9" url="http://podloc.andohs.net/dloadTrack.m4v?prm=2892xhttp://a.espnradio.com/espnvideo/ath/ath100218.mp4" country="USA ESPN" category="sport"/>
-  <link title="USA ESPN Big Finish" aspectRatio="15:9" url="http://podloc.andohs.net/dloadTrack.m4v?prm=2893xhttp://a.espnradio.com/espnvideo/bigfinish/bigfinish100217.mp4" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN Around the Horn" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/feeds/itunes/podCast?id=2870570" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN PTI:Big Finish" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/feeds/itunes/podCast?id=2843027" country="USA ESPN" category="sport"/>
+  <link title="USA ESPNU College BasketBall" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/feeds/itunes/podCast?id=2689788" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN Mike and Mike Moment" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/feeds/itunes/podCast?id=2869921" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN 30 for 30" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/archive?id=4588351" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN Mayne Street" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/archive?id=3695324" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN OTL" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/archive?id=3608911" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN Off-Mikes" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/archive?id=3004114" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN Mike and Mike Moment" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/feeds/itunes/podCast?id=2869921" country="USA ESPN" category="sport"/>
+  <link title="USA ESPN Mike and Mike Moment" aspectRatio="15:9" url="http://sports.espn.go.com/espnradio/podcast/feeds/itunes/podCast?id=2869921" country="USA ESPN" category="sport"/>
   <link title="USA ESPN Moment" aspectRatio="15:9" url="http://podloc.andohs.net/dloadTrack.m4v?prm=2894xhttp://a.espnradio.com/espnvideo/mmm/mmm100218.mp4" country="USA ESPN" category="sport"/>
   <!--USA Fashion-->
-  <link title="USA Fashion H & M" aspectRatio="15:9" url="http://www.hm.com/podcast/itunes" country="USA Fashion" category="fashion"/>
+  <link title="USA Fashion H &amp; M" aspectRatio="15:9" url="http://www.hm.com/podcast/itunes" 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 Sexy Bikini Models " aspectRatio="15:9" url="http://rss.omptv.com/modelfeatures.rss" country="USA Fashion" category="fashion"/>
   <link title="USA Fashion Scoop" aspectRatio="15:9" url="http://www.fashion-scoop.com/scooppodfeed.xml" country="USA Fashion" category="fashion"/>
@@ -573,7 +582,7 @@
   <link title="Google Nature SevenLoad" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:nature&so=1&num=100" country="USA Google" category="nature"/>
   <link title="Google NewsG uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:news&so=1&num=100" country="USA Google" category="newsmagazine"/>
   <link title="Google Olympia MetaCafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:olympia&so=1&num=100" country="USA Google" category="sport"/>
-  <link title="Google Science & Technology uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:sci_tech&so=1&num=100" country="USA Google" category="documentary"/>
+  <link title="Google Science &amp; Technology uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:sci_tech&so=1&num=100" country="USA Google" category="documentary"/>
   <link title="Google SportG BodyRockTV not uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:sport&so=1&num=100" country="USA Google" category="sport"/>
   <link title="Google SportsG utube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:sports&so=1&num=100" country="USA Google" category="sport"/>
   <link title="Google Travel uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:travel&so=1&num=100" country="USA Google" category="travel"/>
@@ -631,12 +640,12 @@
   <link title="USA PBS Nightly Business Report: Ready for Retirement" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/nbr/retirement-video" country="USA PBS" category="documentary"/>
   <link title="USA PBS Nova Vodcast" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/wgbh/nova-video" country="USA PBS" category="documentary"/>
   <link title="USA PBS POV" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/pov-audio" country="USA PBS" category="entertainment"/>
-  <link title="USA PBS Religion & Ethics NewsWeekly" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/religionandethics-video" country="USA PBS" category="documentary"/>
+  <link title="USA PBS Religion &amp; Ethics NewsWeekly" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/religionandethics-video" country="USA PBS" category="documentary"/>
   <link title="USA PBS The Victory Garden" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/wgbh/victorygarden-video" country="USA PBS" category="nature"/>
   <link title="USA PBS Washington Week" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/weta/washingtonweek-video" country="USA PBS" category="newsmagazine"/>
   <link title="USA PBS Wired Science" aspectRatio="15:9" url="http://feeds.pbs.org/pbs/kcet/wiredscience-video" country="USA PBS" category="documentary"/>
   <!--USA Reuters-->
-  <link title="USA Reuters Business & Markets News: US" aspectRatio="15:9" url="http://feeds.reuters.com/reuters/video/companyus/rss/mp4/" country="USA Reuters" category="newsmagazine"/>
+  <link title="USA Reuters Business &amp; Markets News: US" aspectRatio="15:9" url="http://feeds.reuters.com/reuters/video/companyus/rss/mp4/" country="USA Reuters" category="newsmagazine"/>
   <link title="USA Reuters Business News: Europe" aspectRatio="15:9" url="http://feeds.reuters.com/reuters/video/companyeurope/rss/mp4/" country="USA Reuters" category="news"/>
   <link title="USA Reuters Business News: Asia" aspectRatio="15:9" url="http://feeds.reuters.com/reuters/video/companyasia/rss/mp4/" country="USA Reuters" category="news"/>
   <link title="USA Reuters Breaking News: Europe" aspectRatio="15:9" url="http://feeds.reuters.com/reuters/video/breakingnewseurope/rss/mp4/" country="USA Reuters" category="news"/>
@@ -657,9 +666,6 @@
   <link url="http://www.stylenetwork.com/podcasts/video/scene/index.xml" aspectRatio="15:9" title="USA Style Network Scene" country="USA Style Network" category="entertainment"/>
   <link url="http://www.stylenetwork.com/podcasts/video/tips/index.xml" aspectRatio="15:9" title="USA Style Network Tips" country="USA Style Network" category="entertainment"/>
   <link url="http://www.style.com/services/rss/feeds/fashionshow_podcast.xml" aspectRatio="15:9" title="USA Style Network All Access Pass" country="USA Style Network" category="entertainment"/>
-  <link url="http://www.stylenetwork.com/podcasts/video/scene/index.xml" aspectRatio="15:9" title="USA Style Network" country="USA 2" category="entertainment"/>
-  <link url="http://www.stylenetwork.com/podcasts/video/scene/index.xml" aspectRatio="15:9" title="USA Style Network" country="USA 2" category="entertainment"/>
-  <link url="http://www.stylenetwork.com/podcasts/video/sampler/index.xml" aspectRatio="15:9" title="USA Style Network" country="USA 2" category="entertainment"/>
   <!--USAToday-->
   <link title="USA Today News Top Stories" aspectRatio="15:9" url="http://lateshowbiz.podbean.com/" country="USA Today" category="newsmagazine"/>
   <link title="USA Today Podcast" aspectRatio="15:9" url="http://rssfeeds.usatoday.com/TalkingTechPodCast" country="USA Today" category="newsmagazine"/>
@@ -682,9 +688,5 @@
   <link url="mms://streaming3.arcoiris.tv/vive-adsl" aspectRatio="15:9" title="Venezuela Vive" country="Venezuela" category="tv3"/>
   <!--Vietnam-->
   <link title="Vietnam Nation Channel" aspectRatio="15:9" url="mms://live.upstreamnetworks.com/20127-49324?WMContentBitrate=57000&WMThinning=0&MSWMExt=.asf" country="Vietnam" category="tv3"/>
-  <!--TEST-->
-  <link url="http://www.geocities.com/bocarandasteve/rss1.xml" aspectRatio="15:9" title="Spain Bocarandasteve" country="Spain" category="tv3"/>
-  <link url="http://familyfun.go.com/Resources/global/fftv-archive/podcasts/feed.xml?CMP=BAC-PR0798733213" aspectRatio="15:9" title="USA Family Fun" country="USA 1" category="kid"/>
-  <link url="http://www.canada.com/globaltv/national/podcastbeta/vodcast.xml" aspectRatio="15:9" title="Canada National News w " country="Canada" category="news"/>
   <!-- tags: arts, auto, comedy, documentary, entertainment, fashion, food, health, jazz, kid, movie, musicvideo, nature, news, newsmagazine, religion, shop, sport, talkshow, tech, trailer, travel, tv1, tv2, tv3-->
 </playlist>
-- 
1.7.9.5