Merge lp:~suutari-olli/openlp/ui-messages-part-1 into lp:openlp

[Azaziah]

In this re-proposal:
- Re-did some of the changes.
- Changed Powerpoint into PowerPoint for presentation controller names.
  (Also changed this on one error message, (I think it would be good to have
  all Powerpoints renamed to PowerPoint so they are not mixed, lowercaps
  powerpoint would remain as it is.)
- Fixed tests for checking Powerpoint name to PowerPoint.

This branch includes 3 modified tests, is that enough test coverage?

----------------------------------------------------------------------------

This branch includes the following UI string changes:
- 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.
- Some other changes

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Removed "Manager" from some strings since it's no longer used.
- Added dots to various tooltips / descriptions.
- In advanced tab: Number of recent files to display:
  has been changed to Number of recent Service files to display:

Do note that Jenkins is currently broken due to the crosswalk Bible test.
lp:~suutari-olli/openlp/ui-messages-part-1 (revision 2636)
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1413/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1331/
[←[1;31mFAILURE←[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1270/
Stopping after failure

[Tim Bentley (trb143)]

Not convinced with the removal of the version - see email.

Some improvements in the text as some changes can be made even clearer.

review: Needs Fixing

[Azaziah (suutari-olli)]

Thank you for the review, I've replied to the comments and made some changes.

[Tim Bentley (trb143)]

Some wording comments.
Not sure about the impact on the change of PowerPoint.

review: Needs Fixing

[Azaziah (suutari-olli)]

I replied to the comments, I'll see if I can get the traceback sorted out later.

[lp:~suutari-olli/openlp/ui-messages-part-1]

2641. By Azaziah on 2016-04-13

- Reverted the Powerpoint > PowerPoint changes.

2642. By Azaziah on 2016-04-13

Merged trunk on 13.4.16

2643. By Azaziah on 2016-04-13

- Capitalized references to plugin/panel names in settings. (Live etc.)
- Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') to uistrings.
  This is now used in players tab, alerts tab and images tab.
- Added space before "s" and "pt" units.

2644. By Azaziah on 2016-04-13

Splitted mail adress away expection error text, now inserting it with %s

[Azaziah (suutari-olli)]

I replied to expection error and View menu,
now re-proposing.

[lp:~suutari-olli/openlp/ui-messages-part-1]

2645. By Azaziah on 2016-05-10

Commiting for merging trunk, some new changes.

2646. By Azaziah on 2016-05-10

- Merged trunk

2647. By Azaziah on 2016-05-10

Lowercapped some settings.

2648. By Azaziah on 2016-05-10

Lowercapped bunch of stuff, splitted expection error

2649. By Azaziah on 2016-05-10

- Changes based on comments by TRB143

2650. By Azaziah on 2016-05-10

- Pep8 fixes

2651. By Azaziah on 2016-05-18

- Merged trunk on 18.5.2016 20:57

2652. By Azaziah on 2016-07-24

- Changed stuff based on comments by TRB143.

2653. By Azaziah on 2016-07-24

- Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts

2654. By Azaziah on 2016-07-24

- Changed Remote web page titles from OpenLP | x to x | OpenLP

2655. By Azaziah on 2016-08-02

- Merged trunk on 2.8.16

2656. By Azaziah on 2016-08-03

- Changed stuff based on suggestions by superfly

Unmerged revisions

=== modified file 'openlp/core/common/uistrings.py'
--- openlp/core/common/uistrings.py	2016-01-23 08:15:37 +0000
+++ openlp/core/common/uistrings.py	2016-04-13 16:51:01 +0000
@@ -56,6 +56,7 @@
         self.AllFiles = translate('OpenLP.Ui', 'All Files')
         self.Automatic = translate('OpenLP.Ui', 'Automatic')
         self.BackgroundColor = translate('OpenLP.Ui', 'Background Color')
+        self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
         self.Bottom = translate('OpenLP.Ui', 'Bottom')
         self.Browse = translate('OpenLP.Ui', 'Browse...')
         self.Cancel = translate('OpenLP.Ui', 'Cancel')
@@ -80,7 +81,7 @@
         self.File = translate('OpenLP.Ui', 'File')
         self.FileNotFound = translate('OpenLP.Ui', 'File Not Found')
         self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.')
-        self.FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit')
+        self.FontSizePtUnit = translate('OpenLP.Ui', ' pt', 'Abbreviated font pointsize unit')
         self.Help = translate('OpenLP.Ui', 'Help')
         self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours')
         self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected', 'Singular')
@@ -126,7 +127,7 @@
                                                             'player is disabled.')
         self.ResetBG = translate('OpenLP.Ui', 'Reset Background')
         self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.')
-        self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds')
+        self.Seconds = translate('OpenLP.Ui', ' s', 'The abbreviated unit for seconds')
         self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
         self.Search = translate('OpenLP.Ui', 'Search')
         self.SearchThemes = translate('OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ')

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2016-04-05 17:30:20 +0000
+++ openlp/core/ui/advancedtab.py	2016-04-13 16:51:01 +0000
@@ -273,24 +273,24 @@
         self.tab_title_visible = UiStrings().Advanced
         self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
         self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
-        self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
+        self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent Service files to display:'))
         self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
-                                                      'Remember active media manager tab on startup'))
+                                                      'Open the last used Library category on startup'))
         self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
-                                                           'Double-click to send items straight to live'))
+                                                           'Double-click to send items straight to Live'))
         self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
-                                                              'Preview items when clicked in Media Manager'))
+                                                              'Preview items when clicked in Library'))
         self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
-                                                                      'Preview items when clicked in Service Manager'))
+                                                                      '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_spin_box.setSpecialValueText(translate('OpenLP.AdvancedTab', 'Disabled'))
         self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab',
                                                            'Enable application exit confirmation'))
         self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name'))
-        self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default service name'))
+        self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default Service name'))
         self.service_name_time_label.setText(translate('OpenLP.AdvancedTab', 'Date and Time:'))
         self.service_name_day.setItemText(0, translate('OpenLP.AdvancedTab', 'Monday'))
         self.service_name_day.setItemText(1, translate('OpenLP.AdvancedTab', 'Tuesday'))
@@ -300,11 +300,11 @@
         self.service_name_day.setItemText(5, translate('OpenLP.AdvancedTab', 'Saturday'))
         self.service_name_day.setItemText(6, translate('OpenLP.AdvancedTab', 'Sunday'))
         self.service_name_day.setItemText(7, translate('OpenLP.AdvancedTab', 'Now'))
-        self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual service starts.'))
+        self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual Service starts.'))
         self.service_name_label.setText(translate('OpenLP.AdvancedTab', 'Name:'))
         self.service_name_edit.setToolTip(translate('OpenLP.AdvancedTab', 'Consult the OpenLP manual for usage.'))
         self.service_name_revert_button.setToolTip(
-            translate('OpenLP.AdvancedTab', 'Revert to the default service name "%s".') %
+            translate('OpenLP.AdvancedTab', 'Revert to the default Service name "%s".') %
             UiStrings().DefaultServiceName)
         self.service_name_example_label.setText(translate('OpenLP.AdvancedTab', 'Example:'))
         self.hide_mouse_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Mouse Cursor'))
@@ -337,7 +337,7 @@
         self.slide_label.setText(translate('OpenLP.GeneralTab', 'Behavior of next/previous on the last/first slide:'))
         self.end_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Remain on Slide'))
         self.wrap_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Wrap around'))
-        self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous service item'))
+        self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous Service item'))
         self.search_as_type_check_box.setText(translate('SongsPlugin.GeneralTab', 'Enable search as you type'))
 
     def load(self):

=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py	2015-12-31 22:46:06 +0000
+++ openlp/core/ui/exceptiondialog.py	2016-04-13 16:51:01 +0000
@@ -43,6 +43,8 @@
         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'))
@@ -88,17 +90,21 @@
         """
         Translate the widgets on the fly.
         """
+        # Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable.
+        bugs_mail = '<a href = "mailto:[e-mail]" > [e-mail]</a>'
         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', '<strong>Please describe what you were trying to do.</strong> '
+                                                '&nbsp;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 [e-mail], 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', '<strong>Oops, OpenLP hit a problem '
+                      'and couldn\'t recover!</strong> <br><br>'
+                      '<strong>You can help </strong> OpenLP developers to <strong>fix this</strong> by<br>'
+                      'sending them a <strong>bug report</strong> to %s<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!<br>') % bugs_mail)
         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'))

=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py	2016-04-04 19:53:54 +0000
+++ openlp/core/ui/exceptionform.py	2016-04-13 16:51:01 +0000
@@ -199,7 +199,7 @@
         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):
         """

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2016-01-16 20:13:41 +0000
+++ openlp/core/ui/generaltab.py	2016-04-13 16:51:01 +0000
@@ -210,15 +210,15 @@
         self.display_on_monitor_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen'))
         self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup'))
         self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning'))
-        self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last service'))
+        self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last Service'))
         self.show_splash_check_box.setText(translate('OpenLP.GeneralTab', 'Show the splash screen'))
         self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP'))
         self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings'))
         self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab',
-                                                  'Prompt to save before starting a new service'))
-        self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new live item'))
+                                                  'Prompt to save before starting a new Service'))
+        self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new Live item'))
         self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab',
-                                                      'Automatically preview next item in service'))
+                                                      'Automatically preview next item in Service'))
         self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:'))
         self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
         self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details'))

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2016-04-04 19:53:54 +0000
+++ openlp/core/ui/mainwindow.py	2016-04-13 16:51:01 +0000
@@ -385,21 +385,21 @@
         """
         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'))
         self.recent_files_menu.setTitle(translate('OpenLP.MainWindow', '&Recent Services'))
         self.view_menu.setTitle(translate('OpenLP.MainWindow', '&View'))
-        self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', 'M&ode'))
+        self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', '&Layout Presets'))
         self.tools_menu.setTitle(translate('OpenLP.MainWindow', '&Tools'))
         self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings'))
         self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language'))
         self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help'))
         self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Library'))
-        self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager'))
-        self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager'))
-        self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projector Manager'))
+        self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service'))
+        self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Themes'))
+        self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projectors'))
         self.file_new_item.setText(translate('OpenLP.MainWindow', '&New Service'))
         self.file_new_item.setToolTip(UiStrings().NewService)
         self.file_new_item.setStatusTip(UiStrings().CreateService)
@@ -416,7 +416,7 @@
         self.print_service_order_item.setText(UiStrings().PrintService)
         self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.'))
         self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit'))
-        self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP'))
+        self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Close OpenLP - Shut down the program.'))
         self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme'))
         self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language'))
         self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme'))
@@ -425,41 +425,42 @@
         self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...'))
         self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...'))
         self.settings_export_item.setStatusTip(
-            translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file'))
+            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 specified *.config file previously '
-                                           'exported on this or another machine'))
+            translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '
+                                           'this or an another machine.'))
         self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
-        self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projector Manager'))
-        self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Projector Manager'))
+        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 Projector Manager'))
-        self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager'))
-        self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager'))
+                                                                'Toggle the 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',
-                                                  'Toggle the visibility of the media manager.'))
-        self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager'))
-        self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager'))
+                                                  'Toggle the visibility of the Library.'))
+        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 theme manager.'))
-        self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager'))
-        self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager'))
+                                                  'Toggle the 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 manager.'))
-        self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel'))
-        self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel'))
+                                                    'Toggle the 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 panel.'))
-        self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel'))
-        self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel'))
-        self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock Panels'))
-        self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.'))
-        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.'))
+            translate('OpenLP.MainWindow', 'Toggle the 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.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
-        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins'))
+        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'
+                                                                                   'from here.'))
         self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
-        self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP'))
+        self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
         if is_win() or is_macosx():
             self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide'))
         self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help'))
@@ -485,11 +486,13 @@
         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.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.'))
+        self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the '
+                                                                           'default settings.'))
         self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup'))
-        self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Setup.'))
+        self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting'
+                                                                         ' up the Service.'))
         self.mode_live_item.setText(translate('OpenLP.MainWindow', '&Live'))
-        self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.'))
+        self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on Live.'))
 
 
 class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
@@ -851,9 +854,9 @@
             return
         import_file_name, filter_used = QtWidgets.QFileDialog.getOpenFileName(
             self,
-            translate('OpenLP.MainWindow', 'Open File'),
+            translate('OpenLP.MainWindow', 'Import settings'),
             '',
-            translate('OpenLP.MainWindow', 'OpenLP Export Settings Files (*.conf)'))
+            translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)'))
         if not import_file_name:
             return
         setting_sections = []
@@ -943,7 +946,7 @@
             self,
             translate('OpenLP.MainWindow', 'Export Settings File'),
             '',
-            translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)'))
+            translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)'))
         if not export_file_name:
             return
             # Make sure it's a .conf file.
@@ -1153,9 +1156,9 @@
         :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):

=== modified file 'openlp/core/ui/media/playertab.py'
--- openlp/core/ui/media/playertab.py	2015-12-31 22:46:06 +0000
+++ openlp/core/ui/media/playertab.py	2016-04-13 16:51:01 +0000
@@ -125,7 +125,7 @@
         self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players'))
         self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order'))
         self.background_color_group_box.setTitle(UiStrings().BackgroundColor)
-        self.background_color_label.setText(UiStrings().DefaultColor)
+        self.background_color_label.setText(UiStrings().BackgroundColorColon)
         self.information_label.setText(translate('OpenLP.PlayerTab',
                                        'Visible background for videos with aspect ratio different to screen.'))
         self.retranslate_players()

=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/alerts/lib/alertstab.py	2016-04-13 16:51:01 +0000
@@ -98,7 +98,7 @@
         self.font_group_box.setTitle(translate('AlertsPlugin.AlertsTab', 'Font'))
         self.font_label.setText(translate('AlertsPlugin.AlertsTab', 'Font name:'))
         self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:'))
-        self.background_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Background color:'))
+        self.background_color_label.setText(UiStrings().BackgroundColorColon)
         self.font_size_label.setText(translate('AlertsPlugin.AlertsTab', 'Font size:'))
         self.font_size_spin_box.setSuffix(UiStrings().FontSizePtUnit)
         self.timeout_label.setText(translate('AlertsPlugin.AlertsTab', 'Alert timeout:'))

=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/bibles/lib/biblestab.py	2016-04-13 16:51:01 +0000
@@ -171,13 +171,13 @@
         self.display_style_combo_box.setItemText(DisplayStyle.Square,
                                                  translate('BiblesPlugin.BiblesTab', '[ And ]'))
         self.change_note_label.setText(translate('BiblesPlugin.BiblesTab',
-                                       'Note:\nChanges do not affect verses already in the service.'))
+                                       'Note: Changes do not affect verses in the Service'))
         self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses'))
         self.scripture_reference_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Custom Scripture References'))
-        self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse Separator:'))
-        self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range Separator:'))
-        self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List Separator:'))
-        self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End Mark:'))
+        self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse separator:'))
+        self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range separator:'))
+        self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List separator:'))
+        self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End mark:'))
         tip_text = translate('BiblesPlugin.BiblesTab',
                              'Multiple alternative verse separators may be defined.\nThey have to be separated by a '
                              'vertical bar "|".\nPlease clear this edit line to use the default value.')

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/images/lib/imagetab.py	2016-04-13 16:51:01 +0000
@@ -61,7 +61,7 @@
 
     def retranslateUi(self):
         self.background_color_group_box.setTitle(UiStrings().BackgroundColor)
-        self.background_color_label.setText(UiStrings().DefaultColor)
+        self.background_color_label.setText(UiStrings().BackgroundColorColon)
         self.information_label.setText(
             translate('ImagesPlugin.ImageTab', 'Visible background for images with aspect ratio different to screen.'))
 

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2016-04-03 19:44:09 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2016-04-13 16:51:01 +0000
@@ -138,7 +138,7 @@
             disable_optical_button_text = True
             optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
             optical_button_tooltip = translate('MediaPlugin.MediaItem',
-                                               'Load CD/DVD - only supported when 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,

=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2016-04-13 16:51:01 +0000
@@ -514,7 +514,7 @@
             log.exception('Failed to exit Powerpoint presentation after error')
             log.exception(e)
         critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument',
-                                                                'An error occurred in the Powerpoint integration '
+                                                                'An error occurred in the PowerPoint integration '
                                                                 'and the presentation will be stopped. '
                                                                 'Restart the presentation if you wish to present it.'))
 

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2016-04-13 16:51:01 +0000
@@ -125,11 +125,11 @@
             translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
         self.ppt_slide_click_check_box.setText(
             translate('PresentationPlugin.PresentationTab',
-                      'Clicking on a selected slide in the slidecontroller advances to next effect.'))
+                      'Clicking on current slide in Live advances to the next effect'))
         self.ppt_window_check_box.setText(
             translate('PresentationPlugin.PresentationTab',
-                      'Let PowerPoint control the size and position of the presentation window '
-                      '(workaround for Windows 8 scaling issue).'))
+                      'Let PowerPoint control the size and monitor of the presentations\n'
+                      '(This may fixes PowerPoint scaling issues in Windows)'))
         self.pdf_program_check_box.setText(
             translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
 
@@ -151,7 +151,7 @@
             if controller.name == 'Powerpoint' and controller.is_available():
                 powerpoint_available = True
         self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app'))
-        # Load Powerpoint settings
+        # Load PowerPoint settings
         self.ppt_slide_click_check_box.setChecked(Settings().value(self.settings_section +
                                                                    '/powerpoint slide click advance'))
         self.ppt_slide_click_check_box.setEnabled(powerpoint_available)

=== modified file 'openlp/plugins/remotes/lib/httprouter.py'
--- openlp/plugins/remotes/lib/httprouter.py	2016-03-19 19:42:10 +0000
+++ openlp/plugins/remotes/lib/httprouter.py	2016-04-13 16:51:01 +0000
@@ -312,12 +312,11 @@
         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')
         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'),

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/lib/songstab.py	2016-04-13 16:51:01 +0000
@@ -68,10 +68,10 @@
     def retranslateUi(self):
         self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode'))
         self.tool_bar_active_check_box.setText(translate('SongsPlugin.SongsTab',
-                                                         'Display verses on live tool bar'))
-        self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update service from song edit'))
+                                                         'Enable "Go to verse" button in Live panel'))
+        self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update Service from song edit'))
         self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab',
-                                                          'Import missing songs from service files'))
+                                                          'Import missing songs from Service files'))
         self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer'))
         self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab',
                                                            'Display "%s" symbol before copyright info') %

=== modified file 'tests/functional/openlp_core_ui/test_mainwindow.py'
--- tests/functional/openlp_core_ui/test_mainwindow.py	2016-01-15 20:37:53 +0000
+++ tests/functional/openlp_core_ui/test_mainwindow.py	2016-04-13 16:51:01 +0000
@@ -108,9 +108,9 @@
 
         # WHEN no changes are made to the service
 
-        # THEN the main window's title shoud be the same as the OLPV2x string in the UiStrings class
-        self.assertEqual(self.main_window.windowTitle(), UiStrings().OLPV2x,
-                         'The main window\'s title should be the same as the OLPV2x string in UiStrings class')
+        # THEN the main window's title shoud be the same as the OLP string in the UiStrings class
+        self.assertEqual(self.main_window.windowTitle(), UiStrings().OLP,
+                         'The main window\'s title should be the same as the OLP string in UiStrings class')
 
     def set_service_modifed_test(self):
         """
@@ -122,8 +122,8 @@
         self.main_window.set_service_modified(True, 'test.osz')
 
         # THEN the main window's title should be set to the
-        self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLPV2x, 'test.osz'),
-                         'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz*"')
+        self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLP, 'test.osz'),
+                         'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz*"')
 
     def set_service_unmodified_test(self):
         """
@@ -135,8 +135,8 @@
         self.main_window.set_service_modified(False, 'test.osz')
 
         # THEN the main window's title should be set to the
-        self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLPV2x, 'test.osz'),
-                         'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz"')
+        self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLP, 'test.osz'),
+                         'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz"')
 
     def mainwindow_configuration_test(self):
         """