From 692628517f0a63d82a50d2441617f02bd88db6ff Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 5 May 2017 13:14:06 +0530 Subject: [PATCH] String changes --- manual/conversion.rst | 2 +- manual/faq.rst | 2 +- manual/index.rst | 2 +- manual/typesetting_math.rst | 12 ++++++------ manual/viewer.rst | 10 +++++----- src/calibre/customize/__init__.py | 2 +- src/calibre/ebooks/oeb/polish/check/links.py | 4 ++-- src/calibre/gui2/actions/view.py | 2 +- src/calibre/gui2/book_details.py | 2 +- src/calibre/gui2/convert/font_key.ui | 4 ++-- src/calibre/gui2/preferences/search.ui | 2 +- src/calibre/gui2/tag_browser/ui.py | 4 ++-- src/calibre/linux.py | 2 +- src/calibre/utils/winreg/default_programs.py | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/manual/conversion.rst b/manual/conversion.rst index 0bc1c92134..77094c3d58 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -623,7 +623,7 @@ the latest version of calibre as support for ``.docx`` files is very new). calibre will automatically generate a Table of Contents based on headings if you mark your headings with the ``Heading 1``, ``Heading 2``, etc. styles in Word. Open -the output e-book in the calibre viewer and click the :guilabel:`Table of Contents` button +the output e-book in the calibre E-book viewer and click the :guilabel:`Table of Contents` button to view the generated Table of Contents. Older .doc files diff --git a/manual/faq.rst b/manual/faq.rst index bc8b06a764..88775777cb 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -901,7 +901,7 @@ There are several possible things I know of, that can cause this: version of calibre try switching to the 32-bit version. * If the crash happens when you are trying to copy text from the calibre - e-book viewer, it is most likely caused by some clipboard + E-book viewer, it is most likely caused by some clipboard monitoring/managing application you have running. Turn it off and you should be fine. diff --git a/manual/index.rst b/manual/index.rst index 04427ac802..43f44ba296 100644 --- a/manual/index.rst +++ b/manual/index.rst @@ -16,7 +16,7 @@ Adding your favorite news website to calibre news -The calibre e-book viewer +The calibre E-book viewer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. toctree:: diff --git a/manual/typesetting_math.rst b/manual/typesetting_math.rst index 160b37b54c..435a516ad5 100644 --- a/manual/typesetting_math.rst +++ b/manual/typesetting_math.rst @@ -4,17 +4,17 @@ Typesetting Math in e-books ============================ -The calibre e-book viewer has the ability to display math embedded in e-books +The calibre E-book viewer has the ability to display math embedded in e-books (EPUB and HTML files). You can typeset the math directly with TeX or MathML or -AsciiMath. The calibre viewer uses the excellent `MathJax +AsciiMath. The calibre E-book viewer uses the excellent `MathJax `_ library to do this. This is a brief tutorial on -creating e-books with math in them that work well with the calibre viewer. +creating e-books with math in them that work well with the calibre E-book viewer. A simple HTML file with mathematics ------------------------------------- -You can write mathematics inline inside a simple HTML file and the calibre viewer +You can write mathematics inline inside a simple HTML file and the calibre E-book viewer will render it into properly typeset mathematics. In the example below, we use TeX notation for mathematics. You will see that you can use normal TeX commands, with the small caveat that ampersands and less than and greater than @@ -38,7 +38,7 @@ example, here are Lorentz's equations:: \end{align}

-This snippet looks like the following screen shot in the calibre viewer. +This snippet looks like the following screen shot in the calibre E-book viewer. .. figure:: images/lorentz.png :align: center @@ -59,7 +59,7 @@ with an e-book you can distribute easily to other people. More information ----------------- -Since the calibre viewer uses the MathJax library to render mathematics, the best +Since the calibre E-book viewer uses the MathJax library to render mathematics, the best place to find out more about math in e-books and get help is the `MathJax website `_. diff --git a/manual/viewer.rst b/manual/viewer.rst index 2410d956ee..7dd84a83bb 100644 --- a/manual/viewer.rst +++ b/manual/viewer.rst @@ -3,18 +3,18 @@ The E-book viewer ============================= -calibre includes a built-in e-book viewer that can view all the major e-book formats. -The viewer is highly customizable and has many advanced features. +calibre includes a built-in E-book viewer that can view all the major e-book formats. +The E-book viewer is highly customizable and has many advanced features. .. contents:: :depth: 1 :local: -Starting the viewer --------------------- +Starting the E-book viewer +----------------------------- You can view any of the books in your calibre library by selecting the book and pressing the :guilabel:`View` button. This -will open up the book in the e-book viewer. You can also launch the viewer by itself from the Start menu in Windows +will open up the book in the E-book viewer. You can also launch the E-book viewer by itself from the Start menu in Windows or using the command :command:`ebook-viewer` in Linux and OS X (you have to install the command line tools on OS X first by going to :guilabel:`Preferences->Advanced->Miscellaneous`). diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index a8f874dd55..f918f650cd 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -734,7 +734,7 @@ class ViewerPlugin(Plugin): # {{{ type = _('Viewer') ''' - These plugins are used to add functionality to the calibre viewer. + These plugins are used to add functionality to the calibre E-book viewer. ''' def load_fonts(self): diff --git a/src/calibre/ebooks/oeb/polish/check/links.py b/src/calibre/ebooks/oeb/polish/check/links.py index 580497e43a..bb570183f7 100644 --- a/src/calibre/ebooks/oeb/polish/check/links.py +++ b/src/calibre/ebooks/oeb/polish/check/links.py @@ -184,7 +184,7 @@ class Bookmarks(BadLink): HELP = _( 'This file stores the bookmarks and last opened information from' - ' the calibre e-book viewer. You can remove it if you do not' + ' the calibre E-book viewer. You can remove it if you do not' ' need that information, or don\'t want to share it with' ' other people you send this book to.') INDIVIDUAL_FIX = _('Remove this file') @@ -192,7 +192,7 @@ class Bookmarks(BadLink): def __init__(self, name): BadLink.__init__(self, _( - 'The bookmarks file used by the calibre e-book viewer is present'), name) + 'The bookmarks file used by the calibre E-book viewer is present'), name) def __call__(self, container): container.remove_item(self.name) diff --git a/src/calibre/gui2/actions/view.py b/src/calibre/gui2/actions/view.py index 5c989dd686..18ec35e7a5 100644 --- a/src/calibre/gui2/actions/view.py +++ b/src/calibre/gui2/actions/view.py @@ -50,7 +50,7 @@ class ViewAction(InterfaceAction): cm = partial(self.create_menu_action, self.view_menu) self.view_specific_action = cm('specific', _('View specific format'), shortcut='Alt+V', triggered=self.view_specific_format) - self.internal_view_action = cm('internal', _('View with calibre viewer'), triggered=self.view_internal) + self.internal_view_action = cm('internal', _('View with calibre E-book viewer'), triggered=self.view_internal) self.action_pick_random = cm('pick random', _('Read a random book'), icon='random.png', triggered=self.view_random) self.clear_sep1 = self.view_menu.addSeparator() diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py index 55fa6ab67e..3e89cbd6df 100644 --- a/src/calibre/gui2/book_details.py +++ b/src/calibre/gui2/book_details.py @@ -423,7 +423,7 @@ class CoverView(QWidget): # {{{ self.setToolTip( '

'+_('Double-click to open the Book details window') + '

' + _('Path') + ': ' + current_path + - '

' + _('Cover size: %(width)d x %(height)d')%dict( + '

' + _('Cover size: %(width)d x %(height)d pixels')%dict( width=sz.width(), height=sz.height()) ) diff --git a/src/calibre/gui2/convert/font_key.ui b/src/calibre/gui2/convert/font_key.ui index e22aee17ea..8fa7995c9b 100644 --- a/src/calibre/gui2/convert/font_key.ui +++ b/src/calibre/gui2/convert/font_key.ui @@ -32,8 +32,8 @@ <p>This wizard will help you choose an appropriate font size key for your needs. Just enter the base font size of the input document and then enter an input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.</p> -<p>By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile. </p> -<p>See the <a href="%s">User Manual</a> for a discussion of how font size rescaling works.</p> +<p>By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output profile. </p> +<p>See the <a href="%s">User Manual</a> for an explanation of how font size rescaling works.</p> true diff --git a/src/calibre/gui2/preferences/search.ui b/src/calibre/gui2/preferences/search.ui index 8a8ad47182..cd5059d76d 100644 --- a/src/calibre/gui2/preferences/search.ui +++ b/src/calibre/gui2/preferences/search.ui @@ -161,7 +161,7 @@ - Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc. + Clear search histories from all over calibre. Including the book list, E-book viewer, fetch news dialog, etc. Clear search &histories diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py index 4ff282a0cc..2a7a1e87f8 100644 --- a/src/calibre/gui2/tag_browser/ui.py +++ b/src/calibre/gui2/tag_browser/ui.py @@ -448,8 +448,8 @@ class TagBrowserWidget(QWidget): # {{{ sb.bg = QActionGroup(sb) # Must be in the same order as db2.CATEGORY_SORTS - for i, x in enumerate((_('Sort by name'), _('Sort by number of books'), - _('Sort by average rating'))): + for i, x in enumerate((_('Name'), _('Number of books'), + _('Average rating'))): a = sb.m.addAction(x) sb.bg.addAction(a) a.setCheckable(True) diff --git a/src/calibre/linux.py b/src/calibre/linux.py index 99af1e85bf..ebc8904c7c 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -1077,7 +1077,7 @@ def get_appdata(): 'name':'calibre - E-book Viewer', 'summary':_('Read e-books in over a dozen different formats'), 'description': ( - _('The calibre e-book viewer allows you to read e-books in over a dozen different formats.'), + _('The calibre E-book viewer allows you to read e-books in over a dozen different formats.'), _('It has a full screen mode for distraction free reading and can display the text with multiple columns per screen.'), ), 'screenshots':( diff --git a/src/calibre/utils/winreg/default_programs.py b/src/calibre/utils/winreg/default_programs.py index d59b91a71a..50441fd3ee 100644 --- a/src/calibre/utils/winreg/default_programs.py +++ b/src/calibre/utils/winreg/default_programs.py @@ -39,7 +39,7 @@ def default_programs(): 'ebook-viewer.exe': { 'icon_id':'viewer_icon', - 'description': _('The calibre e-book viewer. It can view most known e-book formats.'), + 'description': _('The calibre E-book viewer. It can view most known e-book formats.'), 'capability_name': 'Viewer' + ('64bit' if is64bit else ''), 'name': 'calibre Viewer' + (' 64-bit' if is64bit else ''), 'assoc_name': 'calibreViewer' + ('64bit' if is64bit else ''),