Fixed some wrong translate context and some indentation errors

openlp/core/lib/toolbar.py

@@ -120,7 +120,7 @@ class OpenLPToolbar(QtGui.QToolBar):
         try:
             if self.icons[title]:
                 return self.icons[title]
-        except NameError:
+        except KeyError:
             log.exception(u'getIconFromTitle - no icon for %s' % title)
             return QtGui.QIcon()
 

openlp/core/ui/servicemanager.py

@@ -115,19 +115,19 @@ class ServiceManager(QtGui.QWidget):
         self.Toolbar = OpenLPToolbar(self)
         self.Toolbar.addToolbarButton(
             translate(u'ServiceManager', u'New Service'),
-                u':/general/general_new.png',
+            u':/general/general_new.png',
             translate(u'ServiceManager', u'Create a new service'),
-                self.onNewService)
+            self.onNewService)
         self.Toolbar.addToolbarButton(
             translate(u'ServiceManager', u'Open Service'),
-                u':/general/general_open.png',
+            u':/general/general_open.png',
             translate(u'ServiceManager', u'Load an existing service'),
-                self.onLoadService)
+            self.onLoadService)
         self.Toolbar.addToolbarButton(
             translate(u'ServiceManager', u'Save Service'),
-                u':/general/general_save.png',
+            u':/general/general_save.png',
             translate(u'ServiceManager', u'Save this service'),
-                self.onSaveService)
+            self.onSaveService)
         self.Toolbar.addSeparator()
         self.ThemeLabel = QtGui.QLabel(translate(u'ServiceManager', u'Theme:'),
             self)
@@ -168,28 +168,28 @@ class ServiceManager(QtGui.QWidget):
         self.OrderToolbar = OpenLPToolbar(self)
         self.OrderToolbar.addToolbarButton(
             translate(u'ServiceManager', u'Move to &top'),
-                u':/services/service_top.png',
+            u':/services/service_top.png',
             translate(u'ServiceManager', u'Move to top'), self.onServiceTop)
         self.OrderToolbar.addToolbarButton(
             translate(u'ServiceManager', u'Move &up'),
-                u':/services/service_up.png',
+            u':/services/service_up.png',
             translate(u'ServiceManager', u'Move up order'), self.onServiceUp)
         self.OrderToolbar.addToolbarButton(
             translate(u'ServiceManager', u'Move &down'),
-                u':/services/service_down.png',
+            u':/services/service_down.png',
             translate(u'ServiceManager', u'Move down order'),
-                self.onServiceDown)
+            self.onServiceDown)
         self.OrderToolbar.addToolbarButton(
             translate(u'ServiceManager', u'Move to &bottom'),
-                u':/services/service_bottom.png',
+            u':/services/service_bottom.png',
             translate(u'ServiceManager', u'Move to end'),
-                self.onServiceEnd)
+            self.onServiceEnd)
         self.OrderToolbar.addSeparator()
         self.OrderToolbar.addToolbarButton(
             translate(u'ServiceManager', u'&Delete From Service'),
-                u':/general/general_delete.png',
+            u':/general/general_delete.png',
             translate(u'ServiceManager', u'Delete From Service'),
-                self.onDeleteFromService)
+            self.onDeleteFromService)
         self.Layout.addWidget(self.OrderToolbar)
         # Connect up our signals and slots
         QtCore.QObject.connect(self.ThemeComboBox,

openlp/core/ui/slidecontroller.py

@@ -179,34 +179,34 @@ class SlideController(QtGui.QWidget):
             self.Toolbar.addToolbarButton(
                 u'First Slide', u':/slides/slide_first.png',
                 translate(u'SlideController', u'Move to first'),
-                    self.onSlideSelectedFirst)
+                self.onSlideSelectedFirst)
         self.Toolbar.addToolbarButton(
             u'Previous Slide', u':/slides/slide_previous.png',
             translate(u'SlideController', u'Move to previous'),
-                self.onSlideSelectedPrevious)
+            self.onSlideSelectedPrevious)
         self.Toolbar.addToolbarButton(
             u'Next Slide', u':/slides/slide_next.png',
             translate(u'SlideController', u'Move to next'),
-                self.onSlideSelectedNext)
+            self.onSlideSelectedNext)
         if self.isLive:
             self.Toolbar.addToolbarButton(
                 u'Last Slide', u':/slides/slide_last.png',
                 translate(u'SlideController', u'Move to last'),
-                    self.onSlideSelectedLast)
+                self.onSlideSelectedLast)
         if self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.blankButton = self.Toolbar.addToolbarButton(
                 u'Blank Screen', u':/slides/slide_blank.png',
                 translate(u'SlideController', u'Blank Screen'),
-                    self.onBlankDisplay, True)
+                self.onBlankDisplay, True)
             self.themeButton = self.Toolbar.addToolbarButton(
                 u'Display Theme', u':/slides/slide_theme.png',
                 translate(u'SlideController', u'Theme Screen'),
-                    self.onThemeDisplay, True)
+                self.onThemeDisplay, True)
             self.hideButton = self.Toolbar.addToolbarButton(
                 u'Hide screen', u':/slides/slide_desktop.png',
                 translate(u'SlideController', u'Hide Screen'),
-                    self.onHideDisplay, True)
+                self.onHideDisplay, True)
         if not self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
@@ -216,17 +216,17 @@ class SlideController(QtGui.QWidget):
             self.Toolbar.addToolbarButton(
                 u'Edit Song', u':/general/general_edit.png',
                 translate(u'SlideController', u'Edit and re-preview Song'),
-                    self.onEditSong)
+                self.onEditSong)
         if isLive:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')
             self.Toolbar.addToolbarButton(
                 u'Start Loop', u':/media/media_time.png',
                 translate(u'SlideController', u'Start continuous loop'),
-                    self.onStartLoop)
+                self.onStartLoop)
             self.Toolbar.addToolbarButton(
                 u'Stop Loop', u':/media/media_stop.png',
                 translate(u'SlideController', u'Stop continuous loop'),
-                    self.onStopLoop)
+                self.onStopLoop)
             self.DelaySpinBox = QtGui.QSpinBox()
             self.DelaySpinBox.setMinimum(1)
             self.DelaySpinBox.setMaximum(180)
@@ -242,28 +242,28 @@ class SlideController(QtGui.QWidget):
         self.Mediabar.addToolbarButton(
             u'Media Start', u':/slides/media_playback_start.png',
             translate(u'SlideController', u'Start playing media'),
-                self.onMediaPlay)
+            self.onMediaPlay)
         self.Mediabar.addToolbarButton(
             u'Media Pause', u':/slides/media_playback_pause.png',
             translate(u'SlideController', u'Start playing media'),
-                self.onMediaPause)
+            self.onMediaPause)
         self.Mediabar.addToolbarButton(
             u'Media Stop', u':/slides/media_playback_stop.png',
             translate(u'SlideController', u'Start playing media'),
-                self.onMediaStop)
+            self.onMediaStop)
         if self.isLive:
             self.blankButton = self.Mediabar.addToolbarButton(
                 u'Blank Screen', u':/slides/slide_blank.png',
                 translate(u'SlideController', u'Blank Screen'),
-                    self.onBlankDisplay, True)
+                self.onBlankDisplay, True)
             self.themeButton = self.Mediabar.addToolbarButton(
                 u'Display Theme', u':/slides/slide_theme.png',
                 translate(u'SlideController', u'Theme Screen'),
-                    self.onThemeDisplay, True)
+                self.onThemeDisplay, True)
             self.hideButton = self.Mediabar.addToolbarButton(
                 u'Hide screen', u':/slides/slide_desktop.png',
                 translate(u'SlideController', u'Hide Screen'),
-                    self.onHideDisplay, True)
+                self.onHideDisplay, True)
         if not self.isLive:
             self.seekSlider = Phonon.SeekSlider()
             self.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
@@ -564,7 +564,7 @@ class SlideController(QtGui.QWidget):
                         self.slideList[tag1] = framenumber
                         self.SongMenu.menu().addAction(
                             translate(u'SlideController', u'%s'%tag1),
-                                self.onSongBarHandler)
+                            self.onSongBarHandler)
                 item.setText(frame[u'text'])
             else:
                 label = QtGui.QLabel()

openlp/core/ui/thememanager.py

@@ -58,20 +58,20 @@ class ThemeManager(QtGui.QWidget):
             translate(u'ThemeManager', u'Create a new theme'), self.onAddTheme)
         self.Toolbar.addToolbarButton(
             translate(u'ThemeManager', u'Edit Theme'),
-                u':/themes/theme_edit.png',
+            u':/themes/theme_edit.png',
             translate(u'ThemeManager', u'Edit a theme'), self.onEditTheme)
         self.Toolbar.addToolbarButton(
             translate(u'ThemeManager', u'Delete Theme'),
-                u':/general/general_delete.png',
+            u':/general/general_delete.png',
             translate(u'ThemeManager', u'Delete a theme'), self.onDeleteTheme)
         self.Toolbar.addSeparator()
         self.Toolbar.addToolbarButton(
             translate(u'ThemeManager', u'Import Theme'), 
-                u':/general/general_import.png',
+            u':/general/general_import.png',
             translate(u'ThemeManager', u'Import a theme'), self.onImportTheme)
         self.Toolbar.addToolbarButton(
             translate(u'ThemeManager', u'Export Theme'),
-                u':/general/general_export.png',
+            u':/general/general_export.png',
             translate(u'ThemeManager', u'Export a theme'), self.onExportTheme)
         self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
         self.Layout.addWidget(self.Toolbar)
@@ -192,9 +192,9 @@ class ThemeManager(QtGui.QWidget):
                 for plugin in self.parent.plugin_manager.plugins:
                     if not plugin.can_delete_theme(theme):
                         QtGui.QMessageBox.critical(self, 
-                                translate(u'ThemeManager', u'Error'),
+                            translate(u'ThemeManager', u'Error'),
                             translate(u'ThemeManager',  
-                            u'Theme %s is use in %s plugin' % (theme,
+                                u'Theme %s is use in %s plugin' % (theme,
                             plugin.name)))
                         return
                 if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme:

openlp/plugins/alerts/alertsplugin.py

@@ -64,9 +64,9 @@ class alertsPlugin(Plugin):
         self.toolsAlertItem.setIcon(AlertIcon)
         self.toolsAlertItem.setObjectName(u'toolsAlertItem')
         self.toolsAlertItem.setText(
-            translate('AlertsPlugin.AlertsPlugin', u'&Alert'))
+            translate(u'AlertsPlugin.AlertsPlugin', u'&Alert'))
         self.toolsAlertItem.setStatusTip(
-            translate('AlertsPlugin.AlertsPlugin', u'Show an alert message'))
+            translate(u'AlertsPlugin.AlertsPlugin', u'Show an alert message'))
         self.toolsAlertItem.setShortcut(u'F7')
         self.service_manager.parent.ToolsMenu.addAction(self.toolsAlertItem)
         QtCore.QObject.connect(self.toolsAlertItem,
@@ -94,7 +94,7 @@ class alertsPlugin(Plugin):
         self.alertForm.exec_()
 
     def about(self):
-        about_text = translate('AlertsPlugin.AlertsPlugin', 
+        about_text = translate(u'AlertsPlugin.AlertsPlugin', 
             u'<b>Alerts Plugin</b><br>This plugin '
-            'controls the displaying of alerts on the presentations screen')
+            u'controls the displaying of alerts on the presentations screen')
         return about_text

openlp/plugins/bibles/forms/bibleimportwizard.py

@@ -313,17 +313,17 @@ class Ui_BibleImportWizard(object):
         self.TitleLabel.setText(
             u'<span style="font-size:14pt; font-weight:600;">%s</span>' % \
             translate(u'BiblesPlugin.ImportWizardForm', 
-            u'Welcome to the Bible Import Wizard'))
+                u'Welcome to the Bible Import Wizard'))
         self.InformationLabel.setText(
             translate(u'BiblesPlugin.ImportWizardForm', 
-            u'This wizard will help you to import Bibles from a '
+                u'This wizard will help you to import Bibles from a '
-            u'variety of formats. Click the next button below to start the '
+                u'variety of formats. Click the next button below to start the '
-            u'process by selecting a format to import from.'))
+                u'process by selecting a format to import from.'))
         self.SelectPage.setTitle(translate(u'BiblesPlugin.ImportWizardForm', 
             u'Select Import Source'))
         self.SelectPage.setSubTitle(
             translate(u'BiblesPlugin.ImportWizardForm', 
-            u'Select the import format, and where to import from.'))
+                u'Select the import format, and where to import from.'))
         self.FormatLabel.setText(
             translate(u'BiblesPlugin.ImportWizardForm', u'Format:'))
         self.FormatComboBox.setItemText(0, 
@@ -362,12 +362,12 @@ class Ui_BibleImportWizard(object):
         self.WebDownloadTabWidget.setTabText(
             self.WebDownloadTabWidget.indexOf(self.ProxyServerTab),
             translate(u'BiblesPlugin.ImportWizardForm', 
-            u'Proxy Server (Optional)'))
+                u'Proxy Server (Optional)'))
         self.LicenseDetailsPage.setTitle(
             translate(u'BiblesPlugin.ImportWizardForm', u'License Details'))
         self.LicenseDetailsPage.setSubTitle(
             translate(u'BiblesPlugin.ImportWizardForm', 
-            u'Set up the Bible\'s license details.'))
+                u'Set up the Bible\'s license details.'))
         self.VersionNameLabel.setText(
             translate(u'BiblesPlugin.ImportWizardForm', u'Version Name:'))
         self.CopyrightLabel.setText(
@@ -378,7 +378,7 @@ class Ui_BibleImportWizard(object):
             translate(u'BiblesPlugin.ImportWizardForm', u'Importing'))
         self.ImportPage.setSubTitle(
             translate(u'BiblesPlugin.ImportWizardForm',
-            u'Please wait while your Bible is imported.'))
+                u'Please wait while your Bible is imported.'))
         self.ImportProgressLabel.setText(
             translate(u'BiblesPlugin.ImportWizardForm', u'Ready.'))
         self.ImportProgressBar.setFormat(u'%p%')

openlp/plugins/bibles/forms/importwizardform.py

@@ -123,26 +123,32 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             if self.field(u'source_format').toInt()[0] == BibleFormat.OSIS:
                 if self.field(u'osis_location').toString() == u'':
                     QtGui.QMessageBox.critical(self,
-                        translate(u'BiblesPlugin.ImportWizardForm', u'Invalid Bible Location'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
-                        translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a file to import your '
+                            u'Invalid Bible Location'),
-                            'Bible from.'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
+                            u'You need to specify a file to import your '
+                            u'Bible from.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.OSISLocationEdit.setFocus()
                     return False
             elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV:
                 if self.field(u'csv_booksfile').toString() == u'':
                     QtGui.QMessageBox.critical(self,
-                        translate(u'BiblesPlugin.ImportWizardForm', u'Invalid Books File'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
-                        translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a file with books of '
+                            u'Invalid Books File'),
-                            'the Bible to use in the import.'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
+                            u'You need to specify a file with books of '
+                            u'the Bible to use in the import.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.BooksLocationEdit.setFocus()
                     return False
                 elif self.field(u'csv_versefile').toString() == u'':
                     QtGui.QMessageBox.critical(self,
-                        translate(u'BiblesPlugin.ImportWizardForm', u'Invalid Verse File'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
-                        translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a file of Bible '
+                            u'Invalid Verse File'),
-                            'verses to import.'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
+                            u'You need to specify a file of Bible '
+                            u'verses to import.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.CsvVerseLocationEdit.setFocus()
                     return False
@@ -150,9 +156,11 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                 BibleFormat.OpenSong:
                 if self.field(u'opensong_file').toString() == u'':
                     QtGui.QMessageBox.critical(self,
-                        translate(u'BiblesPlugin.ImportWizardForm', u'Invalid OpenSong Bible'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
-                        translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify an OpenSong Bible '
+                            u'Invalid OpenSong Bible'),
-                            'file to import.'),
+                        translate(u'BiblesPlugin.ImportWizardForm', 
+                            u'You need to specify an OpenSong Bible '
+                            u'file to import.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                     self.OpenSongFileEdit.setFocus()
                     return False
@@ -164,26 +172,32 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                 self.field(u'license_copyright'))
             if license_version == u'':
                 QtGui.QMessageBox.critical(self,
-                    translate(u'BiblesPlugin.ImportWizardForm', u'Empty Version Name'),
+                    translate(u'BiblesPlugin.ImportWizardForm', 
-                    translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a version name for your '
+                        u'Empty Version Name'),
-                        'Bible.'),
+                    translate(u'BiblesPlugin.ImportWizardForm', 
+                        u'You need to specify a version name for your '
+                        u'Bible.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 self.VersionNameEdit.setFocus()
                 return False
             elif license_copyright == u'':
                 QtGui.QMessageBox.critical(self,
-                    translate(u'BiblesPlugin.ImportWizardForm', u'Empty Copyright'),
+                    translate(u'BiblesPlugin.ImportWizardForm', 
-                    translate(u'BiblesPlugin.ImportWizardForm', u'You need to set a copyright for your Bible! '
+                        u'Empty Copyright'),
-                        'Bibles in the Public Domain need to be marked as '
+                    translate(u'BiblesPlugin.ImportWizardForm', 
-                        'such.'),
+                        u'You need to set a copyright for your Bible! '
+                        u'Bibles in the Public Domain need to be marked as '
+                        u'such.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 self.CopyrightEdit.setFocus()
                 return False
             elif self.manager.exists(license_version):
                 QtGui.QMessageBox.critical(self,
-                    translate(u'BiblesPlugin.ImportWizardForm', u'Bible Exists'),
+                    translate(u'BiblesPlugin.ImportWizardForm', 
-                    translate(u'BiblesPlugin.ImportWizardForm', u'This Bible already exists! Please import '
+                        u'Bible Exists'),
-                        'a different Bible or first delete the existing one.'),
+                    translate(u'BiblesPlugin.ImportWizardForm', 
+                        u'This Bible already exists! Please import '
+                        u'a different Bible or first delete the existing one.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
                 self.VersionNameEdit.setFocus()
                 return False
@@ -227,7 +241,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         """
         self.getFileName(
             translate(u'BiblesPlugin.ImportWizardForm', 
-            u'Open Verses CSV File'),
+                u'Open Verses CSV File'),
             self.CsvVerseLocationEdit)
 
     def onOpenSongBrowseButtonClicked(self):
@@ -431,11 +445,11 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             self.manager.reload_bibles()
             self.ImportProgressLabel.setText(
                 translate(u'BiblesPlugin.ImportWizardForm',
-                u'Finished import.'))
+                    u'Finished import.'))
         else:
             self.ImportProgressLabel.setText(
                 translate(u'BiblesPlugin.ImportWizardForm',
-                u'Your Bible import failed.'))
+                    u'Your Bible import failed.'))
             importer.delete()
 
     def postImport(self):

openlp/plugins/bibles/lib/mediaitem.py

@@ -71,7 +71,7 @@ class BibleMediaItem(MediaManagerItem):
         return unicode(obj)
 
     def initPluginNameVisible(self):
-        self.PluginNameVisible = translate(u'BiblesPlugin,MediaItem', u'Bible')
+        self.PluginNameVisible = translate(u'BiblesPlugin.MediaItem', u'Bible')
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
@@ -147,7 +147,8 @@ class BibleMediaItem(MediaManagerItem):
         self.QuickMessage = QtGui.QLabel(self.QuickTab)
         self.QuickMessage.setObjectName(u'QuickMessage')
         self.QuickLayout.addWidget(self.QuickMessage, 6, 0, 1, 3)
-        self.SearchTabWidget.addTab(self.QuickTab, translate(u'BiblesPlugin,MediaItem', u'Quick'))
+        self.SearchTabWidget.addTab(self.QuickTab, 
+            translate(u'BiblesPlugin.MediaItem', u'Quick'))
         QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum,
             QtGui.QSizePolicy.Expanding)
         self.QuickLayout.addItem(QuickSpacerItem, 6, 2, 1, 1)
@@ -231,7 +232,8 @@ class BibleMediaItem(MediaManagerItem):
         self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab)
         self.AdvancedMessage.setObjectName(u'AdvancedMessage')
         self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3)
-        self.SearchTabWidget.addTab(self.AdvancedTab, translate(u'BiblesPlugin,MediaItem', u'Advanced'))
+        self.SearchTabWidget.addTab(self.AdvancedTab, 
+            translate(u'BiblesPlugin.MediaItem', u'Advanced'))
         # Add the search tab widget to the page layout
         self.PageLayout.addWidget(self.SearchTabWidget)
         # Combo Boxes
@@ -289,27 +291,48 @@ class BibleMediaItem(MediaManagerItem):
 
     def retranslateUi(self):
         log.debug(u'retranslateUi')
-        self.QuickVersionLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Version:'))
+        self.QuickVersionLabel.setText(
-        self.QuickSecondVersionLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Dual:'))
+            translate(u'BiblesPlugin.MediaItem', u'Version:'))
-        self.QuickSearchLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Search Type:'))
+        self.QuickSecondVersionLabel.setText(
-        self.QuickSearchLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Find:'))
+            translate(u'BiblesPlugin.MediaItem', u'Dual:'))
-        self.QuickSearchButton.setText(translate(u'BiblesPlugin,MediaItem', u'Search'))
+        self.QuickSearchLabel.setText(
-        self.QuickClearLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Results:'))
+            translate(u'BiblesPlugin.MediaItem', u'Search Type:'))
-        self.AdvancedVersionLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Version:'))
+        self.QuickSearchLabel.setText(
-        self.AdvancedSecondBibleLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Dual:'))
+            translate(u'BiblesPlugin.MediaItem', u'Find:'))
-        self.AdvancedBookLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Book:'))
+        self.QuickSearchButton.setText(
-        self.AdvancedChapterLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Chapter:'))
+            translate(u'BiblesPlugin.MediaItem', u'Search'))
-        self.AdvancedVerseLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Verse:'))
+        self.QuickClearLabel.setText(
-        self.AdvancedFromLabel.setText(translate(u'BiblesPlugin,MediaItem', u'From:'))
+            translate(u'BiblesPlugin.MediaItem', u'Results:'))
-        self.AdvancedToLabel.setText(translate(u'BiblesPlugin,MediaItem', u'To:'))
+        self.AdvancedVersionLabel.setText(
-        self.AdvancedClearLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Results:'))
+            translate(u'BiblesPlugin.MediaItem', u'Version:'))
-        self.AdvancedSearchButton.setText(translate(u'BiblesPlugin,MediaItem', u'Search'))
+        self.AdvancedSecondBibleLabel.setText(
-        self.QuickSearchComboBox.addItem(translate(u'BiblesPlugin,MediaItem', u'Verse Search'))
+            translate(u'BiblesPlugin.MediaItem', u'Dual:'))
-        self.QuickSearchComboBox.addItem(translate(u'BiblesPlugin,MediaItem', u'Text Search'))
+        self.AdvancedBookLabel.setText(
-        self.ClearQuickSearchComboBox.addItem(translate(u'BiblesPlugin,MediaItem', u'Clear'))
+            translate(u'BiblesPlugin.MediaItem', u'Book:'))
-        self.ClearQuickSearchComboBox.addItem(translate(u'BiblesPlugin,MediaItem', u'Keep'))
+        self.AdvancedChapterLabel.setText(
-        self.ClearAdvancedSearchComboBox.addItem(translate(u'BiblesPlugin,MediaItem', u'Clear'))
+            translate(u'BiblesPlugin.MediaItem', u'Chapter:'))
-        self.ClearAdvancedSearchComboBox.addItem(translate(u'BiblesPlugin,MediaItem', u'Keep'))
+        self.AdvancedVerseLabel.setText(
+            translate(u'BiblesPlugin.MediaItem', u'Verse:'))
+        self.AdvancedFromLabel.setText(
+            translate(u'BiblesPlugin.MediaItem', u'From:'))
+        self.AdvancedToLabel.setText(
+            translate(u'BiblesPlugin.MediaItem', u'To:'))
+        self.AdvancedClearLabel.setText(
+            translate(u'BiblesPlugin.MediaItem', u'Results:'))
+        self.AdvancedSearchButton.setText(
+            translate(u'BiblesPlugin.MediaItem', u'Search'))
+        self.QuickSearchComboBox.addItem(
+            translate(u'BiblesPlugin.MediaItem', u'Verse Search'))
+        self.QuickSearchComboBox.addItem(
+            translate(u'BiblesPlugin.MediaItem', u'Text Search'))
+        self.ClearQuickSearchComboBox.addItem(
+            translate(u'BiblesPlugin.MediaItem', u'Clear'))
+        self.ClearQuickSearchComboBox.addItem(
+            translate(u'BiblesPlugin.MediaItem', u'Keep'))
+        self.ClearAdvancedSearchComboBox.addItem(
+            translate(u'BiblesPlugin.MediaItem', u'Clear'))
+        self.ClearAdvancedSearchComboBox.addItem(
+            translate(u'BiblesPlugin.MediaItem', u'Keep'))
 
     def initialise(self):
         log.debug(u'bible manager initialise')
@@ -363,8 +386,9 @@ class BibleMediaItem(MediaManagerItem):
 
     def onNoBookFound(self):
         QtGui.QMessageBox.critical(self,
-            translate(u'BiblesPlugin,MediaItem', u'No Book Found'),
+            translate(u'BiblesPlugin.MediaItem', u'No Book Found'),
-            translate(u'BiblesPlugin,MediaItem', u'No matching book could be found in this Bible.'),
+            translate(u'BiblesPlugin.MediaItem', 
+                u'No matching book could be found in this Bible.'),
             QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
             QtGui.QMessageBox.Ok
         )
@@ -532,9 +556,11 @@ class BibleMediaItem(MediaManagerItem):
                     bible_text = u''
             if not service_item.title:
                 service_item.title = u'%s %s' % (book, verse_text)
-            elif service_item.title.find(translate('MediaItem',u'etc')) == -1:
+            elif service_item.title.find(
+                translate(u'BiblesPlugin.MediaItem', u'etc')) == -1:
                 service_item.title = u'%s, %s' \
-                    % (service_item.title, translate('MediaItem',u'etc'))
+                    % (service_item.title, 
+                       translate(u'BiblesPlugin.MediaItem', u'etc'))
         if  len(self.parent.settings_tab.bible_theme) == 0:
             service_item.theme = None
         else:
@@ -583,7 +609,8 @@ class BibleMediaItem(MediaManagerItem):
         self.verses = self.parent.manager.get_verse_count(bible, book, 1)
         if self.verses == 0:
             self.AdvancedSearchButton.setEnabled(False)
-            self.AdvancedMessage.setText(translate(u'BiblesPlugin,MediaItem', u'Bible not fully loaded'))
+            self.AdvancedMessage.setText(
+                translate(u'BiblesPlugin.MediaItem', u'Bible not fully loaded'))
         else:
             self.AdvancedSearchButton.setEnabled(True)
             self.AdvancedMessage.setText(u'')

openlp/plugins/images/lib/mediaitem.py

@@ -59,10 +59,14 @@ class ImageMediaItem(MediaManagerItem):
         self.PluginNameVisible = translate(u'ImagePlugin.MediaItem', u'Image')
 
     def retranslateUi(self):
-        self.OnNewPrompt = translate(u'ImagePlugin.MediaItem',
+        self.OnNewPrompt = translate(u'ImagePlugin.MediaItem', 
             u'Select Image(s)')
-        self.OnNewFileMasks = translate(u'ImagePlugin.MediaItem',
+        file_formats = u''
-            u'Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)')
+        for file_format in QtGui.QImageReader.supportedImageFormats():
+            file_formats += u'*.%s ' % file_format
+        self.OnNewFileMasks = unicode(
+            translate(u'ImagePlugin.MediaItem', 
+                u'Images (%s);; All files (*)')) % file_formats
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)

openlp/plugins/songs/forms/editsongdialog.py

@@ -471,7 +471,7 @@ class Ui_EditSongDialog(object):
         self.CopyrightGroupBox.setTitle(
             translate(u'SongsPlugin.EditSongForm', u'Copyright Information'))
         self.CopyrightInsertButton.setText(
-            translate('EditSongForm', u'\xa9'))
+            translate(u'SongsPlugin.EditSongForm', u'\xa9'))
         self.CCLILabel.setText(
             translate(u'SongsPlugin.EditSongForm', u'CCLI Number:'))
         self.CommentsGroupBox.setTitle(

openlp/plugins/songs/forms/editsongform.py

@@ -485,8 +485,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                     self.VerseOrderEdit.setFocus()
                     return False, \
                         translate(u'SongsPlugin.EditSongForm', 
-                        u'Invalid verse entry, values must be I,B,T,P,E,O,V,C '
+                            u'Invalid verse entry, values must be I,B,T,P,E,O,V,C '
-                        u'followed by a number')
+                            u'followed by a number')
         return True, u''
 
     def onTitleEditItemLostFocus(self):

openlp/plugins/songs/forms/editverseform.py

@@ -103,8 +103,10 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
         if match:
             verse_type = match.group(1)
             verse_number = int(match.group(2))
-            self.VerseTypeComboBox.setCurrentIndex(VerseType.from_string(verse_type))
+            verse_type_index = VerseType.from_string(verse_type)
-            self.VerseNumberBox.setValue(verse_number)
+            if verse_type_index:
+                self.VerseTypeComboBox.setCurrentIndex(verse_type_index)
+                self.VerseNumberBox.setValue(verse_number)
 
     def setVerse(self, text, single=False,
         tag=u'%s:1' % VerseType.to_string(VerseType.Verse)):

openlp/plugins/songs/forms/topicsform.py

@@ -51,7 +51,7 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
             QtGui.QMessageBox.critical(
                 self, translate(u'SongsPlugin.TopicsForm', u'Error'),
                 translate(u'SongsPlugin.TopicsForm',
-                u'You need to type in a topic name!'),
+                    u'You need to type in a topic name!'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             self.NameEdit.setFocus()
             return False

openlp/plugins/songs/lib/mediaitem.py

@@ -208,8 +208,8 @@ class SongMediaItem(MediaManagerItem):
         for author in searchresults:
             for song in author.songs:
                 song_detail = unicode(
-                    translate(u'SongsPlugin.MediaItem', u'%s (%s)') %
+                    translate(u'SongsPlugin.MediaItem', u'%s (%s)')) % \
-                    (author.display_name, song.title))
+                    (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)

openlp/plugins/songusage/forms/songusagedetaildialog.py

@@ -89,7 +89,7 @@ class Ui_SongUsageDetailDialog(object):
     def retranslateUi(self, SongUsageDetailDialog):
         SongUsageDetailDialog.setWindowTitle(
             translate(u'SongsPlugin.AuditDetailDialog',
-            u'Song Usage Extraction'))
+                u'Song Usage Extraction'))
         self.DateRangeGroupBox.setTitle(
             translate(u'SongsPlugin.AuditDetailDialog', u'Select Date Range'))
         self.ToLabel.setText(