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

Merge branch 'spelling' into 'master'

Browse Source 
Corrected typos in 4 files

Closes #329

See merge request openlp/openlp!78
This commit is contained in:
Raoul Snyman 2019-11-15 16:26:08 +00:00
commit 862a5e563f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/app.py
View File

@ -432,7 +432,7 @@ def main():
except OSError: except OSError:
QtWidgets.QMessageBox.warning( QtWidgets.QMessageBox.warning(
None, translate('OpenLP', 'Settings Upgrade'), None, translate('OpenLP', 'Settings Upgrade'),
translate('OpenLP', 'Settings back up failed.\n\nContinuining to upgrade.')) translate('OpenLP', 'Settings back up failed.\n\nContinuing to upgrade.'))
settings.upgrade_settings() settings.upgrade_settings()
# First time checks in settings # First time checks in settings
if not Settings().value('core/has run wizard'): if not Settings().value('core/has run wizard'):

6
openlp/core/projectors/constants.py
View File

@ -459,14 +459,14 @@ STATUS_MSG = {
E_UNFINISHED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants', E_UNFINISHED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
'The last operation attempted has not finished yet ' 'The last operation attempted has not finished yet '
'(still in progress in the background)'), '(still in progress in the background)'),
E_UNKNOWN: translate('OpenLP.ProjectorConstants', 'Unknown condiction detected'), E_UNKNOWN: translate('OpenLP.ProjectorConstants', 'Unknown condition detected'),
E_UNKNOWN_SOCKET_ERROR: translate('OpenLP.ProjectorConstants', 'An unidentified socket error occurred'), E_UNKNOWN_SOCKET_ERROR: translate('OpenLP.ProjectorConstants', 'An unidentified socket error occurred'),
E_UNSUPPORTED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants', E_UNSUPPORTED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
'The requested socket operation is not supported by the local ' 'The requested socket operation is not supported by the local '
'operating system (e.g., lack of IPv6 support)'), 'operating system (e.g., lack of IPv6 support)'),
E_WARN: translate('OpenLP.ProjectorConstants', 'Warning condition detected'), E_WARN: translate('OpenLP.ProjectorConstants', 'Warning condition detected'),
S_AUTHENTICATE: translate('OpenLP.ProjectorConstants', 'Connection initializing with pin'), S_AUTHENTICATE: translate('OpenLP.ProjectorConstants', 'Connection initializing with pin'),
S_BOUND: translate('OpenLP.ProjectorConstants', 'Socket is bount to an address or port'), S_BOUND: translate('OpenLP.ProjectorConstants', 'Socket is bound to an address or port'),
S_CONNECT: translate('OpenLP.ProjectorConstants', 'Connection initializing'), S_CONNECT: translate('OpenLP.ProjectorConstants', 'Connection initializing'),
S_CLOSING: translate('OpenLP.ProjectorConstants', 'Socket is about to close'), S_CLOSING: translate('OpenLP.ProjectorConstants', 'Socket is about to close'),
S_CONNECTED: translate('OpenLP.ProjectorConstants', 'Connected'), S_CONNECTED: translate('OpenLP.ProjectorConstants', 'Connected'),
@ -476,7 +476,7 @@ STATUS_MSG = {
S_HOST_LOOKUP: translate('OpenLP.ProjectorConstants', 'Performing a host name lookup'), S_HOST_LOOKUP: translate('OpenLP.ProjectorConstants', 'Performing a host name lookup'),
S_INFO: translate('OpenLP.ProjectorConstants', 'Projector Information available'), S_INFO: translate('OpenLP.ProjectorConstants', 'Projector Information available'),
S_INITIALIZE: translate('OpenLP.ProjectorConstants', 'Initialize in progress'), S_INITIALIZE: translate('OpenLP.ProjectorConstants', 'Initialize in progress'),
S_LISTENING: translate('OpenLP.ProjectorConstants', 'Socket it listening (internal use only)'), S_LISTENING: translate('OpenLP.ProjectorConstants', 'Socket is listening (internal use only)'),
S_NETWORK_IDLE: translate('OpenLP.ProjectorConstants', 'No network activity at this time'), S_NETWORK_IDLE: translate('OpenLP.ProjectorConstants', 'No network activity at this time'),
S_NETWORK_RECEIVING: translate('OpenLP.ProjectorConstants', 'Received data'), S_NETWORK_RECEIVING: translate('OpenLP.ProjectorConstants', 'Received data'),
S_NETWORK_SENDING: translate('OpenLP.ProjectorConstants', 'Sending data'), S_NETWORK_SENDING: translate('OpenLP.ProjectorConstants', 'Sending data'),

2
openlp/core/ui/exceptionform.py
View File

@ -114,7 +114,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties):
log.exception('Failed to write crash report') log.exception('Failed to write crash report')
QtWidgets.QMessageBox.warning( QtWidgets.QMessageBox.warning(
self, translate('OpenLP.ExceptionDialog', 'Failed to Save Report'), self, translate('OpenLP.ExceptionDialog', 'Failed to Save Report'),
translate('OpenLP.ExceptionDialog', 'The following error occured when saving the report.\n\n' translate('OpenLP.ExceptionDialog', 'The following error occurred when saving the report.\n\n'
'{exception}').format(file_name=file_path, exception=e)) '{exception}').format(file_name=file_path, exception=e))
def on_send_report_button_clicked(self): def on_send_report_button_clicked(self):

2
openlp/plugins/songs/lib/importer.py
View File

@ -361,7 +361,7 @@ class SongFormat(object):
'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm', 'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm',
'Singing The Faith Exported Files')), 'Singing The Faith Exported Files')),
'descriptionText': translate('SongsPlugin.ImportWizardForm', 'descriptionText': translate('SongsPlugin.ImportWizardForm',
'First use Singing The Faith Electonic edition to export ' 'First use Singing The Faith Electronic edition to export '
'the song(s) in Text format.') 'the song(s) in Text format.')
}, },
SongBeamer: { SongBeamer: {