String changes

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 <https://daringfireball.net/projects/markdown/syntax>`_.
+        You can learn more about the Markdown syntax at `daringfireball <https://daringfireball.net/projects/markdown/syntax>`_.
 
     :guilabel:`Formatting style: None`
         Applies no special formatting to the text, the document is converted to HTML with no other changes.

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'))
-
-
-

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 "
+                    dest="comment", help=_("Path to a TXT file containing the "
-                    "comment to be stored in the lrf file."))
+                    "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())
-

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((

src/calibre/gui2/convert/txt_input.ui

@@ -101,7 +101,7 @@
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>&lt;p&gt;Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit &lt;a href=&quot;https://daringfireball.net/projects/markdown&quot;&gt;markdown&lt;/a&gt;.</string>
+         <string>&lt;p&gt;Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit &lt;a href=&quot;https://daringfireball.net/projects/markdown&quot;&gt;Markdown&lt;/a&gt;.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -114,7 +114,7 @@
       <item>
        <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>You can optionally enable various extensions to the base markdown syntax, below.</string>
+         <string>You can optionally enable various extensions to the base Markdown syntax, below.</string>
         </property>
        </widget>
       </item>
@@ -124,7 +124,7 @@
       <item>
        <widget class="QLabel" name="label_5">
         <property name="text">
-         <string>More information on &lt;a href=&quot;https://pythonhosted.org/Markdown/extensions/index.html&quot;&gt;markdown extensions&lt;/a&gt;</string>
+         <string>More information on &lt;a href=&quot;https://pythonhosted.org/Markdown/extensions/index.html&quot;&gt;Markdown extensions&lt;/a&gt;</string>
         </property>
         <property name="openExternalLinks">
          <bool>true</bool>

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'), _(
+            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)
+                'The Location manager must be in either the main toolbar or the menubar when a device is connected.'), show=True)
             raise AbortCommit()
 
         # Save data.