From bee1650017f12d2aff2e784a8307834b19889875 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 23 Apr 2017 20:54:39 +0530 Subject: [PATCH] String changes --- src/calibre/gui2/convert/search_and_replace.ui | 2 +- .../gui2/device_drivers/tabbed_device_config.py | 6 ++---- src/calibre/gui2/dialogs/check_library.py | 3 +-- src/calibre/gui2/dialogs/comments_dialog.ui | 2 +- .../gui2/dialogs/confirm_delete_location.ui | 2 +- src/calibre/gui2/dialogs/custom_recipes.py | 2 +- src/calibre/gui2/dialogs/drm_error.ui | 2 +- src/calibre/gui2/dialogs/jobs.ui | 2 +- src/calibre/gui2/dialogs/metadata_bulk.py | 2 +- src/calibre/gui2/dialogs/metadata_bulk.ui | 2 +- src/calibre/gui2/dialogs/plugin_updater.py | 6 +++--- src/calibre/gui2/dialogs/tag_list_editor.ui | 2 +- src/calibre/gui2/viewer/documentview.py | 16 ++++++++-------- src/calibre/gui2/widgets.py | 11 ++++++----- src/calibre/gui2/widgets2.py | 2 +- 15 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/calibre/gui2/convert/search_and_replace.ui b/src/calibre/gui2/convert/search_and_replace.ui index ddb73a69a7..d1101e7ad8 100644 --- a/src/calibre/gui2/convert/search_and_replace.ui +++ b/src/calibre/gui2/convert/search_and_replace.ui @@ -32,7 +32,7 @@ - Search/Replace Definition Edit + Search/Replace definition edit diff --git a/src/calibre/gui2/device_drivers/tabbed_device_config.py b/src/calibre/gui2/device_drivers/tabbed_device_config.py index c8af7da14e..ac6fc65ceb 100644 --- a/src/calibre/gui2/device_drivers/tabbed_device_config.py +++ b/src/calibre/gui2/device_drivers/tabbed_device_config.py @@ -81,7 +81,7 @@ class TabbedDeviceConfig(QTabWidget): self.base = QWidget(self) # self.insertTab(0, self.base, _('Configure %s') % self.device.current_friendly_name) - self.insertTab(0, self.base, _("File Formats")) + self.insertTab(0, self.base, _("File formats")) l = self.base.l = QGridLayout(self.base) self.base.setLayout(l) @@ -140,7 +140,7 @@ class TabbedDeviceConfig(QTabWidget): self.device_settings) # Only display the extra customization tab if there are options on it. if self.extra_tab.has_extra_customizations: - self.addTab(self.extra_tab, _('Extra Customization')) + self.addTab(self.extra_tab, _('Extra customization')) self.setCurrentIndex(0) @@ -394,5 +394,3 @@ if __name__ == '__main__': if d.exec_() == d.Accepted: cw.commit() dev.shutdown() - - diff --git a/src/calibre/gui2/dialogs/check_library.py b/src/calibre/gui2/dialogs/check_library.py index 5fb5bdc9b4..664b2f32a8 100644 --- a/src/calibre/gui2/dialogs/check_library.py +++ b/src/calibre/gui2/dialogs/check_library.py @@ -81,7 +81,7 @@ class CheckLibraryDialog(QDialog): QDialog.__init__(self, parent) self.db = db - self.setWindowTitle(_('Check Library -- Problems Found')) + self.setWindowTitle(_('Check library -- Problems Found')) self.setWindowIcon(QIcon(I('debug.png'))) self._tl = QHBoxLayout() @@ -395,4 +395,3 @@ if __name__ == '__main__': from calibre.library import db d = CheckLibraryDialog(None, db()) d.exec_() - diff --git a/src/calibre/gui2/dialogs/comments_dialog.ui b/src/calibre/gui2/dialogs/comments_dialog.ui index 76b23e233d..19d39ca754 100644 --- a/src/calibre/gui2/dialogs/comments_dialog.ui +++ b/src/calibre/gui2/dialogs/comments_dialog.ui @@ -17,7 +17,7 @@ - Edit Comments + Edit comments diff --git a/src/calibre/gui2/dialogs/confirm_delete_location.ui b/src/calibre/gui2/dialogs/confirm_delete_location.ui index f375eb7207..45084daa0d 100644 --- a/src/calibre/gui2/dialogs/confirm_delete_location.ui +++ b/src/calibre/gui2/dialogs/confirm_delete_location.ui @@ -72,7 +72,7 @@ - Library and Device + Library and device diff --git a/src/calibre/gui2/dialogs/custom_recipes.py b/src/calibre/gui2/dialogs/custom_recipes.py index 16901e6644..5a38cc3d8a 100644 --- a/src/calibre/gui2/dialogs/custom_recipes.py +++ b/src/calibre/gui2/dialogs/custom_recipes.py @@ -390,7 +390,7 @@ class BasicRecipe(QWidget): # {{{ self.feed_title.clear() self.feed_url.clear() if src is None: - self.title.setText(_('My News Source')) + self.title.setText(_('My news source')) self.oldest_article.setValue(7) self.max_articles.setValue(100) else: diff --git a/src/calibre/gui2/dialogs/drm_error.ui b/src/calibre/gui2/dialogs/drm_error.ui index 3e594315c6..08d3f3d60a 100644 --- a/src/calibre/gui2/dialogs/drm_error.ui +++ b/src/calibre/gui2/dialogs/drm_error.ui @@ -11,7 +11,7 @@ - This book is DRMed + This book has DRM diff --git a/src/calibre/gui2/dialogs/jobs.ui b/src/calibre/gui2/dialogs/jobs.ui index 1e6b1479b8..688eeeb086 100644 --- a/src/calibre/gui2/dialogs/jobs.ui +++ b/src/calibre/gui2/dialogs/jobs.ui @@ -11,7 +11,7 @@ - Active Jobs + Active jobs diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index a78b961c5d..8d3c119982 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -304,7 +304,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): } s_r_match_modes = [_('Character match'), - _('Regular Expression'), + _('Regular expression'), ] s_r_replace_modes = [_('Replace field'), diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index 1791c20c0b..4ff008c347 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -11,7 +11,7 @@ - Edit Meta information + Edit meta information diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 83d8072c95..82dfc63fed 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -537,12 +537,12 @@ class PluginUpdaterDialog(SizePersistedDialog): self.install_action.triggered.connect(self._install_clicked) self.install_action.setEnabled(False) self.plugin_view.addAction(self.install_action) - self.history_action = QAction(QIcon(I('chapters.png')), _('Version &History'), self) + self.history_action = QAction(QIcon(I('chapters.png')), _('Version &history'), self) self.history_action.setToolTip(_('Show history of changes to this plugin')) self.history_action.triggered.connect(self._history_clicked) self.history_action.setEnabled(False) self.plugin_view.addAction(self.history_action) - self.forum_action = QAction(QIcon(I('plugins/mobileread.png')), _('Plugin &Forum Thread'), self) + self.forum_action = QAction(QIcon(I('plugins/mobileread.png')), _('Plugin &forum thread'), self) self.forum_action.triggered.connect(self._forum_label_activated) self.forum_action.setEnabled(False) self.plugin_view.addAction(self.forum_action) @@ -752,7 +752,7 @@ class PluginUpdaterDialog(SizePersistedDialog): if DEBUG: prints('ERROR occurred while installing plugin: %s'%display_plugin.name) traceback.print_exc() - error_dialog(self.gui, _('Install Plugin Failed'), + error_dialog(self.gui, _('Install plugin failed'), _('A problem occurred while installing this plugin.' ' This plugin will now be uninstalled.' ' Please post the error message in details below into' diff --git a/src/calibre/gui2/dialogs/tag_list_editor.ui b/src/calibre/gui2/dialogs/tag_list_editor.ui index ec434c6d09..30b2e9fce5 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.ui +++ b/src/calibre/gui2/dialogs/tag_list_editor.ui @@ -11,7 +11,7 @@ - Category Editor + Category editor diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 4e67c4bea8..cd9fd2b500 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -615,17 +615,17 @@ class DocumentView(QWebView): # {{{ 'Next Section': self.goto_next_section, 'Previous Section': self.goto_previous_section, } - for name, key in [(_('Next Section'), 'Next Section'), - (_('Previous Section'), 'Previous Section'), + for name, key in [(_('Next section'), 'Next Section'), + (_('Previous section'), 'Previous Section'), (None, None), - (_('Document Start'), 'Document Top'), - (_('Document End'), 'Document Bottom'), + (_('Document start'), 'Document Top'), + (_('Document end'), 'Document Bottom'), (None, None), - (_('Section Start'), 'Section Top'), - (_('Section End'), 'Section Bottom'), + (_('Section start'), 'Section Top'), + (_('Section end'), 'Section Bottom'), (None, None), - (_('Next Page'), 'Next Page'), - (_('Previous Page'), 'Previous Page')]: + (_('Next page'), 'Next Page'), + (_('Previous page'), 'Previous Page')]: if key is None: m.addSeparator() else: diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py index 7947b7b114..1c20c079cc 100644 --- a/src/calibre/gui2/widgets.py +++ b/src/calibre/gui2/widgets.py @@ -447,11 +447,11 @@ class LineEditECM(object): # {{{ menu = self.createStandardContextMenu() menu.addSeparator() - case_menu = QMenu(_('Change Case')) - action_upper_case = case_menu.addAction(_('Upper Case')) - action_lower_case = case_menu.addAction(_('Lower Case')) - action_swap_case = case_menu.addAction(_('Swap Case')) - action_title_case = case_menu.addAction(_('Title Case')) + case_menu = QMenu(_('Change case')) + action_upper_case = case_menu.addAction(_('Upper case')) + action_lower_case = case_menu.addAction(_('Lower case')) + action_swap_case = case_menu.addAction(_('Swap case')) + action_title_case = case_menu.addAction(_('Title case')) action_capitalize = case_menu.addAction(_('Capitalize')) action_upper_case.triggered.connect(self.upper_case) @@ -1167,6 +1167,7 @@ class Splitter(QSplitter): # }}} + if __name__ == '__main__': from PyQt5.Qt import QTextEdit app = QApplication([]) diff --git a/src/calibre/gui2/widgets2.py b/src/calibre/gui2/widgets2.py index ffe167937c..492bf08a4c 100644 --- a/src/calibre/gui2/widgets2.py +++ b/src/calibre/gui2/widgets2.py @@ -129,7 +129,7 @@ def populate_standard_spinbox_context_menu(spinbox, menu, add_clear=False): m.addAction(_('&Paste') + access_key(QKeySequence.Paste), le.paste).setEnabled(not le.isReadOnly()) m.addAction(_('Delete') + access_key(QKeySequence.Delete), le.del_).setEnabled(not le.isReadOnly() and le.hasSelectedText()) m.addSeparator() - m.addAction(_('Select &All') + access_key(QKeySequence.SelectAll), spinbox.selectAll) + m.addAction(_('Select &all') + access_key(QKeySequence.SelectAll), spinbox.selectAll) m.addSeparator() m.addAction(_('&Step up'), spinbox.stepUp) m.addAction(_('Step &down'), spinbox.stepDown)