From bf53bbf07a6ced728bf6a87d097fb6eb8c67e4e0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 14 Jan 2022 15:18:26 +0530
Subject: [PATCH] String changes

---
 src/calibre/gui2/keyboard.py                  |  2 +-
 .../gui2/preferences/create_custom_column.py  |  2 +-
 src/calibre/gui2/preferences/tweaks.py        | 23 +++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/calibre/gui2/keyboard.py b/src/calibre/gui2/keyboard.py
index a69cf5906f..05c3e296ef 100644
--- a/src/calibre/gui2/keyboard.py
+++ b/src/calibre/gui2/keyboard.py
@@ -715,7 +715,7 @@ class ShortcutConfig(QWidget):  # {{{
         self.search.search_done(True)
         if not idx.isValid():
             info_dialog(self, _('No matches'),
-                    _('Could not find any shortcuts matching %s')%query,
+                    _('Could not find any shortcuts matching <i>{}</i>').format(prepare_string_for_xml(query)),
                     show=True, show_copy_button=False)
             return
         self.highlight_index(idx)
diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py
index da27110ad1..312fb1f3e7 100644
--- a/src/calibre/gui2/preferences/create_custom_column.py
+++ b/src/calibre/gui2/preferences/create_custom_column.py
@@ -826,7 +826,7 @@ class CreateNewCustomColumn:
                    _("You cannot specify is_multiple for the datatype %s") % datatype)
         if not isinstance(display, dict):
             return(self.Result.INVALID_DISPLAY,
-                   _("The display parameter must be a python dict"))
+                   _("The display parameter must be a Python dict"))
         self.created_count += 1
         self.custcols[lookup_name] = {
                 'label': lookup_name,
diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py
index e695441d8d..a9beb273ea 100644
--- a/src/calibre/gui2/preferences/tweaks.py
+++ b/src/calibre/gui2/preferences/tweaks.py
@@ -6,25 +6,24 @@ import textwrap
 from collections import OrderedDict
 from functools import partial
 from operator import attrgetter
-from qt.core import (
-    QAbstractItemView, QAbstractListModel, QApplication, QComboBox, QDialog,
-    QDialogButtonBox, QFont, QGridLayout, QGroupBox, QIcon, QItemSelectionModel,
-    QLabel, QListView, QMenu, QModelIndex, QPlainTextEdit, QPushButton, QSizePolicy,
-    QSplitter, Qt, QVBoxLayout, QWidget, pyqtSignal
-)
 
-from calibre import isbytestring
+from calibre import isbytestring, prepare_string_for_xml
 from calibre.gui2 import error_dialog, info_dialog
 from calibre.gui2.preferences import AbortCommit, ConfigWidgetBase, test_widget
 from calibre.gui2.search_box import SearchBox2
 from calibre.gui2.widgets import PythonHighlighter
-from calibre.utils.config_base import (
-    default_tweaks_raw, exec_tweaks, normalize_tweak, read_custom_tweaks,
-    write_custom_tweaks
-)
+from calibre.utils.config_base import (default_tweaks_raw, exec_tweaks,
+                                       normalize_tweak, read_custom_tweaks,
+                                       write_custom_tweaks)
 from calibre.utils.icu import lower
 from calibre.utils.search_query_parser import ParseException, SearchQueryParser
 from polyglot.builtins import iteritems
+from qt.core import (QAbstractItemView, QAbstractListModel, QApplication,
+                     QComboBox, QDialog, QDialogButtonBox, QFont, QGridLayout,
+                     QGroupBox, QIcon, QItemSelectionModel, QLabel, QListView,
+                     QMenu, QModelIndex, QPlainTextEdit, QPushButton,
+                     QSizePolicy, QSplitter, Qt, QVBoxLayout, QWidget,
+                     pyqtSignal)
 
 ROOT = QModelIndex()
 
@@ -557,7 +556,7 @@ class ConfigWidget(ConfigWidgetBase):
         self.search.search_done(True)
         if not idx.isValid():
             info_dialog(self, _('No matches'),
-                    _('Could not find any shortcuts matching %s')%query,
+                    _('Could not find any tweaks matching <i>{}</i>').format(prepare_string_for_xml(query)),
                     show=True, show_copy_button=False)
             return
         self.highlight_index(idx)