diff --git a/manual/faq.rst b/manual/faq.rst index c8826bf3d2..f26a70aea6 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -920,7 +920,7 @@ Downloading from the Internet can sometimes result in a corrupted download. If t the :guilabel:`Security` tab. Make sure that your user account has full control for this folder. -If you still cannot get the installer to work and you are on Windows, you can use the :website:`calibre portable install `, which does not need an installer (it is just a zip file). +If you still cannot get the installer to work and you are on Windows, you can use the :website:`calibre portable install `, which does not need an installer (it is just a ZIP file). My antivirus program claims calibre is a virus/trojan? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/manual/glossary.rst b/manual/glossary.rst index dca2ce1392..6900f3861f 100644 --- a/manual/glossary.rst +++ b/manual/glossary.rst @@ -26,4 +26,4 @@ Glossary **URL** *(Uniform Resource Locator)* for example: ``http://example.com`` regexp - **Regular expressions** provide a concise and flexible means for identifying strings of text of interest, such as particular characters, words, or patterns of characters. See `regexp syntax `_ for the syntax of regular expressions used in Python. + **Regular expressions** provide a concise and flexible means for identifying strings of text of interest, such as particular characters, words, or patterns of characters. See :doc:`the tutorial ` for an introduction to regular expressions. diff --git a/src/calibre/gui2/actions/unpack_book.py b/src/calibre/gui2/actions/unpack_book.py index a1511767e7..0c080b1460 100644 --- a/src/calibre/gui2/actions/unpack_book.py +++ b/src/calibre/gui2/actions/unpack_book.py @@ -338,7 +338,7 @@ class UnpackBookAction(InterfaceAction): 'mobi', 'azw'}) if not tweakable_fmts: return error_dialog(self.gui, _('Cannot unpack book'), - _('The book must be in ePub, HTMLZ or AZW3 formats to unpack.' + _('The book must be in EPUB, HTMLZ or AZW3 formats to unpack.' '\n\nFirst convert the book to one of these formats.'), show=True) dlg = UnpackBook(self.gui, book_id, tweakable_fmts, db) diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index e417a9d34c..8bc76166f1 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -570,7 +570,7 @@ class BasicNewsRecipe(Recipe): article URL. It is called with `article`, an object representing a parsed article from a feed. See `feedparser `_. By default it looks for the original link (for feeds syndicated via a - service like feedburner or pheedo) and if found, + service like FeedBurner or Pheedo) and if found, returns that or else returns `article.link `_. ''' diff --git a/src/pyj/read_book/selection_bar.pyj b/src/pyj/read_book/selection_bar.pyj index a66d64510e..840c86de64 100644 --- a/src/pyj/read_book/selection_bar.pyj +++ b/src/pyj/read_book/selection_bar.pyj @@ -194,7 +194,7 @@ def all_actions(): 'remove_highlight': a('trash', _('Remove this highlight') + _(' [Delete or D]'), 'remove_highlight', True), 'clear': a('close', _('Clear selection') + ' [Esc]', 'clear_selection'), 'speak': a('bullhorn', _('Read aloud') + ' [T]', 'speak_aloud'), - 'cite': a('reference-mode', _('Copy citation to clipboard') + ' [X]', 'cite'), + 'cite': a('reference-mode', _('Copy a citation to this text') + ' [X]', 'cite'), } qh = all_actions.ans.quick_highlight qh.icon_function = quick_highlight_icon.bind(None, qh.icon, qh.text)