diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index 1779a92863..c4219da5bc 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -105,7 +105,7 @@ class KOBO(USBMS): ' e-book file itself. With this option, calibre will send a ' 'separate cover image to the reader, useful if you ' 'have modified the cover.'), - _('Upload Black and White Covers'), + _('Upload black and white Covers'), _('Show expired books') + ':::'+_('A bug in an earlier version left non kepubs book records' ' in the database. With this option calibre will show the ' diff --git a/src/calibre/devices/kobo/kobotouch_config.py b/src/calibre/devices/kobo/kobotouch_config.py index 3b7495adf3..29745363dc 100644 --- a/src/calibre/devices/kobo/kobotouch_config.py +++ b/src/calibre/devices/kobo/kobotouch_config.py @@ -52,8 +52,8 @@ class KOBOTOUCHConfig(TabbedDeviceConfig): self.tab1 = Tab1Config(self, self.device) self.tab2 = Tab2Config(self, self.device) - self.addDeviceTab(self.tab1, _("Collections, Covers && Uploads")) - self.addDeviceTab(self.tab2, _('Metadata, On Device && Advanced')) + self.addDeviceTab(self.tab1, _("Collections, covers && uploads")) + self.addDeviceTab(self.tab2, _('Metadata, on device && advanced')) def get_pref(self, key): return self.device.get_pref(key) @@ -208,7 +208,7 @@ class CollectionsGroupBox(DeviceOptionsGroupBox): self.setChecked(device.get_pref('manage_collections')) self.setToolTip(wrap_msg(_('Create new bookshelves on the Kobo if they do not exist. This is only for firmware V2.0.0 or later.'))) - self.collections_columns_label = QLabel(_('Collections Columns:')) + self.collections_columns_label = QLabel(_('Collections columns:')) self.collections_columns_edit = QLineEdit(self) self.collections_columns_edit.setToolTip(_('The Kobo from firmware V2.0.0 supports bookshelves.' ' These are created on the Kobo. ' + @@ -216,12 +216,12 @@ class CollectionsGroupBox(DeviceOptionsGroupBox): self.collections_columns_edit.setText(device.get_pref('collections_columns')) self.create_collections_checkbox = create_checkbox( - _("Create Collections"), + _("Create collections"), _('Create new bookshelves on the Kobo if they do not exist. This is only for firmware V2.0.0 or later.'), device.get_pref('create_collections') ) self.delete_empty_collections_checkbox = create_checkbox( - _('Delete Empty Bookshelves'), + _('Delete empty bookshelves'), _('Delete any empty bookshelves from the Kobo when syncing is finished. This is only for firmware V2.0.0 or later.'), device.get_pref('delete_empty_collections') ) @@ -277,8 +277,8 @@ class CoversGroupBox(DeviceOptionsGroupBox): self.setToolTip(wrap_msg(_('Upload cover images from the calibre library when sending books to the device.'))) self.upload_grayscale_checkbox = create_checkbox( - _('Upload Black and White Covers'), - _('Convert covers to Black and White when uploading'), + _('Upload black and white Covers'), + _('Convert covers to black and white when uploading'), device.get_pref('upload_grayscale') ) diff --git a/src/calibre/gui2/dialogs/message_box.py b/src/calibre/gui2/dialogs/message_box.py index a67720df5c..689a722910 100644 --- a/src/calibre/gui2/dialogs/message_box.py +++ b/src/calibre/gui2/dialogs/message_box.py @@ -230,6 +230,7 @@ class ViewLog(QDialog): # {{{ gprefs[self.unique_name] = bytearray(self.saveGeometry()) # }}} + _proceed_memory = [] @@ -270,7 +271,7 @@ class ProceedNotification(MessageBox): # {{{ self.log_is_file = log_is_file self.log_viewer_title = log_viewer_title - self.vlb = self.bb.addButton(_('View log'), self.bb.ActionRole) + self.vlb = self.bb.addButton(_('&View log'), self.bb.ActionRole) self.vlb.setIcon(QIcon(I('debug.png'))) self.vlb.clicked.connect(self.show_log) self.det_msg_toggle.setVisible(bool(det_msg)) @@ -326,7 +327,7 @@ class ErrorNotification(MessageBox): # {{{ self.log_viewer_title = log_viewer_title self.finished.connect(self.do_close, type=Qt.QueuedConnection) - self.vlb = self.bb.addButton(_('View log'), self.bb.ActionRole) + self.vlb = self.bb.addButton(_('&View log'), self.bb.ActionRole) self.vlb.setIcon(QIcon(I('debug.png'))) self.vlb.clicked.connect(self.show_log) self.det_msg_toggle.setVisible(bool(det_msg)) @@ -473,6 +474,7 @@ class JobError(QDialog): # {{{ # }}} + if __name__ == '__main__': from calibre.gui2 import question_dialog, Application app = Application([]) diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index 6e19a19d22..95717e37ac 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -1046,7 +1046,7 @@ class FullFetch(QDialog): # {{{ self.prev_button = pb = QPushButton(QIcon(I('back.png')), _('&Back'), self) pb.clicked.connect(self.back_clicked) pb.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) - self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole) + self.log_button = self.bb.addButton(_('&View log'), self.bb.ActionRole) self.log_button.clicked.connect(self.view_log) self.log_button.setIcon(QIcon(I('debug.png'))) self.prev_button.setVisible(False) @@ -1159,7 +1159,7 @@ class CoverFetch(QDialog): # {{{ self.bb = QDialogButtonBox(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) l.addWidget(self.bb) - self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole) + self.log_button = self.bb.addButton(_('&View log'), self.bb.ActionRole) self.log_button.clicked.connect(self.view_log) self.log_button.setIcon(QIcon(I('debug.png'))) self.bb.rejected.connect(self.reject)