diff --git a/src/calibre/gui2/actions/unpack_book.py b/src/calibre/gui2/actions/unpack_book.py index 3251980f71..765ef38463 100644 --- a/src/calibre/gui2/actions/unpack_book.py +++ b/src/calibre/gui2/actions/unpack_book.py @@ -30,7 +30,7 @@ class UnpackBook(QDialog): self._cleanup_files = [] self.setup_ui() - self.setWindowTitle(_('Unpack Book') + ' - ' + db.title(book_id, + self.setWindowTitle(_('Unpack book') + ' - ' + db.title(book_id, index_is_id=True)) button = self.fmt_choice_buttons[0] @@ -74,20 +74,20 @@ class UnpackBook(QDialog): self.fmt_choice_box.setVisible(len(fmts) > 1) self.help_label = QLabel(_('''\ -

About Unpack Book

-

Unpack Book allows you to fine tune the appearance of an ebook by - making small changes to its internals. In order to use Unpack Book, +

About Unpack book

+

Unpack book allows you to fine tune the appearance of an ebook by + making small changes to its internals. In order to use Unpack book, you need to know a little bit about HTML and CSS, technologies that are used in ebooks. Follow the steps:


    -
  1. Click "Explode Book": This will "explode" the book into its +
  2. Click "Explode book": This will "explode" the book into its individual internal components.
  3. Right click on any individual file and select "Open with..." to edit it in your favorite text editor.
  4. When you are done: close the file browser window and the editor windows you used to make your tweaks. Then click - the "Rebuild Book" button, to update the book in your calibre + the "Rebuild book" button, to update the book in your calibre library.
''')) self.help_label.setWordWrap(True) @@ -102,10 +102,10 @@ class UnpackBook(QDialog): b.setContentsMargins(left, top, right, bottom) l.addLayout(b, stretch=10) - self.explode_button = QPushButton(QIcon(I('wizard.png')), _('&Explode Book')) - self.preview_button = QPushButton(QIcon(I('view.png')), _('&Preview Book')) + self.explode_button = QPushButton(QIcon(I('wizard.png')), _('&Explode book')) + self.preview_button = QPushButton(QIcon(I('view.png')), _('&Preview book')) self.cancel_button = QPushButton(QIcon(I('window-close.png')), _('&Cancel')) - self.rebuild_button = QPushButton(QIcon(I('exec.png')), _('&Rebuild Book')) + self.rebuild_button = QPushButton(QIcon(I('exec.png')), _('&Rebuild book')) self.explode_button.setToolTip( _('Explode the book to edit its components')) @@ -324,7 +324,7 @@ class UnpackBookAction(InterfaceAction): def tweak_book(self): row = self.gui.library_view.currentIndex() if not row.isValid(): - return error_dialog(self.gui, _('Cannot unpack Book'), + return error_dialog(self.gui, _('Cannot unpack book'), _('No book selected'), show=True) book_id = self.gui.library_view.model().id(row) @@ -337,13 +337,10 @@ class UnpackBookAction(InterfaceAction): tweakable_fmts = set(fmts).intersection({'epub', 'htmlz', 'azw3', 'mobi', 'azw'}) if not tweakable_fmts: - return error_dialog(self.gui, _('Cannot unpack Book'), + return error_dialog(self.gui, _('Cannot unpack book'), _('The book must be in ePub, HTMLZ or AZW3 formats to unpack.' '\n\nFirst convert the book to one of these formats.'), show=True) dlg = UnpackBook(self.gui, book_id, tweakable_fmts, db) dlg.exec_() dlg.cleanup() - - - diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui index d20c366235..3fce6a420b 100644 --- a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui +++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui @@ -186,7 +186,7 @@ - Nam&e/Description ... + Nam&e/Description... diff --git a/src/calibre/gui2/store/search/adv_search_builder.ui b/src/calibre/gui2/store/search/adv_search_builder.ui index e47713bc0d..eae730d6fd 100644 --- a/src/calibre/gui2/store/search/adv_search_builder.ui +++ b/src/calibre/gui2/store/search/adv_search_builder.ui @@ -186,7 +186,7 @@ - Titl&e/Author/Price ... + Titl&e/Author/Price... diff --git a/src/calibre/gui2/tweak_book/editor/widget.py b/src/calibre/gui2/tweak_book/editor/widget.py index 5122e7c8d9..39ba2fd17b 100644 --- a/src/calibre/gui2/tweak_book/editor/widget.py +++ b/src/calibre/gui2/tweak_book/editor/widget.py @@ -70,9 +70,9 @@ def register_text_editor_actions(_reg, palette): ac.setToolTip(_('

Subscript

Set the selected text slightly smaller and below the normal line')) ac = reg('format-text-color.png', _('&Color'), ('format_text', 'color'), 'format-text-color', (), _('Change text color')) ac.setToolTip(_('

Color

Change the color of the selected text')) - ac = reg('format-fill-color.png', _('&Background Color'), ('format_text', 'background-color'), + ac = reg('format-fill-color.png', _('&Background color'), ('format_text', 'background-color'), 'format-text-background-color', (), _('Change background color of text')) - ac.setToolTip(_('

Background Color

Change the background color of the selected text')) + ac.setToolTip(_('

Background color

Change the background color of the selected text')) ac = reg('format-justify-left.png', _('Align &left'), ('format_text', 'justify_left'), 'format-text-justify-left', (), _('Align left')) ac.setToolTip(_('

Align left

Align the paragraph to the left')) ac = reg('format-justify-center.png', _('&Center'), ('format_text', 'justify_center'), 'format-text-justify-center', (), _('Center')) diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py index 3e294cac31..9ce55d06b3 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py @@ -223,13 +223,13 @@ class UpdateMixin(object): if not plugin: return if number_of_updates: - plugin.qaction.setText(_('Plugin Updates')+'*') + plugin.qaction.setText(_('Plugin updates')+'*') plugin.qaction.setIcon(QIcon(I('plugins/plugin_updater_updates.png'))) plugin.qaction.setToolTip( ngettext('A plugin update is available', 'There are {} plugin updates available', number_of_updates).format(number_of_updates)) else: - plugin.qaction.setText(_('Plugin Updates')) + plugin.qaction.setText(_('Plugin updates')) plugin.qaction.setIcon(QIcon(I('plugins/plugin_updater.png'))) plugin.qaction.setToolTip(_('Install and configure user plugins')) @@ -239,6 +239,7 @@ class UpdateMixin(object): calibre_version, number_of_plugin_updates = cPickle.loads(binascii.unhexlify(url[len('update:'):])) self.update_found(calibre_version, number_of_plugin_updates, force=True) + if __name__ == '__main__': from calibre.gui2 import Application app = Application([]) diff --git a/src/calibre/gui2/viewer/config.ui b/src/calibre/gui2/viewer/config.ui index f3c1ca2246..f3229f3f66 100644 --- a/src/calibre/gui2/viewer/config.ui +++ b/src/calibre/gui2/viewer/config.ui @@ -911,7 +911,7 @@ You must enter the search URL for the search engine, with the placeholder - User &Stylesheet + User &stylesheet diff --git a/src/calibre/gui2/wizard/send_email.ui b/src/calibre/gui2/wizard/send_email.ui index ea7760084c..338e32cb11 100644 --- a/src/calibre/gui2/wizard/send_email.ui +++ b/src/calibre/gui2/wizard/send_email.ui @@ -67,7 +67,7 @@ - The hostname of your mail server. For e.g. smtp.gmail.com + The hostname of your mail server. For example, smtp.gmail.com