From b67684b6b897658d09af37c079f3a563144351ec Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 23 Apr 2017 16:50:12 +0530 Subject: [PATCH] String changes --- manual/faq.rst | 2 +- manual/virtual_libraries.rst | 2 +- resources/default_tweaks.py | 2 +- src/calibre/gui2/__init__.py | 2 +- src/calibre/gui2/actions/delete.py | 2 +- src/calibre/gui2/add_filters.py | 3 ++- src/calibre/gui2/convert/pdf_input.ui | 4 ++-- src/calibre/gui2/convert/regex_builder.py | 2 +- src/calibre/gui2/css_transform_rules.py | 5 +++-- src/calibre/gui2/device_drivers/mtp_config.py | 2 +- src/calibre/gui2/dialogs/comicconf.ui | 6 +++--- src/calibre/gui2/dialogs/exim.py | 2 +- src/calibre/gui2/metadata/single.py | 4 ++-- src/calibre/gui2/preferences/columns.py | 2 +- src/calibre/gui2/preferences/look_feel.ui | 2 +- src/calibre/gui2/preferences/saving.ui | 2 +- src/calibre/gui2/preferences/tweaks.py | 4 +--- src/calibre/gui2/search_box.py | 3 +-- src/calibre/gui2/tag_mapper.py | 6 ++++-- src/calibre/gui2/tweak_book/char_select.py | 2 +- src/calibre/gui2/tweak_book/widgets.py | 2 +- src/calibre/gui2/wizard/kindle.ui | 2 +- 22 files changed, 32 insertions(+), 31 deletions(-) diff --git a/manual/faq.rst b/manual/faq.rst index e0e6d13399..0115587e42 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -161,7 +161,7 @@ some of the advanced features `html-demo.zip `_ -Device Integration +Device integration ------------------- .. contents:: Contents diff --git a/manual/virtual_libraries.rst b/manual/virtual_libraries.rst index 8ad31b01cd..5dafb0ac29 100644 --- a/manual/virtual_libraries.rst +++ b/manual/virtual_libraries.rst @@ -49,7 +49,7 @@ basis of a virtual library. The virtual library will contain only the books matched by that search. First, type in the search you want to use in the search bar or build a search using the :guilabel:`Tag Browser`. When you are happy with the returned results, click the Virtual library -button, choose Create Library and enter a name for the new virtual +button, choose :guilabel:`Create library` and enter a name for the new virtual library. The virtual library will then be created based on the search you just typed in. Searches are very powerful, for examples of the kinds of things you can do with them, see :ref:`search_interface`. diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index ddf0518e0a..403386cd14 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -484,7 +484,7 @@ save_original_format = True save_original_format_when_polishing = True #: Number of recently viewed books to show -# Right-clicking the View button shows a list of recently viewed books. Control +# Right-clicking the "View" button shows a list of recently viewed books. Control # how many should be shown, here. gui_view_history_size = 15 diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 89d60600bd..3a9052dedf 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -201,7 +201,7 @@ def _config(): # {{{ c.add_opt('disable_tray_notification', default=False, help=_('Disable notifications from the system tray icon')) c.add_opt('default_send_to_device_action', default=None, - help=_('Default action to perform when send to device button is ' + help=_('Default action to perform when the "Send to device" button is ' 'clicked')) c.add_opt('asked_library_thing_password', default=False, help='Asked library thing password at least once.') diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py index 3b1d2a9e1b..a22461cf03 100644 --- a/src/calibre/gui2/actions/delete.py +++ b/src/calibre/gui2/actions/delete.py @@ -79,7 +79,7 @@ class MultiDeleter(QObject): # {{{ if self.failures: msg = ['==> '+x[1]+'\n'+x[2] for x in self.failures] error_dialog(self.gui, _('Failed to delete'), - _('Failed to delete some books, click the Show Details button' + _('Failed to delete some books, click the "Show details" button' ' for details.'), det_msg='\n\n'.join(msg), show=True) # }}} diff --git a/src/calibre/gui2/add_filters.py b/src/calibre/gui2/add_filters.py index c16e2973d0..bc1370bed7 100644 --- a/src/calibre/gui2/add_filters.py +++ b/src/calibre/gui2/add_filters.py @@ -121,7 +121,7 @@ class Tester(TesterBase): DIALOG_TITLE = _('Test filename filter rules') PREFS_NAME = 'test-file-filter-rules' LABEL = _('Enter a filename to test:') - PLACEHOLDER = _('Enter filename and click the Test button') + PLACEHOLDER = _('Enter filename and click the "Test" button') EMPTY_RESULT = '

 

' def do_test(self): @@ -141,6 +141,7 @@ class RulesDialog(RulesDialogBase): TesterClass = Tester PREFS_OBJECT = add_filters + if __name__ == '__main__': app = Application([]) d = RulesDialog() diff --git a/src/calibre/gui2/convert/pdf_input.ui b/src/calibre/gui2/convert/pdf_input.ui index b2ee421922..10aec03379 100644 --- a/src/calibre/gui2/convert/pdf_input.ui +++ b/src/calibre/gui2/convert/pdf_input.ui @@ -17,7 +17,7 @@ - Line &Un-Wrapping Factor: + Line &un-Wrapping factor: opt_unwrap_factor @@ -53,7 +53,7 @@ - No &Images + No &images diff --git a/src/calibre/gui2/convert/regex_builder.py b/src/calibre/gui2/convert/regex_builder.py index c530f34f3b..74d6996ce3 100644 --- a/src/calibre/gui2/convert/regex_builder.py +++ b/src/calibre/gui2/convert/regex_builder.py @@ -215,7 +215,7 @@ class RegexEdit(QWidget, Ui_Edit): def builder(self): if self.db is None: - self.doc_cache = _('Click the Open button below to open a ' + self.doc_cache = _('Click the "Open" button below to open a ' 'ebook to use for testing.') bld = RegexBuilder(self.db, self.book_id, self.edit.text(), self.doc_cache, self) if bld.cancelled: diff --git a/src/calibre/gui2/css_transform_rules.py b/src/calibre/gui2/css_transform_rules.py index e4b0f0bf4a..e352bce09a 100644 --- a/src/calibre/gui2/css_transform_rules.py +++ b/src/calibre/gui2/css_transform_rules.py @@ -187,7 +187,7 @@ class Rules(RulesBase): # {{{ RuleItemClass = RuleItem RuleEditDialogClass = RuleEditDialog - MSG = _('You can specify rules to transform styles here. Click the "Add Rule" button' + MSG = _('You can specify rules to transform styles here. Click the "Add rule" button' ' below to get started.') # }}} @@ -209,7 +209,7 @@ class Tester(Dialog): # {{{ self.la = la = QLabel(self.LABEL) l.addWidget(la) self.css = t = TextEdit(self) - t.load_text('/* %s */\n' % _('Enter CSS rules below and click the Test button'), 'css') + t.load_text('/* %s */\n' % _('Enter CSS rules below and click the "Test" button'), 'css') la.setBuddy(t) c = t.textCursor() c.movePosition(c.End) @@ -332,6 +332,7 @@ class RulesWidget(QWidget, SaveLoadMixin): # {{{ self.rules_widget.rules = [] # }}} + if __name__ == '__main__': from calibre.gui2 import Application app = Application([]) diff --git a/src/calibre/gui2/device_drivers/mtp_config.py b/src/calibre/gui2/device_drivers/mtp_config.py index ff6df6b558..90d420adf3 100644 --- a/src/calibre/gui2/device_drivers/mtp_config.py +++ b/src/calibre/gui2/device_drivers/mtp_config.py @@ -504,7 +504,7 @@ class SendError(QDialog): 'folder is currently ignored by calibre when scanning the ' 'device. You have to tell calibre you want this folder scanned ' 'in order to be able to send books to it. Click the ' - 'configure button below to send books to it.')%error.folder) + 'Configure button below to send books to it.')%error.folder) la.setWordWrap(True) la.setMinimumWidth(500) l.addWidget(la) diff --git a/src/calibre/gui2/dialogs/comicconf.ui b/src/calibre/gui2/dialogs/comicconf.ui index 24fa321626..309ff84945 100644 --- a/src/calibre/gui2/dialogs/comicconf.ui +++ b/src/calibre/gui2/dialogs/comicconf.ui @@ -47,7 +47,7 @@ - &Number of Colors: + &Number of colors: opt_colors @@ -97,7 +97,7 @@ - Disable &Sharpening + Disable &sharpening @@ -149,7 +149,7 @@ - Disable &Trimming + Disable &trimming diff --git a/src/calibre/gui2/dialogs/exim.py b/src/calibre/gui2/dialogs/exim.py index 8e9156679b..d03178e0a0 100644 --- a/src/calibre/gui2/dialogs/exim.py +++ b/src/calibre/gui2/dialogs/exim.py @@ -283,7 +283,7 @@ class EximDialog(Dialog): if g.iactions['Connect Share'].content_server_is_running: error_dialog(self, _('Content Server running'), _( 'Cannot import while the content server is running, shut it down first by clicking the' - ' Connect/share button on the calibre toolbar'), show=True) + ' "Connect/share" button on the calibre toolbar'), show=True) return False if self.import_panel.stack.currentIndex() == 0: error_dialog(self, _('No folder selected'), _( diff --git a/src/calibre/gui2/metadata/single.py b/src/calibre/gui2/metadata/single.py index 7806d6a547..f873ae6fc6 100644 --- a/src/calibre/gui2/metadata/single.py +++ b/src/calibre/gui2/metadata/single.py @@ -589,8 +589,8 @@ class MetadataSingleDialogBase(QDialog): 'There are still {} more books to edit in this set.', num).format(num) if not question_dialog( self, _('Are you sure?'), pm + _( - ' Are you sure you want to stop? Use the Next button' - ' instead of the OK button to move through books in the set.'), + ' Are you sure you want to stop? Use the "Next" button' + ' instead of the "OK" button to move through books in the set.'), yes_text=_('&Stop editing'), no_text=_('&Continue editing'), yes_icon='dot_red.png', no_icon='dot_green.png', default_yes=False, skip_dialog_name='edit-metadata-single-confirm-ok-on-multiple'): diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py index 41e7df0e09..6bc8abcf86 100644 --- a/src/calibre/gui2/preferences/columns.py +++ b/src/calibre/gui2/preferences/columns.py @@ -75,7 +75,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.field_metadata = db.field_metadata self.opt_columns.setColumnCount(4) - item = QTableWidgetItem(_('Column Header')) + item = QTableWidgetItem(_('Column header')) self.opt_columns.setHorizontalHeaderItem(0, item) item = QTableWidgetItem(_('Lookup name')) self.opt_columns.setHorizontalHeaderItem(1, item) diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 08f134421b..46055f1251 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -269,7 +269,7 @@ - Control the cover grid view. You can enable this view by clicking the grid button in the bottom right corner of the main calibre window. + Control the cover grid view. You can enable this view by clicking the "Cover Grid" button in the bottom right corner of the main calibre window. true diff --git a/src/calibre/gui2/preferences/saving.ui b/src/calibre/gui2/preferences/saving.ui index 189f86b775..8b23fdabd7 100644 --- a/src/calibre/gui2/preferences/saving.ui +++ b/src/calibre/gui2/preferences/saving.ui @@ -17,7 +17,7 @@ - Here you can control how calibre will save your books when you click the Save to Disk button: + Here you can control how calibre will save your books when you click the "Save to disk" button: true diff --git a/src/calibre/gui2/preferences/tweaks.py b/src/calibre/gui2/preferences/tweaks.py index ff4db80b6e..576f1aa8bf 100644 --- a/src/calibre/gui2/preferences/tweaks.py +++ b/src/calibre/gui2/preferences/tweaks.py @@ -507,7 +507,7 @@ class ConfigWidget(ConfigWidgetBase): import traceback error_dialog(self.gui, _('Failed'), _('There was a syntax error in your tweak. Click ' - 'the show details button for details.'), + 'the "Show details" button for details.'), det_msg=traceback.format_exc(), show=True) return self.tweaks.update_tweak(idx, l) @@ -575,5 +575,3 @@ if __name__ == '__main__': # Tweaks() # test_widget test_widget('Advanced', 'Tweaks') - - diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index 4897c58957..260b8ec97b 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -437,7 +437,7 @@ class SearchBoxMixin(object): # {{{ def init_search_box_mixin(self): self.search.initialize('main_search_history', colorize=True, - help_text=_('Search (For Advanced Search click the button to the left)')) + help_text=_('Search (For Advanced search click the button to the left)')) self.search.cleared.connect(self.search_box_cleared) # Queued so that search.current_text will be correct self.search.changed.connect(self.search_box_changed, @@ -569,4 +569,3 @@ class SavedSearchBoxMixin(object): # {{{ self.saved_search.clear() # }}} - diff --git a/src/calibre/gui2/tag_mapper.py b/src/calibre/gui2/tag_mapper.py index 612657af68..a727fa5f18 100644 --- a/src/calibre/gui2/tag_mapper.py +++ b/src/calibre/gui2/tag_mapper.py @@ -215,6 +215,7 @@ class RuleEditDialog(Dialog): if self.edit_widget.validate(): Dialog.accept(self) + DATA_ROLE = Qt.UserRole RENDER_ROLE = DATA_ROLE + 1 @@ -269,7 +270,7 @@ class Rules(QWidget): RuleEditDialogClass = RuleEditDialog changed = pyqtSignal() - MSG = _('You can specify rules to filter/transform tags here. Click the "Add Rule" button' + MSG = _('You can specify rules to filter/transform tags here. Click the "Add rule" button' ' below to get started. The rules will be processed in order for every tag until either a' ' "remove" or a "keep" rule matches.') @@ -384,7 +385,7 @@ class Tester(Dialog): DIALOG_TITLE = _('Test tag mapper rules') PREFS_NAME = 'test-tag-mapper-rules' LABEL = _('Enter a comma separated list of &tags to test:') - PLACEHOLDER = _('Enter tags and click the Test button') + PLACEHOLDER = _('Enter tags and click the "Test" button') EMPTY_RESULT = '

 
 

' def __init__(self, rules, parent=None): @@ -508,6 +509,7 @@ class RulesDialog(Dialog, SaveLoadMixin): def test_rules(self): self.TesterClass(self.rules, self).exec_() + if __name__ == '__main__': app = Application([]) d = RulesDialog() diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py index fb1162fec0..87744467b6 100644 --- a/src/calibre/gui2/tweak_book/char_select.py +++ b/src/calibre/gui2/tweak_book/char_select.py @@ -786,7 +786,7 @@ class CharSelect(Dialog): l.addWidget(la, 2, 0, 1, 3) self.rearrange_msg = la = QLabel(_( - 'Drag and drop characters to re-arrange them. Click the re-arrange button again when you are done.')) + 'Drag and drop characters to re-arrange them. Click the Re-arrange button again when you are done.')) la.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) la.setVisible(False) l.addWidget(la, 3, 0, 1, 3) diff --git a/src/calibre/gui2/tweak_book/widgets.py b/src/calibre/gui2/tweak_book/widgets.py index 5e84adaa1a..1709c2d1c0 100644 --- a/src/calibre/gui2/tweak_book/widgets.py +++ b/src/calibre/gui2/tweak_book/widgets.py @@ -931,7 +931,7 @@ class FilterCSS(Dialog): # {{{ def __init__(self, current_name=None, parent=None): self.current_name = current_name - Dialog.__init__(self, _('Filter Style Information'), 'filter-css', parent=parent) + Dialog.__init__(self, _('Filter style information'), 'filter-css', parent=parent) def setup_ui(self): from calibre.gui2.convert.look_and_feel_ui import Ui_Form diff --git a/src/calibre/gui2/wizard/kindle.ui b/src/calibre/gui2/wizard/kindle.ui index 5d87a48819..b452d5d914 100644 --- a/src/calibre/gui2/wizard/kindle.ui +++ b/src/calibre/gui2/wizard/kindle.ui @@ -23,7 +23,7 @@ - <p>calibre can automatically send books by email to your Kindle. To do that you have to setup email delivery below. The easiest way is to setup a free <a href="https://gmx.com">GMX account</a> and click the Use GMX button below. You will also have to register your email address in your Amazon account. + <p>calibre can automatically send books by email to your Kindle. To do that you have to setup email delivery below. The easiest way is to setup a free <a href="https://gmx.com">GMX account</a> and click the "Use GMX" button below. You will also have to register your email address in your Amazon account. true