From 7ec8fa2a4b06958fc8a4a9b0a977429d6491dbe7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 20 Apr 2017 08:46:04 +0530 Subject: [PATCH] String changes --- src/calibre/gui2/book_details.py | 2 +- src/calibre/gui2/convert/search_and_replace.py | 4 ++-- src/calibre/gui2/dialogs/choose_format.py | 9 +++++---- src/calibre/gui2/dialogs/choose_format_device.ui | 2 +- src/calibre/gui2/dialogs/custom_recipes.py | 2 +- src/calibre/gui2/dialogs/plugin_updater.py | 10 +++++----- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py index 714d7c66f6..5381cd8800 100644 --- a/src/calibre/gui2/book_details.py +++ b/src/calibre/gui2/book_details.py @@ -421,7 +421,7 @@ class CoverView(QWidget): # {{{ except: sz = QSize(0, 0) self.setToolTip( - '

'+_('Double-click to open Book Details window') + + '

'+_('Double-click to open the book details window') + '

' + _('Path') + ': ' + current_path + '

' + _('Cover size: %(width)d x %(height)d')%dict( width=sz.width(), height=sz.height()) diff --git a/src/calibre/gui2/convert/search_and_replace.py b/src/calibre/gui2/convert/search_and_replace.py index b7684ffef6..6bc079f530 100644 --- a/src/calibre/gui2/convert/search_and_replace.py +++ b/src/calibre/gui2/convert/search_and_replace.py @@ -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: diff --git a/src/calibre/gui2/dialogs/choose_format.py b/src/calibre/gui2/dialogs/choose_format.py index 094ac09d2d..a01783a04f 100644 --- a/src/calibre/gui2/dialogs/choose_format.py +++ b/src/calibre/gui2/dialogs/choose_format.py @@ -16,7 +16,7 @@ class ChooseFormatDialog(QDialog): QDialog.__init__(self, window) self.resize(507, 377) self.setWindowIcon(QIcon(I("mimetypes/unknown.png"))) - self.setWindowTitle(_('Choose Format')) + self.setWindowTitle(_('Choose format')) self.l = l = QVBoxLayout(self) self.msg = QLabel(msg) l.addWidget(self.msg) @@ -28,7 +28,7 @@ class ChooseFormatDialog(QDialog): h.setContentsMargins(0, 0, 0, 0) l.addLayout(h) if show_open_with: - self.owb = QPushButton(_('&Open With...'), self) + self.owb = QPushButton(_('&Open with...'), self) self.formats.currentRowChanged.connect(self.update_open_with_button) h.addWidget(self.owb) self.own = QMenu(self.owb.text()) @@ -60,11 +60,11 @@ class ChooseFormatDialog(QDialog): else: menu.addSeparator() menu.addAction(_('Add other application for %s files...') % fmt.upper(), self.choose_open_with) - menu.addAction(_('Edit Open With applications...'), partial(edit_programs, fmt, self)) + menu.addAction(_('Edit "Open with" applications...'), partial(edit_programs, fmt, self)) def update_open_with_button(self): fmt = self._formats[self.formats.currentRow()] - self.owb.setText(_('Open %s With...') % fmt) + self.owb.setText(_('Open %s with...') % fmt) def open_with(self, entry): self.open_with_format = (self._formats[self.formats.currentRow()], entry) @@ -94,6 +94,7 @@ class ChooseFormatDialog(QDialog): self._format = self._formats[self.formats.currentRow()] return QDialog.accept(self) + if __name__ == '__main__': from calibre.gui2 import Application app = Application([]) diff --git a/src/calibre/gui2/dialogs/choose_format_device.ui b/src/calibre/gui2/dialogs/choose_format_device.ui index a2a07e414a..93b0e5ee56 100644 --- a/src/calibre/gui2/dialogs/choose_format_device.ui +++ b/src/calibre/gui2/dialogs/choose_format_device.ui @@ -11,7 +11,7 @@ - Choose Format + Choose format diff --git a/src/calibre/gui2/dialogs/custom_recipes.py b/src/calibre/gui2/dialogs/custom_recipes.py index 2bb73be502..16901e6644 100644 --- a/src/calibre/gui2/dialogs/custom_recipes.py +++ b/src/calibre/gui2/dialogs/custom_recipes.py @@ -494,7 +494,7 @@ class CustomRecipes(Dialog): else: bb.setStandardButtons(bb.Cancel | bb.Save) if self.stack.currentIndex() == 1: - text = _('S&witch to Advanced mode') + text = _('S&witch to advanced mode') tooltip = _('Edit this recipe in advanced mode') receiver = self.switch_to_advanced b = bb.addButton(text, bb.ActionRole) diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 3bc09171c0..83d8072c95 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -125,7 +125,7 @@ class ImageTitleLayout(QHBoxLayout): pixmap.load(I(icon_name)) if pixmap is None: error_dialog(parent, _('Restart required'), - _('You must restart Calibre before using this plugin!'), show=True) + _('You must restart calibre before using this plugin!'), show=True) else: title_image_label.setPixmap(pixmap) title_image_label.setMaximumSize(32, 32) @@ -277,7 +277,7 @@ class DisplayPluginModel(QAbstractTableModel): QAbstractTableModel.__init__(self) self.display_plugins = display_plugins self.headers = map(unicode, [_('Plugin Name'), _('Donate'), _('Status'), _('Installed'), - _('Available'), _('Released'), _('Calibre'), _('Author')]) + _('Available'), _('Released'), _('calibre'), _('Author')]) def rowCount(self, *args): return len(self.display_plugins) @@ -363,7 +363,7 @@ class DisplayPluginModel(QAbstractTableModel): if not display_plugin.is_valid_platform(): return _('Platform unavailable') if not display_plugin.is_valid_calibre(): - return _('Calibre upgrade required') + return _('calibre upgrade required') if display_plugin.is_installed(): if display_plugin.is_deprecated: return _('Plugin deprecated') @@ -408,7 +408,7 @@ class DisplayPluginModel(QAbstractTableModel): ', '.join(display_plugin.platforms)+'\n\n'+ _('Right-click to see more options')) if numeric_version < display_plugin.calibre_required_version: - return (_('You must upgrade to at least Calibre %s before installing this plugin') % + return (_('You must upgrade to at least calibre %s before installing this plugin') % self._get_display_version(display_plugin.calibre_required_version)+'\n\n'+ _('Right-click to see more options')) if display_plugin.installed_version < display_plugin.available_version: @@ -756,7 +756,7 @@ class PluginUpdaterDialog(SizePersistedDialog): _('A problem occurred while installing this plugin.' ' This plugin will now be uninstalled.' ' Please post the error message in details below into' - ' the forum thread for this plugin and restart Calibre.'), + ' the forum thread for this plugin and restart calibre.'), det_msg=traceback.format_exc(), show=True) if DEBUG: prints('Due to error now uninstalling plugin: %s'%display_plugin.name)