openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/general into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #634771 OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start
  https://bugs.launchpad.net/bugs/634771


Is it too late to fix a few strings, spotted whilst I was "translating"?
-- 
https://code.launchpad.net/~j-corwin/openlp/general/+merge/35926
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/general into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2010-09-14 17:05:05 +0000
+++ openlp/core/ui/servicemanager.py	2010-09-18 16:17:44 +0000
@@ -884,7 +884,8 @@
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
-                    'displayed as there is no handler to display it'))
+                    'displayed as the plugin required to display it is missing '
+                    'or inactive'))
 
     def remoteEdit(self):
         """

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-09-13 05:16:16 +0000
+++ openlp/core/ui/slidecontroller.py	2010-09-18 16:17:44 +0000
@@ -209,7 +209,8 @@
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
                 u'Edit Song', u':/general/general_edit.png',
-                translate('OpenLP.SlideController', 'Edit and re-preview song'),
+                translate('OpenLP.SlideController', 
+                'Edit and reload song preview'),
                 self.onEditSong)
         if isLive:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-09-01 06:19:45 +0000
+++ openlp/core/ui/thememanager.py	2010-09-18 16:17:44 +0000
@@ -242,14 +242,14 @@
                         QtGui.QMessageBox.critical(self,
                             translate('OpenLP.ThemeManager', 'Error'),
                             unicode(translate('OpenLP.ThemeManager',
-                                'Theme %s is use in %s plugin.')) % \
+                                'Theme %s is used in the %s plugin.')) % \
                                 (theme, plugin.name))
                         return
                 if unicode(self.serviceComboBox.currentText()) == theme:
                     QtGui.QMessageBox.critical(self,
                         translate('OpenLP.ThemeManager', 'Error'),
                         unicode(translate('OpenLP.ThemeManager',
-                        'Theme %s is use by the service manager.')) % theme)
+                        'Theme %s is used by the service manager.')) % theme)
                     return
                 row = self.themeListWidget.row(item)
                 self.themeListWidget.takeItem(row)

=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py	2010-07-31 02:06:44 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py	2010-09-18 16:17:44 +0000
@@ -182,7 +182,7 @@
                     translate('BiblesPlugin.ImportWizardForm',
                         'Empty Copyright'),
                     translate('BiblesPlugin.ImportWizardForm',
-                        'You need to set a copyright for your Bible! '
+                        'You need to set a copyright for your Bible. '
                         'Bibles in the Public Domain need to be marked as '
                         'such.'))
                 self.CopyrightEdit.setFocus()
@@ -192,7 +192,7 @@
                     translate('BiblesPlugin.ImportWizardForm',
                         'Bible Exists'),
                     translate('BiblesPlugin.ImportWizardForm',
-                        'This Bible already exists! Please import '
+                        'This Bible already exists. Please import '
                         'a different Bible or first delete the existing one.'))
                 self.VersionNameEdit.setFocus()
                 return False

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2010-09-02 10:53:50 +0000
+++ openlp/plugins/bibles/lib/manager.py	2010-09-18 16:17:44 +0000
@@ -246,7 +246,7 @@
                 translate('BiblesPlugin.BibleManager',
                 'Scripture Reference Error'),
                 translate('BiblesPlugin.BibleManager', 'Your scripture '
-                'reference is either not supported by OpenLP or invalid. '
+                'reference is either not supported by OpenLP or is invalid. '
                 'Please make sure your reference conforms to one of the '
                 'following patterns:\n\n'
                 'Book Chapter\n'

=== modified file 'openlp/plugins/songs/forms/authorsform.py'
--- openlp/plugins/songs/forms/authorsform.py	2010-07-31 02:06:44 +0000
+++ openlp/plugins/songs/forms/authorsform.py	2010-09-18 16:17:44 +0000
@@ -97,8 +97,7 @@
                     self, translate('SongsPlugin.AuthorsForm', 'Error'),
                     translate('SongsPlugin.AuthorsForm',
                         'You have not set a display name for the '
-                        'author, would you like me to combine the first and '
-                        'last names for you?'),
+                        'author, combine the first and last names?'),
                     QtGui.QMessageBox.StandardButtons(
                         QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
                     ) == QtGui.QMessageBox.Yes:

=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py	2010-07-31 02:06:44 +0000
+++ openlp/plugins/songs/forms/topicsform.py	2010-09-18 16:17:44 +0000
@@ -51,7 +51,7 @@
             QtGui.QMessageBox.critical(
                 self, translate('SongsPlugin.TopicsForm', 'Error'),
                 translate('SongsPlugin.TopicsForm',
-                    'You need to type in a topic name!'))
+                    'You need to type in a topic name.'))
             self.NameEdit.setFocus()
             return False
         else: