openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/i18n into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/i18n/+merge/64246

Hello,

- Changed the "split" string in the customs slide dialog (now the songs and customs dialog use the same string <- it is easier to remember what the button does, when both use the same text)
-- 
https://code.launchpad.net/~googol-hush/openlp/i18n/+merge/64246
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/i18n into lp:openlp.

=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py	2011-06-09 22:03:30 +0000
+++ openlp/core/lib/ui.py	2011-06-10 19:56:05 +0000
@@ -119,6 +119,9 @@
         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.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'))
         self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
         self.Themes = translate('OpenLP.Ui', 'Themes', 'Plural')

=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
--- openlp/plugins/custom/forms/editcustomslidedialog.py	2011-05-26 17:11:22 +0000
+++ openlp/plugins/custom/forms/editcustomslidedialog.py	2011-06-10 19:56:05 +0000
@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, SpellTextEdit, build_icon
-from openlp.core.lib.ui import create_accept_reject_button_box
+from openlp.core.lib.ui import create_accept_reject_button_box, UiStrings
 
 class Ui_CustomSlideEditDialog(object):
     def setupUi(self, customSlideEditDialog):
@@ -54,11 +54,8 @@
         QtCore.QMetaObject.connectSlotsByName(customSlideEditDialog)
 
     def retranslateUi(self, customSlideEditDialog):
-        self.splitButton.setText(
-            translate('CustomPlugin.EditCustomForm', 'Split Slide'))
-        self.splitButton.setToolTip(
-            translate('CustomPlugin.EditCustomForm', 'Split a slide into two '
-            'only if it does not fit on the screen as one slide.'))
+        self.splitButton.setText(UiStrings().Split)
+        self.splitButton.setToolTip(UiStrings().SplitToolTip)
         self.insertButton.setText(
             translate('CustomPlugin.EditCustomForm', 'Insert Slide'))
         self.insertButton.setToolTip(

=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py	2011-05-26 17:11:22 +0000
+++ openlp/plugins/songs/forms/editversedialog.py	2011-06-10 19:56:05 +0000
@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, translate, SpellTextEdit
-from openlp.core.lib.ui import create_accept_reject_button_box
+from openlp.core.lib.ui import create_accept_reject_button_box, UiStrings
 from openlp.plugins.songs.lib import VerseType
 
 class Ui_EditVerseDialog(object):
@@ -89,11 +89,8 @@
             VerseType.TranslatedNames[VerseType.Ending])
         self.verseTypeComboBox.setItemText(VerseType.Other,
             VerseType.TranslatedNames[VerseType.Other])
-        self.splitButton.setText(
-            translate('SongsPlugin.EditVerseForm', '&Split'))
-        self.splitButton.setToolTip(
-            translate('SongsPlugin.EditVerseForm', 'Split a slide into two '
-            'only if it does not fit on the screen as one slide.'))
+        self.splitButton.setText(UiStrings().Split)
+        self.splitButton.setToolTip(UiStrings().SplitToolTip)
         self.insertButton.setText(
             translate('SongsPlugin.EditVerseForm', '&Insert'))
         self.insertButton.setToolTip(