This branch includes various UI string changes, such as:

- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2691

openlp/core/ui/advancedtab.py

@@ -257,7 +257,7 @@ class AdvancedTab(SettingsTab):
         self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
         self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:'))
         self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
-                                                      'Open the last used Library category on startup'))
+                                                      'Open the last used Library tab on startup'))
         self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
                                                            'Double-click to send items straight to Live'))
         self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
@@ -265,7 +265,7 @@ class AdvancedTab(SettingsTab):
         self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
                                                                       'Preview items when clicked in Service'))
         self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
-                                                             'Expand new Service items on creation'))
+                                                             'Expand new service items on creation'))
         self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
                                                       'Max height for non-text slides\nin slide controller:'))
         self.slide_max_height_combo_box.setItemText(0, translate('OpenLP.AdvancedTab', 'Disabled'))

openlp/core/ui/exceptiondialog.py

@@ -106,7 +106,7 @@ class Ui_ExceptionDialog(object):
             translate('OpenLP.ExceptionDialog', '{first_part}'
                       '<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>'
+                      'send it from your <strong>mail on browser</strong> via an <strong>attachment.</strong><br><br>'
                       '<strong>Thank you<strong> for being part of making OpenLP better!<br>'
                       ).format(first_part=exception_part1))
         self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))

openlp/core/ui/exceptionform.py

@@ -197,13 +197,18 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties):
         """
         count = int(20 - len(self.description_text_edit.toPlainText()))
         if count < 0:
-            count = 0
             self.__button_state(True)
+            self.description_word_count.setText(
+                translate('OpenLP.ExceptionDialog', '<strong>Thank you for your description!</strong>'))
+        elif count == 20:
+            self.__button_state(False)
+            self.description_word_count.setText(
+                translate('OpenLP.ExceptionDialog', '<strong>Tell us what you were doing when this happened.</strong>'))
         else:
             self.__button_state(False)
             self.description_word_count.setText(
-            translate('OpenLP.ExceptionDialog', '{count} characters remaining from the minimum description.'
+                translate('OpenLP.ExceptionDialog', '<strong>Please enter a more detailed description of the situation'
-                      ).format(count=count))
+                          ))
 
     def on_attach_file_button_clicked(self):
         """

openlp/core/ui/mainwindow.py

@@ -429,13 +429,13 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))
         self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
         self.settings_import_item.setStatusTip(
-            translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '
+            translate('OpenLP.MainWindow', 'Import settings from a *.config file previously exported from '
-                                           'this or an another machine.'))
+                                           'this or another machine.'))
         self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
-        self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors'))
+        self.view_projector_manager_item.setText(translate('OpenLP.MainWindow', '&Projectors'))
         self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))
         self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',
-                                                                'Toggle the visibility of the Projectors.'))
+                                                                'Toggle visibility of the Projectors.'))
         self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))
         self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))
         self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',
@@ -443,22 +443,22 @@ class Ui_MainWindow(object):
         self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))
         self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show themes'))
         self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',
-                                                  'Toggle the visibility of the Themes.'))
+                                                  'Toggle visibility of the Themes.'))
         self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))
         self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))
         self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',
-                                                    'Toggle the visibility of the Service.'))
+                                                    'Toggle visibility of the Service.'))
         self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))
         self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))
         self.view_preview_panel.setStatusTip(
-            translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.'))
+            translate('OpenLP.MainWindow', 'Toggle visibility of the Preview.'))
         self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))
         self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))
         self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))
         self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))
-        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.'))
+        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle visibility of the Live.'))
         self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
-        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'
+        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can enable and disable plugins '
                                                                                    'from here.'))
         self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
         self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
@@ -487,9 +487,9 @@ class Ui_MainWindow(object):
         self.update_theme_images.setText(translate('OpenLP.MainWindow', 'Update Theme Images'))
         self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',
                                                         'Update the preview images for all themes.'))
-        self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default'))
+        self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Show all'))
-        self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the '
+        self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface back to the '
-                                                                           'default settings.'))
+                                                                           'default layout and show all the panels.'))
         self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup'))
         self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting'
                                                                          ' up the Service.'))
@@ -954,7 +954,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
             self,
             translate('OpenLP.MainWindow', 'Export Settings File'),
             '',
-            translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)'))
+            translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)'))
         if not export_file_name:
             return
             # Make sure it's a .conf file.

openlp/plugins/media/lib/mediaitem.py

@@ -133,7 +133,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
             disable_optical_button_text = True
             optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
             optical_button_tooltip = translate('MediaPlugin.MediaItem',
-                                               'CD/DVD Playback is only supported if VLC is installed and enabled.')
+                                               'CD/DVD playback is only supported if VLC is installed and enabled.')
         self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon,
                                                             text=optical_button_text,
                                                             tooltip=optical_button_tooltip,

openlp/plugins/presentations/lib/presentationtab.py

@@ -125,11 +125,11 @@ class PresentationTab(SettingsTab):
             translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
         self.ppt_slide_click_check_box.setText(
             translate('PresentationPlugin.PresentationTab',
-                      'Clicking on current slide advances to the next effect'))
+                      'Clicking on the current slide advances to the next effect'))
         self.ppt_window_check_box.setText(
             translate('PresentationPlugin.PresentationTab',
                       'Let PowerPoint control the size and monitor of the presentations\n'
-                      '(This may fixes PowerPoint scaling issues in Windows 8 and 10)'))
+                      '(This may fix PowerPoint scaling issues in Windows 8 and 10)'))
         self.pdf_program_check_box.setText(
             translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
 

openlp/plugins/remotes/lib/httprouter.py

@@ -317,11 +317,12 @@ class HttpRouter(RegistryProperties):
         Translate various strings in the mobile app.
         """
         remote = translate('RemotePlugin.Mobile', 'Remote')
-        stage = translate('RemotePlugin.Mobile', 'Stage')
+        stage = translate('RemotePlugin.Mobile', 'Stage View')
+        live = translate('RemotePlugin.Mobile', 'Live View')
         self.template_vars = {
-            'app_title': "{remote} | OpenLP".format(remote=remote),
+            'app_title': "{main} {remote}".format(main=UiStrings().OLPV2x, remote=remote),
-            'stage_title': "{stage} | OpenLP".format(stage=stage),
+            'stage_title': "{main} {stage}".format(main=UiStrings().OLPV2x, stage=stage),
-            'live_title': "{live} | OpenLP".format(live=UiStrings().Live),
+            'live_title': "{main} {live}".format(main=UiStrings().OLPV2x, live=live),
             'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'),
             'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'),
             'alerts': translate('RemotePlugin.Mobile', 'Alerts'),