diff --git a/manual/faq.rst b/manual/faq.rst index 826373bb87..d2fa20f2a7 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -329,10 +329,9 @@ utility, etc. Over the air ^^^^^^^^^^^^^^ -calibre has a builtin web server, the :doc:`server`. It makes you calibre -collection available over the net. You can brwse it on your device using a -simple browser or a dedicated application. -First perform the following steps in calibre +calibre has a builtin web server, the :doc:`server`. It makes your calibre +collection available over the net. You can browse it on your device using a +simple browser or a dedicated application. First perform the following steps in calibre: * Set the :guilabel:`Preferred Output Format` in calibre to EPUB for normal Android devices or MOBI for Kindles (The output format can be set under :guilabel:`Preferences->Interface->Behavior`) * Convert the books you want to read on your device to EPUB/MOBI format by selecting them and clicking the :guilabel:`Convert` button. diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index 539cae1628..9f19372280 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -206,7 +206,7 @@ gui_last_modified_display_format = 'dd MMM yyyy' # book will sort under 'T'. # This flag affects calibre's library display. It has no effect on devices. In # addition, titles for books added before changing the flag will retain their -# order until the title is edited. Editing a title and hitting return +# order until the title is edited. Editing a title and hitting Enter # without changing anything is sufficient to change the sort. Or you can use # the 'Update title sort' action in the Bulk metadata edit dialog to update # it for many books at once. @@ -401,7 +401,7 @@ sort_dates_using_visible_fields = False cover_trim_fuzz_value = 10 #: Control behavior of the book list -# You can control the behavior of double clicks and pressing enter on the books +# You can control the behavior of double clicks and pressing Enter on the books # list. Choices: open_viewer, do_nothing, show_book_details, edit_cell, # edit_metadata. Selecting anything other than open_viewer or show_book_details # has the side effect of disabling editing a field using a single click. diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index cbb8c2aee9..f0c917d475 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -216,7 +216,7 @@ class DevicePlugin(Plugin): :param key: The key to unlock the device :param log_packets: If true the packet stream to/from the device is logged :param report_progress: Function that is called with a % progress - (number between 0 and 100) for various tasks + (number between 0 and 100) for various tasks. If it is called with -1 that means that the task does not have any progress information :param detected_device: Device information from the device scanner @@ -302,7 +302,7 @@ class DevicePlugin(Plugin): Set a function to report progress information. :param report_progress: Function that is called with a % progress - (number between 0 and 100) for various tasks + (number between 0 and 100) for various tasks. If it is called with -1 that means that the task does not have any progress information diff --git a/src/calibre/ebooks/conversion/plugins/docx_output.py b/src/calibre/ebooks/conversion/plugins/docx_output.py index 9d393cd5fc..4c76b86ff2 100644 --- a/src/calibre/ebooks/conversion/plugins/docx_output.py +++ b/src/calibre/ebooks/conversion/plugins/docx_output.py @@ -26,8 +26,8 @@ class DOCXOutput(OutputFormatPlugin): 'are %s') % PAGE_SIZES), OptionRecommendation(name='docx_custom_page_size', recommended_value=None, - help=_('Custom size of the document. Use the form width x height ' - 'EG. `123x321` to specify the width and height (in pts). ' + help=_('Custom size of the document. Use the form width x height, ' + 'for example: `123x321` to specify the width and height (in pts). ' 'This overrides any specified page-size.')), OptionRecommendation(name='docx_no_cover', recommended_value=False, diff --git a/src/calibre/gui2/dialogs/choose_library.ui b/src/calibre/gui2/dialogs/choose_library.ui index c960fe9b4a..9de32e61d2 100644 --- a/src/calibre/gui2/dialogs/choose_library.ui +++ b/src/calibre/gui2/dialogs/choose_library.ui @@ -73,7 +73,7 @@ user categories, and other information from the old to the new library - &Move current library to new location + &Move the current library to new location diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 2cc86fd174..14c59e42f3 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -1109,7 +1109,7 @@ see the counts by hovering your mouse over any item. <p>When checked, the Tag browser can get keyboard focus, allowing -use of the keyboard to navigate the tree using the arrow keys. The RETURN key simulates +use of the keyboard to navigate the tree using the arrow keys. The Enter key simulates a click on the selected item. The keyboard shortcut 'Tag browser / Give the Tag browser keyboard focus' changes the keyboard focus without using the mouse.</p> diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py index c882d86628..73084a2deb 100644 --- a/src/calibre/gui2/viewer/main.py +++ b/src/calibre/gui2/viewer/main.py @@ -130,7 +130,7 @@ View an e-book. 'Alternately, you can use the form toc:something and it will open ' 'at the location of the first Table of Contents entry that contains ' 'the string "something". The form toc-href:something will match the ' - 'href (internal link destination) of toc nodes. The matching is exact, ' + 'href (internal link destination) of toc nodes. The matching is exact. ' 'If you want to match a substring, use the form toc-href-contains:something. ' 'The form ref:something will use Reference mode references.')) a('--continue', default=False, action='store_true', dest='continue_reading',