From: Koos Vriezen <koos.vriezen@gmail.com>
Date: Fri, 4 Jun 2010 18:27:02 +0000 (+0200)
Subject: commit: Fix XML errors, ampersand used as non entityref
X-Git-Url: http://git.maemo.org/git/?p=worldtv99;a=commitdiff_plain;h=c66daf46a629c6f89346110ea276196e6a3ccadb

commit: Fix XML errors, ampersand used as non entityref
---

diff --git a/data/WorldTV99.xml b/data/WorldTV99.xml
index 947f3ff..8dd8a8a 100644
--- a/data/WorldTV99.xml
+++ b/data/WorldTV99.xml
@@ -279,7 +279,7 @@
   <!--Switzerland-->
   <link title="Swiss e-Learning Medicine" aspectRatio="15:9" url="http://e-learning.studmed.unibe.ch/loudblog/podcast.php" country="Swiss" category="health"/>
   <link url="http://www.uefa.com/rssfeed/podcast/eurofootballreview_vodcast.xml" aspectRatio="15:9" title="Swiss Football" country="Swiss" category="jazz"/>
-  <link url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1446" aspectRatio="15:9" title="Swiss DBC radioTV" country="Swiss" category="jazz"/>
+  <link url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;id=1446" aspectRatio="15:9" title="Swiss 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="Swiss Europe Football" country="Swiss" category="sport"/>
   <!--Thailand-->
   <link url="mms://broadcast.issp.co.th/11news1" aspectRatio="15:9" title="Thailand News1" country="Thailand" category="tv3"/>
@@ -302,7 +302,7 @@
   <link title="Turkey Samanyolu Haber" aspectRatio="15:9" url="http://live0.stv.com.tr/shaber" country="Turkey" category="tv3"/>
   <link title="Turkey Samanyolu TV" aspectRatio="15:9" url="http://live0.stv.com.tr/stv" country="Turkey" category="tv3"/>
   <link title="Turkey Samanyolu TV Europe" aspectRatio="15:9" url="mms://live.samanyolutv.de/stv_avrupa" country="Turkey" category="tv3"/>
-  <link title="Turkey Show TV" aspectRatio="15:9" url="http://www.showtv.com.tr/asx/SAlone.asp?product=showtv&pType=1" country="Turkey" category="tv3"/>
+  <link title="Turkey Show TV" aspectRatio="15:9" url="http://www.showtv.com.tr/asx/SAlone.asp?product=showtv&amp;pType=1" country="Turkey" category="tv3"/>
   <link title="Turkey Show TV Europe" aspectRatio="15:9" url="http://www.showturk.tv/asx/default1.asp?product=showturk" country="Turkey" category="tv3"/>
   <link title="Turkey Star TV" aspectRatio="15:9" url="http://startv.com.tr/CanliYayin.aspx" country="Turkey" category="tv3"/>
   <link url="mms://212.175.166.3/TV1" aspectRatio="15:9" title="Turkey TRT 1 national TV" country="Turkey" category="tv3"/>
@@ -331,7 +331,7 @@
   <link url="http://podmaster.co.uk/rss.php" aspectRatio="15:9" title="UK PodMaster Highlights" country="UK" category="entertainment"/>
   <link url="mms://live1.wm.skynews.servecast.net/skynews_wmlz_live300k" aspectRatio="15:9" title="UK 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 title="UK SkySport24" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:sport&so=1&num=100" country="UK" category="sport"/>
+  <link title="UK SkySport24" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:sport&amp;so=1&amp;num=100" country="UK" category="sport"/>
   <link title="UK Sportal" aspectRatio="15:9" url="http://s-lon-02.global-mix.net/365m-sportal-tv" country="UK" category="sport"/>
   <link url="http://iphone.tvcatchup.com/" aspectRatio="15:9" title="UK TVCatchup" country="UK" category="tv3"/>
   <!--USA 1-->
@@ -342,7 +342,7 @@
   <link url="http://feeds.feedburner.com/maccise" aspectRatio="15:9" title="USA Alex Maccise" country="USA 1" category="trailer"/>
   <link url="http://feeds.feedburner.com/AmateurTravelerVideo" aspectRatio="15:9" title="USA Amateur travel" country="USA 1" category="travel"/>
   <link url="http://www.americantheatrewing.org/blog/WIT/atwrss.xml" aspectRatio="15:9" title="USA American Theatre Wing" country="USA 1" category="movie"/>
-  <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://listpod.tv/search/rss?query=angelina%20jolie&amp;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" aspectRatio="15:9" url="http://feeds.feedburner.com/artofthedrink" country="USA 1" category="food"/>
@@ -352,8 +352,8 @@
   <link title="USA Barely Political" aspectRatio="15:9" url="http://feeds.barelypolitical.com/barely-political/rss" country="USA 1" category="newsmagazine"/>
   <link title="USA BinsideTV" aspectRatio="15:9" url="http://feeds.feedburner.com/binsidetv" country="USA 1" category="newsmagazine"/>
   <link title="USA Bonnie McCaffery Quilting" aspectRatio="15:9" url="http://BonnieMcCaffery.com/RSS.xml" country="USA 1" category="entertainment"/>
-  <link title="USA Brad Pitt" aspectRatio="15:9" url="http://listpod.tv/search/rss?query=brad%20pitt&page=1" country="USA 1" category="entertainment"/>
-  <link title="USA Brigade Quater Masters" aspectRatio="15:9" url="http://www.podcastingnews.com/forum/links.php?func=show&id=6218" country="USA 1" category="tv3"/>
+  <link title="USA Brad Pitt" aspectRatio="15:9" url="http://listpod.tv/search/rss?query=brad%20pitt&amp;page=1" country="USA 1" category="entertainment"/>
+  <link title="USA Brigade Quater Masters" aspectRatio="15:9" url="http://www.podcastingnews.com/forum/links.php?func=show&amp;id=6218" country="USA 1" category="tv3"/>
   <link title="USA Bringham Young University" aspectRatio="15:9" url="http://kbyutv-byutelevision.wm.llnwd.net/kbyutv_byutelevision" country="USA 1" category="tv3"/>
   <link title="USA CBN 700 club" aspectRatio="15:9" url="http://cbn-news.wm.llnwd.net/cbn_news" country="USA 1" category="religion"/>
   <link title="USA Channel Mode" aspectRatio="15:9" url="http://chanel-podcast.com/RSS2" country="USA 1" category="entertainment"/>
@@ -362,7 +362,7 @@
   <link title="USA Christian Broadcast Network" aspectRatio="15:9" url="http://live1.cbn.org/iptv1" country="USA 1" category="religion"/>
   <link url="http://podcast.cnbc.com/mmpodcast/mbachallenge.xml" aspectRatio="15:9" title="USA CNBC MBA money" country="USA 1" category="newsmagazine"/>
   <link url="http://bolvideopodcast.cnettv.com" aspectRatio="15:9" title="USA Cnet Buzz Out Loud" country="USA 1" category="tech"/>
-  <link title="USA Columbia Informa" aspectRatio="15:9" url="http://www.podcastingnews.com/forum/links.php?func=show&id=11703" country="USA 1" category="newsmagazine"/>
+  <link title="USA Columbia Informa" aspectRatio="15:9" url="http://www.podcastingnews.com/forum/links.php?func=show&amp;id=11703" country="USA 1" category="newsmagazine"/>
   <link title="USA Columbus Museum of Arts" aspectRatio="15:9" url="http://podcasts.cmaohio.org/artlab.php" country="USA 1" category="arts"/>
   <link title="USA Cool music video" aspectRatio="15:9" url="http://feeds.feedburner.com/antcast" country="USA 1" category="musicvideo"/>
   <link url="http://cia.podbean.com/feed/" aspectRatio="15:9" title="USA Culinery of America" country="USA 1" category="food"/>
@@ -379,12 +379,12 @@
   <link title="USA DutchBoy Production" aspectRatio="15:9" url="http://www.dutchboyproductions.nl/podcast/dutchboy.xml" country="USA 1" category="tv1"/>
   <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 title="USA Estelle travel" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;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"/>
-  <link title="USA George Carling" aspectRatio="15:9" url="http://listpod.tv/search/rss?query=george%20carlin&page=1" country="USA 1" category="comedy"/>
+  <link title="USA George Carling" aspectRatio="15:9" url="http://listpod.tv/search/rss?query=george%20carlin&amp;page=1" country="USA 1" category="comedy"/>
   <link title="USA GLivingTV" aspectRatio="15:9" url="http://feeds.feedburner.com/DeliciouslyRawWithLeslieBegaGLivingtvvideo" country="USA 1" category="food"/>
   <link url="http://feeds.feedburner.com/GlobalVoices-HumanRightsVideo" aspectRatio="15:9" title="USA GlobalVoices-HumanRights" country="USA 1" category="documentary"/>
   <link url="mms://ir2-c100.narrowstep.tv/mcp?psid=62553022&amp;ref=0&amp;chid=425&amp;pid=2436&amp;vid=44966764&amp;br=400&amp;tid=2&amp;brid=506&amp;fab=0&amp;MSWMExt=.asf" aspectRatio="15:9" title="USA GlobeTrekkerTV" country="USA 1" category="travel"/>
@@ -405,19 +405,19 @@
   <link title="USA Living Kitchen" aspectRatio="15:9" url="http://www.subzero.com/vodcasts/livingkitchen.xml" country="USA 2" category="food"/>
   <link title="USA Lynda.com video training" aspectRatio="15:9" url="http://lynda.com/podcasts/lynda_podcast.xml" country="USA 2" category="tech"/>
   <link title="USA Market Place Money News" aspectRatio="15:9" url="http://marketplace.publicradio.org/RSS/moneyclip_podcast.xml" country="USA 2" category="newsmagazine"/>
-  <link title="USA Media" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1933" country="USA 2" category="entertainment"/>
+  <link title="USA Media" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;id=1933" country="USA 2" category="entertainment"/>
   <link title="USA Melissa Travel" aspectRatio="15:9" url="http://melissa.libsyn.com/rss" country="USA 2" category="travel"/>
   <link title="USA MicrobeWorld" aspectRatio="15:9" url="http://feeds.feedburner.com/asm" country="USA 2" category="documentary"/>
-  <link title="USA Microsoft" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=22" country="USA 2" category="documentary"/>
+  <link title="USA Microsoft" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;id=22" country="USA 2" category="documentary"/>
   <link title="USA Miller light" aspectRatio="15:9" url="http://www.mixdown.com/podcasts/0608_anlaws.xml" country="USA 2" category="entertainment"/>
   <link url="mms://quickstudy.wmlive.internapcdn.net/live_quickstudy_vitalstream_com_CJIL-stream" aspectRatio="15:9" title="USA Mirale Channel" country="USA 2" category="religion"/>
   <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 2" category="religion"/>
   <link url="http://media1.tempe.gov/tempe11high" aspectRatio="15:9" title="USA Montgomery TV 6" country="USA 2" category="tv3"/>
   <link url="http://www.therestofeverest.com/everest.xml" aspectRatio="15:9" title="USA Mt Everest" country="USA 2" category="nature"/>
-  <link url="http://nanfengoranges.com/?cat=5&feed=rss2" aspectRatio="15:9" title="USA NanfengOranges" country="USA 2" category="documentary"/>
+  <link url="http://nanfengoranges.com/?cat=5&amp;feed=rss2" aspectRatio="15:9" title="USA NanfengOranges" country="USA 2" category="documentary"/>
   <link title="USA National Geographics dog whisperer" aspectRatio="15:9" url="http://podcast.nationalgeographic.com/dog-whisperer/" country="USA 2" category="documentary"/>
-  <link title="USA New Jersey Wine Library" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1671" country="USA 2" category="food"/>
-  <link title="USA New York CityBallet" aspectRatio="15:9" url="http://tragiclovenyc.blip.tv/?file_type=mov,mpeg4,mp4,m4v,mp3&skin=rss" country="USA 2" category="arts"/>
+  <link title="USA New Jersey Wine Library" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;id=1671" country="USA 2" category="food"/>
+  <link title="USA New York CityBallet" aspectRatio="15:9" url="http://tragiclovenyc.blip.tv/?file_type=mov,mpeg4,mp4,m4v,mp3&amp;skin=rss" country="USA 2" category="arts"/>
   <link title="USA New Yorker Animation" aspectRatio="15:9" url="http://ringtales.com/nyrss.xml" country="USA 2" category="movie"/>
   <link url="http://nikefootball.nike.com/nikefootball/podcast/nikefootball.xml" aspectRatio="15:9" title="USA Nike Football" country="USA 2" category="sport"/>
   <link url="http://feeds.feedburner.com/niotv" aspectRatio="15:9" title="USA Nio TV" country="USA 2" category="arts"/>
@@ -467,11 +467,11 @@
   <!--USA ABC-->
   <link title="USA ABC News 20/20 In Touch" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=2601376" country="USA ABC" category="newsmagazine"/>
   <link title="USA ABC News Ahead of the curve" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=1456651" country="USA ABC" category="newsmagazine"/>
-  <link title="USA ABC News Extreme" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&id=1708" country="USA ABC" category="newsmagazine"/>
+  <link title="USA ABC News Extreme" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;id=1708" country="USA ABC" category="newsmagazine"/>
   <link title="USA ABC News Fresh trax" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=1456635" country="USA ABC" category="newsmagazine"/>
   <link title="USA ABC News Good Morning America" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=1474766" country="USA ABC" category="talkshow"/>
-  <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 Medical Minute" aspectRatio="15:9" url="http://www.videopodcasts.tv/vc.php?action=gofeed&amp;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&amp;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 Whats the Buzz" aspectRatio="15:9" url="http://abcnews.go.com/xmldata/xmlPodcast?id=1456657" country="USA ABC" category="entertainment"/>
@@ -492,14 +492,14 @@
   <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 CDC-->
-  <link title="USA CDC Video" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=3" country="USA CDC" category="health"/>
-  <link title="USA CDC Hurricane Preparedness" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=120" country="USA CDC" category="health"/>
-  <link title="USA CDC We Can Be Stronger Than Diabetes" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=131" country="USA CDC" category="health"/>
-  <link title="USA CDC Emergency Preparedness and You" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=134" country="USA CDC" category="health"/>
-  <link title="USA CDC Health System Transformation Lecture Series" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=167" country="USA CDC" category="health"/>
-  <link title="USA CDC Public Health Lecture Series" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=302" country="USA CDC" category="health"/>
-  <link title="USA CDC PCSI Points" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=322" country="USA CDC" category="health"/>
-  <link title="USA CDC Press Briefings" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&c=339" country="USA CDC" category="health"/>
+  <link title="USA CDC Video" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=3" country="USA CDC" category="health"/>
+  <link title="USA CDC Hurricane Preparedness" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=120" country="USA CDC" category="health"/>
+  <link title="USA CDC We Can Be Stronger Than Diabetes" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=131" country="USA CDC" category="health"/>
+  <link title="USA CDC Emergency Preparedness and You" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=134" country="USA CDC" category="health"/>
+  <link title="USA CDC Health System Transformation Lecture Series" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=167" country="USA CDC" category="health"/>
+  <link title="USA CDC Public Health Lecture Series" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=302" country="USA CDC" category="health"/>
+  <link title="USA CDC PCSI Points" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=322" country="USA CDC" category="health"/>
+  <link title="USA CDC Press Briefings" aspectRatio="15:9" url="http://www2c.cdc.gov/podcasts/createrss.asp?t=v&amp;c=339" country="USA CDC" category="health"/>
   <!--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="newsmagazine"/>
   <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"/>
@@ -529,7 +529,7 @@
   <link title="USA CSTV Men Basketball" aspectRatio="15:9" url="http://podcasts.cstv.com/feeds/mensbasketball.xml" country="USA CSTV" category="sport"/>
   <link title="USA CSTV NCAA Fall Championships" aspectRatio="15:9" url="http://podcasts.cstv.com/feeds/ncaa_fall_champ.xml" country="USA CSTV" category="sport"/>
   <link title="USA CSTV Sports" aspectRatio="15:9" url="http://podcasts.cstv.com/feeds/c50230.xml" country="USA CSTV" category="sport"/>
-  <link title="USA CSTV Sports Google Video" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:sports&so=1&num=100" country="USA CSTV" category="sport"/>
+  <link title="USA CSTV Sports Google Video" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:sports&amp;so=1&amp;num=100" country="USA CSTV" category="sport"/>
   <link title="USA CSTV UWire Campus Pulse" aspectRatio="15:9" url="http://podcasts.cstv.com/feeds/uwire.xml" country="USA CSTV" category="sport"/>
   <link title="USA CSTV WCC" aspectRatio="15:9" url="http://podcasts.cstv.com/feeds/wcc.xml" country="USA CSTV" category="sport"/>
   <!--USA Discovery-->
@@ -566,30 +566,30 @@
   <link title="USA FOX News" aspectRatio="15:9" url="http://wwitv.com/tv_channels/b5202.htm" country="USA Fox" category="news"/>
   <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 Ads and promotion YouKu" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:ad_promo&so=1&num=100" country="USA Google" category="entertainment"/>
-  <link title="Google Animation MetaCafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:animation&so=1&num=100" country="USA Google" category="movie"/>
-  <link title="Google Art and Experimental uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:art_expr&so=1&num=100" country="USA Google" category="documentary"/>
-  <link title="Google Business" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:business&so=1&num=100" country="USA Google" category="newsmagazine"/>
-  <link title="Google Dance" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:dance&so=1&num=100" country="USA Google" category="arts"/>
-  <link title="Google Documentary Movieweb" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:documentary&so=1&num=100" country="USA Google" category="documentary"/>
-  <link title="Google Female Metacafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:female&so=1&num=100" country="USA Google" category="documentary"/>
-  <link title="Google Foreign Metacafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:foreign&so=1&num=100" country="USA Google" category="entertainment"/>
-  <link title="Google Health and Fitness not uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:fitness&so=1&num=100" country="USA Google" category="health"/>
-  <link title="Google Modelling Metacafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:modelling&so=1&num=100" country="USA Google" category="entertainment"/>
-  <link title="Google Movie trailer not uTube" 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 Music videoG uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:music_video&so=1&num=100" country="USA Google" category="musicvideo"/>
-  <link title="Google Music videoT not uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:music_video&so=1&num=100" country="USA Google" category="musicvideo"/>
-  <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 &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"/>
-  <link title="Google TVshow Charlie Rose" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:tvshow&so=1&num=100" country="USA Google" category="entertainment"/>
-  <link title="Google Youtube sport" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&q=genre:sport&so=1&num=100" country="USA Google" category="sport"/>
-  <link title="Google Youtube olympic" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&q=genre:olympic&so=1&num=100" country="USA Google" category="sport"/>
-  <link title="Google Youtube comedy" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&q=genre:comedy&so=1&num=100" country="USA Google" category="comedy"/>
+  <link title="Google Ads and promotion YouKu" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:ad_promo&amp;so=1&amp;num=100" country="USA Google" category="entertainment"/>
+  <link title="Google Animation MetaCafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:animation&amp;so=1&amp;num=100" country="USA Google" category="movie"/>
+  <link title="Google Art and Experimental uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:art_expr&amp;so=1&amp;num=100" country="USA Google" category="documentary"/>
+  <link title="Google Business" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:business&amp;so=1&amp;num=100" country="USA Google" category="newsmagazine"/>
+  <link title="Google Dance" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:dance&amp;so=1&amp;num=100" country="USA Google" category="arts"/>
+  <link title="Google Documentary Movieweb" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:documentary&amp;so=1&amp;num=100" country="USA Google" category="documentary"/>
+  <link title="Google Female Metacafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:female&amp;so=1&amp;num=100" country="USA Google" category="documentary"/>
+  <link title="Google Foreign Metacafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:foreign&amp;so=1&amp;num=100" country="USA Google" category="entertainment"/>
+  <link title="Google Health and Fitness not uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:fitness&amp;so=1&amp;num=100" country="USA Google" category="health"/>
+  <link title="Google Modelling Metacafe" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:modelling&amp;so=1&amp;num=100" country="USA Google" category="entertainment"/>
+  <link title="Google Movie trailer not uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:movie_trailer&amp;so=1&amp;num=100" country="USA Google" category="trailer"/>
+  <link title="Google Music videoG uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:music_video&amp;so=1&amp;num=100" country="USA Google" category="musicvideo"/>
+  <link title="Google Music videoT not uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:music_video&amp;so=1&amp;num=100" country="USA Google" category="musicvideo"/>
+  <link title="Google Nature SevenLoad" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:nature&amp;so=1&amp;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&amp;so=1&amp;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&amp;so=1&amp;num=100" country="USA Google" category="sport"/>
+  <link title="Google Science &amp; Technology uTube" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:sci_tech&amp;so=1&amp;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&amp;so=1&amp;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&amp;so=1&amp;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&amp;so=1&amp;num=100" country="USA Google" category="travel"/>
+  <link title="Google TVshow Charlie Rose" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=type:tvshow&amp;so=1&amp;num=100" country="USA Google" category="entertainment"/>
+  <link title="Google Youtube sport" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:sport&amp;so=1&amp;num=100" country="USA Google" category="sport"/>
+  <link title="Google Youtube olympic" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:olympic&amp;so=1&amp;num=100" country="USA Google" category="sport"/>
+  <link title="Google Youtube comedy" aspectRatio="15:9" url="http://video.google.com/videofeed?type=search&amp;q=genre:comedy&amp;so=1&amp;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"/>
@@ -687,6 +687,6 @@
   <!--Venezuela-->
   <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"/>
+  <link title="Vietnam Nation Channel" aspectRatio="15:9" url="mms://live.upstreamnetworks.com/20127-49324?WMContentBitrate=57000&amp;WMThinning=0&amp;MSWMExt=.asf" country="Vietnam" category="tv3"/>
   <!-- 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>