diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 99255c6ee..ebbe31597 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -84,7 +84,8 @@ html_expands.append({u'desc': u'Underline', u'start tag': u'{u}',
     u'start html': u'<span style="text-decoration: underline;">',
     u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
 
-def translate(context, text, comment=None):
+def translate(context, text, comment=None,
+    encoding=QtCore.QCoreApplication.CodecForTr, n=-1):
     """
     A special shortcut method to wrap around the Qt4 translation functions.
     This abstracts the translation procedure so that we can change it if at a
@@ -101,7 +102,7 @@ def translate(context, text, comment=None):
         An identifying string for when the same text is used in different roles
         within the same context.
     """
-    return QtCore.QCoreApplication.translate(context, text, comment)
+    return QtCore.QCoreApplication.translate(context, text, comment, encoding, n)
 
 def get_text_file_string(text_file):
     """
@@ -325,4 +326,4 @@ from dockwidget import OpenLPDockWidget
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem
-from baselistwithdnd import BaseListWithDnD
\ No newline at end of file
+from baselistwithdnd import BaseListWithDnD
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 50e43afd0..7991135f7 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -284,34 +284,30 @@ class MediaManagerItem(QtGui.QWidget):
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_edit.png',
-                    unicode(translate('OpenLP.MediaManagerItem', '&Edit %s')) %
-                    name_string[u'singular'],
+                    self.plugin.getString(StringContent.Edit)[u'title'],
                     self.onEditClick))
             self.listView.addAction(context_menu_separator(self.listView))
         if self.hasDeleteIcon:
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_delete.png',
-                    unicode(translate('OpenLP.MediaManagerItem',
-                        '&Delete %s')) %
-                    name_string[u'singular'],
+                    self.plugin.getString(StringContent.Delete)[u'title'],
                     self.onDeleteClick))
             self.listView.addAction(context_menu_separator(self.listView))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_preview.png',
-                unicode(translate('OpenLP.MediaManagerItem', '&Preview %s')) %
-                name_string[u'singular'],
+                self.plugin.getString(StringContent.Preview)[u'title'],
                 self.onPreviewClick))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_live.png',
-                translate('OpenLP.MediaManagerItem', '&Show Live'),
+                self.plugin.getString(StringContent.Live)[u'title'],
                 self.onLiveClick))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_add.png',
-                translate('OpenLP.MediaManagerItem', '&Add to Service'),
+                self.plugin.getString(StringContent.Service)[u'title'],
                 self.onAddClick))
         if self.addToServiceItem:
             self.listView.addAction(
@@ -544,4 +540,4 @@ class MediaManagerItem(QtGui.QWidget):
         Method to add processing when a service has been loaded and
         individual service items need to be processed by the plugins
         """
-        pass
\ No newline at end of file
+        pass
diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py
index 90a54e12e..3272c7af9 100644
--- a/openlp/core/ui/exceptionform.py
+++ b/openlp/core/ui/exceptionform.py
@@ -135,7 +135,9 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
             '--- Please enter the report below this line. ---\n\n\n'
             '--- Exception Traceback ---\n%s\n'
             '--- System information ---\n%s\n'
-            '--- Library Versions ---\n%s\n'))
+            '--- Library Versions ---\n%s\n',
+            'Please add the information that bug reports are favoured written '
+            'in English.'))
         content = self._createReport()
         for line in content[1].split(u'\n'):
             if re.search(r'[/\\]openlp[/\\]', line):
@@ -144,4 +146,4 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
                 exception = line.split(u'\n')[-1].split(u':')[0]
         subject = u'Bug report: %s in %s' % (exception, source)
         mailto(address=u'bugs@openlp.org', subject=subject,
-            body=body % content)
\ No newline at end of file
+            body=body % content)
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 8c56648c8..6d98d0858 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -389,11 +389,11 @@ class GeneralTab(SettingsTab):
         settings = QtCore.QSettings()
         settings.beginGroup(self.settingsSection)
         for screen in self.screens.screen_list:
-            screen_name = u'%s %d' % (translate('OpenLP.GeneralTab', 'Screen'),
-                screen[u'number'] + 1)
+            screen_name = unicode(translate('OpenLP.GeneralTab', 'Screen %d')) \
+                % (screen[u'number'] + 1)
             if screen[u'primary']:
-                screen_name = u'%s (%s)' % (screen_name,
-                    translate('OpenLP.GeneralTab', 'primary'))
+                screen_name = unicode(translate('OpenLP.GeneralTab',
+                    '%s (primary)')) % screen_name
             self.monitorComboBox.addItem(screen_name)
         self.numberEdit.setText(unicode(settings.value(
             u'ccli number', QtCore.QVariant(u'')).toString()))
@@ -530,4 +530,4 @@ class GeneralTab(SettingsTab):
         """
         Called when the width, height, x position or y position has changed.
         """
-        self.overrideChanged = True
\ No newline at end of file
+        self.overrideChanged = True
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index c7854e187..44720cbcc 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -586,8 +586,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ThemeForm', 'Theme Name Missing'),
                 translate('OpenLP.ThemeForm',
-                    'There is no name for this theme. '
-                    'Please enter one.'),
+                    'There is no name for this theme. Please enter one.'),
                 (QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok)
             return
@@ -595,8 +594,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ThemeForm', 'Theme Name Invalid'),
                 translate('OpenLP.ThemeForm',
-                    'Invalid theme name. '
-                    'Please enter one.'),
+                    'Invalid theme name. Please enter one.'),
                 (QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok)
             return
@@ -620,4 +618,4 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             QtGui.QColor(field), self)
         if new_color.isValid():
             field = new_color.name()
-        return field
\ No newline at end of file
+        return field
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 82d7c4b0e..584edf909 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -223,8 +223,11 @@ class ThemeManager(QtGui.QWidget):
         """
         Renames an existing theme to a new name
         """
-        action = unicode(translate('OpenLP.ThemeManager', 'Rename'))
-        if self._validate_theme_action(action, False):
+        if self._validate_theme_action(unicode(translate('OpenLP.ThemeManager',
+            'You must select a theme to rename.')),
+            unicode(translate('OpenLP.ThemeManager', 'Rename Confirmation')),
+            unicode(translate('OpenLP.ThemeManager', 'Rename %s theme?')),
+            False):
             item = self.themeListWidget.currentItem()
             oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
             self.fileRenameForm.fileNameEdit.setText(oldThemeName)
@@ -288,8 +291,10 @@ class ThemeManager(QtGui.QWidget):
         """
         Delete a theme
         """
-        action = unicode(translate('OpenLP.ThemeManager', 'Delete'))
-        if self._validate_theme_action(action):
+        if self._validate_theme_action(unicode(translate('OpenLP.ThemeManager',
+            'You must select a theme to delete.')),
+            unicode(translate('OpenLP.ThemeManager', 'Delete Confirmation')),
+            unicode(translate('OpenLP.ThemeManager', 'Delete %s theme?'))):
             item = self.themeListWidget.currentItem()
             theme = unicode(item.text())
             row = self.themeListWidget.row(item)
@@ -750,7 +755,8 @@ class ThemeManager(QtGui.QWidget):
         theme.extend_image_filename(path)
         return theme
 
-    def _validate_theme_action(self, action, testPlugin=True):
+    def _validate_theme_action(self, select_text, confirm_title, confirm_text,
+        testPlugin=True):
         """
         Check to see if theme has been selected and the destructive action
         is allowed.
@@ -758,19 +764,14 @@ class ThemeManager(QtGui.QWidget):
         self.global_theme = unicode(QtCore.QSettings().value(
             self.settingsSection + u'/global theme',
             QtCore.QVariant(u'')).toString())
-        if check_item_selected(self.themeListWidget,
-            unicode(translate('OpenLP.ThemeManager',
-            'You must select a theme to %s.')) % action):
+        if check_item_selected(self.themeListWidget, select_text):
             item = self.themeListWidget.currentItem()
             theme = unicode(item.text())
             # confirm deletion
-            answer = QtGui.QMessageBox.question(self,
-                unicode(translate('OpenLP.ThemeManager', '%s Confirmation'))
-                % action,
-                unicode(translate('OpenLP.ThemeManager', '%s %s theme?'))
-                % (action, theme),
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
-                QtGui.QMessageBox.No), QtGui.QMessageBox.No)
+            answer = QtGui.QMessageBox.question(self, confirm_title,
+                confirm_text % theme, QtGui.QMessageBox.StandardButtons(
+                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
+                QtGui.QMessageBox.No)
             if answer == QtGui.QMessageBox.No:
                 return False
             # should be the same unless default
@@ -779,6 +780,7 @@ class ThemeManager(QtGui.QWidget):
                     translate('OpenLP.ThemeManager', 'Error'),
                     translate('OpenLP.ThemeManager',
                         'You are unable to delete the default theme.'))
+                return False
             else:
                 if testPlugin:
                     for plugin in self.parent.pluginManager.plugins:
@@ -795,4 +797,6 @@ class ThemeManager(QtGui.QWidget):
                         unicode(translate('OpenLP.ThemeManager',
                         'Theme %s is used by the service manager.')) % theme)
                     return False
-        return True
\ No newline at end of file
+        else:
+            return False
+        return True
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 277a3903a..4a7e18cef 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -114,10 +114,10 @@ class AlertsPlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('AlertsPlugin', 'Alert'),
-            u'plural': translate('AlertsPlugin', 'Alerts')
+            u'singular': translate('AlertsPlugin', 'Alert', 'name singular'),
+            u'plural': translate('AlertsPlugin', 'Alerts', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('AlertsPlugin', 'Alerts')
-        }
\ No newline at end of file
+            u'title': translate('AlertsPlugin', 'Alerts', 'container title')
+        }
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 3e8dc82ee..15181e871 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -126,53 +126,48 @@ class BiblePlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('BiblesPlugin', 'Bible'),
-            u'plural': translate('BiblesPlugin', 'Bibles')
+            u'singular': translate('BiblesPlugin', 'Bible', 'name singular'),
+            u'plural': translate('BiblesPlugin', 'Bibles', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('BiblesPlugin', 'Bibles')
+            u'title': translate('BiblesPlugin', 'Bibles', 'container title')
         }
         # Middle Header Bar
-        ## Import Button ##
+        ## Import Action ##
         self.textStrings[StringContent.Import] = {
-            u'title': translate('BiblesPlugin', 'Import'),
-            u'tooltip': translate('BiblesPlugin',
-                'Import a Bible')
+            u'title': translate('BiblesPlugin', '&Import'),
+            u'tooltip': translate('BiblesPlugin', 'Import a Bible')
         }
-        ## New Button ##
+        ## New Action ##
         self.textStrings[StringContent.New] = {
-            u'title': translate('BiblesPlugin', 'Add'),
-            u'tooltip': translate('BiblesPlugin',
-                'Add a new Bible')
+            u'title': translate('BiblesPlugin', '&Add'),
+            u'tooltip': translate('BiblesPlugin', 'Add a new Bible')
         }
-        ## Edit Button ##
+        ## Edit Action ##
         self.textStrings[StringContent.Edit] = {
-            u'title': translate('BiblesPlugin', 'Edit'),
-            u'tooltip': translate('BiblesPlugin',
-                'Edit the selected Bible')
+            u'title': translate('BiblesPlugin', '&Edit'),
+            u'tooltip': translate('BiblesPlugin', 'Edit the selected Bible')
         }
-        ## Delete Button ##
+        ## Delete Action ##
         self.textStrings[StringContent.Delete] = {
-            u'title': translate('BiblesPlugin', 'Delete'),
-            u'tooltip': translate('BiblesPlugin',
-                'Delete the selected Bible')
+            u'title': translate('BiblesPlugin', '&Delete'),
+            u'tooltip': translate('BiblesPlugin', 'Delete the selected Bible')
         }
-        ## Preview ##
+        ## Preview Action ##
         self.textStrings[StringContent.Preview] = {
             u'title': translate('BiblesPlugin', 'Preview'),
-            u'tooltip': translate('BiblesPlugin',
-                'Preview the selected Bible')
+            u'tooltip': translate('BiblesPlugin', 'Preview the selected Bible')
         }
-        ## Live  Button ##
+        ## Send Live Action ##
         self.textStrings[StringContent.Live] = {
             u'title': translate('BiblesPlugin', 'Live'),
             u'tooltip': translate('BiblesPlugin',
                 'Send the selected Bible live')
         }
-        ## Add to service Button ##
+        ## Add to Service Action ##
         self.textStrings[StringContent.Service] = {
             u'title': translate('BiblesPlugin', 'Service'),
             u'tooltip': translate('BiblesPlugin',
                 'Add the selected Bible to the service')
-        }
\ No newline at end of file
+        }
diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py
index b6cd81bf5..143b427fb 100644
--- a/openlp/plugins/bibles/lib/csvbible.py
+++ b/openlp/plugins/bibles/lib/csvbible.py
@@ -92,9 +92,10 @@ class CSVBible(BibleDB):
                 if book_ptr != line[0]:
                     book = self.get_book(line[0])
                     book_ptr = book.name
-                    self.wizard.incrementProgressBar(u'%s %s %s...' % (
-                        translate('BiblesPlugin.CSVImport', 'Importing'),
-                        book.name, line[1]))
+                    self.wizard.incrementProgressBar(unicode(translate(
+                        'BiblesPlugin.CSVImport', 'Importing %s %s...',
+                        'Importing <book name> <chapter>...')) %
+                        (book.name, int(line[1])))
                     self.session.commit()
                 self.create_verse(book.id, line[1], line[2],
                     unicode(line[3], details['encoding']))
@@ -109,4 +110,4 @@ class CSVBible(BibleDB):
         if self.stop_import_flag:
             return False
         else:
-            return success
\ No newline at end of file
+            return success
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 20fa9e1f6..3f5ed41e4 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -912,7 +912,7 @@ class BibleMediaItem(MediaManagerItem):
             old_chapter != chapter:
             verse_text = unicode(chapter) + verse_separator + unicode(verse)
         else:
-            verse_text = u'%s' % verse
+            verse_text = unicode(verse)
         if self.parent.settings_tab.display_style == 1:
             verse_text = u'{su}(' + verse_text + u'){/su}'
         elif self.parent.settings_tab.display_style == 2:
@@ -921,4 +921,4 @@ class BibleMediaItem(MediaManagerItem):
             verse_text = u'{su}[' + verse_text + u']{/su}'
         else:
             verse_text = u'{su}' + verse_text + u'{/su}'
-        return verse_text
\ No newline at end of file
+        return verse_text
diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py
index 41f4a2836..866652e5b 100644
--- a/openlp/plugins/bibles/lib/openlp1.py
+++ b/openlp/plugins/bibles/lib/openlp1.py
@@ -73,8 +73,8 @@ class OpenLP1Bible(BibleDB):
             abbreviation = unicode(book[3], u'cp1252')
             self.create_book(name, abbreviation, testament_id)
             # Update the progess bar.
-            self.wizard.incrementProgressBar(u'%s %s...' % (translate(
-                'BiblesPlugin.OpenLP1Import', 'Importing'), name))
+            self.wizard.incrementProgressBar(unicode(translate(
+                'BiblesPlugin.OpenLP1Import', 'Importing %s...')) % name)
             # Import the verses for this book.
             cursor.execute(u'SELECT chapter, verse, text || \'\' AS text FROM '
                 'verse WHERE book_id=%s' % book_id)
@@ -90,4 +90,4 @@ class OpenLP1Bible(BibleDB):
                 Receiver.send_message(u'openlp_process_events')
             self.session.commit()
         connection.close()
-        return True
\ No newline at end of file
+        return True
diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py
index 241efbc0e..0d02cf11f 100644
--- a/openlp/plugins/bibles/lib/opensong.py
+++ b/openlp/plugins/bibles/lib/opensong.py
@@ -84,9 +84,10 @@ class OpenSongBible(BibleDB):
                             unicode(verse.text)
                         )
                         Receiver.send_message(u'openlp_process_events')
-                    self.wizard.incrementProgressBar(u'%s %s %s...' % (
-                        translate('BiblesPlugin.Opensong', 'Importing'),
-                        db_book.name, chapter.attrib[u'n']))
+                    self.wizard.incrementProgressBar(unicode(translate(
+                        'BiblesPlugin.Opensong', 'Importing %s %s...',
+                        'Importing <book name> <chapter>...')) %
+                        (db_book.name, int(chapter.attrib[u'n'])))
                     self.session.commit()
         except IOError:
             log.exception(u'Loading bible from OpenSong file failed')
@@ -97,4 +98,4 @@ class OpenSongBible(BibleDB):
         if self.stop_import_flag:
             return False
         else:
-            return success
\ No newline at end of file
+            return success
diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py
index 5b359240f..8bf2462ac 100644
--- a/openlp/plugins/bibles/lib/osis.py
+++ b/openlp/plugins/bibles/lib/osis.py
@@ -140,9 +140,10 @@ class OSISBible(BibleDB):
                     if last_chapter != chapter:
                         if last_chapter != 0:
                             self.session.commit()
-                        self.wizard.incrementProgressBar(u'%s %s %s...' % (
-                            translate('BiblesPlugin.OsisImport', 'Importing'),
-                            self.books[match.group(1)][0], chapter))
+                        self.wizard.incrementProgressBar(unicode(translate(
+                            'BiblesPlugin.OsisImport', 'Importing %s %s...',
+                            'Importing <book name> <chapter>...')) %
+                            (self.books[match.group(1)][0], chapter))
                         last_chapter = chapter
                     # All of this rigmarol below is because the mod2osis
                     # tool from the Sword library embeds XML in the OSIS
@@ -180,4 +181,4 @@ class OSISBible(BibleDB):
         if self.stop_import_flag:
             return False
         else:
-            return success
\ No newline at end of file
+            return success
diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py
index 9580077a8..54cb38501 100644
--- a/openlp/plugins/custom/customplugin.py
+++ b/openlp/plugins/custom/customplugin.py
@@ -104,57 +104,57 @@ class CustomPlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('CustomsPlugin', 'Custom'),
-            u'plural': translate('CustomsPlugin', 'Customs')
+            u'singular': translate('CustomsPlugin', 'Custom', 'name singular'),
+            u'plural': translate('CustomsPlugin', 'Customs', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('CustomsPlugin', 'Custom')
+            u'title': translate('CustomsPlugin', 'Custom', 'container title')
         }
         # Middle Header Bar
-        ## Import Button ##
+        ## Import Action ##
         self.textStrings[StringContent.Import] = {
             u'title': translate('CustomsPlugin', 'Import'),
             u'tooltip': translate('CustomsPlugin',
                 'Import a Custom')
         }
-        ## Load Button ##
+        ## Load Action ##
         self.textStrings[StringContent.Load] = {
             u'title': translate('CustomsPlugin', 'Load'),
             u'tooltip': translate('CustomsPlugin',
                 'Load a new Custom')
         }
-        ## New Button ##
+        ## New Action ##
         self.textStrings[StringContent.New] = {
             u'title': translate('CustomsPlugin', 'Add'),
             u'tooltip': translate('CustomsPlugin',
                 'Add a new Custom')
         }
-        ## Edit Button ##
+        ## Edit Action ##
         self.textStrings[StringContent.Edit] = {
             u'title': translate('CustomsPlugin', 'Edit'),
             u'tooltip': translate('CustomsPlugin',
                 'Edit the selected Custom')
         }
-        ## Delete Button ##
+        ## Delete Action ##
         self.textStrings[StringContent.Delete] = {
             u'title': translate('CustomsPlugin', 'Delete'),
             u'tooltip': translate('CustomsPlugin',
                 'Delete the selected Custom')
         }
-        ## Preview ##
+        ## Preview Action ##
         self.textStrings[StringContent.Preview] = {
             u'title': translate('CustomsPlugin', 'Preview'),
             u'tooltip': translate('CustomsPlugin',
                 'Preview the selected Custom')
         }
-        ## Live  Button ##
+        ## Send Live Action ##
         self.textStrings[StringContent.Live] = {
             u'title': translate('CustomsPlugin', 'Live'),
             u'tooltip': translate('CustomsPlugin',
                 'Send the selected Custom live')
         }
-        ## Add to service Button ##
+        ## Add to Service Action ##
         self.textStrings[StringContent.Service] = {
             u'title': translate('CustomsPlugin', 'Service'),
             u'tooltip': translate('CustomsPlugin',
@@ -167,4 +167,4 @@ class CustomPlugin(Plugin):
         """
         log.info(u'Custom Finalising')
         self.manager.finalise()
-        Plugin.finalise(self)
\ No newline at end of file
+        Plugin.finalise(self)
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index 4bd7783ee..79b08eb8c 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -64,12 +64,12 @@ class ImagePlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('ImagePlugin', 'Image'),
-            u'plural': translate('ImagePlugin', 'Images')
+            u'singular': translate('ImagePlugin', 'Image', 'name singular'),
+            u'plural': translate('ImagePlugin', 'Images', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('ImagePlugin', 'Images')
+            u'title': translate('ImagePlugin', 'Images', 'container title')
         }
         # Middle Header Bar
         ## Load Button ##
@@ -113,4 +113,4 @@ class ImagePlugin(Plugin):
             u'title': translate('ImagePlugin', 'Service'),
             u'tooltip': translate('ImagePlugin',
                 'Add the selected Image to the service')
-        }
\ No newline at end of file
+        }
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index fabad8e8c..9be08df4b 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -109,7 +109,7 @@ class ImageMediaItem(MediaManagerItem):
             translate('ImagePlugin.MediaItem', 'Replace Live Background'),
             self.onReplaceClick, False)
         self.resetButton = self.toolbar.addToolbarButton(
-            translate('ImagePlugin.MediaItem', u'Reset Background'),
+            translate('ImagePlugin.MediaItem', 'Reset Background'),
             u':/system/system_close.png',
             translate('ImagePlugin.MediaItem', 'Reset Live Background'),
             self.onResetClick, False)
@@ -195,4 +195,4 @@ class ImageMediaItem(MediaManagerItem):
         self.resetButton.setVisible(True)
 
     def onPreviewClick(self):
-        MediaManagerItem.onPreviewClick(self)
\ No newline at end of file
+        MediaManagerItem.onPreviewClick(self)
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index e2309ea76..bf4aac918 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -60,10 +60,9 @@ class MediaMediaItem(MediaManagerItem):
 
     def retranslateUi(self):
         self.OnNewPrompt = translate('MediaPlugin.MediaItem', 'Select Media')
-        self.OnNewFileMasks = translate('MediaPlugin.MediaItem',
-            u'Videos (%s);;'
-            u'Audio (%s);;'
-            u'All files (*)' % (self.parent.video_list, self.parent.audio_list))
+        self.OnNewFileMasks = unicode(translate('MediaPlugin.MediaItem',
+            'Videos (%s);;Audio (%s);;All files (*)')) % \
+            (self.parent.video_list, self.parent.audio_list)
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
@@ -159,4 +158,4 @@ class MediaMediaItem(MediaManagerItem):
             img = QtGui.QPixmap(u':/media/media_video.png').toImage()
             item_name.setIcon(build_icon(img))
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
-            self.listView.addItem(item_name)
\ No newline at end of file
+            self.listView.addItem(item_name)
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 2f5b78b8e..920f703f2 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -93,53 +93,53 @@ class MediaPlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('MediaPlugin', 'Media'),
-            u'plural': translate('MediaPlugin', 'Media')
+            u'singular': translate('MediaPlugin', 'Media', 'name singular'),
+            u'plural': translate('MediaPlugin', 'Media', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('MediaPlugin', 'Media')
+            u'title': translate('MediaPlugin', 'Media', 'container title')
         }
         # Middle Header Bar
-        ## Load Button ##
+        ## Load Action ##
         self.textStrings[StringContent.Load] = {
             u'title': translate('MediaPlugin', 'Load'),
             u'tooltip': translate('MediaPlugin',
                 'Load a new Media')
         }
-        ## New Button ##
+        ## New Action ##
         self.textStrings[StringContent.New] = {
             u'title': translate('MediaPlugin', 'Add'),
             u'tooltip': translate('MediaPlugin',
                 'Add a new Media')
         }
-        ## Edit Button ##
+        ## Edit Action ##
         self.textStrings[StringContent.Edit] = {
             u'title': translate('MediaPlugin', 'Edit'),
             u'tooltip': translate('MediaPlugin',
                 'Edit the selected Media')
         }
-        ## Delete Button ##
+        ## Delete Action ##
         self.textStrings[StringContent.Delete] = {
             u'title': translate('MediaPlugin', 'Delete'),
             u'tooltip': translate('MediaPlugin',
                 'Delete the selected Media')
         }
-        ## Preview ##
+        ## Preview Action ##
         self.textStrings[StringContent.Preview] = {
             u'title': translate('MediaPlugin', 'Preview'),
             u'tooltip': translate('MediaPlugin',
                 'Preview the selected Media')
         }
-        ## Live  Button ##
+        ## Send Live Action ##
         self.textStrings[StringContent.Live] = {
             u'title': translate('MediaPlugin', 'Live'),
             u'tooltip': translate('MediaPlugin',
                 'Send the selected Media live')
         }
-        ## Add to service Button ##
+        ## Add to Service Action ##
         self.textStrings[StringContent.Service] = {
             u'title': translate('MediaPlugin', 'Service'),
             u'tooltip': translate('MediaPlugin',
                 'Add the selected Media to the service')
-        }
\ No newline at end of file
+        }
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 4b1067e8e..a7739fa55 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -90,8 +90,8 @@ class PresentationMediaItem(MediaManagerItem):
                     if fileType.find(type) == -1:
                         fileType += u'*.%s ' % type
                         self.parent.serviceManager.supportedSuffixes(type)
-        self.OnNewFileMasks = translate('PresentationPlugin.MediaItem',
-            'Presentations (%s)' % fileType)
+        self.OnNewFileMasks = unicode(translate('PresentationPlugin.MediaItem',
+            'Presentations (%s)')) % fileType
 
     def requiredIcons(self):
         """
@@ -293,4 +293,4 @@ class PresentationMediaItem(MediaManagerItem):
             if self.controllers[controller].enabled():
                 if filetype in self.controllers[controller].alsosupports:
                     return controller
-        return None
\ No newline at end of file
+        return None
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 9c4a64866..8afed6022 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -152,41 +152,44 @@ class PresentationPlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('PresentationPlugin', 'Presentation'),
-            u'plural': translate('PresentationPlugin', 'Presentations')
+            u'singular': translate('PresentationPlugin', 'Presentation',
+                'name singular'),
+            u'plural': translate('PresentationPlugin', 'Presentations',
+                'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('PresentationPlugin', 'Presentations')
+            u'title': translate('PresentationPlugin', 'Presentations',
+                'container title')
         }
         # Middle Header Bar
-        ## Load Button ##
+        ## Load Action ##
         self.textStrings[StringContent.Load] = {
             u'title': translate('PresentationPlugin', 'Load'),
             u'tooltip': translate('PresentationPlugin',
                 'Load a new Presentation')
         }
-        ## Delete Button ##
+        ## Delete Action ##
         self.textStrings[StringContent.Delete] = {
             u'title': translate('PresentationPlugin', 'Delete'),
             u'tooltip': translate('PresentationPlugin',
                 'Delete the selected Presentation')
         }
-        ## Preview ##
+        ## Preview Action ##
         self.textStrings[StringContent.Preview] = {
             u'title': translate('PresentationPlugin', 'Preview'),
             u'tooltip': translate('PresentationPlugin',
                 'Preview the selected Presentation')
         }
-        ## Live  Button ##
+        ## Send Live Action ##
         self.textStrings[StringContent.Live] = {
             u'title': translate('PresentationPlugin', 'Live'),
             u'tooltip': translate('PresentationPlugin',
                 'Send the selected Presentation live')
         }
-        ## Add to service Button ##
+        ## Add to Service Action ##
         self.textStrings[StringContent.Service] = {
             u'title': translate('PresentationPlugin', 'Service'),
             u'tooltip': translate('PresentationPlugin',
                 'Add the selected Presentation to the service')
-        }
\ No newline at end of file
+        }
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index 419a51a72..dbc56a61c 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -84,10 +84,10 @@ class RemotesPlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('RemotePlugin', 'Remote'),
-            u'plural': translate('RemotePlugin', 'Remotes')
+            u'singular': translate('RemotePlugin', 'Remote', 'name singular'),
+            u'plural': translate('RemotePlugin', 'Remotes', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('RemotePlugin', 'Remote')
-        }
\ No newline at end of file
+            u'title': translate('RemotePlugin', 'Remote', 'container title')
+        }
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 0fcdc6ab1..0364a4df4 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -109,7 +109,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 author_name = QtGui.QListWidgetItem(author.display_name)
             else:
                 author_name = QtGui.QListWidgetItem(
-                    u'%s %s' % (author.first_name, author.last_name))
+                    u' '.join(author.first_name, author.last_name))
             author_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(author.id))
             self.AuthorsListWidget.addItem(author_name)
         if self.AuthorsListWidget.count() == 0:
@@ -305,12 +305,13 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                             'Could not save your changes.'))
                 elif QtGui.QMessageBox.critical(self,
                     translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    translate('SongsPlugin.SongMaintenanceForm', 'The author %s'
-                    ' already exists. Would you like to make songs with author '
-                    '%s use the existing author %s?' % (author.display_name,
-                    temp_display_name, author.display_name)),
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                    QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+                    unicode(translate('SongsPlugin.SongMaintenanceForm',
+                    'The author %s already exists. Would you like to make songs'
+                    ' with author %s use the existing author %s?')) %
+                    (author.display_name, temp_display_name,
+                    author.display_name), QtGui.QMessageBox.StandardButtons(
+                    QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
+                    QtGui.QMessageBox.Yes:
                     self.mergeAuthors(author)
                     self.resetAuthors()
                     Receiver.send_message(u'songs_load_list')
@@ -346,12 +347,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                             'Could not save your changes.'))
                 elif QtGui.QMessageBox.critical(self,
                     translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    translate('SongsPlugin.SongMaintenanceForm', 'The topic %s '
-                    'already exists. Would you like to make songs with topic %s'
-                    ' use the existing topic %s?' % (topic.name, temp_name,
-                    topic.name)),
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                    QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+                    unicode(translate('SongsPlugin.SongMaintenanceForm',
+                    'The topic %s already exists. Would you like to make songs '
+                    'with topic %s use the existing topic %s?')) % (topic.name,
+                    temp_name, topic.name), QtGui.QMessageBox.StandardButtons(
+                    QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
+                    QtGui.QMessageBox.Yes:
                     self.mergeTopics(topic)
                     self.resetTopics()
                 else:
@@ -389,12 +390,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                             'Could not save your changes.'))
                 elif QtGui.QMessageBox.critical(self,
                     translate('SongsPlugin.SongMaintenanceForm', 'Error'),
-                    translate('SongsPlugin.SongMaintenanceForm', 'The book %s '
-                    'already exists. Would you like to make songs with book %s '
-                    'use the existing book %s?' % (book.name, temp_name,
-                    book.name)),
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                    QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
+                    unicode(translate('SongsPlugin.SongMaintenanceForm',
+                    'The book %s already exists. Would you like to make songs '
+                    'with book %s use the existing book %s?')) % (book.name,
+                    temp_name, book.name), QtGui.QMessageBox.StandardButtons(
+                    QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == \
+                    QtGui.QMessageBox.Yes:
                     self.mergeBooks(book)
                     self.resetBooks()
                 else:
@@ -498,4 +499,4 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             translate('SongsPlugin.SongMaintenanceForm',
                 'This book cannot be deleted, it is currently '
                 'assigned to at least one song.'),
-            translate('SongsPlugin.SongMaintenanceForm', 'No book selected!'))
\ No newline at end of file
+            translate('SongsPlugin.SongMaintenanceForm', 'No book selected!'))
diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 79a7260bb..98e4be51e 100644
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -29,6 +29,7 @@ import os
 import chardet
 import codecs
 
+from openlp.core.lib import translate
 from songimport import SongImport
 
 log = logging.getLogger(__name__)
@@ -69,8 +70,9 @@ class CCLIFileImport(SongImport):
         self.import_wizard.importProgressBar.setMaximum(song_total)
         song_count = 1
         for filename in self.filenames:
-            self.import_wizard.incrementProgressBar(
-                u'Importing song %s of %s' % (song_count, song_total))
+            self.import_wizard.incrementProgressBar(unicode(translate(
+                'SongsPlugin.CCLIFileImport', 'Importing song %d of %d')) %
+                (song_count, song_total))
             filename = unicode(filename)
             log.debug(u'Importing CCLI File: %s', filename)
             lines = []
@@ -337,4 +339,4 @@ class CCLIFileImport(SongImport):
         self.copyright = song_copyright
         self.ccli_number = song_ccli
         self.comments = song_comments
-        self.finish()
\ No newline at end of file
+        self.finish()
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 3be60dec4..6521aa5cd 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -235,7 +235,7 @@ class SongMediaItem(MediaManagerItem):
         self.listView.clear()
         for author in searchresults:
             for song in author.songs:
-                song_detail = '%s (%s)' % (author.display_name, song.title)
+                song_detail = u'%s (%s)' % (author.display_name, song.title)
                 song_name = QtGui.QListWidgetItem(song_detail)
                 song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
                 self.listView.addItem(song_name)
@@ -315,16 +315,11 @@ class SongMediaItem(MediaManagerItem):
             translate('SongsPlugin.MediaItem',
             'You must select an item to delete.')):
             items = self.listView.selectedIndexes()
-            if len(items) == 1:
-                del_message = translate('SongsPlugin.MediaItem',
-                    'Are you sure you want to delete the selected song?')
-            else:
-                del_message = unicode(translate('SongsPlugin.MediaItem',
-                    'Are you sure you want to delete the %d selected '
-                    'songs?')) % len(items)
             ans = QtGui.QMessageBox.question(self,
                 translate('SongsPlugin.MediaItem', 'Delete Song(s)?'),
-                del_message,
+                translate('SongsPlugin.MediaItem',
+                'Are you sure you want to delete the %n selected song(s)?', '',
+                QtCore.QCoreApplication.CodecForTr, len(items)),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok|
                      QtGui.QMessageBox.Cancel),
                 QtGui.QMessageBox.Ok)
@@ -457,4 +452,4 @@ class SongMediaItem(MediaManagerItem):
         """
         Locale aware collation of song titles
         """
-        return locale.strcoll(unicode(song_1.title), unicode(song_2.title))
\ No newline at end of file
+        return locale.strcoll(unicode(song_1.title), unicode(song_2.title))
diff --git a/openlp/plugins/songs/lib/olpimport.py b/openlp/plugins/songs/lib/olpimport.py
index b0175d45f..e366ddf4b 100644
--- a/openlp/plugins/songs/lib/olpimport.py
+++ b/openlp/plugins/songs/lib/olpimport.py
@@ -34,6 +34,7 @@ from sqlalchemy.orm import class_mapper, mapper, relation, scoped_session, \
     sessionmaker
 from sqlalchemy.orm.exc import UnmappedClassError
 
+from openlp.core.lib import translate
 from openlp.core.lib.db import BaseModel
 from openlp.plugins.songs.lib.db import Author, Book, Song, Topic #, MediaFile
 from songimport import SongImport
@@ -148,8 +149,9 @@ class OpenLPSongImport(SongImport):
         self.import_wizard.importProgressBar.setMaximum(song_total)
         song_count = 1
         for song in source_songs:
-            self.import_wizard.incrementProgressBar(
-                u'Importing song %s of %s' % (song_count, song_total))
+            self.import_wizard.incrementProgressBar(unicode(translate(
+                'SongsPlugin.OpenLPSongImport', 'Importing song %d of %d.')) %
+                (song_count, song_total))
             new_song = Song()
             new_song.title = song.title
             if has_media_files and hasattr(song, 'alternate_title'):
@@ -220,4 +222,4 @@ class OpenLPSongImport(SongImport):
             if self.stop_import_flag:
                 return False
         engine.dispose()
-        return True
\ No newline at end of file
+        return True
diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index 29884b80c..a69aa0bc1 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -126,17 +126,17 @@ class SongBeamerImport(SongImport):
                         if verse_start:
                             verse_start = False
                             if not self.check_verse_marks(line):
-                                self.current_verse = u'%s\n' % line
+                                self.current_verse = line + u'\n'
                         else:
-                            self.current_verse += u'%s\n' % line
+                            self.current_verse += line + u'\n'
                 if self.current_verse:
                     self.replace_html_tags()
                     self.add_verse(self.current_verse, self.current_verse_type)
                 if self.check_complete():
                     self.finish()
-                self.import_wizard.incrementProgressBar(u'%s %s...' %
-                    (translate('SongsPlugin.SongBeamerImport', 'Importing'),
-                    self.file_name))
+                self.import_wizard.incrementProgressBar(unicode(translate(
+                    'SongsPlugin.SongBeamerImport', 'Importing %s...')) %
+                    self.file_name)
             return True
 
     def replace_html_tags(self):
@@ -252,7 +252,7 @@ class SongBeamerImport(SongImport):
         elif tag_val[0] == u'#TextAlign':
             pass
         elif tag_val[0] == u'#Title':
-            self.title = u'%s' % tag_val[1]
+            self.title = unicode(tag_val[1])
         elif tag_val[0] == u'#TitleAlign':
             pass
         elif tag_val[0] == u'#TitleFontSize':
@@ -292,4 +292,4 @@ class SongBeamerImport(SongImport):
                     self.current_verse_type += marks[1]
             return True
         else:
-            return False
\ No newline at end of file
+            return False
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index a44188c87..545497acb 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -213,45 +213,45 @@ class SongsPlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('SongsPlugin', 'Song'),
-            u'plural': translate('SongsPlugin', 'Songs')
+            u'singular': translate('SongsPlugin', 'Song', 'name singular'),
+            u'plural': translate('SongsPlugin', 'Songs', 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('SongsPlugin', 'Songs')
+            u'title': translate('SongsPlugin', 'Songs', 'container title')
         }
         # Middle Header Bar
-        ## New Button ##
+        ## New Action ##
         self.textStrings[StringContent.New] = {
             u'title': translate('SongsPlugin', 'Add'),
             u'tooltip': translate('SongsPlugin',
                 'Add a new Song')
         }
-        ## Edit Button ##
+        ## Edit Action ##
         self.textStrings[StringContent.Edit] = {
             u'title': translate('SongsPlugin', 'Edit'),
             u'tooltip': translate('SongsPlugin',
                 'Edit the selected Song')
         }
-        ## Delete Button ##
+        ## Delete Action ##
         self.textStrings[StringContent.Delete] = {
             u'title': translate('SongsPlugin', 'Delete'),
             u'tooltip': translate('SongsPlugin',
                 'Delete the selected Song')
         }
-        ## Preview ##
+        ## Preview Action ##
         self.textStrings[StringContent.Preview] = {
             u'title': translate('SongsPlugin', 'Preview'),
             u'tooltip': translate('SongsPlugin',
                 'Preview the selected Song')
         }
-        ## Live  Button ##
+        ## Send Live Action ##
         self.textStrings[StringContent.Live] = {
             u'title': translate('SongsPlugin', 'Live'),
             u'tooltip': translate('SongsPlugin',
                 'Send the selected Song live')
         }
-        ## Add to service Button ##
+        ## Add to Service Action ##
         self.textStrings[StringContent.Service] = {
             u'title': translate('SongsPlugin', 'Service'),
             u'tooltip': translate('SongsPlugin',
@@ -265,4 +265,4 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Finalising')
         self.manager.finalise()
         self.toolsReindexItem.setVisible(False)
-        Plugin.finalise(self)
\ No newline at end of file
+        Plugin.finalise(self)
diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py
index c9c357a84..8588ddcff 100644
--- a/openlp/plugins/songusage/forms/songusagedetailform.py
+++ b/openlp/plugins/songusage/forms/songusagedetailform.py
@@ -73,7 +73,8 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
 
     def accept(self):
         log.debug(u'Detailed report generated')
-        filename = u'usage_detail_%s_%s.txt' % (
+        filename = unicode(translate('SongUsagePlugin.SongUsageDetailForm',
+            'usage_detail_%s_%s.txt')) % (
             self.fromDate.selectedDate().toString(u'ddMMyyyy'),
             self.toDate.selectedDate().toString(u'ddMMyyyy'))
         usage = self.plugin.manager.get_all_objects(
@@ -95,4 +96,4 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
         finally:
             if file:
                 file.close()
-        self.close()
\ No newline at end of file
+        self.close()
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 4a95b00f7..ec37dc65e 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -175,10 +175,13 @@ class SongUsagePlugin(Plugin):
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('SongUsagePlugin', 'SongUsage'),
-            u'plural': translate('SongUsagePlugin', 'SongUsage')
+            u'singular': translate('SongUsagePlugin', 'SongUsage',
+                'name singular'),
+            u'plural': translate('SongUsagePlugin', 'SongUsage',
+                'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('SongUsagePlugin', 'SongUsage')
-        }
\ No newline at end of file
+            u'title': translate('SongUsagePlugin', 'SongUsage',
+                'container title')
+        }