This commit is contained in:
Tim Bentley 2011-06-11 12:15:03 +01:00
commit 6bc529f730
12 changed files with 81 additions and 86 deletions

View File

@ -341,8 +341,8 @@ class MediaManagerItem(QtGui.QWidget):
critical_error_message_box( critical_error_message_box(
UiStrings().Duplicate, UiStrings().Duplicate,
unicode(translate('OpenLP.MediaManagerItem', unicode(translate('OpenLP.MediaManagerItem',
'Duplicate file name %s.\nFilename already exists in ' 'Duplicate filename %s.\nThis filename is already in '
'list')) % filename) 'the list')) % filename)
else: else:
newFiles.append(file) newFiles.append(file)
self.loadList(newFiles) self.loadList(newFiles)

View File

@ -119,6 +119,9 @@ class UiStrings(object):
self.Settings = translate('OpenLP.Ui', 'Settings') self.Settings = translate('OpenLP.Ui', 'Settings')
self.SaveService = translate('OpenLP.Ui', 'Save Service') self.SaveService = translate('OpenLP.Ui', 'Save Service')
self.Service = translate('OpenLP.Ui', '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.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular') self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
self.Themes = translate('OpenLP.Ui', 'Themes', 'Plural') self.Themes = translate('OpenLP.Ui', 'Themes', 'Plural')

View File

@ -128,7 +128,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
tag = { tag = {
u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'), u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'),
u'start tag': u'{n}', u'start tag': u'{n}',
u'start html': translate('OpenLP.DisplayTagTab', '<Html_here>'), u'start html': translate('OpenLP.DisplayTagTab', '<HTML here>'),
u'end tag': u'{/n}', u'end tag': u'{/n}',
u'end html': translate('OpenLP.DisplayTagTab', '</and here>'), u'end html': translate('OpenLP.DisplayTagTab', '</and here>'),
u'protected': False u'protected': False

View File

@ -629,7 +629,7 @@ class ServiceManager(QtGui.QWidget):
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('OpenLP.ServiceManager', 'Corrupt File'), translate('OpenLP.ServiceManager', 'Corrupt File'),
translate('OpenLP.ServiceManager', 'This file is either ' translate('OpenLP.ServiceManager', 'This file is either '
'corrupt or not an OpenLP 2.0 service file.')) 'corrupt or it is not an OpenLP 2.0 service file.'))
return return
finally: finally:
if fileTo: if fileTo:

View File

@ -74,14 +74,14 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
title=translate('OpenLP.StartTimeForm', title=translate('OpenLP.StartTimeForm',
'Time Validation Error'), 'Time Validation Error'),
message=translate('OpenLP.StartTimeForm', message=translate('OpenLP.StartTimeForm',
'End time is set after the end of the media item')) 'Finish time is set after the end of the media item'))
return return
elif start > end: elif start > end:
critical_error_message_box( critical_error_message_box(
title=translate('OpenLP.StartTimeForm', title=translate('OpenLP.StartTimeForm',
'Time Validation Error'), 'Time Validation Error'),
message=translate('OpenLP.StartTimeForm', message=translate('OpenLP.StartTimeForm',
'Start time is after the End Time of the media item')) 'Start time is after the finish time of the media item'))
return return
self.item[u'service_item'].start_time = start self.item[u'service_item'].start_time = start
self.item[u'service_item'].end_time = end self.item[u'service_item'].end_time = end

View File

@ -120,7 +120,7 @@ class BiblePlugin(Plugin):
translate('BiblePlugin', '&Upgrade older Bibles')) translate('BiblePlugin', '&Upgrade older Bibles'))
self.toolsUpgradeItem.setStatusTip( self.toolsUpgradeItem.setStatusTip(
translate('BiblePlugin', 'Upgrade the Bible databases to the ' translate('BiblePlugin', 'Upgrade the Bible databases to the '
'latest format')) 'latest format.'))
tools_menu.addAction(self.toolsUpgradeItem) tools_menu.addAction(self.toolsUpgradeItem)
QtCore.QObject.connect(self.toolsUpgradeItem, QtCore.QObject.connect(self.toolsUpgradeItem,
QtCore.SIGNAL(u'triggered()'), self.onToolsUpgradeItemTriggered) QtCore.SIGNAL(u'triggered()'), self.onToolsUpgradeItemTriggered)

View File

@ -423,8 +423,7 @@ class BibleUpgradeForm(OpenLPWizard):
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'The backup was not successful.\nTo backup your ' 'The backup was not successful.\nTo backup your '
'Bibles you need permission to write to the given ' 'Bibles you need permission to write to the given '
'directory. If you have write permissions and this ' 'directory.'))
'error still occurs, please report a bug.'))
return False return False
return True return True
elif self.currentPage() == self.selectPage: elif self.currentPage() == self.selectPage:
@ -521,7 +520,7 @@ class BibleUpgradeForm(OpenLPWizard):
OpenLPWizard.preWizard(self) OpenLPWizard.preWizard(self)
self.progressLabel.setText(translate( self.progressLabel.setText(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Starting upgrading Bible(s)...')) 'Starting Bible upgrade...'))
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
def performWizard(self): def performWizard(self):
@ -605,8 +604,7 @@ class BibleUpgradeForm(OpenLPWizard):
'Download Error'), 'Download Error'),
translate('BiblesPlugin.UpgradeWizardForm', translate('BiblesPlugin.UpgradeWizardForm',
'To upgrade your Web Bibles an Internet connection is ' 'To upgrade your Web Bibles an Internet connection is '
'required. If you have a working Internet connection ' 'required.'))
'and this error still occurs, please report a bug.'))
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\nFailed')) % 'Upgrading Bible %s of %s: "%s"\nFailed')) %
@ -737,7 +735,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n' 'Upgrading Bible %s of %s: "%s"\n'
'Done')) % 'Complete')) %
(number + 1, self.maxBibles, name)) (number + 1, self.maxBibles, name))
self.success[biblenumber] = True self.success[biblenumber] = True
else: else:
@ -770,8 +768,8 @@ class BibleUpgradeForm(OpenLPWizard):
if self.include_webbible: if self.include_webbible:
self.progressLabel.setText(unicode( self.progressLabel.setText(unicode(
translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading ' translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
'Bible(s): %s successful%s\nPlease note, that verses from ' 'Bible(s): %s successful%s\nPlease note that verses from '
'Web Bibles will be downloaded\non demand and so an ' 'Web Bibles will be downloaded on demand and so an '
'Internet connection is required.')) % 'Internet connection is required.')) %
(successful_import, failed_import_text)) (successful_import, failed_import_text))
else: else:

View File

@ -695,7 +695,7 @@ class BibleMediaItem(MediaManagerItem):
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('BiblePlugin.MediaItem', 'Information'), translate('BiblePlugin.MediaItem', 'Information'),
unicode(translate('BiblePlugin.MediaItem', unicode(translate('BiblePlugin.MediaItem',
'The second Bibles does not contain all the verses ' 'The second Bible does not contain all the verses '
'that are in the main Bible. Only verses found in both ' 'that are in the main Bible. Only verses found in both '
'Bibles will be shown. %d verses have not been ' 'Bibles will be shown. %d verses have not been '
'included in the results.')) % count, 'included in the results.')) % count,

View File

@ -28,7 +28,7 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, SpellTextEdit, build_icon 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): class Ui_CustomSlideEditDialog(object):
def setupUi(self, customSlideEditDialog): def setupUi(self, customSlideEditDialog):
@ -54,11 +54,8 @@ class Ui_CustomSlideEditDialog(object):
QtCore.QMetaObject.connectSlotsByName(customSlideEditDialog) QtCore.QMetaObject.connectSlotsByName(customSlideEditDialog)
def retranslateUi(self, customSlideEditDialog): def retranslateUi(self, customSlideEditDialog):
self.splitButton.setText( self.splitButton.setText(UiStrings().Split)
translate('CustomPlugin.EditCustomForm', 'Split Slide')) self.splitButton.setToolTip(UiStrings().SplitToolTip)
self.splitButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Split a slide into two '
'only if it does not fit on the screen as one slide.'))
self.insertButton.setText( self.insertButton.setText(
translate('CustomPlugin.EditCustomForm', 'Insert Slide')) translate('CustomPlugin.EditCustomForm', 'Insert Slide'))
self.insertButton.setToolTip( self.insertButton.setToolTip(

View File

@ -28,7 +28,7 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import build_icon, translate, SpellTextEdit 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 from openlp.plugins.songs.lib import VerseType
class Ui_EditVerseDialog(object): class Ui_EditVerseDialog(object):
@ -89,11 +89,8 @@ class Ui_EditVerseDialog(object):
VerseType.TranslatedNames[VerseType.Ending]) VerseType.TranslatedNames[VerseType.Ending])
self.verseTypeComboBox.setItemText(VerseType.Other, self.verseTypeComboBox.setItemText(VerseType.Other,
VerseType.TranslatedNames[VerseType.Other]) VerseType.TranslatedNames[VerseType.Other])
self.splitButton.setText( self.splitButton.setText(UiStrings().Split)
translate('SongsPlugin.EditVerseForm', '&Split')) self.splitButton.setToolTip(UiStrings().SplitToolTip)
self.splitButton.setToolTip(
translate('SongsPlugin.EditVerseForm', 'Split a slide into two '
'only if it does not fit on the screen as one slide.'))
self.insertButton.setText( self.insertButton.setText(
translate('SongsPlugin.EditVerseForm', '&Insert')) translate('SongsPlugin.EditVerseForm', '&Insert'))
self.insertButton.setToolTip( self.insertButton.setToolTip(

View File

@ -297,7 +297,7 @@ class SongImportForm(OpenLPWizard):
self.songsOfFellowshipDisabledLabel.setText( self.songsOfFellowshipDisabledLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'The Songs of ' translate('SongsPlugin.ImportWizardForm', 'The Songs of '
'Fellowship importer has been disabled because OpenLP cannot ' 'Fellowship importer has been disabled because OpenLP cannot '
'find OpenOffice.org on your computer.')) 'access OpenOffice or LibreOffice.'))
self.genericAddButton.setText( self.genericAddButton.setText(
translate('SongsPlugin.ImportWizardForm', 'Add Files...')) translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
self.genericRemoveButton.setText( self.genericRemoveButton.setText(
@ -305,7 +305,7 @@ class SongImportForm(OpenLPWizard):
self.genericDisabledLabel.setText( self.genericDisabledLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'The generic document/' translate('SongsPlugin.ImportWizardForm', 'The generic document/'
'presentation importer has been disabled because OpenLP cannot ' 'presentation importer has been disabled because OpenLP cannot '
'find OpenOffice.org on your computer.')) 'access OpenOffice or LibreOffice.'))
self.easiSlidesFilenameLabel.setText( self.easiSlidesFilenameLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Filename:')) translate('SongsPlugin.ImportWizardForm', 'Filename:'))
self.easiSlidesBrowseButton.setText(UiStrings().Browse) self.easiSlidesBrowseButton.setText(UiStrings().Browse)

View File

@ -68,7 +68,7 @@ class OooImport(SongImport):
self.log_error( self.log_error(
self.import_source[0], self.import_source[0],
translate('SongsPlugin.SongImport', translate('SongsPlugin.SongImport',
'Unable to open OpenOffice.org or LibreOffice')) 'Cannot access OpenOffice or LibreOffice'))
log.error(exc) log.error(exc)
return return
self.import_wizard.progressBar.setMaximum(len(self.import_source)) self.import_wizard.progressBar.setMaximum(len(self.import_source))