diff --git a/Changelog.yaml b/Changelog.yaml
index 50a7ec84d8..c87b89cd63 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -2025,7 +2025,7 @@
- title: "A new tool to apply Tag mapper rules to existing books in the library. To use it, go to Preferences->Toolbars and add the tool to the toolbar"
- title: "Kindle driver: Detect books in Amazon's new KFX format present on e-ink Kindle devices"
- description: "Note that this only detects KFX books and allows you to delete them. You cannot copy them to your calibre library. Doing so would be pointless anyway, as KFX books are specialised for individual devices. Instead go to your 'Manage my content' page an Amazon.com and download them from there -- this will give you a regular AZW3 file you can add to calibre"
+ description: "Note that this only detects KFX books and allows you to delete them. You cannot copy them to your calibre library. Doing so would be pointless anyway, as KFX books are specialised for individual devices. Instead go to your 'Manage my content' page on Amazon.com and download them from there -- this will give you a regular AZW3 file you can add to calibre"
tickets: [1496206]
bug fixes:
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index eddc7d34f9..3a293c07a4 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -76,9 +76,9 @@ class KINDLE(USBMS):
VIRTUAL_BOOK_EXTENSIONS = frozenset({'kfx'})
VIRTUAL_BOOK_EXTENSION_MESSAGE = _(
'The following books are in KFX format. KFX is a virtual book format, and cannot'
- ' be transferred from the device. Instead, you must go to your "Manage my'
- ' content and devices" page on amazon.com and download the book to your computer from there.'
- ' That will give you a regular azw3 file that you can add to calibre normally.'
+ ' be transferred from the device. Instead, you should go to your "Manage my'
+ ' content and devices" page on the Amazon homepage and download the book to your computer from there.'
+ ' That will give you a regular AZW3 file that you can add to calibre normally.'
' Click "Show details" to see the list of books.'
)
diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index 1258daecd6..3b66d44eee 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -531,7 +531,7 @@ class CopyToLibraryAction(InterfaceAction):
_('Some books were automatically merged into existing '
'records in the target library. Click "Show '
'details" to see which ones. This behavior is '
- 'controlled by the Automerge option in '
+ 'controlled by the Auto-merge option in '
'Preferences->Import/export->Adding books.'), det_msg=books,
show=True)
if delete_after and self.worker.processed:
diff --git a/src/calibre/gui2/preferences/adding.ui b/src/calibre/gui2/preferences/adding.ui
index e6fd9fad13..57b9a5c45a 100644
--- a/src/calibre/gui2/preferences/adding.ui
+++ b/src/calibre/gui2/preferences/adding.ui
@@ -149,21 +149,21 @@
-
- Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
+ Auto-merge: If books with similar titles and authors found, merge the incoming formats automatically into
existing book records. The box to the right controls what happens when an existing record already has
the incoming format. Note that this option also affects the Copy to library action.
Title match ignores leading indefinite articles ("the", "a", "an"), punctuation, case, etc. Author match is exact.
- &Automerge added books if they already exist:
+ &Auto-merge added books if they already exist:
-
- Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
+ Auto-merge: If books with similar titles and authors found, merge the incoming formats automatically into
existing book records. This box controls what happens when an existing record already has
the incoming format: