Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc. typos, fix accidental nesting in template docs.

Browse Source
This commit is contained in:
Eli Schwartz 2015-08-27 18:43:31 -04:00 committed by Kovid Goyal
parent e64f766890
commit 95917bfcd1
11 changed files with 147 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/creating_plugins.rst
View File

@ -71,7 +71,7 @@ The first thing to note is that this zip file has a lot more files in it, explai
The prefix ``calibre_plugins`` must always be present. ``some_name`` comes from the filename of the empty text file.
``some_module`` refers to :file:`some_module.py` file inside the zip file. Note that this importing is just as
powerful as regular python imports. You can create packages and subpackages of .py modules inside the zip file,
just like you would normally (by defining __init__.py in each sub directory), and everything should Just Work.
just like you would normally (by defining __init__.py in each sub-directory), and everything should Just Work.
The name you use for ``some_name`` enters a global namespace shared by all plugins, **so make it as unique as possible**.
But remember that it must be a valid python identifier (only alphabets, numbers and the underscore).

9
manual/edit.rst
View File

@ -45,7 +45,7 @@ the changes you have made look, click the Save button or use
One useful feature is :guilabel:`Checkpoints`. Before you embark on some
ambitious set of edits, you can create a checkpoint. The checkpoint
will preserve the current state of your book, then if in the future you decide
you dont like the changes you have made to you can go back to the state when
you don't like the changes you have made to you can go back to the state when
you created the checkpoint. To create a checkpoint, use :guilabel:`Edit->Create
checkpoint`. Checkpoints will also be automatically created for you whenever you
run any automated tool like global search and replace. The checkpointing
@ -380,7 +380,7 @@ Removing unused CSS rules
Remove all unused CSS rules from stylesheets and <style> tags. Some books
created from production templates can have a large number of extra CSS rules
that dont match any actual content. These extra rules can slow down readers
that don't match any actual content. These extra rules can slow down readers
that need to process them all. Accessed via :guilabel:`Tools->Remove unused CSS`.
@ -402,7 +402,7 @@ Beautifying files
This tool is used to auto-format all HTML and CSS files so that they "look
pretty". The code is auto-indented so that it lines up nicely, blank lines are
inserted where appropriate and so on. Note that beautifying also auto-fixes
broken HTML/CSS. Therefore, if you dont want any auto-fixing to be performed,
broken HTML/CSS. Therefore, if you don't want any auto-fixing to be performed,
first use the Check Book tool to correct all problems and only then run
beautify. Accessed via :guilabel:`Tools->Beautify all files`.
@ -459,7 +459,7 @@ Checkpoints
------------------------
:guilabel:`Checkpoints` are a way to mark the current state of the book as "special". You
can then go on to do whatever changes you want to the book and if you dont like
can then go on to do whatever changes you want to the book and if you don't like
the results, return to the checkpointed state. Checkpoints are automatically
created every time you run any of the automated tools described in the
previous section.
@ -790,4 +790,3 @@ text. The editor allows you to insert a snippet with only a few key strokes.
The snippets are very powerful, with many features, such as placeholders you
can jump between, automatic mirroring of repeated text and so on.
For more information, see :doc:`snippets`.

9
manual/faq.rst
View File

@ -185,7 +185,7 @@ If your device appears as a USB disk to the operating system, adding support for
We just need some information from you:
* Complete list of ebook formats that your device supports.
* Is there a special directory on the device in which all ebook files should be placed? Also does the device detect files placed in sub directories?
* Is there a special directory on the device in which all ebook files should be placed? Also does the device detect files placed in sub-directories?
* We also need information about your device that calibre will collect automatically. First, if your
device supports SD cards, insert them. Then connect your device to the computer. In calibre go to :guilabel:`Preferences->Miscellaneous`
and click the "Debug device detection" button. This will create some debug output. Copy it to a file
@ -721,7 +721,7 @@ There can be two reasons why calibre is showing a empty list of books:
and so starts up with an empty library instead. To remedy this, do a
right-click on the calibre icon in the calibre toolbar and select Switch/create
library. Click the little blue icon to select the new location of your
calibre library and click OK. If you dont know the new location search your
calibre library and click OK. If you don't know the new location search your
computer for the file :file:`metadata.db`.
* Your metadata.db file was deleted/corrupted. In this case, you can ask
@ -735,7 +735,7 @@ I am getting errors with my calibre library on a networked drive/NAS?
**Do not put your calibre library on a networked drive**.
A filesystem is a complex beast. Most network filesystems lack various
filesystem features that calibre uses. Some dont support file locking, some dont
filesystem features that calibre uses. Some don't support file locking, some don't
support hardlinking, some are just flaky. Additionally, calibre is a single user
application, if you accidentally run two copies of calibre on the same networked
library, bad things will happen. Finally, different OSes impose different
@ -836,7 +836,7 @@ There are several possible things I know of, that can cause this:
* You recently connected an external monitor or TV to your computer. In
this case, whenever calibre opens a new window like the edit metadata
window or the conversion dialog, it appears on the second monitor where
you dont notice it and so you think calibre has frozen. Disconnect your
you don't notice it and so you think calibre has frozen. Disconnect your
second monitor and restart calibre.
* If you use RoboForm, it is known to cause calibre to crash. Add calibre to
@ -1090,4 +1090,3 @@ Finally, you can add downloaded news to the calibre library with::
/opt/calibre/calibredb add --with-library /path/to/library outfile.epub
Remember to read the command line documentation section of the calibre User Manual to learn more about these, and other commands.

2
manual/function_mode.rst
View File

@ -187,7 +187,7 @@ Contents based on these headings. Create the custom function below:
data['toc'] = []
tag_name, anchor, text = match.group(1), replace_entities(match.group(2)), replace_entities(match.group(3))
data['toc'].append((file_name, tag_name, anchor, text))
return match.group() # We dont want to make any actual changes, so return the original matched text
return match.group() # We don't want to make any actual changes, so return the original matched text
# Ensure that we are called once after the last match is found so we can
# output the ToC

2
manual/template_lang.rst
View File

@ -445,7 +445,7 @@ The lookup function lets us do even fancier processing. For example, assume that
To accomplish this, we:
1. Create a composite field (call it AA) containing ``{series}/{series_index} - {title'}``. If the series is not empty, then this template will produce `series/series_index - title`.
2. Create a composite field (call it BB) containing ``{#genre:ifempty(Unknown)}/{author_sort}/{title}``. This template produces `genre/author_sort/title`, where an empty genre is replaced wuth `Unknown`.
2. Create a composite field (call it 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

2
src/calibre/devices/usbms/deviceconfig.py
View File

@ -63,7 +63,7 @@ class DeviceConfig(object):
c.add_opt('format_map', default=cls.FORMATS,
help=_('Ordered list of formats the device will accept'))
c.add_opt('use_subdirs', default=cls.SUPPORTS_SUB_DIRS_DEFAULT,
help=_('Place files in sub directories if the device supports them'))
help=_('Place files in sub-directories if the device supports them'))
c.add_opt('read_metadata', default=True,
help=_('Read metadata from files on device'))
c.add_opt('use_author_sort', default=False,

2
src/calibre/ebooks/oeb/polish/check/links.py
View File

@ -145,7 +145,7 @@ class Bookmarks(BadLink):
HELP = _(
'This file stores the bookmarks and last opened information from'
' the calibre ebook viewer. You can remove it if you do not'
' need that information, or dont want to share it with'
' need that information, or don\'t want to share it with'
' other people you send this book to.')
INDIVIDUAL_FIX = _('Remove this file')
level = INFO

2
src/calibre/gui2/actions/add.py
View File

@ -63,7 +63,7 @@ class AddAction(InterfaceAction):
'file is the same book in a different format)')).triggered.connect(
self.add_recursive_single)
ma('recursive-multiple', _('Add books from directories, including '
'sub directories (Multiple books per directory, assumes every '
'sub-directories (Multiple books per directory, assumes every '
'ebook file is a different book)')).triggered.connect(
self.add_recursive_multiple)
arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP/RAR)'))

4
src/calibre/gui2/device_drivers/configwidget.ui
View File

@ -86,10 +86,10 @@
<item row="2" column="0">
<widget class="QCheckBox" name="opt_use_subdirs">
<property name="toolTip">
<string>If checked, books are placed into sub directories based on their metadata on the device. If unchecked, books are all put into the top level directory.</string>
<string>If checked, books are placed into sub-directories based on their metadata on the device. If unchecked, books are all put into the top level directory.</string>
</property>
<property name="text">
<string>Use sub directories</string>
<string>Use sub-directories</string>
</property>
</widget>
</item>

2
src/calibre/gui2/preferences/look_feel.ui
View File

@ -566,7 +566,7 @@ A value of zero means calculate automatically.</string>
<item row="0" column="0" colspan="5">
<widget class="QLabel" name="label_13">
<property name="text">
<string>There are two kinds of caches that calibre uses to improve performance when rendering covers in the grid view. A disk cache that is kept on your hard disk and stores the cover thumbnails and an in memory cache used to ensure flicker free rendering of covers. For best results, keep the memory cache small and the disk cache large, unless you have a lot of extra RAM in your computer and dont mind it being used by the memory cache.</string>
<string>There are two kinds of caches that calibre uses to improve performance when rendering covers in the grid view. A disk cache that is kept on your hard disk and stores the cover thumbnails and an in memory cache used to ensure flicker free rendering of covers. For best results, keep the memory cache small and the disk cache large, unless you have a lot of extra RAM in your computer and don't mind it being used by the memory cache.</string>
</property>
<property name="wordWrap">
<bool>true</bool>

2
src/calibre/library/server/ajax.py
View File

@ -375,7 +375,7 @@ class AjaxServer(object):
main dictionary,
}
:param sort: How to sort the returned items. CHoices are: name, rating,
:param sort: How to sort the returned items. Choices are: name, rating,
popularity
:param sort_order: asc or desc