diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index ba2f11e1fa..fd7d915119 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -122,8 +122,8 @@ class DriverBase(DeviceConfig, DevicePlugin): EXTRA_CUSTOMIZATION_MESSAGE = [ _('Use Series as Category in iTunes/iBooks') + - ':::' + _('Enable to use the series name as the iTunes Genre, ' - 'iBooks Category'), + ':::' + _('Enable to use the series name as the iTunes genre, ' + 'iBooks category'), _('Cache covers from iTunes/iBooks') + ':::' + _( 'Enable to cache and display covers from iTunes/iBooks'), _(u'"Copy files to iTunes Media folder %s" is enabled in iTunes Preferences|Advanced') % u'\u2026' + ':::' + _( diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 82bf98c54f..1b3b7cb654 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -696,7 +696,7 @@ class DevicePlugin(Plugin): name is ignored in cases where the device uses a template to generate the file name, which most do. The second value in the returned tuple indicated whether the format is future-dated. Return True if it is, - otherwise return False. Calibre will display a dialog to the user + otherwise return False. calibre will display a dialog to the user listing all future dated books. Extremely important: this method is called on the GUI thread. It must diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.ui b/src/calibre/gui2/catalog/catalog_epub_mobi.ui index e00f4bb07a..20ab501c14 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.ui +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.ui @@ -130,7 +130,7 @@ - List of books, sorted by Genre + List of books, sorted by genre &Genres @@ -140,7 +140,7 @@ - Field containing Genres + Field containing genres @@ -160,7 +160,7 @@ List of books, sorted by date added to calibre - &Recently Added + &Recently added diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 28fbbcb30a..917b9d4cb4 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -276,7 +276,7 @@ class DisplayPluginModel(QAbstractTableModel): def __init__(self, display_plugins): QAbstractTableModel.__init__(self) self.display_plugins = display_plugins - self.headers = map(unicode, [_('Plugin Name'), _('Donate'), _('Status'), _('Installed'), + self.headers = map(unicode, [_('Plugin name'), _('Donate'), _('Status'), _('Installed'), _('Available'), _('Released'), _('calibre'), _('Author')]) def rowCount(self, *args): @@ -467,7 +467,7 @@ class PluginUpdaterDialog(SizePersistedDialog): layout = QVBoxLayout(self) self.setLayout(layout) title_layout = ImageTitleLayout(self, 'plugins/plugin_updater.png', - _('User Plugins')) + _('User plugins')) layout.addLayout(title_layout) header_layout = QHBoxLayout() diff --git a/src/calibre/gui2/preferences/template_functions.py b/src/calibre/gui2/preferences/template_functions.py index 9b67465ab5..b13df9d2aa 100644 --- a/src/calibre/gui2/preferences/template_functions.py +++ b/src/calibre/gui2/preferences/template_functions.py @@ -40,12 +40,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): template evaluation.
  • kwargs: a dictionary of metadata. Field values are in this dictionary. -
  • mi: a Metadata instance. Used to get field information. +
  • mi: a Metadata instance. Used to get field information. This parameter can be None in some cases, such as when evaluating non-book templates.
  • locals: the local variables assigned to by the current template program.
  • -
  • your parameters: You must supply one or more formal +
  • your parameters: you must supply one or more formal parameters. The number must match the arg count box, unless arg count is -1 (variable number or arguments), in which case the last argument must be *args. At least one argument is required, and is usually the value of diff --git a/src/calibre/gui2/preferences/template_functions.ui b/src/calibre/gui2/preferences/template_functions.ui index a368da11fb..2b92543ad9 100644 --- a/src/calibre/gui2/preferences/template_functions.ui +++ b/src/calibre/gui2/preferences/template_functions.ui @@ -51,7 +51,7 @@ - Arg &count: + Argument &count: argument_count diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py index 366a9cc268..b0acdd218c 100644 --- a/src/calibre/gui2/tweak_book/ui.py +++ b/src/calibre/gui2/tweak_book/ui.py @@ -497,7 +497,7 @@ class Main(MainWindow): self.action_multiple_split = treg( 'document-split.png', _('&Split at multiple locations'), self.boss.multisplit, 'multisplit', (), _( 'Split HTML file at multiple locations')) - self.action_compare_book = treg('diff.png', _('&Compare to another book'), self.boss.compare_book, 'compare-book', (), _( + self.action_compare_book = treg('diff.png', _('Compare to &another book'), self.boss.compare_book, 'compare-book', (), _( 'Compare to another book')) self.action_manage_snippets = treg( 'snippets.png', _('Manage &Snippets'), self.boss.manage_snippets, 'manage-snippets', (), _( diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py index d7444adea9..2dbba57782 100644 --- a/src/calibre/library/catalogs/epub_mobi.py +++ b/src/calibre/library/catalogs/epub_mobi.py @@ -126,7 +126,7 @@ class EPUB_MOBI(CatalogPlugin): default=_('Tags'), dest='genre_source_field', action=None, - help=_("Source field for Genres section.\n" + help=_("Source field for 'Genres' section.\n" "Default: '%default'\n" "Applies to: AZW3, EPUB, MOBI output formats")), Option('--header-note-source-field', diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index 24f7906e09..95a92d5ea6 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -3887,7 +3887,7 @@ class CatalogBuilder(object): ncx_soup (file): updated """ - self.update_progress_full_step(_("NCX for Genres")) + self.update_progress_full_step(_("NCX for genres")) if not len(self.genres): self.opts.log.warn(" No genres found\n"