Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

String changes

Browse Source
This commit is contained in:
Kovid Goyal 2017-07-02 15:46:06 +05:30
parent ebdec9f6ae
commit 48b3bdf0f3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.yaml
View File

@ -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:

6
src/calibre/devices/kindle/driver.py
View File

@ -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.'
)

2
src/calibre/gui2/actions/copy_to_library.py
View File

@ -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:

6
src/calibre/gui2/preferences/adding.ui
View File

@ -149,21 +149,21 @@
<item row="8" column="0">
<widget class="QCheckBox" name="opt_add_formats_to_existing">
<property name="toolTip">
<string>Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
<string>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 (&quot;the&quot;, &quot;a&quot;, &quot;an&quot;), punctuation, case, etc. Author match is exact.</string>
</property>
<property name="text">
<string>&amp;Automerge added books if they already exist:</string>
<string>&amp;Auto-merge added books if they already exist:</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QComboBox" name="opt_automerge">
<property name="toolTip">
<string>Automerge: If books with similar titles and authors found, merge the incoming formats automatically into
<string>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: