diff --git a/Changelog.yaml b/Changelog.yaml index 716bfb7195..61166f5851 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -1175,7 +1175,7 @@ - title: "Amazon metadata download: Recognize common patterns of embedding the series name after the title and remove it automatically" - - title: "Edit book: Add support for EPUB 3 to the Table of Contents tool. Now when editing EPUB 3 files using the tool will automatically generate both the EPUB 3 navigation document and the NCX table of contents for backwards compatibility" + - title: "Edit book: Add support for EPUB 3 to the Table of Contents tool. Now when editing EPUB 3 files using the tool will automatically generate both the EPUB 3 navigation document and the NCX Table of Contents for backwards compatibility" - title: "EPUB input: Implement reading of Table of Contents from EPUB 3 files that do not specify a fallback NCX ToC" diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index d4250f400d..a143ea75e7 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -458,9 +458,9 @@ maximum_cover_size = (1650, 2200) # the files will be sent to the location with the most free space. send_news_to_device_location = "main" -#: Unified toolbar on OS X +#: Unified toolbar on macOS # If you enable this option and restart calibre, the toolbar will be 'unified' -# with the titlebar as is normal for OS X applications. However, doing this has +# with the titlebar as is normal for macOS applications. However, doing this has # various bugs, for instance the minimum width of the toolbar becomes twice # what it should be and it causes other random bugs on some systems, so turn it # on at your own risk! diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 77d7795f6b..8b395c5a5f 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -62,7 +62,7 @@ class USBDevice: return False if man == self.manufacturer and prod == self.product: return True - # As of OS X 10.11.4 Apple started mangling the names returned via the + # As of macOS 10.11.4 Apple started mangling the names returned via the # IOKit registry. See # https://www.mobileread.com/forums/showthread.php?t=273213 m = osx_sanitize_name_pat.sub('_', (self.manufacturer or '')) @@ -101,7 +101,7 @@ class Device(DeviceConfig, DevicePlugin): #: Used by the new driver detection to disambiguate main memory from #: storage cards. Should be a regular expression that matches the - #: main memory mount point assigned by OS X + #: main memory mount point assigned by macOS OSX_MAIN_MEM_VOL_PAT = None OSX_EJECT_COMMAND = ['diskutil', 'eject'] diff --git a/src/calibre/ebooks/oeb/polish/check/opf.py b/src/calibre/ebooks/oeb/polish/check/opf.py index 50f0f4edab..4e9a874b41 100644 --- a/src/calibre/ebooks/oeb/polish/check/opf.py +++ b/src/calibre/ebooks/oeb/polish/check/opf.py @@ -65,7 +65,7 @@ class IncorrectToc(BaseError): self.HELP = _('There is no item with id="%s" in the manifest.') % bad_idref else: msg = _('The item identified as the Table of Contents has an incorrect media-type (%s)') % bad_mimetype - self.HELP = _('The media type for the table of contents must be %s') % guess_type('a.ncx') + self.HELP = _('The media type for the Table of Contents must be %s') % guess_type('a.ncx') BaseError.__init__(self, msg, name, lnum) diff --git a/src/calibre/ebooks/oeb/polish/toc.py b/src/calibre/ebooks/oeb/polish/toc.py index 0c9d643536..44c9c52db1 100644 --- a/src/calibre/ebooks/oeb/polish/toc.py +++ b/src/calibre/ebooks/oeb/polish/toc.py @@ -379,7 +379,7 @@ def from_xpaths(container, xpaths): Generate a Table of Contents from a list of XPath expressions. Each expression in the list corresponds to a level of the generate ToC. For example: :code:`['//h:h1', '//h:h2', '//h:h3']` will generate a three level - table of contents from the ``

``, ``

`` and ``

`` tags. + Table of Contents from the ``

``, ``

`` and ``

`` tags. ''' tocroot = TOC() xpaths = [XPath(xp) for xp in xpaths] @@ -771,7 +771,7 @@ def toc_to_html(toc, container, toc_name, title, lang=None): def create_inline_toc(container, title=None): ''' - Create an inline (HTML) Table of Contents from an existing NCX table of contents. + Create an inline (HTML) Table of Contents from an existing NCX Table of Contents. :param title: The title for this table of contents. ''' diff --git a/src/calibre/gui2/open_with.py b/src/calibre/gui2/open_with.py index ba7ce3349a..dff5f3c78e 100644 --- a/src/calibre/gui2/open_with.py +++ b/src/calibre/gui2/open_with.py @@ -139,7 +139,7 @@ if iswindows: # }}} elif isosx: - # OS X {{{ + # macOS {{{ oprefs = JSONConfig('osx_open_with') from calibre.utils.open_with.osx import find_programs, get_icon, entry_to_cmdline, get_bundle_data @@ -171,7 +171,7 @@ elif isosx: app = get_bundle_data(ans) if app is None: return error_dialog(parent, _('Invalid Application'), _( - '%s is not a valid OS X application bundle.') % ans, show=True) + '%s is not a valid macOS application bundle.') % ans, show=True) return app if not os.access(ans, os.X_OK): error_dialog(parent, _('Cannot execute'), _( diff --git a/src/calibre/gui2/preferences/metadata_sources.ui b/src/calibre/gui2/preferences/metadata_sources.ui index c983c4e58b..c0ba958c6e 100644 --- a/src/calibre/gui2/preferences/metadata_sources.ui +++ b/src/calibre/gui2/preferences/metadata_sources.ui @@ -88,7 +88,7 @@ - Downloaded metadata fields + Metadata fields to download diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index c2dee4c47b..ea762ecb2d 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -316,7 +316,7 @@ class SearchDialog(QDialog, Ui_Dialog): v = QVBoxLayout(d) button_box.accepted.connect(d.accept) button_box.rejected.connect(d.reject) - d.setWindowTitle(_('Customize get books search')) + d.setWindowTitle(_('Customize Get books search')) tab_widget = QTabWidget(d) v.addWidget(tab_widget) @@ -437,6 +437,7 @@ class SearchDialog(QDialog, Ui_Dialog): self.do_search() return QDialog.exec_(self) + if __name__ == '__main__': from calibre.gui2 import Application from calibre.gui2.preferences.main import init_gui @@ -447,5 +448,3 @@ if __name__ == '__main__': s = SearchDialog(gui, query=' '.join(sys.argv[1:])) s.exec_() - - diff --git a/src/calibre/gui2/tweak_book/widgets.py b/src/calibre/gui2/tweak_book/widgets.py index 9a46d55352..b2f8451399 100644 --- a/src/calibre/gui2/tweak_book/widgets.py +++ b/src/calibre/gui2/tweak_book/widgets.py @@ -831,7 +831,7 @@ class InsertSemantics(Dialog): d = info_dialog(self, _('About semantics'), _( 'Semantics refer to additional information about specific locations in the book.' ' 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' + ' 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 section of the opf file.')) d.resize(d.sizeHint()) diff --git a/src/calibre/linux.py b/src/calibre/linux.py index 0829417ee1..f54c5c09b7 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -1139,7 +1139,7 @@ def main(): def cli_index_strings(): return _('Command Line Interface'), _( - 'On OS X, the command line tools are inside the calibre bundle, for example,' + 'On macOS, the command line tools are inside the calibre bundle, for example,' ' if you installed calibre in :file:`/Applications` the command line tools' ' are in :file:`/Applications/calibre.app/Contents/console.app/Contents/MacOS/`.'), _( 'Documented commands'), _('Undocumented commands'), _(