- Re-did some of the changes.

- Fixed Powerpoint to PowerPoint in presentation controllers and one error.

openlp/core/ui/mainwindow.py

@@ -416,7 +416,7 @@ class Ui_MainWindow(object):
         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', 'Exit OpenLP - Shut down the program.'))
+        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,10 +425,10 @@ class Ui_MainWindow(object):
         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 settings to a .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 settings from a .config file previously exported from '
+            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', '&Projectors'))
@@ -946,7 +946,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', 'Exported OpenLP Settings (*.conf)'))
         if not export_file_name:
             return
             # Make sure it's a .conf file.

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -60,7 +60,7 @@ class PowerpointController(PresentationController):
         Initialise the class
         """
         log.debug('Initialising')
-        super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument)
+        super(PowerpointController, self).__init__(plugin, 'PowerPoint', PowerpointDocument)
         self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
         self.process = None
 
@@ -514,7 +514,7 @@ class PowerpointDocument(PresentationDocument):
             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.'))
 

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -55,7 +55,7 @@ class PptviewController(PresentationController):
         """
         log.debug('Initialising')
         self.process = None
-        super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument)
+        super(PptviewController, self).__init__(plugin, 'PowerPoint Viewer', PptviewDocument)
         self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
 
     def check_available(self):

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 a selected slide in Live advances to the next effect.'))
+                      'Clicking on a selected 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).'))
+                      '(workaround for Windows 8 scaling issue)'))
         self.pdf_program_check_box.setText(
             translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
 
@@ -148,7 +148,7 @@ class PresentationTab(SettingsTab):
             controller = self.controllers[key]
             checkbox = self.presenter_check_boxes[controller.name]
             checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name))
-            if controller.name == 'Powerpoint' and controller.is_available():
+            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

openlp/plugins/presentations/presentationplugin.py

@@ -40,8 +40,8 @@ __default_settings__ = {'presentations/override app': QtCore.Qt.Unchecked,
                         'presentations/enable_pdf_program': QtCore.Qt.Unchecked,
                         'presentations/pdf_program': '',
                         'presentations/Impress': QtCore.Qt.Checked,
-                        'presentations/Powerpoint': QtCore.Qt.Checked,
+                        'presentations/PowerPoint': QtCore.Qt.Checked,
-                        'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
+                        'presentations/PowerPoint Viewer': QtCore.Qt.Checked,
                         'presentations/Pdf': QtCore.Qt.Checked,
                         'presentations/presentations files': [],
                         'presentations/thumbnail_scheme': '',