From 4936c3de210084c52caa58909e83130738e033b9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 May 2017 11:00:18 +0530
Subject: [PATCH] String changes

---
 manual/conversion.rst                       | 2 +-
 src/calibre/ebooks/conversion/plumber.py    | 2 +-
 src/calibre/gui2/convert/look_and_feel.ui   | 4 ++--
 src/calibre/gui2/dialogs/metadata_bulk.ui   | 2 +-
 src/calibre/gui2/tweak_book/manage_fonts.py | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/manual/conversion.rst b/manual/conversion.rst
index f2933b42ed..f0919a4f9c 100644
--- a/manual/conversion.rst
+++ b/manual/conversion.rst
@@ -345,7 +345,7 @@ remove all non-breaking-space entities, or may include false positive matches re
 
 :guilabel:`Replace entity indents with CSS indents`
     Some documents use a convention of defining text indents using non-breaking space entities.  When this option is enabled calibre will
-    attempt to detect this sort of formatting and convert them to a 3% text indent using css.
+    attempt to detect this sort of formatting and convert them to a 3% text indent using CSS.
 
 .. _search-replace:
 
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index bf8853bc25..c14a96c229 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -380,7 +380,7 @@ OptionRecommendation(name='expand_css',
             recommended_value=False, level=OptionRecommendation.LOW,
             help=_(
                 'By default, calibre will use the shorthand form for various'
-                ' css properties such as margin, padding, border, etc. This'
+                ' CSS properties such as margin, padding, border, etc. This'
                 ' option will cause it to use the full expanded form instead.'
                 ' Note that CSS is always expanded when generating EPUB files'
                 ' with the output profile set to one of the Nook profiles'
diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui
index 5684830475..a598fa8d34 100644
--- a/src/calibre/gui2/convert/look_and_feel.ui
+++ b/src/calibre/gui2/convert/look_and_feel.ui
@@ -265,7 +265,7 @@
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
-       <string>Layout</string>
+       <string>&amp;Layout</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
        <item row="1" column="1">
@@ -370,7 +370,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
-          <string>Extra CSS</string>
+          <string>E&amp;xtra CSS</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="0" column="0">
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index 52f33fd7dd..1125006903 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -1203,7 +1203,7 @@ not multiple and the destination field is multiple</string>
                <item row="8" column="0">
                 <widget class="QLabel" name="label_31">
                  <property name="text">
-                  <string>Your test:</string>
+                  <string>Your &amp;test:</string>
                  </property>
                 </widget>
                </item>
diff --git a/src/calibre/gui2/tweak_book/manage_fonts.py b/src/calibre/gui2/tweak_book/manage_fonts.py
index e7ec2abb40..f43eac865e 100644
--- a/src/calibre/gui2/tweak_book/manage_fonts.py
+++ b/src/calibre/gui2/tweak_book/manage_fonts.py
@@ -40,7 +40,7 @@ def show_font_face_rule_for_font_file(file_data, added_name, parent=None):
     QApplication.clipboard().setText(rule)
     QMessageBox.information(parent, _('Font file added'), _(
         'The font file <b>{}</b> has been added. The text for the CSS @font-face rule for this file has been copied'
-        ' to the clipboard. You should paste it into whichever css file you want to add this font to.').format(added_name))
+        ' to the clipboard. You should paste it into whichever CSS file you want to add this font to.').format(added_name))
 
 
 class EmbeddingData(Dialog):
@@ -345,6 +345,7 @@ class ManageFonts(Dialog):
     def refresh(self):
         self.model.build()
 
+
 if __name__ == '__main__':
     from calibre.gui2 import Application
     app = Application([])