openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/rename-split into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/rename-split/+merge/101971

Changed the "Split" button to say "Optional Split" instead.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/rename-split/+merge/101971
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/rename-split into lp:openlp.

=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py	2012-04-04 07:26:51 +0000
+++ openlp/core/lib/ui.py	2012-04-13 20:19:18 +0000
@@ -124,7 +124,7 @@
         self.Settings = translate('OpenLP.Ui', 'Settings')
         self.SaveService = translate('OpenLP.Ui', 'Save Service')
         self.Service = translate('OpenLP.Ui', 'Service')
-        self.Split = translate('OpenLP.Ui', '&Split')
+        self.Split = translate('OpenLP.Ui', 'Optional &Split')
         self.SplitToolTip = translate('OpenLP.Ui', 'Split a slide into two '
             'only if it does not fit on the screen as one slide.')
         self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))

=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py	2012-04-01 22:44:09 +0000
+++ openlp/plugins/songs/forms/editversedialog.py	2012-04-13 20:19:18 +0000
@@ -25,7 +25,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 
 from openlp.core.lib import build_icon, translate, SpellTextEdit
 from openlp.core.lib.ui import create_button_box, UiStrings