diff --git a/Changelog.txt b/Changelog.txt index ba2bd2818a..a891eff46b 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -496,7 +496,7 @@ :: improved recipes - Jot Down -- Various Russian and Ukranian news sources +- Various Russian and Ukrainian news sources - Nautilus Magazine - Süddeutsche Zeitung - The India Forum @@ -974,7 +974,7 @@ - Fix a regression in 7.0 caused by a regression in Qt that would result in calibre hanging rarely when using the cover browser view -- [2049992] Fix custom template functions not useable in save to disk templates +- [2049992] Fix custom template functions not usable in save to disk templates - Fix a regression in 7.2 that caused the popup used for editing fields in the book list to be mis-positioned on very wide monitors diff --git a/bypy/linux/__main__.py b/bypy/linux/__main__.py index 12ab7b1c95..df88bd3c6e 100644 --- a/bypy/linux/__main__.py +++ b/bypy/linux/__main__.py @@ -55,10 +55,10 @@ def binary_includes(): get_dll_path('bz2', 2), j(PREFIX, 'lib', 'libunrar.so'), get_dll_path('python' + py_ver, 2), get_dll_path('jbig', 2), - # We dont include libstdc++.so as the OpenGL dlls on the target + # We don't include libstdc++.so as the OpenGL dlls on the target # computer fail to load in the QPA xcb plugin if they were compiled # with a newer version of gcc than the one on the build computer. - # libstdc++, like glibc is forward compatible and I dont think any + # libstdc++, like glibc is forward compatible and I don't think any # distros do not have libstdc++.so.6, so it should be safe to leave it out. # https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html (The current # debian stable libstdc++ is libstdc++.so.6.0.17) diff --git a/bypy/macos/sign.py b/bypy/macos/sign.py index 87279d74c1..fb1da2b95b 100644 --- a/bypy/macos/sign.py +++ b/bypy/macos/sign.py @@ -13,10 +13,10 @@ entitlements = { # MAP_JIT is used by libpcre which is bundled with Qt 'com.apple.security.cs.allow-jit': True, - # v8 and therefore WebEngine need this as they dont use MAP_JIT + # v8 and therefore WebEngine need this as they don't use MAP_JIT 'com.apple.security.cs.allow-unsigned-executable-memory': True, - # calibre itself does not use DYLD env vars, but dont know about its + # calibre itself does not use DYLD env vars, but don't know about its # dependencies. 'com.apple.security.cs.allow-dyld-environment-variables': True, diff --git a/bypy/windows/file_dialogs.cpp b/bypy/windows/file_dialogs.cpp index 0d200710be..fea720eb8d 100644 --- a/bypy/windows/file_dialogs.cpp +++ b/bypy/windows/file_dialogs.cpp @@ -346,7 +346,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine return write_bytes(pipe, echo_sz, echo_buf) ? 0 : 1; } if (app_uid != NULL) { - // dont check return status as failure is not critical + // don't check return status as failure is not critical set_app_uid(app_uid); } diff --git a/bypy/windows/wix-template.xml b/bypy/windows/wix-template.xml index 901a054b0a..b067f09ec8 100644 --- a/bypy/windows/wix-template.xml +++ b/bypy/windows/wix-template.xml @@ -5,16 +5,16 @@