raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add LibreOffice to error messages. 

Standardise error messages.

bzr-revno: 1626
This commit is contained in:
Gerald Britton 2011-06-11 09:23:31 +02:00 committed by Raoul Snyman
parent 317a12751f 430861030e
commit b068128dfd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/songs/forms/songimportform.py
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)

2
openlp/plugins/songs/lib/oooimport.py
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))