String changes

manual/gui.rst

@@ -495,7 +495,7 @@ be configured to read metadata from the file name instead, via
 :guilabel:`Preferences->Import/export->Adding books->Read metadata from file contents`.
 
 You can also control how metadata is read from the filename using regular
-expressions (see :doc:`regexp`).  In the :guilabel:`Adding books` section of
+expressions (see :doc:`regexp`). In the :guilabel:`Adding books` section of
 the configuration dialog, you can specify a regular expression that calibre
 will use to try and guess metadata from the names of e-book files that you add
 to the library. The default regular expression is::

src/calibre/devices/kobo/driver.py

@@ -130,9 +130,9 @@ class KOBO(USBMS):
             'expired records and allow you to delete them with '
             'the new delete logic.'),
         _('Show previews') + ':::'+_(
-            'Kobo previews are included on the Touch and some other versions'
+            'Kobo previews are included on the Touch and some other versions.'
-            ' by default they are no longer displayed as there is no good reason to '
+            ' By default, they are no longer displayed as there is no good reason to '
-            'see them.  Enable if you wish to see/delete them.'),
+            'see them. Enable if you wish to see/delete them.'),
         _('Show recommendations') + ':::'+_(
             'Kobo now shows recommendations on the device. In some cases these have '
             'files but in other cases they are just pointers to the web site to buy. '
@@ -142,7 +142,7 @@ class KOBO(USBMS):
             'database version. With this option calibre will attempt '
             'to perform full read-write functionality - Here be Dragons!! '
             'Enable only if you are comfortable with restoring your kobo '
-            'to factory defaults and testing software'),
+            'to Factory defaults and testing software'),
     ]
 
     EXTRA_CUSTOMIZATION_DEFAULT = [
@@ -715,7 +715,7 @@ class KOBO(USBMS):
                     ' check by right clicking the device icon in calibre and'
                     ' selecting "Configure this device" and then the '
                     ' "Attempt to support newer firmware" option.'
-                    ' Doing so may require you to perform a factory reset of'
+                    ' Doing so may require you to perform a Factory reset of'
                     ' your Kobo.') + ((
                     '\nDevice database version: %s.'
                     '\nDevice firmware version: %s') % (self.dbversion, self.fwversion))
@@ -3728,7 +3728,7 @@ class KOBOTOUCH(KOBO):
                     ' check by right clicking the device icon in calibre and'
                     ' selecting "Configure this device" and then the'
                     ' "Attempt to support newer firmware" option.'
-                    ' Doing so may require you to perform a factory reset of'
+                    ' Doing so may require you to perform a Factory reset of'
                     ' your Kobo.'
                     ) +
                     '\n\n' +

src/calibre/devices/kobo/kobotouch_config.py

@@ -438,9 +438,9 @@ class DeviceListGroupBox(DeviceOptionsGroupBox):
 
         self.show_previews_checkbox = create_checkbox(
                              _('Show previews'),
-                             _('Kobo previews are included on the Touch and some other versions'
+                             _('Kobo previews are included on the Touch and some other versions.'
-                               ' by default they are no longer displayed as there is no good reason to '
+                               ' By default, they are no longer displayed as there is no good reason to '
-                               'see them.  Enable if you wish to see/delete them.'),
+                               'see them. Enable if you wish to see/delete them.'),
                              device.get_pref('show_previews')
                              )
 

src/calibre/gui2/dialogs/quickview.py

@@ -264,12 +264,12 @@ class Quickview(QDialog, Ui_Quickview):
         self.close_button.setDefault(False)
         self.close_button_tooltip = _('The Quickview shortcut ({0}) shows/hides the Quickview panel')
         if self.is_pane:
-            self.dock_button.setText(_('Undock'))
+            self.dock_button.setText(_('&Undock'))
             self.dock_button.setToolTip(_('Show the Quickview panel in its own floating window'))
             self.dock_button.setIcon(QIcon(I('arrow-up.png')))
             # Remove the ampersands from the buttons because shortcuts exist.
             self.lock_qv.setText(_('Lock Quickview contents'))
-            self.refresh_button.setText(_('Refresh'))
+            self.refresh_button.setText(_('&Refresh'))
             self.gui.quickview_splitter.add_quickview_dialog(self)
             self.close_button.setVisible(False)
         else:

src/calibre/gui2/preferences/coloring.py

@@ -131,7 +131,7 @@ class ConditionEditor(QWidget):  # {{{
         self.l = l = QGridLayout(self)
         self.setLayout(l)
 
-        texts = _('If the ___ column ___ values')
+        texts = _('If the ___ column ___ value')
         try:
             one, two, three = texts.split('___')
         except:

src/calibre/gui2/preferences/look_feel.ui

@@ -1525,11 +1525,11 @@ when the column in the book list is changed using the cursor arrow keys</string>
          <item row="1" column="0">
           <widget class="QCheckBox" name="opt_qv_retkey_changes_column">
            <property name="toolTip">
-            <string>Pressing 'Enter' in a cell changes both the book and the
+            <string>Pressing Enter in a cell changes both the book and the
 column being examined (the left-hand pane)</string>
            </property>
            <property name="text">
-            <string>&amp;Pressing 'Enter' changes the examined column</string>
+            <string>&amp;Pressing Enter changes the examined column</string>
            </property>
           </widget>
          </item>