diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index 9b835ea81..bad89f2ca 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -43,6 +43,8 @@ class Ui_ExceptionDialog(object):
self.exception_layout.setObjectName('exception_layout')
self.message_layout = QtWidgets.QHBoxLayout()
self.message_layout.setObjectName('messageLayout')
+ # Set margin to make the box a bit wider so the traceback is easier to read. (left, top, right, bottom)
+ self.message_layout.setContentsMargins(0, 0, 50, 0)
self.message_layout.addSpacing(12)
self.bug_label = QtWidgets.QLabel(exception_dialog)
self.bug_label.setPixmap(QtGui.QPixmap(':/graphics/exception.png'))
@@ -90,15 +92,18 @@ class Ui_ExceptionDialog(object):
"""
exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred'))
self.description_explanation.setText(
- translate('OpenLP.ExceptionDialog', 'Please enter a description of what you were doing to cause this error.'
- ' If possible, write in English.'
- '\n(Minimum 20 characters)'))
+ translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. '
+ ' If possible, write in English.'))
self.message_label.setText(
- translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the '
- 'box below contains information that might be helpful to the OpenLP '
- 'developers, so please e-mail it to bugs@openlp.org, along with a '
- 'detailed description of what you were doing when the problem '
- 'occurred. Also attach any files that triggered the problem.'))
+ translate('OpenLP.ExceptionDialog', 'Oops, OpenLP hit a problem '
+ 'and couldn\'t recover!
'
+ 'You can help OpenLP developers to fix this by
'
+ 'sending them a bug report '
+ 'to bugs@openlp.org
'
+ 'No email app? You can save this '
+ 'information to a file and
'
+ 'send it from your mail on browser via an attachement.
'
+ 'Thank you for being part of making OpenLP better!'))
self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File'))
self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File'))
diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py
index 2e4661579..f161e9b3b 100644
--- a/openlp/core/ui/exceptionform.py
+++ b/openlp/core/ui/exceptionform.py
@@ -200,7 +200,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties):
else:
self.__button_state(False)
self.description_word_count.setText(
- translate('OpenLP.ExceptionDialog', 'Description characters to enter : %s') % count)
+ translate('OpenLP.ExceptionDialog', '%s Characters from the minimum description remaining.') % count)
def on_attach_file_button_clicked(self):
"""
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 7bb19934d..2e5ff2c39 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -385,7 +385,7 @@ class Ui_MainWindow(object):
"""
Set up the translation system
"""
- main_window.setWindowTitle(UiStrings().OLPV2x)
+ main_window.setWindowTitle(UiStrings().OLP)
self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File'))
self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import'))
self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export'))
@@ -1156,9 +1156,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
:param file_name: The file name of the service file.
"""
if modified:
- title = '%s - %s*' % (UiStrings().OLPV2x, file_name)
+ title = '%s - %s*' % (UiStrings().OLP, file_name)
else:
- title = '%s - %s' % (UiStrings().OLPV2x, file_name)
+ title = '%s - %s' % (UiStrings().OLP, file_name)
self.setWindowTitle(title)
def show_status_message(self, message):
diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py
index 5b8fb7c2f..fcd899b0c 100644
--- a/openlp/plugins/media/lib/mediatab.py
+++ b/openlp/plugins/media/lib/mediatab.py
@@ -54,7 +54,7 @@ class MediaTab(SettingsTab):
def retranslateUi(self):
self.advanced_group_box.setTitle(UiStrings().Advanced)
self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden'))
- self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically'))
+ self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start live items automatically'))
def load(self):
self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player'))
diff --git a/openlp/plugins/remotes/lib/httprouter.py b/openlp/plugins/remotes/lib/httprouter.py
index d5e8cda1c..0a8e44432 100644
--- a/openlp/plugins/remotes/lib/httprouter.py
+++ b/openlp/plugins/remotes/lib/httprouter.py
@@ -312,12 +312,12 @@ class HttpRouter(RegistryProperties):
Translate various strings in the mobile app.
"""
remote = translate('RemotePlugin.Mobile', 'Remote')
- stage = translate('RemotePlugin.Mobile', 'Stage View')
- live = translate('RemotePlugin.Mobile', 'Live View')
+ stage = translate('RemotePlugin.Mobile', 'Stage')
+ #live = translate('RemotePlugin.Mobile', 'Live')
self.template_vars = {
- 'app_title': "%s %s" % (UiStrings().OLPV2x, remote),
- 'stage_title': "%s %s" % (UiStrings().OLPV2x, stage),
- 'live_title': "%s %s" % (UiStrings().OLPV2x, live),
+ 'app_title': "OpenLP | %s" % remote,
+ 'stage_title': "OpenLP | %s" % stage,
+ 'live_title': "OpenLP | %s" % (UiStrings().Live),
'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'),
'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'),
'alerts': translate('RemotePlugin.Mobile', 'Alerts'),