openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/futures into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)


Fix text strings and song edit error
-- 
https://code.launchpad.net/~trb143/openlp/futures/+merge/21214
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2010-02-27 15:31:23 +0000
+++ openlp/plugins/images/imageplugin.py	2010-03-12 07:39:16 +0000
@@ -61,6 +61,6 @@
             'together and presented on the live controller it is possible '
             'to turn them into a timed loop.<br<br>From the plugin if the '
             '<i>Override background</i> is chosen and an image is selected '
-            'any somgs which are rendered will use the selected image from '
+            'any songs which are rendered will use the selected image from '
             'the background instead of the one provied by the theme.<br>')
         return about_text

=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py	2010-02-27 10:10:03 +0000
+++ openlp/plugins/songs/forms/editverseform.py	2010-03-12 07:39:16 +0000
@@ -77,7 +77,7 @@
     def setVerse(self, text, verseCount=0, single=False, tag=u'Verse:1'):
         posVerse = 0
         posSub = 0
-        if len(text) == 0:
+        if len(text) == 0 and not single:
             text = u'---[Verse:1]---\n'
         if single:
             id = tag.split(u':')

=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py	2009-12-31 12:52:01 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py	2010-03-12 07:39:16 +0000
@@ -139,7 +139,7 @@
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your author!'),
+                    self.trUtf8('Couldn\'t add your author.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onTopicAddButtonClick(self):
@@ -150,7 +150,7 @@
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your topic!'),
+                    self.trUtf8('Couldn\'t add your topic.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onBookAddButtonClick(self):
@@ -162,7 +162,7 @@
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your book!'),
+                    self.trUtf8('Couldn\'t add your book.'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onAuthorEditButtonClick(self):
@@ -182,7 +182,7 @@
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your author!'),
+                        self.trUtf8('Couldn\'t save your author.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onTopicEditButtonClick(self):
@@ -197,7 +197,7 @@
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your topic!'),
+                        self.trUtf8('Couldn\'t save your topic.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onBookEditButtonClick(self):
@@ -214,7 +214,7 @@
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your book!'),
+                        self.trUtf8('Couldn\'t save your book.'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onAuthorDeleteButtonClick(self):
@@ -227,7 +227,7 @@
             self.trUtf8('Delete Author'),
             self.trUtf8('Are you sure you want to delete the selected author?'),
             self.trUtf8('This author can\'t be deleted, they are currently '
-                'assigned to at least one song!'),
+                'assigned to at least one song.'),
             self.trUtf8('No author selected!'))
 
     def onTopicDeleteButtonClick(self):
@@ -240,7 +240,7 @@
             self.trUtf8('Delete Topic'),
             self.trUtf8('Are you sure you want to delete the selected topic?'),
             self.trUtf8('This topic can\'t be deleted, it is currently '
-                'assigned to at least one song!'),
+                'assigned to at least one song.'),
             self.trUtf8('No topic selected!'))
 
     def onBookDeleteButtonClick(self):
@@ -253,5 +253,5 @@
             self.trUtf8('Delete Book'),
             self.trUtf8('Are you sure you want to delete the selected book?'),
             self.trUtf8('This book can\'t be deleted, it is currently '
-                'assigned to at least one song!'),
-            self.trUtf8('No book selected!'))
\ No newline at end of file
+                'assigned to at least one song.'),
+            self.trUtf8('No book selected!'))

=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py	2009-12-31 12:52:01 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py	2010-03-12 07:39:16 +0000
@@ -57,4 +57,4 @@
         QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog)
 
     def retranslateUi(self, AuditDeleteDialog):
-        AuditDeleteDialog.setWindowTitle(self.trUtf8('Audit Delete'))
+        AuditDeleteDialog.setWindowTitle(self.trUtf8('Song Usage Delete'))

=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py	2010-02-17 20:17:33 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py	2010-03-12 07:39:16 +0000
@@ -85,7 +85,7 @@
         QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
 
     def retranslateUi(self, AuditDetailDialog):
-        AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
-        self.DateRangeGroupBox.setTitle(self.trUtf8('ASelect Date Range'))
+        AuditDetailDialog.setWindowTitle(self.trUtf8('Song Usage Extraction'))
+        self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
         self.ToLabel.setText(self.trUtf8('to'))
         self.FileGroupBox.setTitle(self.trUtf8('Report Location'))