From 0ccb0f4fddd7c0f2cda02d3a8fa957a4b97db093 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Mon, 17 Jan 2011 21:52:27 +0000
Subject: [PATCH] Few small cleanups

---
 openlp/plugins/songs/lib/__init__.py         | 2 +-
 openlp/plugins/songs/lib/mediaitem.py        | 3 +--
 openlp/plugins/songs/lib/songbeamerimport.py | 2 +-
 openlp/plugins/songs/lib/wowimport.py        | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 462dac89a..4124cc252 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -163,7 +163,7 @@ def retrieve_windows_encoding(recommendation=None):
             translate('SongsPlugin', 'Character Encoding'),
             translate('SongsPlugin', 'The codepage setting is responsible\n'
                 'for the correct character representation.\n'
-                'Usually you are fine with the preselected choise.'),
+                'Usually you are fine with the preselected choice.'),
             [pair[1] for pair in encodings], recommended_index, False)
     else:
         choice = QtGui.QInputDialog.getItem(None,
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 93e40f58a..67021616b 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -194,8 +194,7 @@ class SongMediaItem(MediaManagerItem):
         elif search_type == 5:
             log.debug(u'Theme Search')
             search_results = self.parent.manager.get_all_objects(Song,
-                Song.theme_name == search_keywords,
-                Song.search_lyrics.asc())
+                Song.theme_name == search_keywords, Song.search_lyrics.asc())
             self.displayResultsSong(search_results)
 
     def onSongListLoad(self):
diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index c783793db..a4d53ec08 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -83,7 +83,7 @@ class SongBeamerImport(SongImport):
 
     def do_import(self):
         """
-        Recieve a single file, or a list of files to import.
+        Receive a single file or a list of files to import.
         """
         if isinstance(self.import_source, list):
             self.import_wizard.progressBar.setMaximum(
diff --git a/openlp/plugins/songs/lib/wowimport.py b/openlp/plugins/songs/lib/wowimport.py
index d0c308413..a8acb6266 100644
--- a/openlp/plugins/songs/lib/wowimport.py
+++ b/openlp/plugins/songs/lib/wowimport.py
@@ -107,7 +107,7 @@ class WowImport(SongImport):
 
     def do_import(self):
         """
-        Recieve a single file, or a list of files to import.
+        Receive a single file or a list of files to import.
         """
 
         if isinstance(self.import_source, list):