openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #918718 in OpenLP: "overridden mispelled"
  https://bugs.launchpad.net/openlp/+bug/918718
  Bug #943380 in OpenLP: "wrapping slides typo"
  https://bugs.launchpad.net/openlp/+bug/943380

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/typos/+merge/96891

Fix a couple of typos
-- 
https://code.launchpad.net/~j-corwin/openlp/typos/+merge/96891
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/typos into lp:openlp.

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2012-02-13 11:10:27 +0000
+++ openlp/core/ui/advancedtab.py	2012-03-10 18:47:19 +0000
@@ -357,7 +357,7 @@
             translate('OpenLP.GeneralTab', '&Next Item'))
         self.nextItemLabel.setText(
             translate('OpenLP.GeneralTab', 'Up and down arrow keys '
-            'advance to the the next or previous Service Item from the '
+            'advance to the next or previous Service Item from the '
             'top and bottom slides of each Service Item.'))
 
     def load(self):

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2012-03-05 19:40:16 +0000
+++ openlp/core/ui/media/mediacontroller.py	2012-03-10 18:47:19 +0000
@@ -47,7 +47,7 @@
         self.parent = parent
         self.mediaPlayers = {}
         self.controller = []
-        self.overridenPlayer = ''
+        self.overriddenPlayer = ''
         self.curDisplayMediaPlayer = {}
         # Timer for video state
         self.timer = QtCore.QTimer()
@@ -365,8 +365,8 @@
         usedPlayers = playerSettings.split(u',')
         if QtCore.QSettings().value(u'media/override player',
             QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
-            if self.overridenPlayer != '':
-                usedPlayers = [self.overridenPlayer]
+            if self.overriddenPlayer != '':
+                usedPlayers = [self.overriddenPlayer]
         if controller.media_info.file_info.isFile():
             suffix = u'*.%s' % \
                 controller.media_info.file_info.suffix().toLower()
@@ -581,9 +581,9 @@
             QtCore.QVariant(u'webkit')).toString())
         usedPlayers = playerSettings.split(u',')
         if override_player in usedPlayers:
-            self.overridenPlayer = override_player
+            self.overriddenPlayer = override_player
         else:
-            self.overridenPlayer = ''
+            self.overriddenPlayer = ''
 
     def finalise(self):
         self.timer.stop()

=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py	2011-12-31 17:37:56 +0000
+++ openlp/plugins/media/lib/mediatab.py	2012-03-10 18:47:19 +0000
@@ -131,7 +131,7 @@
         self.advancedGroupBox.setTitle(UiStrings().Advanced)
         self.overridePlayerCheckBox.setText(
             translate('MediaPlugin.MediaTab',
-            'Allow media player to be overriden'))
+            'Allow media player to be overridden'))
 
     def onPlayerCheckBoxChanged(self, check_state):
         player = self.sender().text()

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2012-01-07 11:22:53 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2012-03-10 18:47:19 +0000
@@ -85,7 +85,7 @@
         self.AdvancedGroupBox.setTitle(UiStrings().Advanced)
         self.OverrideAppCheckBox.setText(
             translate('PresentationPlugin.PresentationTab',
-            'Allow presentation application to be overriden'))
+            'Allow presentation application to be overridden'))
 
     def setControllerText(self, checkbox, controller):
         if checkbox.isEnabled():