From 1cde0b6fc9a99a36a6c675b072120a06b04acc8d Mon Sep 17 00:00:00 2001
From: Daniel Hodgin <dhodgin@gmail.com>
Date: Fri, 25 Jun 2010 14:32:55 -0400
Subject: [PATCH] merged in manifest and translate

---
 popcorn.js            | 2 +-
 xml/webMadeMovies.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/popcorn.js b/popcorn.js
index 6b998ee6..ce9032af 100644
--- a/popcorn.js
+++ b/popcorn.js
@@ -220,7 +220,7 @@
         return new SubtitleCommand(name, params, text, videoManager);
       }
     },
-    tagThisVideo: {
+    videotag: {
       create: function(name, params, text, videoManager) {
         return new TagCommand(name, params, text, videoManager);
       }
diff --git a/xml/webMadeMovies.xml b/xml/webMadeMovies.xml
index 41b55d66..81663b80 100644
--- a/xml/webMadeMovies.xml
+++ b/xml/webMadeMovies.xml
@@ -6,16 +6,16 @@
         <resource id="celinetwitter" src="http://twitter.com/celinecelines" description="Celine's Twitter" />
       </person>
       <person id="brian" name="brian" >
-        <resource id="briantwitter" source="http://twitter.com/bchirls" description="Brian's twitter" />
+        <resource id="briantwitter" src="http://twitter.com/bchirls" description="Brian's twitter" />
       </person>
       <person id="mona" name="Mona" >
-        <resource id="monahomepage" source="http://monakasra.com/" description="Mona's Homepage"/>
+        <resource id="monahomepage" src="http://monakasra.com/" description="Mona's Homepage"/>
       </person>
       <person id="dave" name="Dave" >
-        <resource id="davetwitter" source="http://twitter.com/academicdave" description="Dave's twitter" />
+        <resource id="davetwitter" src="http://twitter.com/academicdave" description="Dave's twitter" />
       </person>
       <person id="noah" name="Noah" >
-        <resource id="noahtwitter" source="http://twitter.com/noahworkman" description="Noah's Twitter Feed" />
+        <resource id="noahtwitter" src="http://twitter.com/noahworkman" description="Noah's Twitter Feed" />
       </person>
     </people>
     <places>