From 5847f36df9c2b70ff5622fde5d2556a83f981f54 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 23 Apr 2017 21:12:27 +0530 Subject: [PATCH] String changes --- src/calibre/gui2/actions/tweak_epub.py | 2 +- src/calibre/gui2/actions/view.py | 2 +- src/calibre/gui2/catalog/catalog_bibtex.py | 2 +- src/calibre/gui2/catalog/catalog_csv_xml.py | 4 ++-- src/calibre/gui2/catalog/catalog_epub_mobi.ui | 12 ++++++------ src/calibre/gui2/comments_editor.py | 2 +- src/calibre/gui2/convert/bulk.py | 4 +--- src/calibre/gui2/convert/comic_input.py | 4 +--- src/calibre/gui2/convert/docx_input.py | 3 +-- src/calibre/gui2/convert/docx_output.py | 2 +- src/calibre/gui2/convert/epub_output.py | 3 +-- src/calibre/gui2/convert/fb2_output.py | 2 +- src/calibre/gui2/widgets.py | 4 ++-- 13 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py index 8a48a14317..5310e9973b 100755 --- a/src/calibre/gui2/actions/tweak_epub.py +++ b/src/calibre/gui2/actions/tweak_epub.py @@ -107,7 +107,7 @@ class TweakEpubAction(InterfaceAction): fmts = [x.upper().strip() for x in fmts.split(',')] tweakable_fmts = set(fmts).intersection(SUPPORTED) if not tweakable_fmts: - return error_dialog(self.gui, _('Cannot Edit book'), + return error_dialog(self.gui, _('Cannot edit book'), _('The book must be in the %s formats to edit.' '\n\nFirst convert the book to one of these formats.') % (_(' or ').join(SUPPORTED)), show=True) diff --git a/src/calibre/gui2/actions/view.py b/src/calibre/gui2/actions/view.py index 77de6a102b..8f058a695c 100644 --- a/src/calibre/gui2/actions/view.py +++ b/src/calibre/gui2/actions/view.py @@ -203,7 +203,7 @@ class ViewAction(InterfaceAction): def _view_check(self, num, max_=3): if num <= max_: return True - return question_dialog(self.gui, _('Multiple Books Selected'), + return question_dialog(self.gui, _('Multiple books selected'), _('You are attempting to open %d books. Opening too many ' 'books at once can be slow and have a negative effect on the ' 'responsiveness of your computer. Once started the process ' diff --git a/src/calibre/gui2/catalog/catalog_bibtex.py b/src/calibre/gui2/catalog/catalog_bibtex.py index ff22a65e76..7d3455827d 100644 --- a/src/calibre/gui2/catalog/catalog_bibtex.py +++ b/src/calibre/gui2/catalog/catalog_bibtex.py @@ -14,7 +14,7 @@ from PyQt5.Qt import QWidget, QListWidgetItem class PluginWidget(QWidget, Ui_Form): - TITLE = _('BibTeX Options') + TITLE = _('BibTeX options') HELP = _('Options specific to')+' BibTeX '+_('output') OPTION_FIELDS = [('bib_cit','{authors}{id}'), ('bib_entry', 0), # mixed diff --git a/src/calibre/gui2/catalog/catalog_csv_xml.py b/src/calibre/gui2/catalog/catalog_csv_xml.py index 42b15bba7e..8fc7277ad1 100644 --- a/src/calibre/gui2/catalog/catalog_csv_xml.py +++ b/src/calibre/gui2/catalog/catalog_csv_xml.py @@ -13,7 +13,7 @@ from PyQt5.Qt import QWidget, QListWidgetItem, Qt, QVBoxLayout, QLabel, QListWid class PluginWidget(QWidget): - TITLE = _('CSV/XML Options') + TITLE = _('CSV/XML options') HELP = _('Options specific to')+' CSV/XML '+_('output') sync_enabled = False formats = set(['csv', 'xml']) @@ -46,7 +46,7 @@ class PluginWidget(QWidget): if x == 'isbn': return 'ISBN' if x == 'library_name': - return _('Library Name') + return _('Library name') if x.endswith('_index'): return name(x[:-len('_index')]) + ' ' + _('Number') return fm[x].get('name') or x diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.ui b/src/calibre/gui2/catalog/catalog_epub_mobi.ui index 608c5c81aa..e00f4bb07a 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.ui +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.ui @@ -448,7 +448,7 @@ The default pattern \[.+\]|\+ excludes tags of the form [tag], e.g., [Test book] - Custom column containing additional content to be merged with Comments metadata in Descriptions section. + Custom column containing additional content to be merged with comments metadata in the descriptions section. @@ -462,7 +462,7 @@ The default pattern \[.+\]|\+ excludes tags of the form [tag], e.g., [Test book] - Merge additional content before Comments in Descriptions section. + Merge additional content before comments in descriptions section. &Before @@ -475,7 +475,7 @@ The default pattern \[.+\]|\+ excludes tags of the form [tag], e.g., [Test book] - Merge additional content after Comments in Descriptions section. + Merge additional content after comments in descriptions section. &After @@ -495,10 +495,10 @@ The default pattern \[.+\]|\+ excludes tags of the form [tag], e.g., [Test book] - Separate Comments metadata and additional content with a horizontal rule in Descriptions section. + Separate comments metadata and additional content with a horizontal rule in the descriptions section. - Include &Separator + Include &separator @@ -519,7 +519,7 @@ The default pattern \[.+\]|\+ excludes tags of the form [tag], e.g., [Test book] - &Merge with Comments: + &Merge with comments: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py index b1ec4b032f..72350a3a13 100644 --- a/src/calibre/gui2/comments_editor.py +++ b/src/calibre/gui2/comments_editor.py @@ -117,7 +117,7 @@ class EditorWidget(QWebView): # {{{ ('Indent', 'indent', 'format-indent-more', _('Increase indentation'), False), ('Outdent', 'outdent', 'format-indent-less', - _('Decrease Indentation'), False), + _('Decrease indentation'), False), ('SelectAll', 'select_all', 'edit-select-all', _('Select all'), False), ]: diff --git a/src/calibre/gui2/convert/bulk.py b/src/calibre/gui2/convert/bulk.py index d95957569d..3fd2570310 100644 --- a/src/calibre/gui2/convert/bulk.py +++ b/src/calibre/gui2/convert/bulk.py @@ -78,7 +78,7 @@ class BulkConfig(Config): return cls(self.stack, self.plumber.get_option_by_name, self.plumber.get_option_help, self.db) - self.setWindowTitle(_('Bulk Convert')) + self.setWindowTitle(_('Bulk convert')) lf = widget_factory(LookAndFeelWidget) hw = widget_factory(HeuristicsWidget) sr = widget_factory(SearchAndReplaceWidget) @@ -142,5 +142,3 @@ class BulkConfig(Config): gprefs['convert_bulk_dialog_geom'] = \ bytearray(self.saveGeometry()) return QDialog.done(self, r) - - diff --git a/src/calibre/gui2/convert/comic_input.py b/src/calibre/gui2/convert/comic_input.py index ecdb59ae37..0fe3a3722d 100644 --- a/src/calibre/gui2/convert/comic_input.py +++ b/src/calibre/gui2/convert/comic_input.py @@ -13,7 +13,7 @@ from calibre.gui2.convert import Widget class PluginWidget(Widget, Ui_Form): - TITLE = _('Comic Input') + TITLE = _('Comic input') HELP = _('Options specific to')+' comic '+_('input') COMMIT_NAME = 'comic_input' ICON = I('mimetypes/png.png') @@ -32,5 +32,3 @@ class PluginWidget(Widget, Ui_Form): self.initialize_options(get_option, get_help, db, book_id) self.opt_no_process.toggle() self.opt_no_process.toggle() - - diff --git a/src/calibre/gui2/convert/docx_input.py b/src/calibre/gui2/convert/docx_input.py index 3af6b063dd..d148687eff 100644 --- a/src/calibre/gui2/convert/docx_input.py +++ b/src/calibre/gui2/convert/docx_input.py @@ -12,7 +12,7 @@ from calibre.gui2.convert import Widget class PluginWidget(Widget, Ui_Form): - TITLE = _('DOCX Input') + TITLE = _('DOCX input') HELP = _('Options specific to')+' DOCX '+_('input') COMMIT_NAME = 'docx_input' ICON = I('mimetypes/docx.png') @@ -21,4 +21,3 @@ class PluginWidget(Widget, Ui_Form): Widget.__init__(self, parent, ['docx_no_cover', 'docx_no_pagebreaks_between_notes', 'docx_inline_subsup']) self.initialize_options(get_option, get_help, db, book_id) - diff --git a/src/calibre/gui2/convert/docx_output.py b/src/calibre/gui2/convert/docx_output.py index c3d0c55406..4c2936196a 100644 --- a/src/calibre/gui2/convert/docx_output.py +++ b/src/calibre/gui2/convert/docx_output.py @@ -14,7 +14,7 @@ orientation_model = None class PluginWidget(Widget): - TITLE = _('DOCX Output') + TITLE = _('DOCX output') HELP = _('Options specific to')+' DOCX '+_('output') COMMIT_NAME = 'docx_output' ICON = I('mimetypes/docx.png') diff --git a/src/calibre/gui2/convert/epub_output.py b/src/calibre/gui2/convert/epub_output.py index ec378b5e44..6616590331 100644 --- a/src/calibre/gui2/convert/epub_output.py +++ b/src/calibre/gui2/convert/epub_output.py @@ -13,7 +13,7 @@ from calibre.gui2.convert import Widget class PluginWidget(Widget, Ui_Form): - TITLE = _('EPUB Output') + TITLE = _('EPUB output') HELP = _('Options specific to')+' EPUB '+_('output') COMMIT_NAME = 'epub_output' ICON = I('mimetypes/epub.png') @@ -29,4 +29,3 @@ class PluginWidget(Widget, Ui_Form): self.opt_no_svg_cover.toggle() self.db, self.book_id = db, book_id self.initialize_options(get_option, get_help, db, book_id) - diff --git a/src/calibre/gui2/convert/fb2_output.py b/src/calibre/gui2/convert/fb2_output.py index 2d7e849cf2..6c381a7834 100644 --- a/src/calibre/gui2/convert/fb2_output.py +++ b/src/calibre/gui2/convert/fb2_output.py @@ -12,7 +12,7 @@ format_model = None class PluginWidget(Widget, Ui_Form): - TITLE = _('FB2 Output') + TITLE = _('FB2 output') HELP = _('Options specific to')+' FB2 '+_('output') COMMIT_NAME = 'fb2_output' ICON = I('mimetypes/fb2.png') diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py index 1c20c079cc..425ab60cbf 100644 --- a/src/calibre/gui2/widgets.py +++ b/src/calibre/gui2/widgets.py @@ -269,8 +269,8 @@ class ImageDropMixin(object): # {{{ def build_context_menu(self): cm = QMenu(self) - paste = cm.addAction(_('Paste Cover')) - copy = cm.addAction(_('Copy Cover')) + paste = cm.addAction(_('Paste cover')) + copy = cm.addAction(_('Copy cover')) if not QApplication.instance().clipboard().mimeData().hasImage(): paste.setEnabled(False) copy.triggered.connect(self.copy_to_clipboard)