diff --git a/src/calibre/gui2/catalog/catalog_bibtex.ui b/src/calibre/gui2/catalog/catalog_bibtex.ui index b3d2b56b65..4599107db8 100644 --- a/src/calibre/gui2/catalog/catalog_bibtex.ui +++ b/src/calibre/gui2/catalog/catalog_bibtex.ui @@ -50,7 +50,7 @@ - Encoding configuration (change if you have errors) : + Encoding configuration (change if you have errors): @@ -90,7 +90,7 @@ - Add files path with formats? + Add file paths with formats? diff --git a/src/calibre/gui2/convert/metadata.ui b/src/calibre/gui2/convert/metadata.ui index 3fbe57b969..0b7aacadb8 100644 --- a/src/calibre/gui2/convert/metadata.ui +++ b/src/calibre/gui2/convert/metadata.ui @@ -139,7 +139,7 @@ - Author So&rt: + Author so&rt: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/calibre/gui2/convert/search_and_replace.py b/src/calibre/gui2/convert/search_and_replace.py index ad2253211b..b7684ffef6 100644 --- a/src/calibre/gui2/convert/search_and_replace.py +++ b/src/calibre/gui2/convert/search_and_replace.py @@ -43,7 +43,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form): ) self.db, self.book_id = db, book_id - self.sr_search.set_msg(_('&Search Regular Expression')) + self.sr_search.set_msg(_('&Search regular expression:')) self.sr_search.set_book_id(book_id) self.sr_search.set_db(db) @@ -56,7 +56,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form): self.search_replace.setColumnWidth(0, 320) self.search_replace.setColumnWidth(1, 320) self.search_replace.setHorizontalHeaderLabels([ - _('Search Regular Expression'), _('Replacement Text')]) + _('Search regular expression'), _('Replacement text')]) self.sr_add.clicked.connect(self.sr_add_clicked) self.sr_change.clicked.connect(self.sr_change_clicked) @@ -108,9 +108,9 @@ class SearchAndReplaceWidget(Widget, Ui_Form): def sr_load_clicked(self): files = choose_files(self, 'sr_saved_patterns', - _('Load Calibre Search-Replace definitions file'), + _('Load calibre Search-Replace definitions file'), filters=[ - (_('Calibre Search-Replace definitions file'), ['csr']) + (_('calibre Search-Replace definitions file'), ['csr']) ], select_only_single_file=True) if files: from calibre.ebooks.conversion.cli import read_sr_patterns @@ -126,9 +126,9 @@ class SearchAndReplaceWidget(Widget, Ui_Form): def sr_save_clicked(self): filename = choose_save_file(self, 'sr_saved_patterns', - _('Save Calibre Search-Replace definitions file'), + _('Save calibre Search-Replace definitions file'), filters=[ - (_('Calibre Search-Replace definitions file'), ['csr']) + (_('calibre Search-Replace definitions file'), ['csr']) ]) if filename: with codecs.open(filename, 'w', 'utf-8') as f: @@ -201,7 +201,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form): break if not found and not question_dialog(self, _('Unused Search & Replace definition'), - _('The search / replace definition being edited ' + _('The search/replace definition being edited ' ' has not been added to the list of definitions. ' 'Do you wish to continue with the conversion ' '(the definition will not be used)?')): diff --git a/src/calibre/gui2/convert/search_and_replace.ui b/src/calibre/gui2/convert/search_and_replace.ui index 150f9919cd..ddb73a69a7 100644 --- a/src/calibre/gui2/convert/search_and_replace.ui +++ b/src/calibre/gui2/convert/search_and_replace.ui @@ -57,7 +57,7 @@ - &Replacement Text + &Replacement text: sr_replace diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py index 0240f219ba..687e5c0df6 100644 --- a/src/calibre/gui2/convert/single.py +++ b/src/calibre/gui2/convert/single.py @@ -165,7 +165,7 @@ class Config(QDialog, Ui_Dialog): self.groups.clicked[(QModelIndex)].connect(self.show_pane) self.groups.entered[(QModelIndex)].connect(self.show_group_help) rb = self.buttonBox.button(self.buttonBox.RestoreDefaults) - rb.setText(_('Restore &Defaults')) + rb.setText(_('Restore &defaults')) rb.clicked.connect(self.restore_defaults) self.groups.setMouseTracking(True) geom = gprefs.get('convert_single_dialog_geom', None) @@ -320,6 +320,3 @@ class Config(QDialog, Ui_Dialog): def show_group_help(self, index): widget = self._groups_model.widgets[index.row()] self.help.setPlainText(widget.HELP) - - - diff --git a/src/calibre/gui2/convert/toc.ui b/src/calibre/gui2/convert/toc.ui index 8d48b51ee0..e97cd910ab 100644 --- a/src/calibre/gui2/convert/toc.ui +++ b/src/calibre/gui2/convert/toc.ui @@ -48,7 +48,7 @@ - TOC &Filter: + TOC &filter: opt_toc_filter diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 6a18a621e6..26b7e88067 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -601,7 +601,7 @@ class DeviceManager(Thread): # {{{ def upload_books(self, done, files, names, on_card=None, titles=None, metadata=None, plugboards=None, add_as_step_to_job=None): - desc = ngettext('Upload one book to the device', 'Upload {} books to device', len(names)).format(len(names)) + desc = ngettext('Upload one book to the device', 'Upload {} books to the device', len(names)).format(len(names)) if titles: desc += u':' + u', '.join(titles) return self.create_job_step(self._upload_books, done, to_job=add_as_step_to_job, @@ -1255,11 +1255,11 @@ class DeviceMixin(object): # {{{ format_count[f] = 1 for f in self.device_manager.device.settings().format_map: if f in format_count.keys(): - formats.append((f, _('%(num)i of %(total)i Books') % dict( + formats.append((f, _('%(num)i of %(total)i books') % dict( num=format_count[f], total=len(rows)), True if f in aval_out_formats else False)) elif f in aval_out_formats: - formats.append((f, _('0 of %i Books') % len(rows), True)) + formats.append((f, _('0 of %i books') % len(rows), True)) d = ChooseFormatDeviceDialog(self, _('Choose format to send to device'), formats) if d.exec_() != QDialog.Accepted: return diff --git a/src/calibre/gui2/tweak_book/download.py b/src/calibre/gui2/tweak_book/download.py index 45a04502ad..984228019d 100644 --- a/src/calibre/gui2/tweak_book/download.py +++ b/src/calibre/gui2/tweak_book/download.py @@ -113,7 +113,7 @@ class DownloadResources(Dialog): self.wait = WaitStack(_('Searching for external resources...'), cr, self) self.wait.addWidget(ds), self.wait.addWidget(s) self.wait.start() - for t, f in ((_('Select &None'), cr.select_none), (_('Select &All'), cr.select_all)): + for t, f in ((_('Select &none'), cr.select_none), (_('Select &all'), cr.select_all)): b = self.bb.addButton(t, self.bb.ActionRole) b.clicked.connect(f), b.setAutoDefault(False) self.bb.setVisible(False) @@ -248,6 +248,7 @@ class DownloadResources(Dialog): def sizeHint(self): return QSize(800, 500) + if __name__ == '__main__': from calibre.gui2 import Application import sys diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py index c36b19ee99..768e8b1802 100644 --- a/src/calibre/gui2/tweak_book/ui.py +++ b/src/calibre/gui2/tweak_book/ui.py @@ -387,8 +387,8 @@ class Main(MainWindow): _('Insert special character')) self.action_rationalize_folders = treg('mimetypes/dir.png', _('&Arrange into folders'), self.boss.rationalize_folders, 'rationalize-folders', (), _('Arrange into folders')) - self.action_set_semantics = treg('tags.png', _('Set &Semantics'), self.boss.set_semantics, 'set-semantics', (), - _('Set Semantics')) + self.action_set_semantics = treg('tags.png', _('Set &semantics'), self.boss.set_semantics, 'set-semantics', (), + _('Set semantics')) self.action_filter_css = treg('filter.png', _('&Filter style information'), self.boss.filter_css, 'filter-css', (), _('Filter style information')) self.action_manage_fonts = treg('font.png', _('Manage &fonts'), self.boss.manage_fonts, 'manage-fonts', (), _('Manage fonts in the book')) @@ -466,7 +466,7 @@ class Main(MainWindow): # Check Book actions group = _('Check Book') - self.action_check_book = treg('debug.png', _('&Check Book'), self.boss.check_requested, 'check-book', ('F7'), _('Check book for errors')) + self.action_check_book = treg('debug.png', _('&Check book'), self.boss.check_requested, 'check-book', ('F7'), _('Check book for errors')) self.action_spell_check_book = treg('spell-check.png', _('Check &spelling'), self.boss.spell_check_requested, 'spell-check-book', ('Alt+F7'), _( 'Check book for spelling errors')) self.action_check_book_next = reg('forward.png', _('&Next error'), partial( @@ -566,7 +566,7 @@ class Main(MainWindow): e.addAction(self.action_set_semantics) e.addAction(self.action_filter_css) e.addAction(self.action_spell_check_book) - er = e.addMenu(_('External Links')) + er = e.addMenu(_('External links')) er.addAction(self.action_check_external_links) er.addAction(self.action_get_ext_resources) e.addAction(self.action_check_book) diff --git a/src/calibre/gui2/viewer/config.ui b/src/calibre/gui2/viewer/config.ui index fc705c74e0..f3c1ca2246 100644 --- a/src/calibre/gui2/viewer/config.ui +++ b/src/calibre/gui2/viewer/config.ui @@ -304,7 +304,7 @@ QToolBox::tab:hover { - &Top margin + &Top margin: opt_top_margin @@ -327,7 +327,7 @@ QToolBox::tab:hover { - &Side margin + &Side margin: opt_side_margin @@ -350,7 +350,7 @@ QToolBox::tab:hover { - &Bottom margin + &Bottom margin: opt_bottom_margin