From fb1d7c40f81d578ed470522ddcea682f5dc49c44 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 3 Oct 2021 09:44:42 +0200 Subject: [PATCH] Fix the remaining typos --- src/calibre/db/adding.py | 4 +- src/calibre/db/delete_service.py | 2 +- src/calibre/db/restore.py | 2 +- src/calibre/devices/cli.py | 2 +- src/calibre/devices/errors.py | 2 +- src/calibre/devices/interface.py | 2 +- src/calibre/devices/kindle/apnx.py | 2 +- src/calibre/devices/kobo/driver.py | 46 +++++++++---------- .../devices/mtp/unix/upstream/device-flags.h | 4 +- .../devices/mtp/unix/upstream/music-players.h | 12 ++--- src/calibre/devices/mtp/windows/wpd.cpp | 2 +- src/calibre/devices/prs505/sony_cache.py | 2 +- .../ebooks/conversion/plugins/lit_input.py | 2 +- .../ebooks/conversion/plugins/pml_input.py | 2 +- .../ebooks/conversion/plugins/txt_input.py | 2 +- src/calibre/ebooks/conversion/plumber.py | 2 +- src/calibre/ebooks/docx/index.py | 2 +- src/calibre/ebooks/epub/cfi/parse.py | 2 +- src/calibre/ebooks/html/input.py | 2 +- src/calibre/ebooks/hyphenate.py | 2 +- src/calibre/ebooks/lit/mssha1.py | 2 +- src/calibre/ebooks/lrf/html/convert_from.py | 4 +- src/calibre/ebooks/lrf/pylrs/pylrs.py | 2 +- src/calibre/ebooks/metadata/ereader.py | 2 +- src/calibre/ebooks/metadata/fb2.py | 4 +- src/calibre/ebooks/metadata/sources/amazon.py | 2 +- src/calibre/ebooks/metadata/sources/base.py | 2 +- src/calibre/ebooks/mobi/writer2/resources.py | 2 +- src/calibre/ebooks/mobi/writer2/serializer.py | 2 +- src/calibre/ebooks/odt/input.py | 4 +- src/calibre/ebooks/oeb/polish/container.py | 2 +- src/calibre/ebooks/oeb/polish/pretty.py | 2 +- src/calibre/ebooks/oeb/transforms/split.py | 4 +- src/calibre/ebooks/pdb/ereader/inspector.py | 2 +- src/calibre/ebooks/pdb/ereader/writer.py | 2 +- src/calibre/ebooks/pdb/header.py | 2 +- src/calibre/ebooks/pdb/plucker/reader.py | 8 ++-- src/calibre/ebooks/pdb/ztxt/reader.py | 2 +- src/calibre/ebooks/pdf/render/links.py | 2 +- src/calibre/ebooks/pml/pmlml.py | 4 +- src/calibre/ebooks/rb/rbml.py | 2 +- src/calibre/ebooks/rb/writer.py | 12 ++--- src/calibre/ebooks/readability/readability.py | 4 +- src/calibre/ebooks/rtf/preprocess.py | 4 +- src/calibre/ebooks/rtf/rtfml.py | 2 +- src/calibre/ebooks/rtf2xml/ParseRtf.py | 4 +- src/calibre/ebooks/rtf2xml/add_brackets.py | 4 +- src/calibre/ebooks/rtf2xml/colors.py | 4 +- src/calibre/ebooks/rtf2xml/configure_txt.py | 4 +- src/calibre/ebooks/rtf2xml/convert_to_tags.py | 4 +- src/calibre/ebooks/rtf2xml/delete_info.py | 4 +- src/calibre/ebooks/rtf2xml/field_strings.py | 28 +++++------ src/calibre/ebooks/rtf2xml/fields_large.py | 12 ++--- src/calibre/ebooks/rtf2xml/fields_small.py | 8 ++-- src/calibre/ebooks/rtf2xml/get_options.py | 4 +- src/calibre/ebooks/rtf2xml/group_borders.py | 2 +- src/calibre/ebooks/rtf2xml/group_styles.py | 2 +- .../ebooks/rtf2xml/headings_to_sections.py | 2 +- src/calibre/ebooks/rtf2xml/hex_2_utf8.py | 12 ++--- src/calibre/ebooks/rtf2xml/info.py | 10 ++-- src/calibre/ebooks/rtf2xml/inline.py | 4 +- src/calibre/ebooks/rtf2xml/list_table.py | 12 ++--- src/calibre/ebooks/rtf2xml/make_lists.py | 2 +- src/calibre/ebooks/rtf2xml/options_trem.py | 4 +- src/calibre/ebooks/rtf2xml/paragraph_def.py | 18 ++++---- src/calibre/ebooks/rtf2xml/preamble_div.py | 2 +- src/calibre/ebooks/rtf2xml/preamble_rest.py | 2 +- src/calibre/ebooks/rtf2xml/process_tokens.py | 4 +- src/calibre/ebooks/rtf2xml/sections.py | 16 +++---- src/calibre/ebooks/rtf2xml/styles.py | 8 ++-- src/calibre/ebooks/rtf2xml/table.py | 8 ++-- src/calibre/ebooks/snb/snbfile.py | 2 +- src/calibre/ebooks/txt/markdownml.py | 2 +- src/calibre/ebooks/txt/textileml.py | 2 +- src/calibre/ebooks/unihandecode/unidecoder.py | 4 +- src/calibre/gui2/actions/__init__.py | 2 +- src/calibre/gui2/bars.py | 2 +- src/calibre/gui2/library/alternate_views.py | 2 +- src/calibre/gui2/library/views.py | 2 +- src/calibre/gui2/metadata/single.py | 2 +- src/calibre/gui2/pictureflow/pictureflow.h | 2 +- .../gui2/preferences/texture_chooser.py | 4 +- src/calibre/gui2/store/__init__.py | 4 +- src/calibre/gui2/store/search/models.py | 2 +- src/calibre/gui2/store/search/search.py | 2 +- .../store/stores/bubok_portugal_plugin.py | 2 +- .../store/stores/bubok_publishing_plugin.py | 2 +- .../gui2/store/stores/rw2010_plugin.py | 2 +- src/calibre/gui2/threaded_jobs.py | 2 +- .../gui2/tweak_book/diff/_patiencediff_c.c | 4 +- src/calibre/gui2/tweak_book/editor/widget.py | 4 +- src/calibre/gui2/tweak_book/job.py | 2 +- src/calibre/gui2/tweak_book/live_css.py | 2 +- src/calibre/gui2/tweak_book/preferences.py | 2 +- src/calibre/gui2/tweak_book/save.py | 2 +- src/calibre/gui2/update.py | 2 +- src/calibre/gui2/viewer/toolbars.py | 2 +- src/calibre/gui2/widgets.py | 4 +- src/calibre/headless/headless_integration.cpp | 2 +- src/calibre/library/catalogs/bibtex.py | 4 +- src/calibre/library/catalogs/utils.py | 2 +- src/calibre/library/database.py | 2 +- src/calibre/spell/dictionary.py | 2 +- src/calibre/srv/fast_css_transform.cpp | 2 +- src/calibre/srv/web_socket.py | 2 +- src/calibre/utils/certgen.c | 2 +- src/calibre/utils/exim.py | 2 +- src/calibre/utils/ipc/worker.py | 2 +- src/calibre/utils/matcher.py | 2 +- src/calibre/utils/mreplace.py | 2 +- src/calibre/utils/smartypants.py | 2 +- src/calibre/utils/speedup.c | 2 +- src/calibre/utils/threadpool.py | 6 +-- src/calibre/utils/windows/winutil.cpp | 10 ++-- src/calibre/web/feeds/news.py | 2 +- 115 files changed, 238 insertions(+), 238 deletions(-) diff --git a/src/calibre/db/adding.py b/src/calibre/db/adding.py index a1b5e25850..11e955d265 100644 --- a/src/calibre/db/adding.py +++ b/src/calibre/db/adding.py @@ -263,7 +263,7 @@ def add_catalog(cache, path, title, dbapi=None): new_book_added = True else: cache._set_metadata(db_id, mi) - cache.add_format(db_id, fmt, stream, dbapi=dbapi) # Cant keep write lock since post-import hooks might run + cache.add_format(db_id, fmt, stream, dbapi=dbapi) # Can't keep write lock since post-import hooks might run return db_id, new_book_added @@ -295,7 +295,7 @@ def add_news(cache, path, arg, dbapi=None): mi.timestamp = utcnow() db_id = cache._create_book_entry(mi, apply_import_tags=False) - cache.add_format(db_id, fmt, stream, dbapi=dbapi) # Cant keep write lock since post-import hooks might run + cache.add_format(db_id, fmt, stream, dbapi=dbapi) # Can't keep write lock since post-import hooks might run if not hasattr(path, 'read'): stream.close() diff --git a/src/calibre/db/delete_service.py b/src/calibre/db/delete_service.py index 2871942d4e..f5fd837d21 100644 --- a/src/calibre/db/delete_service.py +++ b/src/calibre/db/delete_service.py @@ -23,7 +23,7 @@ class DeleteService(Thread): by only moving the files/folders to be deleted out of the library in the main thread, they are deleted to recycle bin in a separate worker thread. - This has the added advantage that doing a restore from the recycle bin wont + This has the added advantage that doing a restore from the recycle bin won't cause metadata.db and the file system to get out of sync. Also, deleting becomes much faster, since in the common case, the move is done by a simple os.rename(). The downside is that if the user quits calibre while a long diff --git a/src/calibre/db/restore.py b/src/calibre/db/restore.py index b15c7cd6d1..c9b293b608 100644 --- a/src/calibre/db/restore.py +++ b/src/calibre/db/restore.py @@ -108,7 +108,7 @@ class Restore(Thread): tdir = TemporaryDirectory('_rlib', dir=basedir) tdir.__enter__() except EnvironmentError: - # Incase we dont have permissions to create directories in the + # In case we dont have permissions to create directories in the # parent folder of the src library tdir = TemporaryDirectory('_rlib') diff --git a/src/calibre/devices/cli.py b/src/calibre/devices/cli.py index ef06afd8d7..46c7b8983a 100755 --- a/src/calibre/devices/cli.py +++ b/src/calibre/devices/cli.py @@ -346,7 +346,7 @@ def main(): dev.rm(args[0]) elif command == "touch": parser = OptionParser(usage="usage: %prog touch path\nCreate an empty file on the device\n\npath should point to a file on the device and must begin with /,a:/ or b:/\n\n"+ # noqa - "Unfortunately, I cant figure out how to update file times on the device, so if path already exists, touch does nothing") + "Unfortunately, I can't figure out how to update file times on the device, so if path already exists, touch does nothing") options, args = parser.parse_args(args) if len(args) != 1: parser.print_help() diff --git a/src/calibre/devices/errors.py b/src/calibre/devices/errors.py index a0d0b61ce8..ce088eae2e 100644 --- a/src/calibre/devices/errors.py +++ b/src/calibre/devices/errors.py @@ -148,7 +148,7 @@ class ControlError(ProtocolError): class WrongDestinationError(PathError): ''' The user chose the wrong destination to send books to, for example by - trying to send books to a non existant storage card.''' + trying to send books to a non existent storage card.''' pass diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 3050532f06..e219220b6b 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -677,7 +677,7 @@ class DevicePlugin(Plugin): def synchronize_with_db(self, db, book_id, book_metadata, first_call): ''' Called during book matching when a book on the device is matched with - a book in calibre's db. The method is responsible for syncronizing + a book in calibre's db. The method is responsible for synchronizing data from the device to calibre's db (if needed). The method must return a two-value tuple. The first value is a set of diff --git a/src/calibre/devices/kindle/apnx.py b/src/calibre/devices/kindle/apnx.py index 594b987305..d93d32327c 100644 --- a/src/calibre/devices/kindle/apnx.py +++ b/src/calibre/devices/kindle/apnx.py @@ -280,7 +280,7 @@ class APNXBuilder: def get_pages_pagebreak_tag(self, mobi_file_path): ''' - Determine pages based on the presense of + Determine pages based on the presence of . ''' pages = [] diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index d1e737494d..8722a3f894 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -309,7 +309,7 @@ class KOBO(USBMS): # print 'update_metadata_item returned true' changed = True else: - debug_print(" Strange: The file: ", prefix, lpath, " does mot exist!") + debug_print(" Strange: The file: ", prefix, lpath, " does not exist!") if lpath in playlist_map and \ playlist_map[lpath] not in bl[idx].device_collections: bl[idx].device_collections = playlist_map.get(lpath,[]) @@ -321,7 +321,7 @@ class KOBO(USBMS): if os.path.exists(self.normalize_path(os.path.join(prefix, lpath))): book = self.book_from_path(prefix, lpath, title, authors, mime, date, ContentType, ImageID) else: - debug_print(" Strange: The file: ", prefix, lpath, " does mot exist!") + debug_print(" Strange: The file: ", prefix, lpath, " does not exist!") title = "FILE MISSING: " + title book = self.book_class(prefix, lpath, title, authors, mime, date, ContentType, ImageID, size=1048576) @@ -350,10 +350,10 @@ class KOBO(USBMS): if self.dbversion >= 33: query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' 'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, IsDownloaded from content where ' - 'BookID is Null %(previews)s %(recomendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict( + 'BookID is Null %(previews)s %(recommendations)s and not ((___ExpirationStatus=3 or ___ExpirationStatus is Null) %(expiry)s') % dict( expiry=' and ContentType = 6)' if opts.extra_customization[self.OPT_SHOW_EXPIRED_BOOK_RECORDS] else ')', previews=' and Accessibility <> 6' if not self.show_previews else '', - recomendations=' and IsDownloaded in (\'true\', 1)' if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] is False else '') + recommendations=' and IsDownloaded in (\'true\', 1)' if opts.extra_customization[self.OPT_SHOW_RECOMMENDATIONS] is False else '') elif self.dbversion >= 16 and self.dbversion < 33: query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, ' 'ImageID, ReadStatus, ___ExpirationStatus, FavouritesIndex, Accessibility, "1" as IsDownloaded from content where ' @@ -600,7 +600,7 @@ class KOBO(USBMS): prints('in add_books_to_metadata. Prefix is None!', path, self._main_prefix) continue - # print "Add book to metatdata: " + # print "Add book to metadata: " # print "prefix: " + prefix lpath = path.partition(prefix)[2] if lpath.startswith('/') or lpath.startswith('\\'): @@ -926,10 +926,10 @@ class KOBO(USBMS): pass else: # No collections # Since no collections exist the ReadStatus needs to be reset to 0 (Unread) - debug_print("No Collections - reseting ReadStatus") + debug_print("No Collections - resetting ReadStatus") self.reset_readstatus(connection, oncard) if self.dbversion >= 14: - debug_print("No Collections - reseting FavouritesIndex") + debug_print("No Collections - resetting FavouritesIndex") self.reset_favouritesindex(connection, oncard) # debug_print('Finished update_device_database_collections', collections_attributes) @@ -1067,11 +1067,11 @@ class KOBO(USBMS): fsync(f) else: - debug_print("ImageID could not be retreived from the database") + debug_print("ImageID could not be retrieved from the database") def prepare_addable_books(self, paths): ''' - The Kobo supports an encrypted epub refered to as a kepub + The Kobo supports an encrypted epub referred to as a kepub Unfortunately Kobo decided to put the files on the device with no file extension. I just hope that decision causes them as much grief as it does me :-) @@ -1369,7 +1369,7 @@ class KOBOTOUCH(KOBO): # build number. A number will be recorded here but it can be safely ignored # when testing the firmware version. max_supported_fwversion = (4, 28, 16705) - # The following document firwmare versions where new function or devices were added. + # The following document firmware versions where new function or devices were added. # Not all are used, but this feels a good place to record it. min_fwversion_shelves = (2, 0, 0) min_fwversion_images_on_sdcard = (2, 4, 1) @@ -1667,7 +1667,7 @@ class KOBOTOUCH(KOBO): if favouritesindex == 1: playlist_map[lpath].append('Shortlist') - # The follwing is in flux: + # The following is in flux: # - FW2.0.0, DBVersion 53,55 accessibility == 1 # - FW2.1.2 beta, DBVersion == 56, accessibility == -1: # So, the following should be OK @@ -1857,7 +1857,7 @@ class KOBOTOUCH(KOBO): "from ShelfContent " \ "where ContentId = ? " \ "and _IsDeleted = 'false' " \ - "and ShelfName is not null" # This should never be nulll, but it is protection against an error cause by a sync to the Kobo server + "and ShelfName is not null" # This should never be null, but it is protection against an error cause by a sync to the Kobo server values = (ContentID, ) cursor.execute(query, values) for i, row in enumerate(cursor): @@ -1905,32 +1905,32 @@ class KOBOTOUCH(KOBO): where_clause = (" WHERE BookID IS NULL " " AND ((Accessibility = -1 AND IsDownloaded in ('true', 1 )) " # Sideloaded books " OR (Accessibility IN (%(downloaded_accessibility)s) %(expiry)s) " # Purchased books - " %(previews)s %(recomendations)s ) " # Previews or Recommendations + " %(previews)s %(recommendations)s ) " # Previews or Recommendations ) % \ dict( expiry="" if self.show_archived_books else "and IsDownloaded in ('true', 1)", previews=" OR (Accessibility in (6) AND ___UserID <> '')" if self.show_previews else "", - recomendations=" OR (Accessibility IN (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else "", + recommendations=" OR (Accessibility IN (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else "", downloaded_accessibility="1,2,8,9" if self.supports_overdrive() else "1,2" ) elif self.supports_series(): where_clause = (" WHERE BookID IS NULL " - " AND ((Accessibility = -1 AND IsDownloaded IN ('true', 1)) or (Accessibility IN (1,2)) %(previews)s %(recomendations)s )" + " AND ((Accessibility = -1 AND IsDownloaded IN ('true', 1)) or (Accessibility IN (1,2)) %(previews)s %(recommendations)s )" " AND NOT ((___ExpirationStatus=3 OR ___ExpirationStatus is Null) %(expiry)s)" ) % \ dict( expiry=" AND ContentType = 6" if self.show_archived_books else "", previews=" or (Accessibility IN (6) AND ___UserID <> '')" if self.show_previews else "", - recomendations=" or (Accessibility in (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else "" + recommendations=" or (Accessibility in (-1, 4, 6) AND ___UserId = '')" if self.show_recommendations else "" ) elif self.dbversion >= 33: - where_clause = (' WHERE BookID IS NULL %(previews)s %(recomendations)s AND NOT' + where_clause = (' WHERE BookID IS NULL %(previews)s %(recommendations)s AND NOT' ' ((___ExpirationStatus=3 or ___ExpirationStatus IS NULL) %(expiry)s)' ) % \ dict( expiry=' AND ContentType = 6' if self.show_archived_books else '', previews=' AND Accessibility <> 6' if not self.show_previews else '', - recomendations=' AND IsDownloaded IN (\'true\', 1)' if not self.show_recommendations else '' + recommendations=' AND IsDownloaded IN (\'true\', 1)' if not self.show_recommendations else '' ) elif self.dbversion >= 16: where_clause = (' WHERE BookID IS NULL ' @@ -2527,7 +2527,7 @@ class KOBOTOUCH(KOBO): elif bookshelf_attribute: # No collections but have set the shelf option # Since no collections exist the ReadStatus needs to be reset to 0 (Unread) - debug_print("No Collections - reseting ReadStatus") + debug_print("No Collections - resetting ReadStatus") if self.dbversion < 53: self.reset_readstatus(connection, oncard) if self.dbversion >= 14 and self.fwversion < self.min_fwversion_shelves: @@ -2675,7 +2675,7 @@ class KOBOTOUCH(KOBO): ): ''' This will generate the new cover image from the cover in the library. It is a wrapper - for save_cover_data_to to allow it to be overriden in a subclass. For this reason, + for save_cover_data_to to allow it to be overridden in a subclass. For this reason, options are passed in that are not used by this implementation. :param cover_data: original cover data @@ -3525,12 +3525,12 @@ class KOBOTOUCH(KOBO): @property def create_bookshelves(self): - # Only for backwards compatabilty + # Only for backwards compatibility return self.manage_collections @property def delete_empty_shelves(self): - # Only for backwards compatabilty + # Only for backwards compatibility return self.delete_empty_collections @property @@ -3756,7 +3756,7 @@ class KOBOTOUCH(KOBO): settings.show_recommendations = settings.extra_customization[OPT_SHOW_RECOMMENDATIONS] # If the configuration hasn't been change for a long time, the last few option will be out - # of sync. The last two options aare always the support newer firmware and the debugging + # of sync. The last two options are always the support newer firmware and the debugging # title. Set seties and Modify CSS were the last two new options. The debugging title is # a string, so looking for that. start_subclass_extra_options = OPT_MODIFY_CSS diff --git a/src/calibre/devices/mtp/unix/upstream/device-flags.h b/src/calibre/devices/mtp/unix/upstream/device-flags.h index ba3f22bee5..de730e8fe1 100644 --- a/src/calibre/devices/mtp/unix/upstream/device-flags.h +++ b/src/calibre/devices/mtp/unix/upstream/device-flags.h @@ -171,7 +171,7 @@ */ #define DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR 0x00000800 /** - * Samsung has implimented its own playlist format as a .spl file + * Samsung has implemented its own playlist format as a .spl file * stored in the normal file system, rather than a proper mtp * playlist. There are multiple versions of the .spl format * identified by a line in the file: VERSION X.XX @@ -179,7 +179,7 @@ */ #define DEVICE_FLAG_PLAYLIST_SPL_V1 0x00001000 /** - * Samsung has implimented its own playlist format as a .spl file + * Samsung has implemented its own playlist format as a .spl file * stored in the normal file system, rather than a proper mtp * playlist. There are multiple versions of the .spl format * identified by a line in the file: VERSION X.XX diff --git a/src/calibre/devices/mtp/unix/upstream/music-players.h b/src/calibre/devices/mtp/unix/upstream/music-players.h index 7907c8ffe5..fca76b9a28 100644 --- a/src/calibre/devices/mtp/unix/upstream/music-players.h +++ b/src/calibre/devices/mtp/unix/upstream/music-players.h @@ -296,7 +296,7 @@ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_PLAYLIST_SPL_V1 }, // YP-F3 is NOT MTP - USB mass storage - // From a rouge .INF file + // From a rogue .INF file // this device ID seems to have been recycled for: // the Samsung SGH-A707 Cingular cellphone // the Samsung L760-V cellphone @@ -613,7 +613,7 @@ /* * SanDisk - * several devices (c150 for sure) are definately dual-mode and must + * several devices (c150 for sure) are definitely dual-mode and must * have the USB mass storage driver that hooks them unloaded first. * They all have problematic dual-mode making the device unload effect * uncertain on these devices. @@ -1071,7 +1071,7 @@ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL }, // From: Willy Gardiol (web) // Spurious errors for getting all objects, lead me to believe - // this flag atleast is needed + // this flag at least is needed { "Nokia", 0x0421, "5800 XpressMusic v2", 0x0155, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL }, // Yet another version... I think @@ -2711,7 +2711,7 @@ #if 1 /* after some review I commented it back in. There was apparently * only one or two devices misbehaving (having this ID in mass storage mode), - * but more seem to use it regulary as MTP devices. Marcus 20150401 */ + * but more seem to use it regularly as MTP devices. Marcus 20150401 */ /* * This had to be commented out - the same VID+PID is used also for * other modes than MTP, so we need to let mtp-probe do its job on this @@ -2796,7 +2796,7 @@ #if 1 /* after some review I commented it back in. There was apparently * only one or two devices misbehaving (having this ID in mass storage mode), - * but more seem to use it regulary as MTP devices. Marcus 20150401 */ + * but more seem to use it regularly as MTP devices. Marcus 20150401 */ /* * This had to be commented out - the same VID+PID is used also for * other modes than MTP, so we need to let mtp-probe do its job on this @@ -3136,7 +3136,7 @@ DEVICE_FLAGS_ANDROID_BUGS }, /* In update 4 the order of devices was changed for - better OS X / Windows suport and another device-id + better OS X / Windows support and another device-id got assigned for the MTP */ { "Jolla", 0x2931, "Sailfish (ID2)", 0x0a05, DEVICE_FLAGS_ANDROID_BUGS }, diff --git a/src/calibre/devices/mtp/windows/wpd.cpp b/src/calibre/devices/mtp/windows/wpd.cpp index 9e751838e9..1cc90c3d50 100644 --- a/src/calibre/devices/mtp/windows/wpd.cpp +++ b/src/calibre/devices/mtp/windows/wpd.cpp @@ -136,7 +136,7 @@ wpd_enumerate_devices(PyObject *self, PyObject *args) { hr = portable_device_manager->GetDevices(NULL, &num_of_devices); Py_END_ALLOW_THREADS; if (FAILED(hr)) return hresult_set_exc("Failed to get number of devices on the system", hr); - num_of_devices += 15; // Incase new devices were connected between this call and the next + num_of_devices += 15; // In case new devices were connected between this call and the next pnp_device_ids = (PWSTR*)calloc(num_of_devices, sizeof(PWSTR)); if (pnp_device_ids == NULL) return PyErr_NoMemory(); diff --git a/src/calibre/devices/prs505/sony_cache.py b/src/calibre/devices/prs505/sony_cache.py index c2a83c5866..d025a994f0 100644 --- a/src/calibre/devices/prs505/sony_cache.py +++ b/src/calibre/devices/prs505/sony_cache.py @@ -27,7 +27,7 @@ Periodical identifier sample from a PRS-650: main_thumbnail.jpg diff --git a/src/calibre/ebooks/conversion/plugins/lit_input.py b/src/calibre/ebooks/conversion/plugins/lit_input.py index 3ad207c657..fea2ce265d 100644 --- a/src/calibre/ebooks/conversion/plugins/lit_input.py +++ b/src/calibre/ebooks/conversion/plugins/lit_input.py @@ -45,7 +45,7 @@ class LITInput(InputFormatPlugin): from calibre.ebooks.chardet import xml_to_unicode from calibre.utils.xml_parse import safe_xml_fromstring import copy - self.log('LIT file with all text in singe 
 tag detected')
+                    self.log('LIT file with all text in single 
 tag detected')
                     html = separate_paragraphs_single_line(pre.text)
                     html = convert_basic(html).replace('',
                             ''%XHTML_NS)
diff --git a/src/calibre/ebooks/conversion/plugins/pml_input.py b/src/calibre/ebooks/conversion/plugins/pml_input.py
index 07d61a195b..02595af9c1 100644
--- a/src/calibre/ebooks/conversion/plugins/pml_input.py
+++ b/src/calibre/ebooks/conversion/plugins/pml_input.py
@@ -121,7 +121,7 @@ class PMLInput(InputFormatPlugin):
             if hasattr(stream, 'name'):
                 images = self.get_images(stream, os.path.abspath(os.path.dirname(stream.name)))
 
-        # We want pages to be orded alphabetically.
+        # We want pages to be ordered alphabetically.
         pages.sort()
 
         manifest_items = []
diff --git a/src/calibre/ebooks/conversion/plugins/txt_input.py b/src/calibre/ebooks/conversion/plugins/txt_input.py
index 2a1f0c0759..a149e982ef 100644
--- a/src/calibre/ebooks/conversion/plugins/txt_input.py
+++ b/src/calibre/ebooks/conversion/plugins/txt_input.py
@@ -170,7 +170,7 @@ class TXTInput(InputFormatPlugin):
                     if txt_formatting is not None and txt_formatting.text:
                         txt_formatting = txt_formatting.text.strip()
                         if txt_formatting in ('plain', 'textile', 'markdown') and options.formatting_type == 'auto':
-                            log.info(f'Using metadata from TXTZ archive to set text formating type to: {txt_formatting}')
+                            log.info(f'Using metadata from TXTZ archive to set text formatting type to: {txt_formatting}')
                             options.formatting_type = txt_formatting
                             if txt_formatting != 'plain':
                                 options.paragraph_type = 'off'
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 02c76e274b..37957b4b8a 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -1054,7 +1054,7 @@ OptionRecommendation(name='search_replace',
             from calibre.utils.fonts.scanner import font_scanner  # noqa
         import css_parser, logging
         css_parser.log.setLevel(logging.WARN)
-        get_types_map()  # Ensure the mimetypes module is intialized
+        get_types_map()  # Ensure the mimetypes module is initialized
 
         if self.opts.debug_pipeline is not None:
             self.opts.verbose = max(self.opts.verbose, 4)
diff --git a/src/calibre/ebooks/docx/index.py b/src/calibre/ebooks/docx/index.py
index c9db68004d..39419284c0 100644
--- a/src/calibre/ebooks/docx/index.py
+++ b/src/calibre/ebooks/docx/index.py
@@ -19,7 +19,7 @@ def get_applicable_xe_fields(index, xe_fields, XPath, expand):
 
     lr = index.get('letter-range', None)
     if lr is not None:
-        sl, el = lr.parition('-')[0::2]
+        sl, el = lr.partition('-')[0::2]
         sl, el = sl.strip(), el.strip()
         if sl and el:
             def inrange(text):
diff --git a/src/calibre/ebooks/epub/cfi/parse.py b/src/calibre/ebooks/epub/cfi/parse.py
index c548863f9f..4e69ae1a16 100644
--- a/src/calibre/ebooks/epub/cfi/parse.py
+++ b/src/calibre/ebooks/epub/cfi/parse.py
@@ -14,7 +14,7 @@ class Parser:
     ''' See epubcfi.ebnf for the specification that this parser tries to
     follow. I have implemented it manually, since I dont want to depend on
     grako, and the grammar is pretty simple. This parser is thread-safe, i.e.
-    it can be used from multiple threads simulataneously. '''
+    it can be used from multiple threads simultaneously. '''
 
     def __init__(self):
         # All allowed unicode characters + escaped special characters
diff --git a/src/calibre/ebooks/html/input.py b/src/calibre/ebooks/html/input.py
index c8c5d56684..ed652fedb0 100644
--- a/src/calibre/ebooks/html/input.py
+++ b/src/calibre/ebooks/html/input.py
@@ -168,7 +168,7 @@ class HTMLFile:
             try:
                 link = self.resolve(url)
             except ValueError:
-                # Unparseable URL, ignore
+                # Unparsable URL, ignore
                 continue
             if link not in self.links:
                 self.links.append(link)
diff --git a/src/calibre/ebooks/hyphenate.py b/src/calibre/ebooks/hyphenate.py
index 5815c68b96..5311fbdda3 100644
--- a/src/calibre/ebooks/hyphenate.py
+++ b/src/calibre/ebooks/hyphenate.py
@@ -383,7 +383,7 @@ sol3d2 so3lic 5solv 3som 3s4on. sona4 son4g s4op 5sophic s5ophiz s5ophy sor5c
 sor5d 4sov so5vi 2spa 5spai spa4n spen4d 2s5peo 2sper s2phe 3spher spho5 spil4
 sp5ing 4spio s4ply s4pon spor4 4spot squal4l s1r 2ss s1sa ssas3 s2s5c s3sel
 s5seng s4ses. s5set s1si s4sie ssi4er ss5ily s4sl ss4li s4sn sspend4 ss2t ssur5a
-ss5w 2st. s2tag s2tal stam4i 5stand s4ta4p 5stat. s4ted stern5i s5tero ste2w
+ss5w 2nd. s2tag s2tal stam4i 5stand s4ta4p 5stat. s4ted stern5i s5tero ste2w
 stew5a s3the st2i s4ti. s5tia s1tic 5stick s4tie s3tif st3ing 5stir s1tle 5stock
 stom3a 5stone s4top 3store st4r s4trad 5stratu s4tray s4trid 4stry 4st3w s2ty
 1su su1al su4b3 su2g3 su5is suit3 s4ul su2m sum3i su2n su2r 4sv sw2 4swo s4y
diff --git a/src/calibre/ebooks/lit/mssha1.py b/src/calibre/ebooks/lit/mssha1.py
index f68ee92c63..265d0ad7ea 100644
--- a/src/calibre/ebooks/lit/mssha1.py
+++ b/src/calibre/ebooks/lit/mssha1.py
@@ -66,7 +66,7 @@ def _bytelist2longBigEndian(blist):
 
 
 def _rotateLeft(x, n):
-    "Rotate x (32 bit) left n bits circularly."
+    "Rotate x (32 bit) left n bits circular."
 
     return (x << n) | (x >> (32-n))
 
diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py
index 63fcdfb16a..28f3948041 100644
--- a/src/calibre/ebooks/lrf/html/convert_from.py
+++ b/src/calibre/ebooks/lrf/html/convert_from.py
@@ -236,7 +236,7 @@ class HTMLConverter:
         self.id_counter = 0
         self.unused_target_blocks = []  # : Used to remove extra TextBlocks
         self.link_level  = 0    #: Current link level
-        self.memory = []        #: Used to ensure that duplicate CSS unhandled erros are not reported
+        self.memory = []        #: Used to ensure that duplicate CSS unhandled errors are not reported
         self.tops = {}          #: element representing the top of each HTML file in the LRF file
         self.previous_text = ''  # : Used to figure out when to lstrip
         self.stripped_space = ''
@@ -937,7 +937,7 @@ class HTMLConverter:
             if height <= 0:
                 height = 1
             pt = PersistentTemporaryFile(suffix='_html2lrf_scaled_image_.'+encoding.lower())
-            self.image_memory.append(pt)  # Neccessary, trust me ;-)
+            self.image_memory.append(pt)  # Necessary, trust me ;-)
             try:
                 im.resize((int(width), int(height)), PILImage.ANTIALIAS).save(pt, encoding)
                 pt.close()
diff --git a/src/calibre/ebooks/lrf/pylrs/pylrs.py b/src/calibre/ebooks/lrf/pylrs/pylrs.py
index 236381a7d9..e9ead94ab6 100644
--- a/src/calibre/ebooks/lrf/pylrs/pylrs.py
+++ b/src/calibre/ebooks/lrf/pylrs/pylrs.py
@@ -351,7 +351,7 @@ class Book(Delegator):
         the Book class in some way or another in order to be rendered as
         an LRS or LRF file.
 
-        The following settings are available on the contructor of Book:
+        The following settings are available on the constructor of Book:
 
         author="book author" or author=("book author", "sort as")
         Author of the book.
diff --git a/src/calibre/ebooks/metadata/ereader.py b/src/calibre/ebooks/metadata/ereader.py
index 76a2f5860a..0c911eec50 100644
--- a/src/calibre/ebooks/metadata/ereader.py
+++ b/src/calibre/ebooks/metadata/ereader.py
@@ -79,7 +79,7 @@ def set_metadata(stream, mi):
     if hr.compression not in (2, 10):
         return
 
-    # Create a metadata record for the file if one does not alreay exist
+    # Create a metadata record for the file if one does not already exist
     if not hr.has_metadata:
         sections += [b'', b'MeTaInFo\x00']
         last_data = len(sections) - 1
diff --git a/src/calibre/ebooks/metadata/fb2.py b/src/calibre/ebooks/metadata/fb2.py
index 022ed40306..c557beb464 100644
--- a/src/calibre/ebooks/metadata/fb2.py
+++ b/src/calibre/ebooks/metadata/fb2.py
@@ -163,7 +163,7 @@ def get_metadata(stream):
 
 def _parse_authors(root, ctx):
     authors = []
-    # pick up authors but only from 1 secrion ; otherwise it is not consistent!
+    # pick up authors but only from 1 section ; otherwise it is not consistent!
     # Those are fallbacks: , 
     author = None
     for author_sec in ['title-info', 'src-title-info', 'document-info']:
@@ -248,7 +248,7 @@ def _parse_cover_data(root, imgid, mi, ctx):
 
 
 def _parse_tags(root, mi, ctx):
-    # pick up genre but only from 1 secrion ; otherwise it is not consistent!
+    # pick up genre but only from 1 section ; otherwise it is not consistent!
     # Those are fallbacks: 
     for genre_sec in ['title-info', 'src-title-info']:
         # -- i18n Translations-- ?
diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 085bb91c04..c3da51dc58 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -307,7 +307,7 @@ class Worker(Thread):  # Get details {{{
                 text() = "Buscar productos similares por categoría" or
                 text() = "Ricerca articoli simili per categoria" or
                 text() = "Rechercher des articles similaires par rubrique" or
-                text() = "Procure por itens similares por categoria" or
+                text() = "Procure por items similares por categoria" or
                 text() = "関連商品を探す"
             ]/../descendant::ul/li
         '''
diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py
index d660d7d8a5..b1b63426d3 100644
--- a/src/calibre/ebooks/metadata/sources/base.py
+++ b/src/calibre/ebooks/metadata/sources/base.py
@@ -480,7 +480,7 @@ class Source(Plugin):
         The URL is the URL for the book identified by identifiers at this
         source. identifier_type, identifier_value specify the identifier
         corresponding to the URL.
-        This URL must be browseable to by a human using a browser. It is meant
+        This URL must be browsable to by a human using a browser. It is meant
         to provide a clickable link for the user to easily visit the books page
         at this source.
         If no URL is found, return None. This method must be quick, and
diff --git a/src/calibre/ebooks/mobi/writer2/resources.py b/src/calibre/ebooks/mobi/writer2/resources.py
index e1b8dd8133..36535d56f5 100644
--- a/src/calibre/ebooks/mobi/writer2/resources.py
+++ b/src/calibre/ebooks/mobi/writer2/resources.py
@@ -25,7 +25,7 @@ PLACEHOLDER_GIF = b'GIF89a\x01\x00\x01\x00\xf0\x00\x00\x00\x00\x00\xff\xff\xff!\
 def process_jpegs_for_amazon(data: bytes) -> bytes:
     img = Image.open(BytesIO(data))
     if img.format == 'JPEG':
-        # Amazon's MOBI renderer cant render JPEG images without JFIF metadata
+        # Amazon's MOBI renderer can't render JPEG images without JFIF metadata
         # and images with EXIF data dont get displayed on the cover screen
         changed = not img.info
         if hasattr(img, '_getexif') and img._getexif():
diff --git a/src/calibre/ebooks/mobi/writer2/serializer.py b/src/calibre/ebooks/mobi/writer2/serializer.py
index d012903517..ad98becd9e 100644
--- a/src/calibre/ebooks/mobi/writer2/serializer.py
+++ b/src/calibre/ebooks/mobi/writer2/serializer.py
@@ -194,7 +194,7 @@ class Serializer:
         try:
             path, frag = urldefrag(urlnormalize(href))
         except ValueError:
-            # Unparseable URL
+            # Unparsable URL
             return False
         if path and base:
             path = base.abshref(path)
diff --git a/src/calibre/ebooks/odt/input.py b/src/calibre/ebooks/odt/input.py
index e5714b0250..76adcf9d0e 100644
--- a/src/calibre/ebooks/odt/input.py
+++ b/src/calibre/ebooks/odt/input.py
@@ -229,10 +229,10 @@ class Extract(ODF2XHTML):
                     # only one draw:image allowed in the draw:frame
                     if len(img) == 1 and img[0].getAttribute('href') == mi.cover:
                         # ok, this is the right frame with the right image
-                        # check if there are more childs
+                        # check if there are more children
                         if len(frm.childNodes) != 1:
                             break
-                        # check if the parent paragraph more childs
+                        # check if the parent paragraph more children
                         para = frm.parentNode
                         if para.tagName != 'text:p' or len(para.childNodes) != 1:
                             break
diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py
index 2f9396745b..f15ca81fab 100644
--- a/src/calibre/ebooks/oeb/polish/container.py
+++ b/src/calibre/ebooks/oeb/polish/container.py
@@ -520,7 +520,7 @@ class Container(ContainerBase):  # {{{
         return unicodedata.normalize('NFC', abspath_to_name(fullpath, root or self.root))
 
     def name_to_abspath(self, name):
-        ' Convert a canonical name to an absolute OS dependant path '
+        ' Convert a canonical name to an absolute OS dependent path '
         return name_to_abspath(name, self.root)
 
     def exists(self, name):
diff --git a/src/calibre/ebooks/oeb/polish/pretty.py b/src/calibre/ebooks/oeb/polish/pretty.py
index a5dcb13a0c..3916cd2faa 100644
--- a/src/calibre/ebooks/oeb/polish/pretty.py
+++ b/src/calibre/ebooks/oeb/polish/pretty.py
@@ -27,7 +27,7 @@ def pretty_xml_tree(elem, level=0, indent='  '):
     textual content.  Also assumes that there is no text immediately after
     closing tags. These are true for opf/ncx and container.xml files. If either
     of the assumptions are violated, there should be no data loss, but pretty
-    printing wont produce optimal results.'''
+    printing won't produce optimal results.'''
     if (not elem.text and len(elem) > 0) or (elem.text and isspace(elem.text)):
         elem.text = '\n' + (indent * (level+1))
     for i, child in enumerate(elem):
diff --git a/src/calibre/ebooks/oeb/transforms/split.py b/src/calibre/ebooks/oeb/transforms/split.py
index 40dd7e74ea..0c5885af93 100644
--- a/src/calibre/ebooks/oeb/transforms/split.py
+++ b/src/calibre/ebooks/oeb/transforms/split.py
@@ -124,7 +124,7 @@ class Split:
         for i, elem in enumerate(item.data.iter('*')):
             try:
                 elem.set('pb_order', unicode_type(i))
-            except TypeError:  # Cant set attributes on comment nodes etc.
+            except TypeError:  # Can't set attributes on comment nodes etc.
                 continue
 
         page_breaks = list(page_breaks)
@@ -168,7 +168,7 @@ class Split:
         try:
             href = self.current_item.abshref(href)
         except ValueError:
-            # Unparseable URL
+            # Unparsable URL
             return url
         try:
             href = urlnormalize(href)
diff --git a/src/calibre/ebooks/pdb/ereader/inspector.py b/src/calibre/ebooks/pdb/ereader/inspector.py
index 85a0d1cad3..ebd112e64f 100644
--- a/src/calibre/ebooks/pdb/ereader/inspector.py
+++ b/src/calibre/ebooks/pdb/ereader/inspector.py
@@ -36,7 +36,7 @@ def pdb_header_info(header):
     print('PDB Header Info:')
     print('')
     print('Identity:        %s' % header.ident)
-    print('Total Sectons:   %s' % header.num_sections)
+    print('Total Sections:   %s' % header.num_sections)
     print('Title:           %s' % header.title)
     print('')
 
diff --git a/src/calibre/ebooks/pdb/ereader/writer.py b/src/calibre/ebooks/pdb/ereader/writer.py
index 4239d448c7..4e5043ad63 100644
--- a/src/calibre/ebooks/pdb/ereader/writer.py
+++ b/src/calibre/ebooks/pdb/ereader/writer.py
@@ -154,7 +154,7 @@ class Writer(FormatWriter):
                     if len(data) + len(header) < 65505:
                         images.append((header, data))
                 except Exception as e:
-                    self.log.error('Error: Could not include file %s becuase '
+                    self.log.error('Error: Could not include file %s because '
                         '%s.' % (item.href, e))
 
         return images
diff --git a/src/calibre/ebooks/pdb/header.py b/src/calibre/ebooks/pdb/header.py
index 241efa034d..4f3bd475d0 100644
--- a/src/calibre/ebooks/pdb/header.py
+++ b/src/calibre/ebooks/pdb/header.py
@@ -74,7 +74,7 @@ class PdbHeaderBuilder:
 
     def build_header(self, section_lengths, out_stream):
         '''
-        section_lengths = Lenght of each section in file.
+        section_lengths = Length of each section in file.
         '''
 
         now = int(time.time())
diff --git a/src/calibre/ebooks/pdb/plucker/reader.py b/src/calibre/ebooks/pdb/plucker/reader.py
index cc03c340ec..0c090dd172 100644
--- a/src/calibre/ebooks/pdb/plucker/reader.py
+++ b/src/calibre/ebooks/pdb/plucker/reader.py
@@ -118,7 +118,7 @@ class HeaderRecord:
 
     def __init__(self, raw):
         self.uid, = struct.unpack('>H', raw[0:2])
-        # This is labled version in the spec.
+        # This is labeled version in the spec.
         # 2 is ZLIB compressed,
         # 1 is DOC compressed
         self.compression, = struct.unpack('>H', raw[2:4])
@@ -182,7 +182,7 @@ class SectionMetadata:
 
     This does not store metadata such as title, or author.
     That metadata would be best retrieved with the PDB (plucker)
-    metdata reader.
+    metadata reader.
 
     This stores document specific information such as the
     text encoding.
@@ -358,7 +358,7 @@ class Reader(FormatReader):
     def extract_content(self, output_dir):
         # Each text record is independent (unless the continuation
         # value is set in the previous record). Put each converted
-        # text recored into a separate file. We will reference the
+        # text recorded into a separate file. We will reference the
         # home.html file as the first file and let the HTML input
         # plugin assemble the order based on hyperlinks.
         with CurrentDir(output_dir):
@@ -452,7 +452,7 @@ class Reader(FormatReader):
         odi = self.options.debug_pipeline
         self.options.debug_pipeline = None
         # Determine the home.html record uid. This should be set in the
-        # reserved values in the metadata recored. home.html is the first
+        # reserved values in the metadata recorded. home.html is the first
         # text record (should have hyper link references to other records)
         # in the document.
         try:
diff --git a/src/calibre/ebooks/pdb/ztxt/reader.py b/src/calibre/ebooks/pdb/ztxt/reader.py
index 2af0d1f486..21df8ddc95 100644
--- a/src/calibre/ebooks/pdb/ztxt/reader.py
+++ b/src/calibre/ebooks/pdb/ztxt/reader.py
@@ -60,7 +60,7 @@ class Reader(FormatReader):
 
         self.log.debug('Foud ztxt version: %i.%i' % (vmajor, vminor))
 
-        # Initalize the decompressor
+        # Initialize the decompressor
         self.uncompressor = zlib.decompressobj()
         self.uncompressor.decompress(self.section_data(1))
 
diff --git a/src/calibre/ebooks/pdf/render/links.py b/src/calibre/ebooks/pdf/render/links.py
index 78cec28371..4ead9be159 100644
--- a/src/calibre/ebooks/pdf/render/links.py
+++ b/src/calibre/ebooks/pdf/render/links.py
@@ -88,7 +88,7 @@ class Links:
                 try:
                     purl = urlparse(url)
                 except Exception:
-                    self.pdf.debug('Ignoring unparseable URL: %r' % url)
+                    self.pdf.debug('Ignoring unparsable URL: %r' % url)
                     continue
                 if purl.scheme and purl.scheme != 'file':
                     action = Dictionary({
diff --git a/src/calibre/ebooks/pml/pmlml.py b/src/calibre/ebooks/pml/pmlml.py
index 9ec933bb67..83700ddf11 100644
--- a/src/calibre/ebooks/pml/pmlml.py
+++ b/src/calibre/ebooks/pml/pmlml.py
@@ -198,7 +198,7 @@ class PMLMLizer:
         text = text.replace('\xa0', ' ')
 
         # Turn all characters that cannot be represented by themself into their
-        # PML code equivelent
+        # PML code equivalent
         text = re.sub('[^\x00-\x7f]', lambda x: unipmlcode(x.group()), text)
 
         # Remove excess spaces at beginning and end of lines
@@ -346,7 +346,7 @@ class PMLMLizer:
         except:
             pass
 
-        # Proccess text within this tag.
+        # Process text within this tag.
         if hasattr(elem, 'text') and elem.text:
             text.append(self.prepare_string_for_pml(elem.text))
 
diff --git a/src/calibre/ebooks/rb/rbml.py b/src/calibre/ebooks/rb/rbml.py
index bdabf1eccc..94a412ac3b 100644
--- a/src/calibre/ebooks/rb/rbml.py
+++ b/src/calibre/ebooks/rb/rbml.py
@@ -206,7 +206,7 @@ class RBMLizer:
                 text.append('<%s>' % style_tag)
                 tag_stack.append(style_tag)
 
-        # Proccess tags that contain text.
+        # Process tags that contain text.
         if hasattr(elem, 'text') and elem.text:
             text.append(prepare_string_for_xml(elem.text))
 
diff --git a/src/calibre/ebooks/rb/writer.py b/src/calibre/ebooks/rb/writer.py
index 18688ee1a0..b95354b131 100644
--- a/src/calibre/ebooks/rb/writer.py
+++ b/src/calibre/ebooks/rb/writer.py
@@ -37,9 +37,9 @@ class RBWriter:
     def write_content(self, oeb_book, out_stream, metadata=None):
         info = [('info.info', self._info_section(metadata))]
         images = self._images(oeb_book.manifest)
-        text_size, chuncks = self._text(oeb_book)
-        chunck_sizes = [len(x) for x in chuncks]
-        text = [('index.html', chuncks)]
+        text_size, chunks = self._text(oeb_book)
+        chunck_sizes = [len(x) for x in chunks]
+        text = [('index.html', chunks)]
         hidx = [('index.hidx', ' ')]
 
         toc_items = []
@@ -84,8 +84,8 @@ class RBWriter:
         out_stream.write(struct.pack(''. So
         read each token one at a time, and split them by '>'.
         """
@@ -256,7 +256,7 @@ class ConvertToTags:
             an open function for open tags
             an open with attribute function for tags with attributes
             an empty with attribute function for tags that are empty but have
-            attribtes.
+            attributes.
             a closed function for closed tags.
             an empty tag function.
             """
diff --git a/src/calibre/ebooks/rtf2xml/delete_info.py b/src/calibre/ebooks/rtf2xml/delete_info.py
index fdcf0fccfe..4555fa94f2 100644
--- a/src/calibre/ebooks/rtf2xml/delete_info.py
+++ b/src/calibre/ebooks/rtf2xml/delete_info.py
@@ -19,7 +19,7 @@ from . import open_for_read, open_for_write
 
 
 class DeleteInfo:
-    """Delete unecessary destination groups"""
+    """Delete unnecessary destination groups"""
 
     def __init__(self,
             in_file ,
@@ -110,7 +110,7 @@ class DeleteInfo:
         If you find that you are in a delete group, and the previous
         token in not an open bracket (self.__ob = 0), that means
         that the delete group is nested inside another acceptable
-        detination group. In this case, you have already written
+        destination group. In this case, you have already written
         the open bracket, so you will need to write the closed one
         as well.
         """
diff --git a/src/calibre/ebooks/rtf2xml/field_strings.py b/src/calibre/ebooks/rtf2xml/field_strings.py
index 4bdd9ad1ce..def908cfee 100644
--- a/src/calibre/ebooks/rtf2xml/field_strings.py
+++ b/src/calibre/ebooks/rtf2xml/field_strings.py
@@ -255,11 +255,11 @@ class FieldStrings:
 
     def __equation_func(self, field_name, name, line):
         """
-        Requried:
+        Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
-        Retuns:
+        Returns:
             The name of the field
         Logic:
         """
@@ -272,7 +272,7 @@ class FieldStrings:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
-        Retuns:
+        Returns:
             The name of the field
         Logic:
         """
@@ -378,11 +378,11 @@ class FieldStrings:
 
     def __simple_info_func(self, field_name, name, line):
         """
-        Requried:
+        Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
-        Retuns:
+        Returns:
             The name of the field
         Logic:
             These fields can only have the following switches:
@@ -406,11 +406,11 @@ class FieldStrings:
 
     def __hyperlink_func(self, field_name, name, line):
         """
-        Requried:
+        Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
-        Retuns:
+        Returns:
             The name of the field
         """
         self.__link_switch = re.compile(r'\\l\s{1,}"{0,1}(.*?)"{0,1}\s')
@@ -442,11 +442,11 @@ class FieldStrings:
 
     def __include_text_func(self, field_name, name, line):
         """
-        Requried:
+        Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
-        Retuns:
+        Returns:
             The name of the field
         Logic:
         """
@@ -484,11 +484,11 @@ class FieldStrings:
 
     def __include_pict_func(self, field_name, name, line):
         """
-        Requried:
+        Required:
             field_name -- the first word in the string
             name --the changed name according to the dictionary
             line -- the string to be parse
-        Retuns:
+        Returns:
             The name of the field
         Logic:
         """
@@ -526,7 +526,7 @@ class FieldStrings:
             A page reference field looks like this:
                 PAGEREF _Toc440880424 \\h
             I want to extract the second line of info, which is used as an
-            achor in the resulting XML file.
+            anchor in the resulting XML file.
         """
         the_string = name
         match_group = re.search(self.__format_text_exp, line)
@@ -776,7 +776,7 @@ class FieldStrings:
             name -- the changed name according to the dictionary.
             line -- the string to parse.
         Returns:
-            A string containing font size, font style, and a hexidecimal value.
+            A string containing font size, font style, and a hexadecimal value.
         Logic:
             The SYMBOL field is one of Microsoft's many quirky ways of
             entering text. The string that results from this method looks like
@@ -785,7 +785,7 @@ class FieldStrings:
             The first word merely tells us that we have encountered a SYMBOL
             field.
             The next value is the Microsoft decimal value. Change this to
-            hexidecimal.
+            hexadecimal.
             The pattern '\\f "some font' tells us the font.
             The pattern '\\s some size'  tells us the font size.
             Extract all of this information. Store this information in a
diff --git a/src/calibre/ebooks/rtf2xml/fields_large.py b/src/calibre/ebooks/rtf2xml/fields_large.py
index 78df869ddd..9b46a43bdd 100644
--- a/src/calibre/ebooks/rtf2xml/fields_large.py
+++ b/src/calibre/ebooks/rtf2xml/fields_large.py
@@ -53,7 +53,7 @@ Examples
         
             10:34 PM
         
-    The simple field in the above example conatins no paragraph or sections breaks.
+    The simple field in the above example contains no paragraph or sections breaks.
     This line of RTF:
         {{\field{\*\fldinst SYMBOL 97 \\f "Symbol" \\s 12}{\fldrslt\f3\fs24}}}
     Becomes:
@@ -141,7 +141,7 @@ Examples
         }
         self.__field_count = []  # keep track of the brackets
         self.__field_instruction = []  # field instruction strings
-        self.__symbol = 0   # wheter or not the field is really UTF-8
+        self.__symbol = 0   # whether or not the field is really UTF-8
         # (these fields cannot be nested.)
         self.__field_instruction_string = ''  # string that collects field instruction
         self.__par_in_field = []  # paragraphs in field?
@@ -150,7 +150,7 @@ Examples
 
     def __before_body_func(self, line):
         """
-        Requried:
+        Required:
             line --line ro parse
         Returns:
             nothing (changes an instant and writes a line)
@@ -183,7 +183,7 @@ Examples
         Returns:
             nothing
         Logic:
-            Set the values for parseing the field. Four lists have to have
+            Set the values for parsing the field. Four lists have to have
             items appended to them.
         """
         self.__state = 'field'
@@ -201,7 +201,7 @@ Examples
         Returns:
             nothing.
         Logic:
-            Check for the end of the field; a paragaph break; a section break;
+            Check for the end of the field; a paragraph break; a section break;
             the beginning of another field; or the beginning of the field
             instruction.
         """
@@ -289,7 +289,7 @@ Examples
             Nothing
         Logic:
             Pop the last values in the instructions list, the fields list, the
-            paragaph list, and the section list.
+            paragraph list, and the section list.
             If the field is a symbol, do not write the tags ,
             since this field is really just UTF-8.
             If the field contains paragraph or section breaks, it is a
diff --git a/src/calibre/ebooks/rtf2xml/fields_small.py b/src/calibre/ebooks/rtf2xml/fields_small.py
index 53235aca74..4a484ef135 100644
--- a/src/calibre/ebooks/rtf2xml/fields_small.py
+++ b/src/calibre/ebooks/rtf2xml/fields_small.py
@@ -30,7 +30,7 @@ use to you unless you use it as part of the other modules.)
 Method
 -----------
 Look for the beginning of a bookmark, index, or toc entry. When such a token
-is found, store the opeing bracket count in a variable. Collect all the text
+is found, store the opening bracket count in a variable. Collect all the text
 until the closing bracket entry is found. Send the string to the module
 field_strings to process it. Write the processed string to the output
 file.
@@ -170,7 +170,7 @@ file.
             A string for a toc instruction field.
         Logic:
             This method is meant for *both* index and toc entries.
-            I want to eleminate paragraph endings, and I want to divide the
+            I want to eliminate paragraph endings, and I want to divide the
             entry into a main entry and (if it exists) a sub entry.
             Split the string by newlines. Read on token at a time. If the
             token is a special colon, end the main entry element and start the
@@ -238,7 +238,7 @@ file.
 
     def __index_bookmark_func(self, my_string):
         """
-        Requries:
+        Requires:
             my_string -- string in all the index
         Returns:
             bookmark_string -- the text string of the book mark
@@ -373,7 +373,7 @@ file.
             my_string --string to parse
             type --type of string
         Returns:
-            A string formated for a field instruction.
+            A string formatted for a field instruction.
         Logic:
             The type is the name (either bookmark-end or bookmark-start). The
             id is the complete text string.
diff --git a/src/calibre/ebooks/rtf2xml/get_options.py b/src/calibre/ebooks/rtf2xml/get_options.py
index 1ffc61b8d7..ec7fdac2a9 100644
--- a/src/calibre/ebooks/rtf2xml/get_options.py
+++ b/src/calibre/ebooks/rtf2xml/get_options.py
@@ -108,7 +108,7 @@ class GetOptions:
             pass
             """
             sys.stderr.write(
-                'You must provide an ouput file with the \'o\' option\n')
+                'You must provide an output file with the \'o\' option\n')
             return_options['valid'] = 0
             """
         if 'level' in the_keys:
@@ -226,7 +226,7 @@ class GetOptions:
         if not smart_output and not return_options['out-file']:
             """
             sys.stderr.write(
-                'Please provide and file to outut with the -o option.\n'
+                'Please provide and file to output with the -o option.\n'
                 'Or set \'\'.\n'
                 'in the configuration file.\n'
                 )
diff --git a/src/calibre/ebooks/rtf2xml/group_borders.py b/src/calibre/ebooks/rtf2xml/group_borders.py
index f666d10f20..5f84b668af 100644
--- a/src/calibre/ebooks/rtf2xml/group_borders.py
+++ b/src/calibre/ebooks/rtf2xml/group_borders.py
@@ -214,7 +214,7 @@ class GroupBorders:
         Returns:
             Nothing
         Logic
-            Look for the start of a paragraph defintion. If one is found, check if
+            Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
             """
diff --git a/src/calibre/ebooks/rtf2xml/group_styles.py b/src/calibre/ebooks/rtf2xml/group_styles.py
index dc71615c38..4480c1dd0d 100644
--- a/src/calibre/ebooks/rtf2xml/group_styles.py
+++ b/src/calibre/ebooks/rtf2xml/group_styles.py
@@ -207,7 +207,7 @@ class GroupStyles:
         Returns:
             Nothing
         Logic
-            Look for the start of a paragraph defintion. If one is found, check if
+            Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
             """
diff --git a/src/calibre/ebooks/rtf2xml/headings_to_sections.py b/src/calibre/ebooks/rtf2xml/headings_to_sections.py
index c012479b88..a0c8c6b4b9 100644
--- a/src/calibre/ebooks/rtf2xml/headings_to_sections.py
+++ b/src/calibre/ebooks/rtf2xml/headings_to_sections.py
@@ -149,7 +149,7 @@ class HeadingsToSections:
         Returns:
             Nothing
         Logic
-            Look for the start of a paragraph defintion. If one is found, check if
+            Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
             """
diff --git a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
index 38b0dfee42..7e07a8f21d 100644
--- a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
+++ b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py
@@ -23,7 +23,7 @@ from . import open_for_read, open_for_write
 
 class Hex2Utf8:
     """
-    Convert Microsoft hexidecimal numbers to utf-8
+    Convert Microsoft hexadecimal numbers to utf-8
     """
 
     def __init__(self,
@@ -54,7 +54,7 @@ class Hex2Utf8:
             directory from which the script is run.)
             'symbol'--whether to load the symbol character map
             'winddings'--whether to load the wingdings character map
-            'caps'--whether to load the caps characer map
+            'caps'--whether to load the caps character map
             'convert_to_caps'--wether to convert caps to utf-8
         Returns:
             nothing
@@ -110,7 +110,7 @@ class Hex2Utf8:
             directory from which the script is run.)
             'symbol'--whether to load the symbol character map
             'winddings'--whether to load the wingdings character map
-            'caps'--whether to load the caps characer map
+            'caps'--whether to load the caps character map
             'convert_to_caps'--wether to convert caps to utf-8
         Returns:
             nothing
@@ -145,7 +145,7 @@ class Hex2Utf8:
         Set values, including those for the dictionaries.
         The file that contains the maps is broken down into many different
         sets. For example, for the Symbol font, there is the standard part for
-        hexidecimal numbers, and the part for Microsoft characters. Read
+        hexadecimal numbers, and the part for Microsoft characters. Read
         each part in, and then combine them.
         """
         # the default encoding system, the lower map for characters 0 through
@@ -262,7 +262,7 @@ class Hex2Utf8:
                     hex_num)
                 if self.__run_level > 4:
                     # msg = 'no dictionary entry for %s\n'
-                    # msg += 'the hexidecimal num is "%s"\n' % (hex_num)
+                    # msg += 'the hexadecimal num is "%s"\n' % (hex_num)
                     # msg += 'dictionary is %s\n' % self.__current_dict_name
                     msg = 'Character "&#x%s;" does not appear to be valid (or is a control character)\n' % token
                     raise self.__bug_handler(msg)
@@ -537,7 +537,7 @@ class Hex2Utf8:
         new_char_entity = '&#x%s' % hex_num
         converted = self.__caps_uni_dict.get(new_char_entity)
         if not converted:
-            # bullets and other entities dont' have capital equivelents
+            # bullets and other entities don't have capital equivalents
             return char_entity
         else:
             return converted
diff --git a/src/calibre/ebooks/rtf2xml/info.py b/src/calibre/ebooks/rtf2xml/info.py
index 03ca7b8aaa..8a4e063af8 100644
--- a/src/calibre/ebooks/rtf2xml/info.py
+++ b/src/calibre/ebooks/rtf2xml/info.py
@@ -112,7 +112,7 @@ class Info:
         Returns:
             nothing
         Logic:
-            Check for the beginning of the informatin table. When found, set
+            Check for the beginning of the information table. When found, set
             the state to the information table. Always write the line.
         """
         if self.__token_info == 'mi number-of-words)
         """
@@ -265,7 +265,7 @@ class Info:
             If the state is in the information table, use other methods to
             parse the information
             style table, look for lines with style info, and substitute the
-            number with the name of the style.  If the state if afer the
+            number with the name of the style.  If the state if after the
             information table, simply write the line to the output file.
         """
         self.__initiate_values()
diff --git a/src/calibre/ebooks/rtf2xml/inline.py b/src/calibre/ebooks/rtf2xml/inline.py
index 58f96c84da..5eca1e35cc 100644
--- a/src/calibre/ebooks/rtf2xml/inline.py
+++ b/src/calibre/ebooks/rtf2xml/inline.py
@@ -175,7 +175,7 @@ class Inline:
         Logic:
             If the token is a control word for character info (cw value pair.
             Remove the first item (the dictionary) form this list. Now iterate
-            through what is left in the list. Each list will conatin one item,
+            through what is left in the list. Each list will contain one item,
             a dictionary. Get this dictionary and print out key => value pair.
         """
         not_allow = ['list-id',]
@@ -440,7 +440,7 @@ class ListTable:
         Returns:
             A string and the dictionary of list-table values and attributes.
         Logic:
-            Call on the __parse_lines metod, which splits the text string into
+            Call on the __parse_lines method, which splits the text string into
             lines (which will be tokens) and processes them.
         """
         self.__parse_lines(line)
diff --git a/src/calibre/ebooks/rtf2xml/make_lists.py b/src/calibre/ebooks/rtf2xml/make_lists.py
index c5d7657a00..7d55545193 100644
--- a/src/calibre/ebooks/rtf2xml/make_lists.py
+++ b/src/calibre/ebooks/rtf2xml/make_lists.py
@@ -392,7 +392,7 @@ class MakeLists:
         Returns:
             Nothing
         Logic
-            Look for the start of a paragraph defintion. If one is found, check if
+            Look for the start of a paragraph definition. If one is found, check if
             it contains a list-id. If it does, start a list. Change the state to
             in_pard.
             """
diff --git a/src/calibre/ebooks/rtf2xml/options_trem.py b/src/calibre/ebooks/rtf2xml/options_trem.py
index d2ceb5c282..1861fae8a7 100644
--- a/src/calibre/ebooks/rtf2xml/options_trem.py
+++ b/src/calibre/ebooks/rtf2xml/options_trem.py
@@ -10,7 +10,7 @@ class ParseOptions:
            options_dict -- a dictionary with the key equal to the opition, and
            a list describing that option. (See below)
         Returns:
-            A tupple. The first item in the tupple is a dictionary containing
+            A tuple. The first item in the tuple is a dictionary containing
             the arguments for each options. The second is a list of the
             arguments.
             If invalid options are passed to the module, 0,0 is returned.
@@ -193,7 +193,7 @@ class ParseOptions:
             list of options
         Logic:
             Iterate through the self.__system string, looking for the last
-            option. The options are everything in the sysem string before the
+            option. The options are everything in the system string before the
             last option.
             Check to see that the options contain no arguments.
         """
diff --git a/src/calibre/ebooks/rtf2xml/paragraph_def.py b/src/calibre/ebooks/rtf2xml/paragraph_def.py
index fe9dddc3a3..e1992c34b1 100644
--- a/src/calibre/ebooks/rtf2xml/paragraph_def.py
+++ b/src/calibre/ebooks/rtf2xml/paragraph_def.py
@@ -316,7 +316,7 @@ if another paragraph_def is found, the state changes to collect_tokens.
         Returns:
             nothing
         Logic:
-            Look for the beginning of a paragaraph definition
+            Look for the beginning of a paragraph definition
         """
         # cw 0:
             self.__write_obj.write('mi> 8)
diff --git a/src/calibre/gui2/actions/__init__.py b/src/calibre/gui2/actions/__init__.py
index e869fdf680..44bd894c77 100644
--- a/src/calibre/gui2/actions/__init__.py
+++ b/src/calibre/gui2/actions/__init__.py
@@ -274,7 +274,7 @@ class InterfaceAction(QObject):
                 persist_shortcut=persist_shortcut)
             # In Qt 5 keyboard shortcuts dont work unless the
             # action is explicitly added to the main window and on OSX and
-            # Unity since the menu might be exported, the shortcuts wont work
+            # Unity since the menu might be exported, the shortcuts won't work
             self.gui.addAction(ac)
         if triggered is not None:
             ac.triggered.connect(triggered)
diff --git a/src/calibre/gui2/bars.py b/src/calibre/gui2/bars.py
index 826621965b..6a0ff0acdb 100644
--- a/src/calibre/gui2/bars.py
+++ b/src/calibre/gui2/bars.py
@@ -675,7 +675,7 @@ class BarsManager(QObject):
         '''
         This shows the correct main toolbar and rebuilds the menubar based on
         whether a device is connected or not. Note that the toolbars are
-        explicitly not rebuilt, this is to workaround a Qt limitation iwth
+        explicitly not rebuilt, this is to workaround a Qt limitation with
         QToolButton's popup menus and modal dialogs. If you want the toolbars
         rebuilt, call init_bars().
         '''
diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
index 159de62310..757fd92e61 100644
--- a/src/calibre/gui2/library/alternate_views.py
+++ b/src/calibre/gui2/library/alternate_views.py
@@ -976,7 +976,7 @@ class GridView(QListView):
                 newdb.new_api.add_cover_cache(x)
             try:
                 # Use a timeout so that if, for some reason, the render thread
-                # gets stuck, we dont deadlock, future covers wont get
+                # gets stuck, we dont deadlock, future covers won't get
                 # rendered, but this is better than a deadlock
                 join_with_timeout(self.delegate.render_queue)
             except RuntimeError:
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 579e4141b3..84af133d67 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -990,7 +990,7 @@ class BooksView(QTableView):  # {{{
 
         self.restore_state()
         self.set_ondevice_column_visibility()
-        # incase there were marked books
+        # in case there were marked books
         self.model().set_row_decoration(set())
         self.row_header.headerDataChanged(Qt.Orientation.Vertical, 0, self.row_header.count()-1)
         self.row_header.geometriesChanged.emit()
diff --git a/src/calibre/gui2/metadata/single.py b/src/calibre/gui2/metadata/single.py
index a45cbb212d..6567a7cdcf 100644
--- a/src/calibre/gui2/metadata/single.py
+++ b/src/calibre/gui2/metadata/single.py
@@ -269,7 +269,7 @@ class MetadataSingleDialogBase(QDialog):
         self.fetch_metadata_button = b = RightClickButton(self)
         # The following rigmarole is needed so that Qt gives the button the
         # same height as the other buttons in the dialog. There is no way to
-        # center the text in a QToolButton with an icon, so we cant just set an
+        # center the text in a QToolButton with an icon, so we can't just set an
         # icon
         b.setIcon(QIcon(I('download-metadata.png')))
         b.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
diff --git a/src/calibre/gui2/pictureflow/pictureflow.h b/src/calibre/gui2/pictureflow/pictureflow.h
index 7c47317c92..d07a879f85 100644
--- a/src/calibre/gui2/pictureflow/pictureflow.h
+++ b/src/calibre/gui2/pictureflow/pictureflow.h
@@ -160,7 +160,7 @@ public:
   /*!
     Returns QImage of specified slide.
     This function will be called only whenever necessary, e.g. the 100th slide
-    will not be retrived when only the first few slides are visible.
+    will not be retrieved when only the first few slides are visible.
   */
   virtual QImage slide(int index) const;
 
diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py
index cccbb8a95a..171848ca56 100644
--- a/src/calibre/gui2/preferences/texture_chooser.py
+++ b/src/calibre/gui2/preferences/texture_chooser.py
@@ -102,8 +102,8 @@ class TextureChooser(QDialog):
         return i
 
     def update_remove_state(self):
-        removeable = bool(self.selected_fname and not self.selected_fname.startswith(':'))
-        self.remove_button.setEnabled(removeable)
+        removable = bool(self.selected_fname and not self.selected_fname.startswith(':'))
+        self.remove_button.setEnabled(removable)
 
     @property
     def texture(self):
diff --git a/src/calibre/gui2/store/__init__.py b/src/calibre/gui2/store/__init__.py
index c8111c6bf0..8b167fd02c 100644
--- a/src/calibre/gui2/store/__init__.py
+++ b/src/calibre/gui2/store/__init__.py
@@ -115,14 +115,14 @@ class StorePlugin:  # {{{
         disabled by default.
 
         If a store doesn't provide search on it's own use something like a site specific
-        google search to get search results for this funtion.
+        google search to get search results for this function.
 
         :param query: The string query search with.
         :param max_results: The maximum number of results to return.
         :param timeout: The maximum amount of time in seconds to spend downloading data for search results.
 
         :return: :class:`calibre.gui2.store.search_result.SearchResult` objects
-        item_data is plugin specific and is used in :meth:`open` to open to a specifc place in the store.
+        item_data is plugin specific and is used in :meth:`open` to open to a specific place in the store.
         '''
         raise NotImplementedError()
 
diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py
index 94e648f1c1..a4ca73b51f 100644
--- a/src/calibre/gui2/store/search/models.py
+++ b/src/calibre/gui2/store/search/models.py
@@ -148,7 +148,7 @@ class Matches(QAbstractItemModel):
         query = query.replace('~', '')
         query = query.replace('>', '')
         query = query.replace('<', '')
-        # Store the query at this point for comparision later
+        # Store the query at this point for comparison later
         mod_query = query
         # Remove filter identifiers
         # Remove the prefix.
diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py
index 4cad8ff580..a656ffcfe6 100644
--- a/src/calibre/gui2/store/search/search.py
+++ b/src/calibre/gui2/store/search/search.py
@@ -200,7 +200,7 @@ class SearchDialog(QDialog, Ui_Dialog):
         self.searching = True
         self.search.setText(self.STOP_TEXT)
         # Give the query to the results model so it can do
-        # futher filtering.
+        # further filtering.
         self.results_view.model().set_query(query)
 
         # Plugins are in random order that does not change.
diff --git a/src/calibre/gui2/store/stores/bubok_portugal_plugin.py b/src/calibre/gui2/store/stores/bubok_portugal_plugin.py
index dced5e721b..4f1f970f98 100644
--- a/src/calibre/gui2/store/stores/bubok_portugal_plugin.py
+++ b/src/calibre/gui2/store/stores/bubok_portugal_plugin.py
@@ -53,7 +53,7 @@ class BubokPortugalStore(BasicStoreConfig, StorePlugin):
 
                 title = ''.join(data.xpath('.//div[@class="titulo"]/text()'))
 
-                author = ''.join(data.xpath('.//div[@class="autor"]/text()'))
+                author = ''.join(data.xpath('.//div[@class="author"]/text()'))
 
                 price = ''.join(data.xpath('.//div[@class="precio"]/text()'))
 
diff --git a/src/calibre/gui2/store/stores/bubok_publishing_plugin.py b/src/calibre/gui2/store/stores/bubok_publishing_plugin.py
index 281b3e1130..b6e7930e2c 100644
--- a/src/calibre/gui2/store/stores/bubok_publishing_plugin.py
+++ b/src/calibre/gui2/store/stores/bubok_publishing_plugin.py
@@ -53,7 +53,7 @@ class BubokPublishingStore(BasicStoreConfig, StorePlugin):
 
                 title = ''.join(data.xpath('.//div[@class="titulo"]/text()'))
 
-                author = ''.join(data.xpath('.//div[@class="autor"]/text()'))
+                author = ''.join(data.xpath('.//div[@class="author"]/text()'))
 
                 price = ''.join(data.xpath('.//div[@class="precio"]/text()'))
 
diff --git a/src/calibre/gui2/store/stores/rw2010_plugin.py b/src/calibre/gui2/store/stores/rw2010_plugin.py
index f57af28270..baa0ab0f71 100644
--- a/src/calibre/gui2/store/stores/rw2010_plugin.py
+++ b/src/calibre/gui2/store/stores/rw2010_plugin.py
@@ -62,7 +62,7 @@ class RW2010Store(BasicStoreConfig, StorePlugin):
                 with closing(br.open(id.strip(), timeout=timeout/4)) as nf:
                     idata = html.fromstring(nf.read())
                     cover_url = ''.join(idata.xpath('//div[@class="boxa"]//div[@class="img"]/img/@src'))
-                    author = ''.join(idata.xpath('//div[@class="boxb"]//h3[text()="Autor: "]/span/text()'))
+                    author = ''.join(idata.xpath('//div[@class="boxb"]//h3[text()="Author: "]/span/text()'))
                     title = ''.join(idata.xpath('//div[@class="boxb"]/h2[1]/text()'))
                     title = re.sub(r'\(#.+\)', '', title)
                     formats = ''.join(idata.xpath('//div[@class="boxb"]//h3[text()="Format pliku: "]/span/text()'))
diff --git a/src/calibre/gui2/threaded_jobs.py b/src/calibre/gui2/threaded_jobs.py
index 70006d19b4..f81ac5bdb3 100644
--- a/src/calibre/gui2/threaded_jobs.py
+++ b/src/calibre/gui2/threaded_jobs.py
@@ -54,7 +54,7 @@ class ThreadedJob(BaseJob):
         Note that it is not called if the user kills the job. Check job.failed
         to see if the job succeeded or not. And use job.log to get the job log.
 
-        :param killable: If False the GUI wont let the user kill this job
+        :param killable: If False the GUI won't let the user kill this job
 
         :param log: Must be a subclass of GUILog or None. If None a default
         GUILog is created.
diff --git a/src/calibre/gui2/tweak_book/diff/_patiencediff_c.c b/src/calibre/gui2/tweak_book/diff/_patiencediff_c.c
index f2b4ec29ba..aa64c71efa 100644
--- a/src/calibre/gui2/tweak_book/diff/_patiencediff_c.c
+++ b/src/calibre/gui2/tweak_book/diff/_patiencediff_c.c
@@ -60,7 +60,7 @@ enum {
 };
 
 
-/* values from this array need to correspont to the order of the enum above */
+/* values from this array need to correspond to the order of the enum above */
 static char *opcode_names[] = {
     "equal",
     "insert",
@@ -586,7 +586,7 @@ load_lines(PyObject *orig, struct line **lines)
         line->data = item;
         line->hash = PyObject_Hash(item);
         if (line->hash == (-1)) {
-            /* Propogate the hash exception */
+            /* Propagate the hash exception */
             size = -1;
             goto cleanup;
         }
diff --git a/src/calibre/gui2/tweak_book/editor/widget.py b/src/calibre/gui2/tweak_book/editor/widget.py
index a0cb8225d7..417e8de43b 100644
--- a/src/calibre/gui2/tweak_book/editor/widget.py
+++ b/src/calibre/gui2/tweak_book/editor/widget.py
@@ -401,7 +401,7 @@ class Editor(QMainWindow):
             if name == 'insert-tag':
                 w = bar.widgetForAction(ac)
                 if hasattr(w, 'setPopupMode'):
-                    # For some unknown reason this button is occassionally a
+                    # For some unknown reason this button is occasionally a
                     # QPushButton instead of a QToolButton
                     w.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
                 w.setMenu(self.insert_tag_menu)
@@ -413,7 +413,7 @@ class Editor(QMainWindow):
                 ac.setMenu(m)
                 ch = bar.widgetForAction(ac)
                 if hasattr(ch, 'setPopupMode'):
-                    # For some unknown reason this button is occassionally a
+                    # For some unknown reason this button is occasionally a
                     # QPushButton instead of a QToolButton
                     ch.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
                 for name in tuple('h%d' % d for d in range(1, 7)) + ('p',):
diff --git a/src/calibre/gui2/tweak_book/job.py b/src/calibre/gui2/tweak_book/job.py
index 873bf7284c..d02ed12ef7 100644
--- a/src/calibre/gui2/tweak_book/job.py
+++ b/src/calibre/gui2/tweak_book/job.py
@@ -62,7 +62,7 @@ class BlockingJob(QWidget):
     def start(self):
         self.setGeometry(0, 0, self.parent().width(), self.parent().height())
         self.setVisible(True)
-        # Prevent any actions from being triggerred by key presses
+        # Prevent any actions from being triggered by key presses
         self.parent().setEnabled(False)
         self.raise_()
         self.setFocus(Qt.FocusReason.OtherFocusReason)
diff --git a/src/calibre/gui2/tweak_book/live_css.py b/src/calibre/gui2/tweak_book/live_css.py
index 40b43ef9bc..018fb26888 100644
--- a/src/calibre/gui2/tweak_book/live_css.py
+++ b/src/calibre/gui2/tweak_book/live_css.py
@@ -176,7 +176,7 @@ class Declaration(QWidget):
             ])
             self.lines_for_copy.append(text + vtext)
             if prop.is_overriden:
-                self.lines_for_copy[-1] += ' [overriden]'
+                self.lines_for_copy[-1] += ' [overridden]'
             ypos += max(br1.height(), br2.height()) + line_spacing
         self.lines_for_copy.append('--------------------------\n')
 
diff --git a/src/calibre/gui2/tweak_book/preferences.py b/src/calibre/gui2/tweak_book/preferences.py
index 6cfaf64403..2540b8632f 100644
--- a/src/calibre/gui2/tweak_book/preferences.py
+++ b/src/calibre/gui2/tweak_book/preferences.py
@@ -472,7 +472,7 @@ class ToolbarSettings(QWidget):
         self.sl = l = QGridLayout()
         gl.addLayout(l, 1, 0, 1, -1)
 
-        self.gb1 = gb1 = QGroupBox(_('A&vailable actions'), self)
+        self.gb1 = gb1 = QGroupBox(_('A&available actions'), self)
         self.gb2 = gb2 = QGroupBox(_('&Current actions'), self)
         gb1.setFlat(True), gb2.setFlat(True)
         gb1.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
diff --git a/src/calibre/gui2/tweak_book/save.py b/src/calibre/gui2/tweak_book/save.py
index b6c6472366..323af2bd3b 100644
--- a/src/calibre/gui2/tweak_book/save.py
+++ b/src/calibre/gui2/tweak_book/save.py
@@ -61,7 +61,7 @@ def save_container(container, path):
             except EnvironmentError as err:
                 if err.errno not in (errno.EPERM, errno.EACCES):
                     # ignore chown failure as user could be editing file belonging
-                    # to a different user, in which case we really cant do anything
+                    # to a different user, in which case we really can't do anything
                     # about it short of making the file update non-atomic
                     raise
 
diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py
index 85b6f9e320..77d46f01de 100644
--- a/src/calibre/gui2/update.py
+++ b/src/calibre/gui2/update.py
@@ -53,7 +53,7 @@ def get_newest_version():
         # certificate verification failed, since the version check contains no
         # critical information, ignore and proceed
         # We have to do this as if the calibre CA certificate ever
-        # needs to be revoked, then we wont be able to do version checks
+        # needs to be revoked, then we won't be able to do version checks
         version = get_https_resource_securely(URL, headers=headers, cacerts=None)
     try:
         version = version.decode('utf-8').strip()
diff --git a/src/calibre/gui2/viewer/toolbars.py b/src/calibre/gui2/viewer/toolbars.py
index 972d0985ec..f8b66cc2e6 100644
--- a/src/calibre/gui2/viewer/toolbars.py
+++ b/src/calibre/gui2/viewer/toolbars.py
@@ -418,7 +418,7 @@ class ConfigureToolBar(Dialog):
 
         self.h = h = QHBoxLayout()
         l.addLayout(h)
-        self.lg = lg = QGroupBox(_('A&vailable actions'), self)
+        self.lg = lg = QGroupBox(_('A&available actions'), self)
         lg.v = v = QVBoxLayout(lg)
         v.addWidget(self.available_actions)
         h.addWidget(lg)
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index ee0bd9b936..5911ee6ae4 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -83,7 +83,7 @@ class FilenamePattern(QWidget, Ui_Form):  # {{{
         connect_lambda(self.re.lineEdit().textChanged, self, lambda self, x: self.changed_signal.emit())
 
     def initialize(self, defaults=False):
-        # Get all items in the combobox. If we are reseting
+        # Get all items in the combobox. If we are resetting
         # to defaults we don't want to lose what the user
         # has added.
         val_hist = [unicode_type(self.re.lineEdit().text())] + [unicode_type(self.re.itemText(i)) for i in range(self.re.count())]
@@ -789,7 +789,7 @@ class EncodingComboBox(QComboBox):  # {{{
     A combobox that holds text encodings support
     by Python. This is only populated with the most
     common and standard encodings. There is no good
-    way to programatically list all supported encodings
+    way to programmatically list all supported encodings
     using encodings.aliases.aliases.keys(). It
     will not work.
     '''
diff --git a/src/calibre/headless/headless_integration.cpp b/src/calibre/headless/headless_integration.cpp
index 5e8345ab20..bc8f6d3ea6 100644
--- a/src/calibre/headless/headless_integration.cpp
+++ b/src/calibre/headless/headless_integration.cpp
@@ -32,7 +32,7 @@ class GenericUnixServices : public QGenericUnixServices {
      * leading to a segfault.  For example, defaultHintStyleFromMatch() queries
      * the nativeInterface() without checking that it is NULL. See
      * https://bugreports.qt-project.org/browse/QTBUG-40946
-     * This is no longer strictly neccessary since we implement our own fontconfig database
+     * This is no longer strictly necessary since we implement our own fontconfig database
      * (a patched version of the Qt fontconfig database). However, it is probably a good idea to
      * keep it unknown, since the headless QPA is used in contexts where a desktop environment
      * does not make sense anyway.
diff --git a/src/calibre/library/catalogs/bibtex.py b/src/calibre/library/catalogs/bibtex.py
index ca8fce82f1..6ef4a65bda 100644
--- a/src/calibre/library/catalogs/bibtex.py
+++ b/src/calibre/library/catalogs/bibtex.py
@@ -279,7 +279,7 @@ class BIBTEX(CatalogPlugin):
         bibfile_enctag = ['strict', 'replace', 'ignore', 'backslashreplace']
         bib_entry = ['mixed', 'misc', 'book']
 
-        # Needed beacause CLI return str vs int by widget
+        # Needed because CLI return str vs int by widget
         try:
             bibfile_enc = bibfile_enc[opts.bibfile_enc]
             bibfile_enctag = bibfile_enctag[opts.bibfile_enctag]
@@ -342,7 +342,7 @@ class BIBTEX(CatalogPlugin):
         # Initialize BibTeX class
         bibtexc = BibTeX()
 
-        # Entries writing after Bibtex formating (or not)
+        # Entries writing after Bibtex formatting (or not)
         if bibfile_enc != 'ascii' :
             bibtexc.ascii_bibtex = False
         else :
diff --git a/src/calibre/library/catalogs/utils.py b/src/calibre/library/catalogs/utils.py
index 4b2238777e..19a41381f7 100644
--- a/src/calibre/library/catalogs/utils.py
+++ b/src/calibre/library/catalogs/utils.py
@@ -129,7 +129,7 @@ class NumberToText:  # {{{
             right = NumberToText(decimal_strings[1]).text
             self.text = '%s point %s' % (left.capitalize(), right)
 
-        # Test for hypenated
+        # Test for hyphenated
         elif re.search('-', self.number):
             if self.verbose:
                 self.log("Hyphenated: %s" % self.number)
diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py
index 23658b78e3..d0ee2f88a3 100644
--- a/src/calibre/library/database.py
+++ b/src/calibre/library/database.py
@@ -404,7 +404,7 @@ class LibraryDatabase:
             END;
         END;
         CREATE TRIGGER fkc_update_books_series_link_b
-        BEFORE UPDATE OF serie ON books_series_link
+        BEFORE UPDATE OF series ON books_series_link
         BEGIN
             SELECT CASE
                 WHEN (SELECT id from series WHERE id=NEW.series) IS NULL
diff --git a/src/calibre/spell/dictionary.py b/src/calibre/spell/dictionary.py
index 7114b09d86..963f50d7ed 100644
--- a/src/calibre/spell/dictionary.py
+++ b/src/calibre/spell/dictionary.py
@@ -216,7 +216,7 @@ class Dictionaries:
                             try:
                                 ans.obj.add(word)
                             except Exception:
-                                # not critical since all it means is that the word wont show up in suggestions
+                                # not critical since all it means is that the word won't show up in suggestions
                                 prints('Failed to add the word %r to the dictionary for %s' % (word, locale), file=sys.stderr)
             self.dictionaries[locale] = ans
         return ans
diff --git a/src/calibre/srv/fast_css_transform.cpp b/src/calibre/srv/fast_css_transform.cpp
index d71d3349f2..6941cd422f 100644
--- a/src/calibre/srv/fast_css_transform.cpp
+++ b/src/calibre/srv/fast_css_transform.cpp
@@ -414,7 +414,7 @@ class Token {
 		}
 
 		void set_text(const PyObject* src) {
-			if (PyUnicode_READY(src) != 0) throw python_error("Failed to set token value from unicode object as readying the unicode obect failed");
+			if (PyUnicode_READY(src) != 0) throw python_error("Failed to set token value from unicode object as readying the unicode object failed");
 			int kind = PyUnicode_KIND(src); void *data = PyUnicode_DATA(src);
             text.resize(PyUnicode_GET_LENGTH(src));
 			for (Py_ssize_t i = 0; i < PyUnicode_GET_LENGTH(src); i++) text[i] = PyUnicode_READ(kind, data, i);
diff --git a/src/calibre/srv/web_socket.py b/src/calibre/srv/web_socket.py
index 7e4c9dd736..bddc294529 100644
--- a/src/calibre/srv/web_socket.py
+++ b/src/calibre/srv/web_socket.py
@@ -398,7 +398,7 @@ class WebSocketConnection(HTTPConnection):
                     try:
                         close_code = unpack_from(b'!H', data)[0]
                     except struct_error:
-                        data = pack(b'!H', PROTOCOL_ERROR) + b'close frame data must be atleast two bytes'
+                        data = pack(b'!H', PROTOCOL_ERROR) + b'close frame data must be at least two bytes'
                     else:
                         try:
                             utf8_decode(data[2:])
diff --git a/src/calibre/utils/certgen.c b/src/calibre/utils/certgen.c
index a22ea1fc9a..7955a0f0f8 100644
--- a/src/calibre/utils/certgen.c
+++ b/src/calibre/utils/certgen.c
@@ -164,7 +164,7 @@ static void free_cert(PyObject *capsule) {
     if (Cert) X509_free(Cert);
 }
 
-/* Presently this just uses a random number, but a more appealling solution
+/* Presently this just uses a random number, but a more appealing solution
  * is to switch to using a hash of certain key elements. Apparently Verisign do
  * something similar and it seems like a damned good idea. The suggested
  * fields to hash are
diff --git a/src/calibre/utils/exim.py b/src/calibre/utils/exim.py
index 798fe3c94f..cf07c6ffff 100644
--- a/src/calibre/utils/exim.py
+++ b/src/calibre/utils/exim.py
@@ -104,7 +104,7 @@ class Exporter:
             if size + self.f.tell() < self.part_size:
                 return
         except AttributeError:
-            raise RuntimeError('This exporter has already been commited, cannot add to it')
+            raise RuntimeError('This exporter has already been committed, cannot add to it')
         self.commit_part()
         self.new_part()
 
diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py
index 445f14d992..2113e3f6e8 100644
--- a/src/calibre/utils/ipc/worker.py
+++ b/src/calibre/utils/ipc/worker.py
@@ -157,7 +157,7 @@ def get_func(name):
         module = importlib.import_module(module)
     except ZipImportError:
         # Something windows weird happened, try clearing the zip import cache
-        # incase the zipfile was changed from under us
+        # in case the zipfile was changed from under us
         from zipimport import _zip_directory_cache as zdc
         zdc.clear()
         module = importlib.import_module(module)
diff --git a/src/calibre/utils/matcher.py b/src/calibre/utils/matcher.py
index fd67b2c073..52ed11f91a 100644
--- a/src/calibre/utils/matcher.py
+++ b/src/calibre/utils/matcher.py
@@ -274,7 +274,7 @@ def test(return_tests=False):
 
     class Test(unittest.TestCase):
 
-        @unittest.skipIf(is_sanitized, 'Sanitizer enabled cant check for leaks')
+        @unittest.skipIf(is_sanitized, 'Sanitizer enabled can't check for leaks')
         def test_mem_leaks(self):
             import gc
             from calibre.utils.mem import get_memory as memory
diff --git a/src/calibre/utils/mreplace.py b/src/calibre/utils/mreplace.py
index 7c0af13730..41ce0bcf36 100644
--- a/src/calibre/utils/mreplace.py
+++ b/src/calibre/utils/mreplace.py
@@ -1,4 +1,4 @@
-# multiple replace from dictionnary : http://code.activestate.com/recipes/81330/
+# multiple replace from dictionary : http://code.activestate.com/recipes/81330/
 
 __license__   = 'GPL v3'
 __copyright__ = '2010, sengian '
diff --git a/src/calibre/utils/smartypants.py b/src/calibre/utils/smartypants.py
index 1521b5719e..487772332c 100644
--- a/src/calibre/utils/smartypants.py
+++ b/src/calibre/utils/smartypants.py
@@ -572,7 +572,7 @@ def educateQuotes(text):
     # start-of-line and end-ol-line regex operators will match anything
     # meaningful
 
-    # Special case for Quotes at end of line with a preceeding space (may change just to end of line)
+    # Special case for Quotes at end of line with a preceding space (may change just to end of line)
     # text = re.sub(r"""(?<=\s)"$""", r"""”""", text)
     # text = re.sub(r"""(?<=\s)'$""", r"""’""", text)
 
diff --git a/src/calibre/utils/speedup.c b/src/calibre/utils/speedup.c
index 102a20af38..ff5c55a690 100644
--- a/src/calibre/utils/speedup.c
+++ b/src/calibre/utils/speedup.c
@@ -439,7 +439,7 @@ speedup_iso_8601(PyObject *self, PyObject *args) {
 #define FREEBSD_SET_NAME
 #endif
 #if defined(__APPLE__)
-// I cant figure out how to get pthread.h to include this definition on macOS. MACOSX_DEPLOYMENT_TARGET does not work.
+// I can't figure out how to get pthread.h to include this definition on macOS. MACOSX_DEPLOYMENT_TARGET does not work.
 extern int pthread_setname_np(const char *name);
 #elif defined(FREEBSD_SET_NAME)
 // Function has a different name on FreeBSD
diff --git a/src/calibre/utils/threadpool.py b/src/calibre/utils/threadpool.py
index 4eed2b8b8b..b8debbeee4 100644
--- a/src/calibre/utils/threadpool.py
+++ b/src/calibre/utils/threadpool.py
@@ -169,7 +169,7 @@ class ThreadPool:
     def __init__(self, num_workers, q_size=0):
         """Set up the thread pool and start num_workers worker threads.
 
-        num_workers is the number of worker threads to start initialy.
+        num_workers is the number of worker threads to start initially.
         If q_size > 0 the size of the work request queue is limited and
         the thread pool blocks when the queue is full and it tries to put
         more work requests in it (see putRequest method).
@@ -216,7 +216,7 @@ class ThreadPool:
             try:
                 # get back next results
                 request, result = self.resultsQueue.get(block=block)
-                # has an exception occured?
+                # has an exception occurred?
                 if request.exception and request.exc_callback:
                     request.exc_callback(request, result)
                 # hand results to callback, if any
@@ -293,7 +293,7 @@ if __name__ == '__main__':
 
     # this will be called when an exception occurs within a thread
     def handle_exception(request, exc_info):
-        print("Exception occured in request #%s: %s" %
+        print("Exception occurred in request #%s: %s" %
           (request.requestID, exc_info[1]))
 
     # assemble the arguments for each job to a list...
diff --git a/src/calibre/utils/windows/winutil.cpp b/src/calibre/utils/windows/winutil.cpp
index 6d48a537b2..5fc8ac85cd 100644
--- a/src/calibre/utils/windows/winutil.cpp
+++ b/src/calibre/utils/windows/winutil.cpp
@@ -272,7 +272,7 @@ class scoped_com_initializer {  // {{{
 	public:
 		scoped_com_initializer() : m_succeded(false) { if (SUCCEEDED(CoInitialize(NULL))) m_succeded = true; }
 		~scoped_com_initializer() { CoUninitialize(); }
-		bool succeded() { return m_succeded; }
+		bool succeeded() { return m_succeded; }
 	private:
 		bool m_succeded;
 		scoped_com_initializer( const scoped_com_initializer & ) ;
@@ -637,7 +637,7 @@ winutil_move_to_trash(PyObject *self, PyObject *args) {
 	if (!PyArg_ParseTuple(args, "O&", py_to_wchar, &path)) return NULL;
 
 	scoped_com_initializer com;
-	if (!com.succeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
+	if (!com.succeeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
 
 	CComPtr pfo;
 	if (FAILED(CoCreateInstance(CLSID_FileOperation, nullptr, CLSCTX_ALL, IID_PPV_ARGS(&pfo)))) {
@@ -687,7 +687,7 @@ resolve_lnk(PyObject *self, PyObject *args) {
 		return NULL;
 	}
 	scoped_com_initializer com;
-	if (!com.succeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
+	if (!com.succeeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
 	CComPtr shell_link;
 	if (FAILED(CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&shell_link)))) {
 		PyErr_SetString(PyExc_OSError, "Failed to create IShellLink instance");
@@ -723,7 +723,7 @@ winutil_manage_shortcut(PyObject *self, PyObject *args) {
 	}
 
 	scoped_com_initializer com;
-	if (!com.succeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
+	if (!com.succeeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
 
 	CComPtr shell_link;
 	if (FAILED(CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&shell_link)))) {
@@ -1094,7 +1094,7 @@ get_icon_for_file(PyObject *self, PyObject *args) {
 	wchar_raii path;
 	if (!PyArg_ParseTuple(args, "O&", py_to_wchar_no_none, &path)) return NULL;
 	scoped_com_initializer com;
-	if (!com.succeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
+	if (!com.succeeded()) { PyErr_SetString(PyExc_OSError, "Failed to initialize COM"); return NULL; }
 	SHFILEINFO fi = {0};
 	DWORD_PTR res;
 	Py_BEGIN_ALLOW_THREADS
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index ba7544a758..595783724b 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -414,7 +414,7 @@ class BasicNewsRecipe(Recipe):
     #: with the URL scheme of your particular website.
     resolve_internal_links = False
 
-    #: Set to False if you dont want to use gziped transfers. Note that some old servers flake out with gzip
+    #: Set to False if you dont want to use gzipped transfers. Note that some old servers flake out with gzip
     handle_gzip = True
 
     # See the built-in recipes for examples of these settings.