diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index d0ae71fbc..ca018cabd 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -88,9 +88,10 @@ class BiblePlugin(Plugin): self.media_item.onImportClick() def about(self): - about_text = translate('BiblePlugin','Bible Plugin
This ' - 'plugin allows bible verses from different sources to be ' - 'displayed on the screen during the service.') + about_text = translate(u'BiblesPlugin.BiblePlugin', + u'Bible Plugin
This ' + u'plugin allows bible verses from different sources to be ' + u'displayed on the screen during the service.') return about_text def can_delete_theme(self, theme): diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py index c2aa2dde4..48fef9bf0 100644 --- a/openlp/plugins/bibles/forms/bibleimportwizard.py +++ b/openlp/plugins/bibles/forms/bibleimportwizard.py @@ -308,49 +308,79 @@ class Ui_BibleImportWizard(object): QtCore.QMetaObject.connectSlotsByName(BibleImportWizard) def retranslateUi(self, BibleImportWizard): - BibleImportWizard.setWindowTitle(translate('ImportWizardForm', 'Bible Import Wizard')) + BibleImportWizard.setWindowTitle( + translate(u'BiblesPlugin.ImportWizardForm', u'Bible Import Wizard')) self.TitleLabel.setText( u'%s' % \ - translate('ImportWizardForm', 'Welcome to the Bible Import Wizard')) + translate(u'BiblesPlugin.ImportWizardForm', + u'Welcome to the Bible Import Wizard')) self.InformationLabel.setText( - translate('ImportWizardForm', 'This wizard will help you to import Bibles from a ' - 'variety of formats. Click the next button below to start the ' - 'process by selecting a format to import from.')) - self.SelectPage.setTitle(translate('ImportWizardForm', 'Select Import Source')) + translate(u'BiblesPlugin.ImportWizardForm', + u'This wizard will help you to import Bibles from a ' + u'variety of formats. Click the next button below to start the ' + u'process by selecting a format to import from.')) + self.SelectPage.setTitle(translate(u'BiblesPlugin.ImportWizardForm', + u'Select Import Source')) self.SelectPage.setSubTitle( - translate('ImportWizardForm', 'Select the import format, and where to import from.')) - self.FormatLabel.setText(translate('ImportWizardForm', 'Format:')) - self.FormatComboBox.setItemText(0, translate('ImportWizardForm', 'OSIS')) - self.FormatComboBox.setItemText(1, translate('ImportWizardForm', 'CSV')) - self.FormatComboBox.setItemText(2, translate('ImportWizardForm', 'OpenSong')) - self.FormatComboBox.setItemText(3, translate('ImportWizardForm', 'Web Download')) - self.OsisLocationLabel.setText(translate('ImportWizardForm', 'File Location:')) - self.BooksLocationLabel.setText(translate('ImportWizardForm', 'Books Location:')) - self.VerseLocationLabel.setText(translate('ImportWizardForm', 'Verse Location:')) - self.OpenSongFileLabel.setText(translate('ImportWizardForm', 'Bible Filename:')) - self.LocationLabel.setText(translate('ImportWizardForm', 'Location:')) - self.LocationComboBox.setItemText(0, translate('ImportWizardForm', 'Crosswalk')) - self.LocationComboBox.setItemText(1, translate('ImportWizardForm', 'BibleGateway')) - self.BibleLabel.setText(translate('ImportWizardForm', 'Bible:')) + translate(u'BiblesPlugin.ImportWizardForm', + u'Select the import format, and where to import from.')) + self.FormatLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Format:')) + self.FormatComboBox.setItemText(0, + translate(u'BiblesPlugin.ImportWizardForm', u'OSIS')) + self.FormatComboBox.setItemText(1, + translate(u'BiblesPlugin.ImportWizardForm', u'CSV')) + self.FormatComboBox.setItemText(2, + translate(u'BiblesPlugin.ImportWizardForm', u'OpenSong')) + self.FormatComboBox.setItemText(3, + translate(u'BiblesPlugin.ImportWizardForm', u'Web Download')) + self.OsisLocationLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'File Location:')) + self.BooksLocationLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Books Location:')) + self.VerseLocationLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Verse Location:')) + self.OpenSongFileLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Bible Filename:')) + self.LocationLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Location:')) + self.LocationComboBox.setItemText(0, + translate(u'BiblesPlugin.ImportWizardForm', u'Crosswalk')) + self.LocationComboBox.setItemText(1, + translate(u'BiblesPlugin.ImportWizardForm', u'BibleGateway')) + self.BibleLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Bible:')) self.WebDownloadTabWidget.setTabText( self.WebDownloadTabWidget.indexOf(self.DownloadOptionsTab), - translate('ImportWizardForm', 'Download Options')) - self.AddressLabel.setText(translate('ImportWizardForm', 'Server:')) - self.UsernameLabel.setText(translate('ImportWizardForm', 'Username:')) - self.PasswordLabel.setText(translate('ImportWizardForm', 'Password:')) + translate(u'BiblesPlugin.ImportWizardForm', u'Download Options')) + self.AddressLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Server:')) + self.UsernameLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Username:')) + self.PasswordLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Password:')) self.WebDownloadTabWidget.setTabText( self.WebDownloadTabWidget.indexOf(self.ProxyServerTab), - translate('ImportWizardForm', 'Proxy Server (Optional)')) - self.LicenseDetailsPage.setTitle(translate('ImportWizardForm', 'License Details')) + translate(u'BiblesPlugin.ImportWizardForm', + u'Proxy Server (Optional)')) + self.LicenseDetailsPage.setTitle( + translate(u'BiblesPlugin.ImportWizardForm', u'License Details')) self.LicenseDetailsPage.setSubTitle( - translate('ImportWizardForm', 'Set up the Bible\'s license details.')) - self.VersionNameLabel.setText(translate('ImportWizardForm', 'Version Name:')) - self.CopyrightLabel.setText(translate('ImportWizardForm', 'Copyright:')) - self.PermissionLabel.setText(translate('ImportWizardForm', 'Permission:')) - self.ImportPage.setTitle(translate('ImportWizardForm', 'Importing')) + translate(u'BiblesPlugin.ImportWizardForm', + u'Set up the Bible\'s license details.')) + self.VersionNameLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Version Name:')) + self.CopyrightLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Copyright:')) + self.PermissionLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Permission:')) + self.ImportPage.setTitle( + translate(u'BiblesPlugin.ImportWizardForm', u'Importing')) self.ImportPage.setSubTitle( - translate('ImportWizardForm', 'Please wait while your Bible is imported.')) - self.ImportProgressLabel.setText(translate('ImportWizardForm', 'Ready.')) + translate(u'BiblesPlugin.ImportWizardForm', + u'Please wait while your Bible is imported.')) + self.ImportProgressLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Ready.')) self.ImportProgressBar.setFormat(u'%p%') diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py index 84ed345f4..00ecce6d5 100644 --- a/openlp/plugins/bibles/forms/importwizardform.py +++ b/openlp/plugins/bibles/forms/importwizardform.py @@ -123,8 +123,8 @@ 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('ImportWizardForm','Invalid Bible Location'), - translate('ImportWizardForm','You need to specify a file to import your ' + translate(u'BiblesPlugin.ImportWizardForm', u'Invalid Bible Location'), + translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a file to import your ' 'Bible from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OSISLocationEdit.setFocus() @@ -132,16 +132,16 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV: if self.field(u'csv_booksfile').toString() == u'': QtGui.QMessageBox.critical(self, - translate('ImportWizardForm','Invalid Books File'), - translate('ImportWizardForm','You need to specify a file with books of ' + translate(u'BiblesPlugin.ImportWizardForm', u'Invalid Books File'), + translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a file with books of ' '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('ImportWizardForm','Invalid Verse File'), - translate('ImportWizardForm','You need to specify a file of Bible ' + translate(u'BiblesPlugin.ImportWizardForm', u'Invalid Verse File'), + translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a file of Bible ' 'verses to import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.CsvVerseLocationEdit.setFocus() @@ -149,8 +149,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenSong: if self.field(u'opensong_file').toString() == u'': QtGui.QMessageBox.critical(self, - translate('ImportWizardForm','Invalid OpenSong Bible'), - translate('ImportWizardForm','You need to specify an OpenSong Bible ' + translate(u'BiblesPlugin.ImportWizardForm', u'Invalid OpenSong Bible'), + translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify an OpenSong Bible ' 'file to import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OpenSongFileEdit.setFocus() @@ -162,16 +162,16 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): license_copyright = variant_to_unicode(self.field(u'license_copyright')) if license_version == u'': QtGui.QMessageBox.critical(self, - translate('ImportWizardForm','Empty Version Name'), - translate('ImportWizardForm','You need to specify a version name for your ' + translate(u'BiblesPlugin.ImportWizardForm', u'Empty Version Name'), + translate(u'BiblesPlugin.ImportWizardForm', u'You need to specify a version name for your ' 'Bible.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.VersionNameEdit.setFocus() return False elif license_copyright == u'': QtGui.QMessageBox.critical(self, - translate('ImportWizardForm','Empty Copyright'), - translate('ImportWizardForm','You need to set a copyright for your Bible! ' + translate(u'BiblesPlugin.ImportWizardForm', u'Empty Copyright'), + translate(u'BiblesPlugin.ImportWizardForm', u'You need to set a copyright for your Bible! ' 'Bibles in the Public Domain need to be marked as ' 'such.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) @@ -179,8 +179,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): return False elif self.manager.exists(license_version): QtGui.QMessageBox.critical(self, - translate('ImportWizardForm','Bible Exists'), - translate('ImportWizardForm','This Bible already exists! Please import ' + translate(u'BiblesPlugin.ImportWizardForm', u'Bible Exists'), + translate(u'BiblesPlugin.ImportWizardForm', u'This Bible already exists! Please import ' 'a different Bible or first delete the existing one.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.VersionNameEdit.setFocus() @@ -200,34 +200,40 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): """ self.BibleComboBox.clear() for bible in self.web_bible_list[index].keys(): - self.BibleComboBox.addItem(unicode(translate('ImportWizardForm',bible))) + self.BibleComboBox.addItem(unicode( + translate(u'BiblesPlugin.ImportWizardForm', bible))) def onOsisFileButtonClicked(self): """ Show the file open dialog for the OSIS file. """ - self.getFileName(translate('ImportWizardForm','Open OSIS File'), + self.getFileName( + translate(u'BiblesPlugin.ImportWizardForm', u'Open OSIS File'), self.OSISLocationEdit) def onBooksFileButtonClicked(self): """ Show the file open dialog for the books CSV file. """ - self.getFileName(translate('ImportWizardForm','Open Books CSV File'), + self.getFileName( + translate(u'BiblesPlugin.ImportWizardForm', u'Open Books CSV File'), self.BooksLocationEdit) def onCsvVersesFileButtonClicked(self): """ Show the file open dialog for the verses CSV file. """ - self.getFileName(translate('ImportWizardForm','Open Verses CSV File'), + self.getFileName( + translate(u'BiblesPlugin.ImportWizardForm', + u'Open Verses CSV File'), self.CsvVerseLocationEdit) def onOpenSongBrowseButtonClicked(self): """ Show the file open dialog for the OpenSong file. """ - self.getFileName(translate('ImportWizardForm','Open OpenSong Bible'), + self.getFileName( + translate(u'BiblesPlugin.ImportWizardForm', u'Open OpenSong Bible'), self.OpenSongFileEdit) def onCancelButtonClicked(self, checked): @@ -362,7 +368,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): self.ImportProgressBar.setMinimum(0) self.ImportProgressBar.setMaximum(1188) self.ImportProgressBar.setValue(0) - self.ImportProgressLabel.setText(translate('ImportWizardForm','Starting import...')) + self.ImportProgressLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', u'Starting import...')) Receiver.send_message(u'openlp_process_events') def performImport(self): @@ -416,10 +423,13 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): self.manager.save_meta_data(license_version, license_version, license_copyright, license_permission) self.manager.reload_bibles() - self.ImportProgressLabel.setText(translate('ImportWizardForm','Finished import.')) + self.ImportProgressLabel.setText( + translate(u'BiblesPlugin.ImportWizardForm', + u'Finished import.')) else: self.ImportProgressLabel.setText( - translate('ImportWizardForm','Your Bible import failed.')) + translate(u'BiblesPlugin.ImportWizardForm', + u'Your Bible import failed.')) importer.delete() def postImport(self): diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 549adb818..c01ba8c8d 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -45,7 +45,7 @@ class BiblesTab(SettingsTab): def setupUi(self): self.setObjectName(u'BiblesTab') - self.tabTitleVisible = translate('BiblesTab','Bibles') + self.tabTitleVisible = translate(u'BiblesPlugin,BiblesTab', u'Bibles') self.BibleLayout = QtGui.QHBoxLayout(self) self.BibleLayout.setSpacing(8) self.BibleLayout.setMargin(8) @@ -149,22 +149,35 @@ class BiblesTab(SettingsTab): QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList) def retranslateUi(self): - self.VerseDisplayGroupBox.setTitle(translate('BiblesTab','Verse Display')) + self.VerseDisplayGroupBox.setTitle( + translate(u'BiblesPlugin,BiblesTab', u'Verse Display')) self.NewChaptersCheckBox.setText( - translate('BiblesTab','Only show new chapter numbers')) - self.LayoutStyleLabel.setText(translate('BiblesTab','Layout Style:')) - self.DisplayStyleLabel.setText(translate('BiblesTab','Display Style:')) - self.BibleThemeLabel.setText(translate('BiblesTab','Bible Theme:')) - self.LayoutStyleComboBox.setItemText(0, translate('BiblesTab','verse per slide')) - self.LayoutStyleComboBox.setItemText(1, translate('BiblesTab','verse per line')) - self.LayoutStyleComboBox.setItemText(2, translate('BiblesTab','continuous')) - self.DisplayStyleComboBox.setItemText(0, translate('BiblesTab','No brackets')) - self.DisplayStyleComboBox.setItemText(1, translate('BiblesTab','( and )')) - self.DisplayStyleComboBox.setItemText(2, translate('BiblesTab','{ and }')) - self.DisplayStyleComboBox.setItemText(3, translate('BiblesTab','[ and ]')) - self.ChangeNoteLabel.setText(translate('BiblesTab', - 'Note:\nChanges don\'t affect verses already in the service')) - self.BibleDualCheckBox.setText(translate('BiblesTab','Display Dual Bible Verses')) + translate(u'BiblesPlugin,BiblesTab', + u'Only show new chapter numbers')) + self.LayoutStyleLabel.setText( + translate(u'BiblesPlugin,BiblesTab', u'Layout Style:')) + self.DisplayStyleLabel.setText( + translate(u'BiblesPlugin,BiblesTab', u'Display Style:')) + self.BibleThemeLabel.setText( + translate(u'BiblesPlugin,BiblesTab', u'Bible Theme:')) + self.LayoutStyleComboBox.setItemText(0, + translate(u'BiblesPlugin,BiblesTab', u'verse per slide')) + self.LayoutStyleComboBox.setItemText(1, + translate(u'BiblesPlugin,BiblesTab', u'verse per line')) + self.LayoutStyleComboBox.setItemText(2, + translate(u'BiblesPlugin,BiblesTab', u'continuous')) + self.DisplayStyleComboBox.setItemText(0, + translate(u'BiblesPlugin,BiblesTab', u'No brackets')) + self.DisplayStyleComboBox.setItemText(1, + translate(u'BiblesPlugin,BiblesTab', u'( and )')) + self.DisplayStyleComboBox.setItemText(2, + translate(u'BiblesPlugin,BiblesTab', u'{ and }')) + self.DisplayStyleComboBox.setItemText(3, + translate(u'BiblesPlugin,BiblesTab', u'[ and ]')) + self.ChangeNoteLabel.setText(translate(u'BiblesPlugin.BiblesTab', + u'Note:\nChanges don\'t affect verses already in the service')) + self.BibleDualCheckBox.setText( + translate(u'BiblesPlugin,BiblesTab', u'Display Dual Bible Verses')) def onBibleThemeComboBoxChanged(self): self.bible_theme = self.BibleThemeComboBox.currentText() diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 24c4d42e0..47518ac85 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -71,7 +71,7 @@ class BibleMediaItem(MediaManagerItem): return unicode(obj) def initPluginNameVisible(self): - self.PluginNameVisible = translate('MediaItem','Bible') + self.PluginNameVisible = translate(u'BiblesPlugin,MediaItem', u'Bible') def requiredIcons(self): MediaManagerItem.requiredIcons(self) @@ -147,7 +147,7 @@ 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('MediaItem','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 +231,7 @@ 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('MediaItem','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 +289,27 @@ class BibleMediaItem(MediaManagerItem): def retranslateUi(self): log.debug(u'retranslateUi') - self.QuickVersionLabel.setText(translate('MediaItem','Version:')) - self.QuickSecondVersionLabel.setText(translate('MediaItem','Dual:')) - self.QuickSearchLabel.setText(translate('MediaItem','Search Type:')) - self.QuickSearchLabel.setText(translate('MediaItem','Find:')) - self.QuickSearchButton.setText(translate('MediaItem','Search')) - self.QuickClearLabel.setText(translate('MediaItem','Results:')) - self.AdvancedVersionLabel.setText(translate('MediaItem','Version:')) - self.AdvancedSecondBibleLabel.setText(translate('MediaItem','Dual:')) - self.AdvancedBookLabel.setText(translate('MediaItem','Book:')) - self.AdvancedChapterLabel.setText(translate('MediaItem','Chapter:')) - self.AdvancedVerseLabel.setText(translate('MediaItem','Verse:')) - self.AdvancedFromLabel.setText(translate('MediaItem','From:')) - self.AdvancedToLabel.setText(translate('MediaItem','To:')) - self.AdvancedClearLabel.setText(translate('MediaItem','Results:')) - self.AdvancedSearchButton.setText(translate('MediaItem','Search')) - self.QuickSearchComboBox.addItem(translate('MediaItem','Verse Search')) - self.QuickSearchComboBox.addItem(translate('MediaItem','Text Search')) - self.ClearQuickSearchComboBox.addItem(translate('MediaItem','Clear')) - self.ClearQuickSearchComboBox.addItem(translate('MediaItem','Keep')) - self.ClearAdvancedSearchComboBox.addItem(translate('MediaItem','Clear')) - self.ClearAdvancedSearchComboBox.addItem(translate('MediaItem','Keep')) + self.QuickVersionLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Version:')) + self.QuickSecondVersionLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Dual:')) + self.QuickSearchLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Search Type:')) + self.QuickSearchLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Find:')) + self.QuickSearchButton.setText(translate(u'BiblesPlugin,MediaItem', u'Search')) + self.QuickClearLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Results:')) + self.AdvancedVersionLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Version:')) + self.AdvancedSecondBibleLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Dual:')) + self.AdvancedBookLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Book:')) + self.AdvancedChapterLabel.setText(translate(u'BiblesPlugin,MediaItem', u'Chapter:')) + 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 +363,8 @@ class BibleMediaItem(MediaManagerItem): def onNoBookFound(self): QtGui.QMessageBox.critical(self, - translate('MediaItem','No Book Found'), - translate('MediaItem','No matching book could be found in this Bible.'), + translate(u'BiblesPlugin,MediaItem', u'No Book Found'), + translate(u'BiblesPlugin,MediaItem', u'No matching book could be found in this Bible.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.Ok ) @@ -574,7 +574,7 @@ 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('MediaItem','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'') diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 3b55b9b74..3160d4b87 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -94,7 +94,8 @@ class OpenSongBible(BibleDB): ) Receiver.send_message(u'openlp_process_events') self.wizard.incrementProgressBar( - QtCore.QString('%s %s %s' % (translate('OpenSong','Importing'),\ + QtCore.QString('%s %s %s' % ( + translate(u'BiblesPlugin.Opensong', u'Importing'),\ db_book.name, chapter.attrib[u'n']))) self.commit() except: