String changes

Changelog.yaml

@@ -1238,7 +1238,7 @@
     - title: "LIT Output: Fix regression in 3.41 caused by py3 porting that broke conversion of some files to LIT."
       tickets: [1837561]
 
-    - title: "Version 3.47.1 fixes an error when using internet lookup from the book details panel and the e-book viewer, and also the tweak to control number of columns in the edit metadata dialog not working"
+    - title: "Version 3.47.1 fixes an error when using internet lookup from the book details panel and the E-book viewer, and also the tweak to control number of columns in the edit metadata dialog not working"
       tickets: [1842158,1842183,1842090,1842201]
 
   improved recipes:
@@ -1862,7 +1862,7 @@ to appear as Unknown if metadata management was set to manual in calibre."
     - title: "Edit book: Insert image dialog: Add buttons to change the image thumbnail size."
       tickets: [1791428]
 
-    - title: "Book details panel: Allow right clicking on a format to open it in the calibre editor"
+    - title: "Book details panel: Allow right clicking on a format to open it in the calibre E-book editor"
 
     - title: "Edit metadata dialog: Allow viewing or editing specific formats by right clicking the format in the formats list"
 

manual/conversion.rst

@@ -928,7 +928,7 @@ Custom page margins for individual HTML files
 If you are converting an EPUB or AZW3 file with multiple individual HTML files
 inside it and you want to change the page margins for a particular HTML file
 you can add the following style block to the HTML file using the calibre
-editor:
+E-book editor:
 
 .. code-block:: html
 

manual/edit.rst

@@ -26,7 +26,7 @@ Basic workflow
 ---------------
 
 .. note::
-    A video tour of the calibre editor is available `here
+    A video tour of the calibre E-book editor is available `here
     <https://calibre-ebook.com/demo#tutorials>`_.
 
 When you first open a book with the Edit book tool, you will be presented with
@@ -851,7 +851,7 @@ find it saves you a lot of time and effort.
 Snippets
 ^^^^^^^^^^^^^^^
 
-The calibre editor supports *snippets*. A snippet is a
+The calibre E-book editor supports *snippets*. A snippet is a
 piece of text that is either re-used often or contains a lot of redundant
 text. The editor allows you to insert a snippet with only a few key strokes.
 The snippets are very powerful, with many features, such as placeholders you

manual/function_mode.rst

@@ -408,4 +408,4 @@ More examples
 ----------------
 
 More useful examples, contributed by calibre users, can be found in the
-`calibre Editor forum <https://www.mobileread.com/forums/showthread.php?t=237181>`_.
+`calibre E-book editor forum <https://www.mobileread.com/forums/showthread.php?t=237181>`_.

manual/snippets.rst

@@ -3,7 +3,7 @@ Snippets
 
 .. |ct| replace:: ``Control+J``
 
-The calibre editor supports *snippets*. A snippet is a 
+The calibre E-book editor supports *snippets*. A snippet is a
 piece of text that is either re-used often or contains a lot of redundant
 text. The editor allows you to insert a snippet with only a few key strokes.
 For example, suppose you often find yourself inserting link tags when editing
@@ -24,7 +24,7 @@ built-in snippets and you can create your own to suit your editing style.
 The following discussion of the built-in snippets should help illustrate the
 power of the snippets system.
 
-.. note:: 
+.. note::
     You can also use snippets in the text entry fields in the :guilabel:`Search & replace`
     panel, however, placeholders (using |ct| to jump around) will not
     work.
@@ -69,7 +69,7 @@ Placeholders are simply the dollar ($) sign followed by a number. When the
 snippet is expanded by pressing |ct| the cursor is positioned at the first
 placeholder (the placeholder with the lowest number). When you press |ct| again
 the cursor jumps to the next placeholder (the placeholder with the next higher
-number). 
+number).
 
 Inserting an HTML link tag [<a]
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -100,7 +100,7 @@ substituted for the placeholder when the snippet is expanded. Also when you
 jump to a placeholder with default text using |ct|, the default text is
 selected. In this way, you can use default text to act as a reminder to you to
 fill in important parts of the template. You can specify default text for a
-placeholder by using the syntax: ``${<number>:default text}``. 
+placeholder by using the syntax: ``${<number>:default text}``.
 
 The other new feature is that the second placeholder has an asterisk after it
 (``${2*}``). This means that any text that was selected before expanding the
@@ -159,7 +159,7 @@ assumes that you want to specify a class for the tag::
 This will allow you to first type the tag name, press |ct|, type the class
 name, press |ct| type the contents of the tag and press |ct| one last time to
 jump out of the tag. The closing tag will be auto-filled.
-    
+
 
 Creating your own snippets
 ----------------------------

src/calibre/linux.py

@@ -1151,7 +1151,7 @@ def get_appdata():
             'name':'calibre - E-book Editor',
             'summary':_('Edit the text and styles inside e-books'),
             'description':(
-                _('The calibre e-book editor allows you to edit the text and styles inside the book with a live preview of your changes.'),
+                _('The calibre E-book editor allows you to edit the text and styles inside the book with a live preview of your changes.'),
                 _('It can edit books in both the EPUB and AZW3 (kindle) formats. It includes various useful tools for checking the book for errors, editing the Table of Contents, performing automated cleanups, etc.'),  # noqa
             ),
             'screenshots':(

src/calibre/utils/winreg/default_programs.py

@@ -31,7 +31,7 @@ def default_programs():
 
         'ebook-edit.exe': {
             'icon_id':'editor_icon',
-            'description': _('The calibre e-book editor. It can be used to edit common e-book formats.'),
+            'description': _('The calibre E-book editor. It can be used to edit common e-book formats.'),
             'capability_name': 'Editor' + ('64bit' if is64bit else ''),
             'name': 'calibre Editor' + (' 64-bit' if is64bit else ''),
             'assoc_name': 'calibreEditor' + ('64bit' if is64bit else ''),

src/pyj/read_book/highlights.pyj

@@ -649,7 +649,7 @@ def highlight_entry(h, onclick, view):
         E.div(class_='title', h.highlighted_text),
         E.div(
             class_='actions',
-            button(_('Show in text'), action.bind(None, show_in_text.bind(None, h.uuid))),
+            button(_('Show in book'), action.bind(None, show_in_text.bind(None, h.uuid))),
             E.span('\xa0'),
             button(_('Edit notes'), edit_notes.bind(None, h.uuid, h.notes, view)),
             E.span('\xa0'),