From 4c9bd6d34b9c9affd352fb28e6c8e6ea5b553f6d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 12 Mar 2010 16:55:01 +0000 Subject: [PATCH 1/3] Fix text --- openlp/plugins/custom/customplugin.py | 2 +- openlp/plugins/songusage/forms/songusagedeleteform.py | 4 ++-- openlp/plugins/songusage/forms/songusagedetailform.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index ac5384390..29905a760 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -69,7 +69,7 @@ class CustomPlugin(Plugin): def about(self): about_text = self.trUtf8('Custom Plugin
This plugin ' 'allows slides to be displayed on the screen in the same way ' - 'songs are. This plugin provides greater freedom over the ' + 'songs are. This plugin provides greater freedom over the ' 'songs plugin.
') return about_text diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index 56eb1954a..9dda0cafc 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -41,8 +41,8 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog): def accept(self): ret = QtGui.QMessageBox.question(self, - self.trUtf8('Delete Selected Audit Events?'), - self.trUtf8('Are you sure you want to delete selected Audit Data?'), + self.trUtf8('Delete Selected Song Usage Events?'), + self.trUtf8('Are you sure you want to delete selected Song Usage data?'), QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel), diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index be548ac35..28690d85f 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -81,7 +81,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): instance.copyright, instance.ccl_number , instance.authors) file.write(record) except: - log.exception(u'Failed to write out audit records') + log.exception(u'Failed to write out song usage records') finally: if file: file.close() From db84256a206f9b777bc76dc1ad3a6be855e25f75 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 12 Mar 2010 19:39:15 +0000 Subject: [PATCH 2/3] Fix yet more text --- openlp/core/ui/servicemanager.py | 2 ++ openlp/core/ui/thememanager.py | 10 +++++----- openlp/plugins/alerts/forms/alerteditform.py | 2 +- openlp/plugins/bibles/forms/importwizardform.py | 10 +++++----- openlp/plugins/images/lib/mediaitem.py | 2 +- openlp/plugins/presentations/presentationplugin.py | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index a0a198f2d..e2e343f9e 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -216,6 +216,8 @@ class ServiceManager(QtGui.QWidget): def contextMenu(self, point): item = self.ServiceManagerList.itemAt(point) + if item is None: + return if item.parent() is None: pos = item.data(0, QtCore.Qt.UserRole).toInt()[0] else: diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 5cad41f58..59813a9e7 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -177,20 +177,20 @@ class ThemeManager(QtGui.QWidget): if theme != unicode(item.data(QtCore.Qt.UserRole).toString()): QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('You are unable to delete the default theme!'), + self.trUtf8('You are unable to delete the Default Theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) else: for plugin in self.parent.plugin_manager.plugins: if not plugin.can_delete_theme(theme): QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('theme %s is use in %s plugin' % (theme, plugin.name)), + self.trUtf8('Theme %s is use in %s plugin' % (theme, plugin.name)), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme: QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('theme %s is use Service Manager' % theme), + self.trUtf8('Theme %s is use by Service Manager' % theme), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return self.themelist.remove(theme) @@ -216,7 +216,7 @@ class ThemeManager(QtGui.QWidget): item = self.ThemeListWidget.currentItem() if item is None: QtGui.QMessageBox.critical(self, self.trUtf8('Error'), - self.trUtf8('You have not selected a theme!'), + self.trUtf8('You have not selected a theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return theme = unicode(item.data(QtCore.Qt.UserRole).toString()) @@ -359,7 +359,7 @@ class ThemeManager(QtGui.QWidget): except: QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('File is not a valid theme!'), + self.trUtf8('File is not a valid theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) log.exception(u'Importing theme from zip file failed %s' % filename) finally: diff --git a/openlp/plugins/alerts/forms/alerteditform.py b/openlp/plugins/alerts/forms/alerteditform.py index 62c129508..1aa6cc1f5 100644 --- a/openlp/plugins/alerts/forms/alerteditform.py +++ b/openlp/plugins/alerts/forms/alerteditform.py @@ -85,7 +85,7 @@ class AlertEditForm(QtGui.QDialog, Ui_AlertEditDialog): if self.AlertLineEdit.text(): QtGui.QMessageBox.information(self, self.trUtf8('Item selected to Edit'), - self.trUtf8('Please Save or Clear seletced item')) + self.trUtf8('Please Save or Clear selected item')) else: self.EditButton.setEnabled(True) self.DeleteButton.setEnabled(True) diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py index 742598fdb..03769abcd 100644 --- a/openlp/plugins/bibles/forms/importwizardform.py +++ b/openlp/plugins/bibles/forms/importwizardform.py @@ -110,7 +110,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid Bible Location'), self.trUtf8('You need to specify a file to import your ' - 'Bible from!'), + 'Bible from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OSISLocationEdit.setFocus() return False @@ -119,7 +119,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid Books File'), self.trUtf8('You need to specify a file with books of ' - 'the Bible to use in the import!'), + 'the Bible to use in the import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.BooksLocationEdit.setFocus() return False @@ -127,7 +127,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid Verse File'), self.trUtf8('You need to specify a file of Bible ' - 'verses to import!'), + 'verses to import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.CsvVerseLocationEdit.setFocus() return False @@ -136,7 +136,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid OpenSong Bible'), self.trUtf8('You need to specify an OpenSong Bible ' - 'file to import!'), + 'file to import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OpenSongFileEdit.setFocus() return False @@ -147,7 +147,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Empty Version Name'), self.trUtf8('You need to specify a version name for your ' - 'Bible!'), + 'Bible.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.VersionNameEdit.setFocus() return False diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 75f2fd981..2cde4958c 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -101,7 +101,7 @@ class ImageMediaItem(MediaManagerItem): self.OverrideCheckBox.setChecked(False) self.OverrideCheckBox.setText(self.trUtf8('Override background')) self.OverrideCheckBox.setStatusTip( - self.trUtf8('Allow background of live slide to be overridden')) + self.trUtf8('Allow the background of live slide to be overridden')) self.OverrideLayout.addWidget(self.OverrideCheckBox) self.OverrideLabel = QtGui.QLabel(self.ImageWidget) self.OverrideLabel.setObjectName(u'OverrideLabel') diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 8353611ab..e39259a36 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -111,6 +111,6 @@ class PresentationPlugin(Plugin): def about(self): about_text = self.trUtf8('Presentation Plugin
Delivers ' 'the ability to show presentations using a number of different ' - 'programs. The choice of available presentation programs is ' + 'programs. The choice of available presentation programs is ' 'available to the user in a drop down box.') return about_text From 47dc69b19490a5869d120a983ecb7ead79377329 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 13 Mar 2010 08:43:54 +0000 Subject: [PATCH 3/3] More text fixes --- openlp/core/ui/thememanager.py | 2 +- openlp/plugins/alerts/forms/alerteditform.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 59813a9e7..1d8be6499 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -177,7 +177,7 @@ class ThemeManager(QtGui.QWidget): if theme != unicode(item.data(QtCore.Qt.UserRole).toString()): QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('You are unable to delete the Default Theme.'), + self.trUtf8('You are unable to delete the default theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) else: for plugin in self.parent.plugin_manager.plugins: diff --git a/openlp/plugins/alerts/forms/alerteditform.py b/openlp/plugins/alerts/forms/alerteditform.py index 1aa6cc1f5..a88eff4f3 100644 --- a/openlp/plugins/alerts/forms/alerteditform.py +++ b/openlp/plugins/alerts/forms/alerteditform.py @@ -85,7 +85,7 @@ class AlertEditForm(QtGui.QDialog, Ui_AlertEditDialog): if self.AlertLineEdit.text(): QtGui.QMessageBox.information(self, self.trUtf8('Item selected to Edit'), - self.trUtf8('Please Save or Clear selected item')) + self.trUtf8('Please save or clear selected item')) else: self.EditButton.setEnabled(True) self.DeleteButton.setEnabled(True) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 2cde4958c..1542faa1e 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -61,7 +61,7 @@ class ImageMediaItem(MediaManagerItem): def retranslateUi(self): self.OnNewPrompt = self.trUtf8('Select Image(s)') self.OnNewFileMasks = \ - self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)') + self.trUtf8('Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)') def requiredIcons(self): MediaManagerItem.requiredIcons(self)