In this commit:

- Removed version number from main window name
- Removed version number from remote window names
- Reworked the traceback error message (New text, added margin to right)

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.'
+            translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> '
-                                                ' If possible, write in English.'
+                                                '&nbsp;If possible, write in English.'))
-                                                '\n(Minimum 20 characters)'))
         self.message_label.setText(
-            translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the '
+            translate('OpenLP.ExceptionDialog', '<strong>Oops, OpenLP hit a problem '
-                                                'box below contains information that might be helpful to the OpenLP '
+                      'and couldn\'t recover!</strong> <br><br>'
-                                                'developers, so please e-mail it to bugs@openlp.org, along with a '
+                      '<strong>You can help </strong> OpenLP developers to fix this by<br>'
-                                                'detailed description of what you were doing when the problem '
+                      'sending them a <strong>bug report</strong> '
-                                                'occurred. Also attach any files that triggered the problem.'))
+                      'to  <a href="mailto:bugs@openlp.org"> bugs@openlp.org </a> <br> <br>'
+                      '<strong>No email app? </strong> You can <strong>save</strong> this '
+                      'information to a <strong>file</strong> and<br>'
+                      'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'
+                      '<strong>Thank you<strong> 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'))

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):
         """

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):

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'))

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')
+        stage = translate('RemotePlugin.Mobile', 'Stage')
-        live = translate('RemotePlugin.Mobile', 'Live View')
+        #live = translate('RemotePlugin.Mobile', 'Live')
         self.template_vars = {
-            'app_title': "%s %s" % (UiStrings().OLPV2x, remote),
+            'app_title': "OpenLP | %s" % remote,
-            'stage_title': "%s %s" % (UiStrings().OLPV2x, stage),
+            'stage_title': "OpenLP | %s" % stage,
-            'live_title': "%s %s" % (UiStrings().OLPV2x, live),
+            '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'),