s/favourites/favorites/g

3 files changed, 58 insertions, 58 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dbc06c2..9aa9f9b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -28,7 +28,7 @@ msgid "Number"
 msgstr "数量"
 
 #: ../totem/plugin/ppstream.py:887
-msgid "Favourites"
+msgid "Favorites"
 msgstr "收藏"
 
 #: ../totem/plugin/ppstream.py:1019
@@ -130,7 +130,7 @@ msgid "Add the video to the playlist"
 msgstr "将视频添加到播放列表"
 
 #: ../totem/plugin/ppstream.ui.h:2
-msgid "Add to favourites"
+msgid "Add to favorites"
 msgstr "添加到收藏"
 
 #: ../totem/plugin/ppstream.ui.h:3
@@ -150,7 +150,7 @@ msgid "Films"
 msgstr "影片"
 
 #: ../totem/plugin/ppstream.ui.h:7
-msgid "Remove from favourites"
+msgid "Remove from favorites"
 msgstr "从收藏中删除"
 
 #: ../totem/plugin/ppstream.ui.h:8
diff --git a/totem/plugin/ppstream.py b/totem/plugin/ppstream.py
index d735123..dd01ff2 100644
--- a/totem/plugin/ppstream.py
+++ b/totem/plugin/ppstream.py
@@ -495,7 +495,7 @@ class PPStream (totem.Plugin):
 		self.notebook_pages = ["categories", "films", "files"]
 		self.current_treeview_name = "categories"
 		self.load_config ()
-		self.setup_favourites ()
+		self.setup_favorites ()
 		self.setup_categories ()
 		self.setup_films ()
 		self.setup_files ()
@@ -542,9 +542,9 @@ class PPStream (totem.Plugin):
 			self.clear_ui ()
 			self.retrieveimage.cancel_tasks ()
 
-			### show favourites
+			### show favorites
 			self.subclass_index += 1
-			self.classes = [self.favourites]
+			self.classes = [self.favorites]
 
 			url = 'http://playlist.pps.tv/classfortv.php'
 			thread = DownloadThread (url, self.classes_fetched,
@@ -845,7 +845,7 @@ class PPStream (totem.Plugin):
 
 		self.categories_count = 0
 
-	def on_add_to_favourites (self, button):
+	def on_add_to_favorites (self, button):
 		selection = self.treeview['films'].get_selection ()
 		model, rows = selection.get_selected_rows ()
 		if not rows:
@@ -864,12 +864,12 @@ class PPStream (totem.Plugin):
 				filtermodel = model
 			clsid = filtermodel.get_value (iter, 4)
 			subclsid = filtermodel.get_value (iter, 5)
-			self.add_favourites (clsid, subclsid,
+			self.add_favorites (clsid, subclsid,
 					     filtermodel.get_path (iter)[0], False)
-		self.save_favourites ()
-		self.refresh_favourites ()
+		self.save_favorites ()
+		self.refresh_favorites ()
 
-	def on_remove_from_favourites (self, button):
+	def on_remove_from_favorites (self, button):
 		selection = self.treeview['films'].get_selection ()
 		model, rows = selection.get_selected_rows ()
 		if not rows:
@@ -885,29 +885,29 @@ class PPStream (totem.Plugin):
 				filtermodel = model
 			clsid = filtermodel.get_value (iter, 4)
 			subclsid = filtermodel.get_value (iter, 5)
-			self.remove_favourites (clsid, subclsid,
+			self.remove_favorites (clsid, subclsid,
 						filtermodel.get_path (iter)[0], False)
-		self.save_favourites ()
-		self.refresh_favourites ()
+		self.save_favorites ()
+		self.refresh_favorites ()
 
-	def setup_favourites (self):
-		button = self.builder.get_object ('pps_add_to_favourites_button')
-		self.add_to_favourites_button = button
+	def setup_favorites (self):
+		button = self.builder.get_object ('pps_add_to_favorites_button')
+		self.add_to_favorites_button = button
 		button.set_sensitive (False)
-		button.connect ('clicked', self.on_add_to_favourites)
-		button = self.builder.get_object ('pps_remove_from_favourites_button')
+		button.connect ('clicked', self.on_add_to_favorites)
+		button = self.builder.get_object ('pps_remove_from_favorites_button')
 		button.set_sensitive (False)
-		button.connect ('clicked', self.on_remove_from_favourites)
-		self.remove_from_favourites_button = button
-		self.load_favourites ()
+		button.connect ('clicked', self.on_remove_from_favorites)
+		self.remove_from_favorites_button = button
+		self.load_favorites ()
 
-	def load_favourites (self):
+	def load_favorites (self):
 		treeview_name = 'categories'
-		filename = os.path.join (pps_cache_dir, 'favourites.xml')
+		filename = os.path.join (pps_cache_dir, 'favorites.xml')
 
-		self.favourites = PPSClass ()
-		self.favourites.title = _('Favourites')
-		self.favourites.films_fetched = True
+		self.favorites = PPSClass ()
+		self.favorites.title = _('Favorites')
+		self.favorites.films_fetched = True
 
 		if not os.path.exists (filename):
 			return
@@ -915,17 +915,17 @@ class PPStream (totem.Plugin):
 			res = file (filename, 'rb').read ()
 			films = self.parse_films (res, 0, 0)
 		except Exception, e:
-			print "Couldn't load favourites.xml:", e
+			print "Couldn't load favorites.xml:", e
 			return
-		#print 'loaded favourite films', films
+		#print 'loaded favorite films', films
 		if not films:
 			return
-		self.favourites.films = films
-		self.favourites.contentnum = len (films)
+		self.favorites.films = films
+		self.favorites.contentnum = len (films)
 
-	def save_favourites (self):
+	def save_favorites (self):
 		treeview_name = 'categories'
-		filename = os.path.join (pps_cache_dir, 'favourites.xml')
+		filename = os.path.join (pps_cache_dir, 'favorites.xml')
 		fp = None
 		try:
 			fp = file (filename, 'w')
@@ -934,51 +934,51 @@ class PPStream (totem.Plugin):
 		impl = minidom.getDOMImplementation ()
 		doc = impl.createDocument(None, "FilmData", None)
 		filmdata = doc.documentElement
-		for film in self.favourites.films:
+		for film in self.favorites.films:
 			filmdata.childNodes.append (film.toxml (doc))
 		fp.write (doc.toxml (encoding = 'utf-8'))
 		fp.close ()
 
-	def add_favourites (self, clsid, subclsid, index, update = True):
+	def add_favorites (self, clsid, subclsid, index, update = True):
 		cls, subcls = self.get_class_pair (clsid, subclsid)
 		if cls.type == 1:
 			subcls = cls
 		film = subcls.films[index]
-		if film in self.favourites.films:
+		if film in self.favorites.films:
 			return
-		self.favourites.films.append (film)
-		self.favourites.contentnum = len (self.favourites.films)
+		self.favorites.films.append (film)
+		self.favorites.contentnum = len (self.favorites.films)
 
 		if not update:
 			return
-		self.refresh_favourites ()
-		self.save_favourites ()
+		self.refresh_favorites ()
+		self.save_favorites ()
 
-	def remove_favourites (self, clsid, subclsid, index, update = False):
+	def remove_favorites (self, clsid, subclsid, index, update = False):
 		cls, subcls = self.get_class_pair (clsid, subclsid)
 		if cls.type == 1:
 			subcls = cls
 		film = subcls.films[index]
-		#print self.favourites.films, film
-		if not film in self.favourites.films:
-			print "Couldn't find ", film, ' in favourites'
+		#print self.favorites.films, film
+		if not film in self.favorites.films:
+			print "Couldn't find ", film, ' in favorites'
 			return
-		self.favourites.films.remove (film)
-		self.favourites.contentnum = len (self.favourites.films)
+		self.favorites.films.remove (film)
+		self.favorites.contentnum = len (self.favorites.films)
 
 		if not update:
 			return
-		self.refresh_favourites ()
-		self.save_favourites ()
+		self.refresh_favorites ()
+		self.save_favorites ()
 
-	def refresh_favourites (self):
+	def refresh_favorites (self):
 		treeview_name = 'categories'
 		treeview = self.builder.get_object ("pps_liststore_" + treeview_name)
 		if not len (treeview):
 			return
 
 		iter = treeview.get_iter (0)
-		treeview.set (iter, 4, self.favourites.contentnum)
+		treeview.set (iter, 4, self.favorites.contentnum)
 
 		clsid, subclsid = self.films_ids
 		if (clsid, subclsid) != (0, 0):
@@ -1353,18 +1353,18 @@ class PPStream (totem.Plugin):
 
 	def on_notebook_page_changed (self, notebook, notebook_page, page_num):
 		self.current_treeview_name = self.notebook_pages[page_num]
-		self.add_to_favourites_button.set_sensitive (False)
-		self.remove_from_favourites_button.set_sensitive (False)
+		self.add_to_favorites_button.set_sensitive (False)
+		self.remove_from_favorites_button.set_sensitive (False)
 		if self.current_treeview_name == 'files':
 			self.refresh_button.set_sensitive (False)
 		elif self.current_treeview_name == 'films':
 			if self.films_ids == (-1, -1):
 				self.refresh_button.set_sensitive (False)
 			elif self.films_ids == (0, 0):
-				self.remove_from_favourites_button.set_sensitive (True)
+				self.remove_from_favorites_button.set_sensitive (True)
 			else:
 				self.refresh_button.set_sensitive (True)
-				self.add_to_favourites_button.set_sensitive (True)
+				self.add_to_favorites_button.set_sensitive (True)
 
 		else:
 			self.refresh_button.set_sensitive (True)
diff --git a/totem/plugin/ppstream.ui b/totem/plugin/ppstream.ui
index 5efd1a0..1522762 100644
--- a/totem/plugin/ppstream.ui
+++ b/totem/plugin/ppstream.ui
@@ -215,8 +215,8 @@
       <object class="GtkHBox" id="hbox2">
         <property name="visible">True</property>
         <child>
-          <object class="GtkButton" id="pps_add_to_favourites_button">
-            <property name="label" translatable="yes">Add to favourites</property>
+          <object class="GtkButton" id="pps_add_to_favorites_button">
+            <property name="label" translatable="yes">Add to favorites</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -227,8 +227,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="pps_remove_from_favourites_button">
-            <property name="label" translatable="yes">Remove from favourites</property>
+          <object class="GtkButton" id="pps_remove_from_favorites_button">
+            <property name="label" translatable="yes">Remove from favorites</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>