From 8cc494367364b09735130bf736b0864f311803ca Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 9 May 2017 00:57:14 +0530 Subject: [PATCH] String changes --- manual/conversion.rst | 6 +++--- manual/edit.rst | 2 +- src/calibre/devices/kobo/driver.py | 2 +- src/calibre/devices/prs505/driver.py | 8 ++++---- src/calibre/devices/teclast/driver.py | 1 - src/calibre/ebooks/conversion/plugins/html_output.py | 4 ++-- src/calibre/ebooks/conversion/plugins/htmlz_output.py | 4 ++-- src/calibre/gui2/font_family_chooser.py | 4 ++-- src/calibre/gui2/metadata/single.py | 4 ++-- src/calibre/gui2/preferences/look_feel.ui | 6 +++--- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/manual/conversion.rst b/manual/conversion.rst index a550b73df6..230a6b23c0 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -319,7 +319,7 @@ remove all non-breaking-space entities, or may include false positive matches re If this option is configured then calibre will replace scene break markers it finds with the replacement text specified by the user. Please note that some ornamental characters may not be supported across all reading devices. - In general you should avoid using html tags, calibre will discard any tags and use pre-defined markup.
+ In general you should avoid using HTML tags, calibre will discard any tags and use pre-defined markup.
tags, i.e. horizontal rules, and tags are exceptions. Horizontal rules can optionally be specified with styles, if you choose to add your own style be sure to include the 'width' setting, otherwise the style information will be discarded. Image tags can used, but calibre does not provide the ability to add the image during conversion, this must be done after the fact using @@ -690,7 +690,7 @@ TXT input supports a number of options to differentiate how paragraphs are detec :guilabel:`Formatting style: Heuristic` Analyzes the document for common chapter headings, scene breaks, and italicized words and applies the - appropriate html markup during conversion. + appropriate HTML markup during conversion. :guilabel:`Formatting style: Markdown` calibre also supports running TXT input though a transformation preprocessor known as markdown. Markdown @@ -700,7 +700,7 @@ TXT input supports a number of options to differentiate how paragraphs are detec 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. + Applies no special formatting to the text, the document is converted to HTML with no other changes. .. _pdfconversion: diff --git a/manual/edit.rst b/manual/edit.rst index 2799f0d248..3b1b1c6b9b 100644 --- a/manual/edit.rst +++ b/manual/edit.rst @@ -177,7 +177,7 @@ Adding new images/fonts/etc. or creating new blank files You can add a new image, font, stylesheet, etc. from your computer into the book by clicking :guilabel:`File->New file`. This lets you either import a file -by clicking the :guilabel:`Import resource file` button or create a new blank html file +by clicking the :guilabel:`Import resource file` button or create a new blank HTML file or stylesheet by simply entering the file name into the box for the new file. You can also import multiple files into the book at once using File->Import diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index dfb14aa2c5..0e3e4ba3b6 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -101,7 +101,7 @@ class KOBO(USBMS): _('The Kobo supports several collections including ')+ 'Read, Closed, Im_Reading. ' + _('Create tags for automatic management'), _('Upload covers for books (newer readers)') + - ':::'+_('Normally, the KOBO readers get the cover image from the' + ':::'+_('Normally, the Kobo readers get the cover image from the' ' e-book file itself. With this option, calibre will send a ' 'separate cover image to the reader, useful if you ' 'have modified the cover.'), diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py index 21f00747c8..8ccbb2a38b 100644 --- a/src/calibre/devices/prs505/driver.py +++ b/src/calibre/devices/prs505/driver.py @@ -67,12 +67,12 @@ class PRS505(USBMS): EXTRA_CUSTOMIZATION_MESSAGE = [ _('Comma separated list of metadata fields ' - 'to turn into collections on the device. Possibilities include: ')+ - 'series, tags, authors' + - _('. Two special collections are available: %(abt)s:%(abtv)s and %(aba)s:%(abav)s. Add ' + 'to turn into collections on the device. Possibilities include: ' + '%(coll)s. Two special collections are available: ' + '%(abt)s:%(abtv)s and %(aba)s:%(abav)s. Add ' 'these values to the list to enable them. The collections will be ' 'given the name provided after the ":" character.')%dict( - abt='abt', abtv=ALL_BY_TITLE, aba='aba', abav=ALL_BY_AUTHOR), + abt='abt', abtv=ALL_BY_TITLE, aba='aba', abav=ALL_BY_AUTHOR, coll='series, tags, authors'), _('Upload separate cover thumbnails for books (newer readers)') + ':::'+ _('Normally, the SONY readers get the cover image from the' ' e-book file itself. With this option, calibre will send a ' diff --git a/src/calibre/devices/teclast/driver.py b/src/calibre/devices/teclast/driver.py index 3ecd37f356..a2a20be3ec 100644 --- a/src/calibre/devices/teclast/driver.py +++ b/src/calibre/devices/teclast/driver.py @@ -127,4 +127,3 @@ class WEXLER(TECLAST_K3): VENDOR_NAME = 'WEXLER' WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'T7001' - diff --git a/src/calibre/ebooks/conversion/plugins/html_output.py b/src/calibre/ebooks/conversion/plugins/html_output.py index aece8f36da..927acc6e0e 100644 --- a/src/calibre/ebooks/conversion/plugins/html_output.py +++ b/src/calibre/ebooks/conversion/plugins/html_output.py @@ -26,10 +26,10 @@ class HTMLOutput(OutputFormatPlugin): help=_('CSS file used for the output instead of the default file')), OptionRecommendation(name='template_html_index', - help=_('Template used for generation of the html index file instead of the default file')), + help=_('Template used for generation of the HTML index file instead of the default file')), OptionRecommendation(name='template_html', - help=_('Template used for the generation of the html contents of the book instead of the default file')), + help=_('Template used for the generation of the HTML contents of the book instead of the default file')), OptionRecommendation(name='extract_to', help=_('Extract the contents of the generated ZIP file to the ' diff --git a/src/calibre/ebooks/conversion/plugins/htmlz_output.py b/src/calibre/ebooks/conversion/plugins/htmlz_output.py index 09c669ab45..3cfa1ed3ff 100644 --- a/src/calibre/ebooks/conversion/plugins/htmlz_output.py +++ b/src/calibre/ebooks/conversion/plugins/htmlz_output.py @@ -40,8 +40,8 @@ class HTMLZOutput(OutputFormatPlugin): )), OptionRecommendation(name='htmlz_title_filename', recommended_value=False, level=OptionRecommendation.LOW, - help=_('If set this option causes the file name of the html file' - ' inside the htmlz archive to be based on the book title.') + help=_('If set this option causes the file name of the HTML file' + ' inside the HTMLZ archive to be based on the book title.') ), ]) diff --git a/src/calibre/gui2/font_family_chooser.py b/src/calibre/gui2/font_family_chooser.py index 642a4bcd94..7fb0197866 100644 --- a/src/calibre/gui2/font_family_chooser.py +++ b/src/calibre/gui2/font_family_chooser.py @@ -234,10 +234,10 @@ class FontFamilyDialog(QDialog): self.search.returnPressed.connect(self.find) self.nb = QToolButton(self) self.nb.setIcon(QIcon(I('arrow-down.png'))) - self.nb.setToolTip(_('Find Next')) + self.nb.setToolTip(_('Find next')) self.pb = QToolButton(self) self.pb.setIcon(QIcon(I('arrow-up.png'))) - self.pb.setToolTip(_('Find Previous')) + self.pb.setToolTip(_('Find previous')) self.nb.clicked.connect(self.find_next) self.pb.clicked.connect(self.find_previous) diff --git a/src/calibre/gui2/metadata/single.py b/src/calibre/gui2/metadata/single.py index f873ae6fc6..54909bce6d 100644 --- a/src/calibre/gui2/metadata/single.py +++ b/src/calibre/gui2/metadata/single.py @@ -80,11 +80,11 @@ class MetadataSingleDialogBase(QDialog): self.button_box = bb = QDialogButtonBox(self) self.button_box.accepted.connect(self.accept) self.button_box.rejected.connect(self.reject) - self.next_button = QPushButton(QIcon(I('forward.png')), _('Next'), + self.next_button = QPushButton(QIcon(I('forward.png')), _('&Next'), self) self.next_button.setShortcut(QKeySequence('Alt+Right')) self.next_button.clicked.connect(self.next_clicked) - self.prev_button = QPushButton(QIcon(I('back.png')), _('Previous'), + self.prev_button = QPushButton(QIcon(I('back.png')), _('&Previous'), self) self.prev_button.setShortcut(QKeySequence('Alt+Left')) diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 1301dd6a3b..f6f92c169b 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -553,7 +553,7 @@ A value of zero means calculate automatically. - Open cache directory + &Open cache directory @@ -613,14 +613,14 @@ A value of zero means calculate automatically. - Maximum amount of disk space to use for caching thumbnails: + Maximum amount of &disk space to use for caching thumbnails: - Empty disk cache + &Empty disk cache