String changes

manual/faq.rst

@@ -161,7 +161,7 @@ some of the advanced features
 `html-demo.zip <https://calibre-ebook.com/downloads/html-demo.zip>`_
 
 
-Device Integration
+Device integration
 -------------------
 
 .. contents:: Contents

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`. 

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
 

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.')

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)
 # }}}
 

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 = '<p>&nbsp;</p>'
 
     def do_test(self):
@@ -141,6 +141,7 @@ class RulesDialog(RulesDialogBase):
     TesterClass = Tester
     PREFS_OBJECT = add_filters
 
+
 if __name__ == '__main__':
     app = Application([])
     d = RulesDialog()

src/calibre/gui2/convert/pdf_input.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Line &amp;Un-Wrapping Factor:</string>
+      <string>Line &amp;un-Wrapping factor:</string>
      </property>
      <property name="buddy">
       <cstring>opt_unwrap_factor</cstring>
@@ -53,7 +53,7 @@
    <item row="1" column="0">
     <widget class="QCheckBox" name="opt_no_images">
      <property name="text">
-      <string>No &amp;Images</string>
+      <string>No &amp;images</string>
      </property>
     </widget>
    </item>

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:

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([])

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 '
-              '<b>configure</b> button below to send books to it.')%error.folder)
+              '<b>Configure</b> button below to send books to it.')%error.folder)
         la.setWordWrap(True)
         la.setMinimumWidth(500)
         l.addWidget(la)

src/calibre/gui2/dialogs/comicconf.ui

@@ -47,7 +47,7 @@
    <item row="2" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>&amp;Number of Colors:</string>
+      <string>&amp;Number of colors:</string>
      </property>
      <property name="buddy">
       <cstring>opt_colors</cstring>
@@ -97,7 +97,7 @@
    <item row="6" column="0">
     <widget class="QCheckBox" name="opt_dont_sharpen">
      <property name="text">
-      <string>Disable &amp;Sharpening</string>
+      <string>Disable &amp;sharpening</string>
      </property>
     </widget>
    </item>
@@ -149,7 +149,7 @@
    <item row="7" column="0">
     <widget class="QCheckBox" name="opt_disable_trim">
      <property name="text">
-      <string>Disable &amp;Trimming</string>
+      <string>Disable &amp;trimming</string>
      </property>
     </widget>
    </item>

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'), _(

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'
+                      ' Are you sure you want to stop? Use the "Next" button'
-                      ' instead of the OK button to move through books in the set.'),
+                      ' 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'):

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)

src/calibre/gui2/preferences/look_feel.ui

@@ -269,7 +269,7 @@
            <item row="0" column="0" colspan="2">
             <widget class="QLabel" name="label_19">
              <property name="text">
-              <string>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.</string>
+              <string>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.</string>
              </property>
              <property name="wordWrap">
               <bool>true</bool>

src/calibre/gui2/preferences/saving.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Here you can control how calibre will save your books when you click the Save to Disk button:</string>
+      <string>Here you can control how calibre will save your books when you click the "Save to disk" button:</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

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')
-
-

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()
 
     # }}}
-

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 = '<p>&nbsp;<br>&nbsp;</p>'
 
     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()

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)

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

src/calibre/gui2/wizard/kindle.ui

@@ -23,7 +23,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;p&gt;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 &lt;a href=&quot;https://gmx.com&quot;&gt;GMX account&lt;/a&gt; and click the Use GMX button below. You will also have to register your email address in your Amazon account.</string>
+      <string>&lt;p&gt;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 &lt;a href=&quot;https://gmx.com&quot;&gt;GMX account&lt;/a&gt; and click the "Use GMX" button below. You will also have to register your email address in your Amazon account.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>