From acbddd78457d1608f458c788e02b4e17c199aed9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Mar 2020 22:56:59 +0530
Subject: [PATCH] String changes

---
 Changelog.yaml                            | 2 +-
 manual/drm.rst                            | 2 +-
 src/calibre/gui2/actions/edit_metadata.py | 2 +-
 src/calibre/gui2/book_details.py          | 2 +-
 src/calibre/gui2/open_with.py             | 2 +-
 src/calibre/gui2/tweak_book/file_list.py  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 486f415e4b..a73f1c5ed2 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -1123,7 +1123,7 @@
     - title: "Content server: Fix editing metadata that affects multiple books causing all the metadata for all the books to become the same."
       tickets: [1812781]
 
-    - title: "Open With: Fix using .bat files as the program not working."
+    - title: "Open with: Fix using .bat files as the program not working."
       tickets: [1811045]
 
     - title: "ZIP Output: Fix an error when building the ToC on macOS for some books with non-ASCII ToC entries"
diff --git a/manual/drm.rst b/manual/drm.rst
index 551ed63e6c..67ecd13f7c 100644
--- a/manual/drm.rst
+++ b/manual/drm.rst
@@ -16,7 +16,7 @@ the file or device, such as serial numbers or key-files. It can also refer to
 restrictions associated with specific instances of digital works or devices.
 DRM technologies attempt to control use of digital media by preventing access,
 copying or conversion to other formats by end users. See `wikipedia
-<http://en.wikipedia.org/wiki/Digital_rights_management>`_.
+<https://en.wikipedia.org/wiki/Digital_rights_management>`_.
 
 
 What does DRM imply for me personally?
diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 657d7cc1fc..f385defff9 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -312,7 +312,7 @@ class EditMetadataAction(InterfaceAction):
                 intro_msg=_('The downloaded metadata is on the left and the original metadata'
                             ' is on the right. If a downloaded value is blank or unknown,'
                             ' the original value is used.'),
-                action_button=(_('&View Book'), I('view.png'), self.gui.iactions['View'].view_historical),
+                action_button=(_('&View book'), I('view.png'), self.gui.iactions['View'].view_historical),
                 db=db
             )
             if d.exec_() == d.Accepted:
diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index 1e89b26da9..5b77323a8f 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -212,7 +212,7 @@ def add_format_entries(menu, data, book_info):
         else:
             m.addSeparator()
             m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(book_info.choose_open_with, book_id, fmt))
-            m.addAction(_('Edit Open With applications...'), partial(edit_programs, fmt, book_info))
+            m.addAction(_('Edit Open with applications...'), partial(edit_programs, fmt, book_info))
             menu.addMenu(m)
             menu.ow = m
         if fmt.upper() in SUPPORTED:
diff --git a/src/calibre/gui2/open_with.py b/src/calibre/gui2/open_with.py
index 8eed3f1757..c829fe8972 100644
--- a/src/calibre/gui2/open_with.py
+++ b/src/calibre/gui2/open_with.py
@@ -444,7 +444,7 @@ def register_keyboard_shortcuts(gui=None, finalize=False):
             unique_name = application['uuid']
             func = partial(gui.open_with_action_triggerred, filetype, application)
             ac.triggered.connect(func)
-            gui.keyboard.register_shortcut(unique_name, name, action=ac, group=_('Open With'))
+            gui.keyboard.register_shortcut(unique_name, name, action=ac, group=_('Open with'))
             gui.addAction(ac)
             registered_shortcuts[unique_name] = ac
     if finalize:
diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py
index cacd4bd094..d533947a73 100644
--- a/src/calibre/gui2/tweak_book/file_list.py
+++ b/src/calibre/gui2/tweak_book/file_list.py
@@ -206,7 +206,7 @@ class OpenWithHandler(object):  # {{{
         else:
             m.addSeparator()
             m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(self.choose_open_with, file_name, fmt))
-            m.addAction(_('Edit Open With applications...'), partial(edit_programs, fmt, self))
+            m.addAction(_('Edit Open with applications...'), partial(edit_programs, fmt, self))
             menu.addMenu(m)
             menu.ow = m