From bca7dcc5309600f9f7a304b6f6a2fdeac560efaf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 12 May 2017 08:17:54 +0530 Subject: [PATCH] String changes --- manual/conversion.rst | 4 ++-- src/calibre/ebooks/lrf/html/convert_from.py | 5 +---- src/calibre/ebooks/lrf/meta.py | 6 +++--- src/calibre/ebooks/metadata/sources/google_images.py | 2 +- src/calibre/gui2/convert/txt_input.ui | 6 +++--- src/calibre/gui2/preferences/toolbar.py | 4 ++-- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/manual/conversion.rst b/manual/conversion.rst index 230a6b23c0..f2933b42ed 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -693,11 +693,11 @@ TXT input supports a number of options to differentiate how paragraphs are detec appropriate HTML markup during conversion. :guilabel:`Formatting style: Markdown` - calibre also supports running TXT input though a transformation preprocessor known as markdown. Markdown + calibre also supports running TXT input though a transformation preprocessor known as Markdown. Markdown allows for basic formatting to be added to TXT documents, such as bold, italics, section headings, tables, lists, a Table of Contents, etc. Marking chapter headings with a leading # and setting the chapter XPath detection expression to "//h:h1" is the easiest way to have a proper table of contents generated from a TXT document. - You can learn more about the markdown syntax at `daringfireball `_. + You can learn more about the Markdown syntax at `daringfireball `_. :guilabel:`Formatting style: None` Applies no special formatting to the text, the document is converted to HTML with no other changes. diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py index c1d9800d49..478a597010 100644 --- a/src/calibre/ebooks/lrf/html/convert_from.py +++ b/src/calibre/ebooks/lrf/html/convert_from.py @@ -1978,7 +1978,4 @@ def try_opf(path, options, logger): if not getattr(options, 'toc', None): options.toc = opf.toc except Exception: - logger.exception(_('Failed to process opf file')) - - - + logger.exception(_('Failed to process OPF file')) diff --git a/src/calibre/ebooks/lrf/meta.py b/src/calibre/ebooks/lrf/meta.py index 05912604d3..6a3a9a226c 100644 --- a/src/calibre/ebooks/lrf/meta.py +++ b/src/calibre/ebooks/lrf/meta.py @@ -639,8 +639,8 @@ Show/edit the metadata in an LRF file.\n\n'''), dest="thumbnail", help=_("Path to a graphic that will be" " set as this files' thumbnail")) parser.add_option("--comment", action="store", type="string", - dest="comment", help=_("Path to a txt file containing the " - "comment to be stored in the lrf file.")) + dest="comment", help=_("Path to a TXT file containing the " + "comment to be stored in the LRF file.")) parser.add_option("--get-thumbnail", action="store_true", dest="get_thumbnail", default=False, help=_("Extract thumbnail from LRF file")) @@ -746,6 +746,6 @@ def main(args=sys.argv): else: print 'Could not find cover in the LRF file' + if __name__ == '__main__': sys.exit(main()) - diff --git a/src/calibre/ebooks/metadata/sources/google_images.py b/src/calibre/ebooks/metadata/sources/google_images.py index 8bf5548961..9e9f2b2032 100644 --- a/src/calibre/ebooks/metadata/sources/google_images.py +++ b/src/calibre/ebooks/metadata/sources/google_images.py @@ -25,7 +25,7 @@ class GoogleImages(Source): can_get_multiple_covers = True supports_gzip_transfer_encoding = True options = (Option('max_covers', 'number', 5, _('Maximum number of covers to get'), - _('The maximum number of covers to process from the google search result')), + _('The maximum number of covers to process from the Google search result')), Option('size', 'choices', 'svga', _('Cover size'), _('Search for covers larger than the specified size'), choices=OrderedDict(( diff --git a/src/calibre/gui2/convert/txt_input.ui b/src/calibre/gui2/convert/txt_input.ui index 8d0fb4d7a8..bb2ed91573 100644 --- a/src/calibre/gui2/convert/txt_input.ui +++ b/src/calibre/gui2/convert/txt_input.ui @@ -101,7 +101,7 @@ - <p>Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit <a href="https://daringfireball.net/projects/markdown">markdown</a>. + <p>Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit <a href="https://daringfireball.net/projects/markdown">Markdown</a>. true @@ -114,7 +114,7 @@ - You can optionally enable various extensions to the base markdown syntax, below. + You can optionally enable various extensions to the base Markdown syntax, below. @@ -124,7 +124,7 @@ - More information on <a href="https://pythonhosted.org/Markdown/extensions/index.html">markdown extensions</a> + More information on <a href="https://pythonhosted.org/Markdown/extensions/index.html">Markdown extensions</a> true diff --git a/src/calibre/gui2/preferences/toolbar.py b/src/calibre/gui2/preferences/toolbar.py index 691ae54b99..7ba33b4c62 100644 --- a/src/calibre/gui2/preferences/toolbar.py +++ b/src/calibre/gui2/preferences/toolbar.py @@ -339,8 +339,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): 'The Preferences action must be in either the main toolbar or the menubar.'), show=True) raise AbortCommit() if not lm_in_toolbar and not lm_in_menubar: - error_dialog(self, _('Location Manager missing'), _( - 'The Location Manager must be in either the main toolbar or the menubar when a device is connected.'), show=True) + error_dialog(self, _('Location manager missing'), _( + 'The Location manager must be in either the main toolbar or the menubar when a device is connected.'), show=True) raise AbortCommit() # Save data.