diff --git a/manual/conversion.rst b/manual/conversion.rst index 9b4d71a543..f03fb3142e 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -1,6 +1,6 @@ .. _conversion: -Ebook Conversion +E-book conversion =================== calibre has a conversion system that is designed to be very easy to use. diff --git a/manual/edit.rst b/manual/edit.rst index 6bd88f0c16..77ff6eef5e 100644 --- a/manual/edit.rst +++ b/manual/edit.rst @@ -39,7 +39,7 @@ Tutorial `_ and `CSS Tutorial As you make changes to the HTML or CSS in the editor, the changes will be previewed, live, in the preview panel to the right. When you are happy with how -the changes you have made look, click the Save button or use +the changes you have made look, click the :guilabel:`Save` button or use :guilabel:`File->Save` to save your changes into the ebook. One useful feature is :guilabel:`Checkpoints`. Before you embark on some diff --git a/manual/function_mode.rst b/manual/function_mode.rst index b93edd55d1..010b0f8afc 100644 --- a/manual/function_mode.rst +++ b/manual/function_mode.rst @@ -44,7 +44,7 @@ functions to process text in arbitrary ways. The Smarten Punctuation tool in the editor leaves individual hyphens alone, so you can use the this function to replace them with em-dashes. -To create a new function, simply click the Create/Edit button to create a new +To create a new function, simply click the :guilabel:`Create/Edit` button to create a new function and copy the python code from below. .. code-block:: python diff --git a/manual/gui.rst b/manual/gui.rst index 7ceb7bfeb0..0bef8a2937 100644 --- a/manual/gui.rst +++ b/manual/gui.rst @@ -66,9 +66,9 @@ To add an additional format for an existing book you can do any of three things: 1. Drag and drop the file onto the book details panel on the right side of the main window - 2. Right click the Add books button and choose :guilabel:`Add files to selected books`. + 2. Right click the :guilabel:`Add books` button and choose :guilabel:`Add files to selected books`. - 3. Click the red add books button in the top right area of the :guilabel:`Edit Metadata` dialog, accessed by the :ref:`edit_meta_information` action. + 3. Click the :guilabel:`Add books` button in the top right area of the :guilabel:`Edit Metadata` dialog, accessed by the :ref:`edit_meta_information` action. .. _edit_meta_information: diff --git a/manual/plugins.rst b/manual/plugins.rst index 0368fc55fe..df5f41883d 100644 --- a/manual/plugins.rst +++ b/manual/plugins.rst @@ -1,6 +1,6 @@ .. _plugins: -API Documentation for plugins +API documentation for plugins =============================== .. module:: calibre.customize diff --git a/manual/template_lang.rst b/manual/template_lang.rst index 860ac7c6c3..2ac6637cd9 100644 --- a/manual/template_lang.rst +++ b/manual/template_lang.rst @@ -461,7 +461,7 @@ To accomplish this, we: 2. Create a composite field (give it lookup name #BB) containing ``{#genre:ifempty(Unknown)}/{author_sort}/{title}``. This template produces `genre/author_sort/title`, where an empty genre is replaced with `Unknown`. 3. Set the save template to ``{series:lookup(.,#AA,#BB)}``. This template chooses composite field #AA if series is not empty, and composite field #BB if series is empty. We therefore have two completely different save paths, depending on whether or not `series` is empty. -Templates and Plugboards +Templates and plugboards ------------------------ Plugboards are used for changing the metadata written into books during send-to-device and save-to-disk operations. A plugboard permits you to specify a template to provide the data to write into the book's metadata. You can use plugboards to modify the following fields: authors, author_sort, language, publisher, tags, title, title_sort. This feature helps people who want to use different metadata in books on devices to solve sorting or display issues. diff --git a/manual/viewer.rst b/manual/viewer.rst index 15b35c6113..2d67eb48ab 100644 --- a/manual/viewer.rst +++ b/manual/viewer.rst @@ -13,7 +13,7 @@ The viewer is highly customizable and has many advanced features. Starting the viewer -------------------- -You can view any of the books in your calibre library by selecting the book and pressing the View button. This +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 ebook viewer. You can also launch the 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`). @@ -40,14 +40,14 @@ Bookmarks ^^^^^^^^^^^^ When you are in the middle of a book and close the viewer, it will remember where you stopped reading and return there -the next time you open the book. You can also set bookmarks in the book by using the Bookmark button |bookmi|. When viewing EPUB format +the next time you open the book. You can also set bookmarks in the book by using the :guilabel:`Bookmark` button |bookmi|. When viewing EPUB format books, these bookmarks are actually saved in the EPUB file itself. You can add bookmarks, then send the file to a friend. When they open the file, they will be able to see your bookmarks. Table of Contents ^^^^^^^^^^^^^^^^^^^^ -If the book you are reading defines a Table of Contents, you can access it by pressing the Table of Contents button |toci|. +If the book you are reading defines a Table of Contents, you can access it by pressing the :guilabel:`Table of Contents` button |toci|. This will bring up a list of sections in the book. You can click on any of them to jump to that portion of the book. Navigating by location @@ -60,7 +60,7 @@ size you are viewing the book at, and they play a similar role to page numbers i You can enter any number you like to go to the corresponding location in the book. calibre also has a very handy -reference mode. You can turn it on by clicking the Reference Mode button |refmi|. Once you do this, every time you move your +reference mode. You can turn it on by clicking the :guilabel:`Reference mode` button |refmi|. Once you do this, every time you move your mouse over a paragraph, calibre will display a unique number made up of the section and paragraph numbers. .. image:: images/ref_mode.png @@ -70,7 +70,7 @@ You can use this number to unambiguously refer to parts of the books when discus in other works. You can enter these numbers in the box marked Go to at the top of the window to go to a particular reference location. -If you click on links inside the ebook to take you to different parts of the book, such as an endnote, you can use the back and forward buttons +If you click on links inside the ebook to take you to different parts of the book, such as an endnote, you can use the :guilabel:`Back` and :guilabel:`Forward` buttons in the top left corner to return to where you were. These buttons behave just like those in a web browser. Customizing the look and feel of your reading experience diff --git a/manual/xpath.rst b/manual/xpath.rst index dda4241e8b..3b03cf6ac8 100644 --- a/manual/xpath.rst +++ b/manual/xpath.rst @@ -1,6 +1,6 @@ .. _xpath-tutorial: -XPath Tutorial +XPath tutorial ============== In this tutorial, you will be given a gentle introduction to diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index 84b333de26..70c508dfe0 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -368,8 +368,8 @@ class CreateCustomColumn(QDialog): self.composite_sort_by = csb = QComboBox(self) la.setBuddy(csb), csb.setToolTip(_("How this column should handled in the GUI when sorting and searching")) l.addWidget(la), l.addWidget(csb) - self.composite_make_category = cmc = QCheckBox(_("Show in tags browser")) - cmc.setToolTip(_("If checked, this column will appear in the tags browser as a category")) + self.composite_make_category = cmc = QCheckBox(_("Show in Tag browser")) + cmc.setToolTip(_("If checked, this column will appear in the Tag browser as a category")) l.addWidget(cmc) self.composite_contains_html = cch = QCheckBox(_("Show as HTML in book details")) cch.setToolTip('

' + diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 94b5a6ceca..34c8e05a58 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -939,7 +939,7 @@ if you never want subcategories - &Tags browser category partitioning method: + &Tag browser category partitioning method: opt_tags_browser_partition_method @@ -949,7 +949,7 @@ if you never want subcategories - Show &average ratings in the tags browser + Show &average ratings in the Tag browser true