Merge pull request #25023 from CAM-Gerlach/prefs-ui-text-shortcuts

PR: Clarify and polish UI text for keyboard shortcuts pref pane

Author: ccordoba12

spyder/plugins/shortcuts/confpage.py

@@ -30,14 +30,10 @@ def setup_page(self):
         reset_btn = self.create_button(
             icon=ima.icon("restart"),
             callback=self.reset_to_default,
-            tooltip=_("Reset to default values"),
+            tooltip=_("Reset all shortcuts to default values"),
         )
         top_label = QLabel(
-            _(
-                "Here you can browse the list of all available shortcuts in "
-                "Spyder. You can also customize them by double-clicking on "
-                "any entry in this table."
-            )
+            _("Customize a shortcut by double-clicking on its entry below.")
         )
 
         # Widget setup
@@ -71,11 +67,11 @@ def check_settings(self):
         self.table.check_shortcuts()
 
     def reset_to_default(self, force=False):
-        """Reset to default values of the shortcuts making a confirmation."""
+        """Reset all shortcuts to default values after confirmation."""
         if not force:
             reset = QMessageBox.warning(
                 self,
-                _("Shortcuts reset"),
+                _("Reset all shortcuts"),
                 _(
                     "Do you want to reset all shortcuts to their default "
                     "values?"

spyder/plugins/shortcuts/widgets/table.py

@@ -180,9 +180,12 @@ def setup(self):
         # Widgets
         self.label_info = QLabel()
         self.label_info.setText(
-            _("Press the new shortcut and select <b>Ok</b> to confirm, "
-              "click <b>Cancel</b> to revert to the previous state, "
-              "or use <b>Clear</b> to unbind the command from a shortcut.")
+            _(
+                "Press the new shortcut and select <b>Ok</b> to confirm, "
+                "click <b>Cancel</b> to revert to the previous state, "
+                "use <b>Clear</b> to unbind the command from a shortcut "
+                "or press <b>Default</b> to restore the default shortcut."
+            )
         )
         self.label_info.setAlignment(Qt.AlignTop | Qt.AlignLeft)
         self.label_info.setWordWrap(True)
@@ -205,15 +208,15 @@ def setup(self):
         self.label_warning.setAlignment(Qt.AlignTop | Qt.AlignLeft)
 
         self.button_default = QPushButton(_('Default'))
+        self.button_clear = QPushButton(_('Clear'))
         self.button_ok = QPushButton(_('Ok'))
         self.button_ok.setEnabled(False)
-        self.button_clear = QPushButton(_('Clear'))
         self.button_cancel = QPushButton(_('Cancel'))
         button_box = QHBoxLayout()
         button_box.addWidget(self.button_default)
+        button_box.addWidget(self.button_clear)
         button_box.addStretch(100)
         button_box.addWidget(self.button_ok)
-        button_box.addWidget(self.button_clear)
         button_box.addWidget(self.button_cancel)
 
         # New Sequence button box
@@ -399,9 +402,13 @@ def update_warning(self):
                 tip_body += ' - {0}: <b>{1}</b><br>'.format(s.context, s.name)
             tip_body += '<br>'
             if len(conflicts) == 1:
-                tip_override = _("Press 'Ok' to unbind it and assign it to")
+                tip_override = _(
+                    "Press 'Ok' to unbind it and assign the shortcut to"
+                )
             else:
-                tip_override = _("Press 'Ok' to unbind them and assign it to")
+                tip_override = _(
+                    "Press 'Ok' to unbind them and assign the shortcut to"
+                )
             tip_override += ' <b>{}</b>.'.format(self.name)
             tip = template.format(tip_title, tip_body, tip_override)
             icon = ima.icon('warning')