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 2020-04-27 09:29:09 +05:30
parent 89b86799bf
commit 1edc3a0fb9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Changelog.yaml
View File

@ -1245,9 +1245,9 @@
- title: "ZIP Output: Fix an error when building the ToC on macOS for some books with non-ASCII ToC entries"
tickets: [1813905]
- title: "Edit book: Check book: Follow recent releases of epubcheck in expecting .ttf files to have the mime-type application/vnd.ms-opentype in EPUB 3 books"
- title: "Edit book: Check book: Follow recent releases of epubcheck in expecting .ttf files to have the MIME type application/vnd.ms-opentype in EPUB 3 books"
- title: "Fix font mime-types not being auto-corrected when upgrading EPUBs from 2 to 3"
- title: "Fix font MIME types not being auto-corrected when upgrading EPUBs from 2 to 3"
- title: "Content server: Try to detect if a book file has been edited outside of calibre and serve the updated copy"
@ -1466,7 +1466,7 @@ to appear as Unknown if metadata management was set to manual in calibre."
- title: "Edit book: Insert image: remember size of displayed thumbnails."
tickets: [1795845]
- title: "Edit book: Compress images losslessly: Remember the last used compression quality for jpeg compression."
- title: "Edit book: Compress images losslessly: Remember the last used compression quality for JPEG compression."
tickets: [1796950]
bug fixes:
@ -2246,7 +2246,7 @@ to appear as Unknown if metadata management was set to manual in calibre."
- title: "Edit Book: Use the cache directory rather than the temp directory to store working files. Hopefully prevents temp file cleaners from destroying books."
tickets: [1740460]
- title: "EPUB input: Handle books that erroneously set the mimetype for font files to text/plain"
- title: "EPUB input: Handle books that erroneously set the MIME type for font files to text/plain"
- title: "AZW3 input: Do not fail to process files with invalid internal flow references."
tickets: [1740140]

2
manual/conversion.rst
View File

@ -589,7 +589,7 @@ clicking the :guilabel:`Edit metadata` button to bring up the bulk metadata
edit dialog, near the bottom of the dialog is an option to remove stored
conversion settings.
When you Bulk convert a set of books, settings are taken in the following order (last one wins):
When you bulk convert a set of books, settings are taken in the following order (last one wins):
* From the defaults set in Preferences->Conversion

2
manual/viewer.rst
View File

@ -142,7 +142,7 @@ Zooming in on images
You can zoom in to show an image at full size in a separate window by either
double clicking or long tapping on it. You can also right click on it and
choose :guilabel:`View Image`.
choose :guilabel:`View image`.
Non re-flowable content

2
resources/default_tweaks.py
View File

@ -429,7 +429,7 @@ metadata_edit_custom_column_order = []
#: The number of seconds to wait before sending emails
# The number of seconds to wait before sending emails when using a
# public email server like gmx/hotmail/gmail. Default is: 5 minutes
# public email server like GMX/Hotmail/Gmail. Default is: 5 minutes
# Setting it to lower may cause the server's SPAM controls to kick in,
# making email sending fail. Changes will take effect only after a restart of
# calibre. You can also change the list of hosts that calibre considers

2
src/calibre/devices/interface.py
View File

@ -315,7 +315,7 @@ class DevicePlugin(Plugin):
"""
Ask device for device information. See L{DeviceInfoQuery}.
:return: (device name, device version, software version on device, mime type)
:return: (device name, device version, software version on device, MIME type)
The tuple can optionally have a fifth element, which is a
drive information dictionary. See usbms.driver for an example.

10
src/calibre/ebooks/oeb/polish/check/links.py
View File

@ -206,17 +206,17 @@ class MimetypeMismatch(BaseError):
def __init__(self, container, name, opf_mt, ext_mt):
self.opf_mt, self.ext_mt = opf_mt, ext_mt
self.file_name = name
BaseError.__init__(self, _('The file %s has a mimetype that does not match its extension') % name, container.opf_name)
BaseError.__init__(self, _('The file %s has a MIME type that does not match its extension') % name, container.opf_name)
ext = name.rpartition('.')[-1]
self.HELP = _('The file {0} has its mimetype specified as {1} in the OPF file.'
' The recommended mimetype for files with the extension "{2}" is {3}.'
' You should change either the file extension or the mimetype in the OPF.').format(
self.HELP = _('The file {0} has its MIME type specified as {1} in the OPF file.'
' The recommended MIME type for files with the extension "{2}" is {3}.'
' You should change either the file extension or the MIME type in the OPF.').format(
name, opf_mt, ext, ext_mt)
if opf_mt in OEB_DOCS and name in {n for n, l in container.spine_names}:
self.INDIVIDUAL_FIX = _('Change the file extension to .xhtml')
self.change_ext_to = 'xhtml'
else:
self.INDIVIDUAL_FIX = _('Change the mimetype for this file in the OPF to %s') % ext_mt
self.INDIVIDUAL_FIX = _('Change the MIME type for this file in the OPF to %s') % ext_mt
self.change_ext_to = None
def __call__(self, container):

2
src/calibre/ebooks/oeb/polish/container.py
View File

@ -598,7 +598,7 @@ class Container(ContainerBase): # {{{
'''
Return the raw data corresponding to the file specified by name
:param decode: If True and the file has a text based mimetype, decode it and return a unicode object instead of raw bytes.
:param decode: If True and the file has a text based MIME type, decode it and return a unicode object instead of raw bytes.
:param normalize_to_nfc: If True the returned unicode object is normalized to the NFC normal form as is required for the EPUB and AZW3 file formats.
'''
ans = self.open(name).read()

2
src/calibre/gui2/dialogs/tag_categories.ui
View File

@ -149,7 +149,7 @@
<widget class="QCheckBox" name="apply_vl_checkbox">
<property name="toolTip">
<string>&lt;p&gt;Show items in the Available items box only if they appear in the
current Virtual library. Applied items not in the VL will be marked
current Virtual library. Applied items not in the Virtual library will be marked
&quot;not on any book&quot;.&lt;/p&gt;</string>
</property>
<property name="text">

2
src/calibre/gui2/dialogs/tag_list_editor.ui
View File

@ -66,7 +66,7 @@
<widget class="QCheckBox" name="apply_vl_checkbox">
<property name="toolTip">
<string>&lt;p&gt;Show items in the Available items box only if they appear in the
current Virtual library. Applied items not in the VL will be marked
current Virtual library. Applied items not in the Virtual library will be marked
&quot;not on any book&quot;.&lt;/p&gt;</string>
</property>
<property name="text">

2
src/calibre/gui2/tweak_book/widgets.py
View File

@ -885,7 +885,7 @@ class InsertSemantics(Dialog):
' For example, you can specify that a particular location is the dedication or the preface'
' or the Table of Contents and so on.\n\nFirst choose the type of semantic information, then'
' choose a file and optionally a location within the file to point to.\n\nThe'
' semantic information will be written in the <guide> section of the opf file.'))
' semantic information will be written in the <guide> section of the OPF file.'))
d.resize(d.sizeHint())
d.exec_()

10
src/calibre/utils/localization.py
View File

@ -285,7 +285,7 @@ set_translators.lang = None
_iso639 = None
_extra_lang_codes = {
'pt_BR' : _('Brazilian Portuguese'),
'en_GB' : _('English (UK)'),
'en_GB' : _('English (United Kingdom)'),
'zh_CN' : _('Simplified Chinese'),
'zh_TW' : _('Traditional Chinese'),
'en' : _('English'),
@ -332,10 +332,10 @@ _extra_lang_codes = {
'es_BO' : _('Spanish (Bolivia)'),
'es_NI' : _('Spanish (Nicaragua)'),
'es_CO' : _('Spanish (Colombia)'),
'de_AT' : _('German (AT)'),
'fr_BE' : _('French (BE)'),
'nl' : _('Dutch (NL)'),
'nl_BE' : _('Dutch (BE)'),
'de_AT' : _('German (Austria)'),
'fr_BE' : _('French (Belgium)'),
'nl' : _('Dutch (Netherlands)'),
'nl_BE' : _('Dutch (Belgium)'),
'und' : _('Unknown')
}

12
src/calibre/web/feeds/news.py
View File

@ -343,20 +343,20 @@ class BasicNewsRecipe(Recipe):
ignore_duplicate_articles = None
# The following parameters control how the recipe attempts to minimize
# jpeg image sizes
# JPEG image sizes
#: Set this to False to ignore all scaling and compression parameters and
#: pass images through unmodified. If True and the other compression
#: parameters are left at their default values, jpeg images will be scaled to fit
#: parameters are left at their default values, JPEG images will be scaled to fit
#: in the screen dimensions set by the output profile and compressed to size at
#: most (w * h)/16 where w x h are the scaled image dimensions.
compress_news_images = False
#: The factor used when auto compressing jpeg images. If set to None,
#: The factor used when auto compressing JPEG images. If set to None,
#: auto compression is disabled. Otherwise, the images will be reduced in size to
#: (w * h)/compress_news_images_auto_size bytes if possible by reducing
#: the quality level, where w x h are the image dimensions in pixels.
#: The minimum jpeg quality will be 5/100 so it is possible this constraint
#: The minimum JPEG quality will be 5/100 so it is possible this constraint
#: will not be met. This parameter can be overridden by the parameter
#: compress_news_images_max_size which provides a fixed maximum size for images.
#: Note that if you enable scale_news_images_to_device then the image will
@ -365,9 +365,9 @@ class BasicNewsRecipe(Recipe):
#: other words, this compression happens after scaling.
compress_news_images_auto_size = 16
#: Set jpeg quality so images do not exceed the size given (in KBytes).
#: Set JPEG quality so images do not exceed the size given (in KBytes).
#: If set, this parameter overrides auto compression via compress_news_images_auto_size.
#: The minimum jpeg quality will be 5/100 so it is possible this constraint
#: The minimum JPEG quality will be 5/100 so it is possible this constraint
#: will not be met.
compress_news_images_max_size = None