Use consistant terminology for syntax highlighting theme in UI

Author: CAM-Gerlach

spyder/plugins/appearance/confpage.py

@@ -95,9 +95,9 @@ def setup_page(self):
         syntax_group = QGroupBox(_("Syntax highlighting theme"))
 
         # Syntax Widgets
-        edit_button = QPushButton(_("Edit selected scheme"))
-        create_button = QPushButton(_("Create new scheme"))
-        self.delete_button = QPushButton(_("Delete scheme"))
+        edit_button = QPushButton(_("Edit selected theme"))
+        create_button = QPushButton(_("Create new theme"))
+        self.delete_button = QPushButton(_("Delete theme"))
         self.reset_button = QPushButton(_("Reset to defaults"))
 
         self.stacked_widget = QStackedWidget(self)
@@ -560,10 +560,12 @@ def delete_scheme(self):
         """Deletes the currently selected custom color scheme."""
         scheme_name = self.current_scheme
 
-        answer = QMessageBox.warning(self, _("Warning"),
-                                     _("Are you sure you want to delete "
-                                       "this scheme?"),
-                                     QMessageBox.Yes | QMessageBox.No)
+        answer = QMessageBox.warning(
+            self,
+            _("Warning"),
+            _("Are you sure you want to delete this theme?"),
+            QMessageBox.Yes | QMessageBox.No,
+        )
         if answer == QMessageBox.Yes:
             # Put the combobox in Spyder by default, when deleting a scheme
             names = self.get_option('names')

spyder/plugins/appearance/widgets.py

@@ -30,7 +30,7 @@ class SchemeEditor(QDialog):
     """A color scheme editor dialog."""
 
     def __init__(self, parent=None, stack=None):
-        super().__init__(parent)
+        super(SchemeEditor, self).__init__(parent)
         self.parent = parent
         self.stack = stack
         self.order = []    # Uses scheme names
@@ -150,14 +150,14 @@ def add_color_scheme_stack(self, scheme_name, custom=False):
 
         parent = self.parent
         self.line_edit = parent.create_lineedit(
-            _("Scheme name:"), '{0}/name'.format(scheme_name)
+            _("Theme name:"), '{0}/name'.format(scheme_name)
         )
 
         self.widgets[scheme_name] = {}
 
         # Widget setup
         self.line_edit.label.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
-        self.setWindowTitle(_('Color scheme editor'))
+        self.setWindowTitle(_('Syntax highlighting theme editor'))
 
         # Layout
         name_layout = QHBoxLayout()
@@ -243,7 +243,7 @@ def restore_original_scheme(self, scheme_name):
         self.line_edit.textbox.setText(
             str(parent.get_option('{0}/name'.format(scheme_name)))
         )
-        
+
         for key, value in self.original_scheme.items():
             if isinstance(value, tuple):
                 color = QColor()
@@ -255,7 +255,7 @@ def restore_original_scheme(self, scheme_name):
                 color = QColor()
                 color.setNamedColor(value)
                 self.widgets[scheme_name][key][0].update_text(color)
-    
+
     def reject(self):
         """Executes when Cancel is pressed: Restores the edited scheme."""
         self.restore_original_scheme(self.last_used_scheme)