diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 6ea0917e9e..d38f570be5 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1117,7 +1117,7 @@ class Columns(PreferencesPlugin): class Toolbar(PreferencesPlugin): name = 'Toolbar' icon = I('wizard.png') - gui_name = _('Toolbars and menus') + gui_name = _('Toolbars & menus') category = 'Interface' gui_category = _('Interface') category_order = 1 diff --git a/src/calibre/gui2/dialogs/duplicates.py b/src/calibre/gui2/dialogs/duplicates.py index 3f06378e15..5154058095 100644 --- a/src/calibre/gui2/dialogs/duplicates.py +++ b/src/calibre/gui2/dialogs/duplicates.py @@ -23,7 +23,7 @@ class DuplicatesQuestion(QDialog): QDialog.__init__(self, parent) self.l = l = QGridLayout() self.setLayout(l) - t = ngettext('Duplicate found', 'Duplicates found', len(duplicates)) + t = ngettext('Duplicate found', 'duplicates found', len(duplicates)) if len(duplicates) > 1: t = '%d %s' % (len(duplicates), t) self.setWindowTitle(t) @@ -161,4 +161,3 @@ if __name__ == '__main__': d = DuplicatesQuestion(db, [(M('Life of Pi', ['Yann Martel']), None, None), (M('Heirs of the blade', ['Adrian Tchaikovsky']), None, None)]) print (tuple(d.duplicates)) - diff --git a/src/calibre/gui2/tweak_book/widgets.py b/src/calibre/gui2/tweak_book/widgets.py index 51a71d7c26..8a92c8badf 100644 --- a/src/calibre/gui2/tweak_book/widgets.py +++ b/src/calibre/gui2/tweak_book/widgets.py @@ -189,6 +189,7 @@ class ImportForeign(Dialog): # {{{ def setup_ui(self): self.l = l = QFormLayout(self) + l.setFieldGrowthPolicy(l.AllNonFixedFieldsGrow) self.setLayout(l) la = self.la = QLabel(_( @@ -206,7 +207,7 @@ class ImportForeign(Dialog): # {{{ b.setIcon(QIcon(I('document_open.png'))) b.setText(_('Choose file')) h1.addWidget(b) - l.addRow(_('Source file'), h1) + l.addRow(_('Source file:'), h1) b.clicked.connect(self.choose_source) b.setFocus(Qt.OtherFocusReason) @@ -218,7 +219,7 @@ class ImportForeign(Dialog): # {{{ b.setIcon(QIcon(I('document_open.png'))) b.setText(_('Choose file')) h1.addWidget(b) - l.addRow(_('Destination file'), h1) + l.addRow(_('Destination file:'), h1) b.clicked.connect(self.choose_destination) l.addRow(self.bb)