From 5391aeda8c3b049dd7527bcf0b89c262ae124d53 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 25 Sep 2017 21:00:53 +0530
Subject: [PATCH] String changes

---
 resources/default_tweaks.py               | 2 +-
 src/calibre/gui2/dialogs/metadata_bulk.ui | 2 +-
 src/calibre/gui2/wizard/send_email.py     | 4 ++--
 src/calibre/gui2/wizard/send_email.ui     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index 21b397e80f..7469c7f8e1 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -555,7 +555,7 @@ content_server_thumbnail_compression_quality = 75
 cover_drop_exclude = ()
 
 #: Show the Saved searches box in the Search bar
-# In newer version of calibre, only a button that allows you to add a new Saved
+# In newer versions of calibre, only a button that allows you to add a new Saved
 # search is shown in the Search bar. If you would like to have the old
 # Saved searches box with its two buttons back, set this tweak to True.
 show_saved_search_box = False
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index 862fe755af..615c98e5c1 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -637,7 +637,7 @@ title and author are swapped before the title case is set</string>
               <item>
                <widget class="QRadioButton" name="cover_from_fmt">
                 <property name="text">
-                 <string>Set from &amp;e-book file(s)</string>
+                 <string>Set from &amp;e-book files</string>
                 </property>
                </widget>
               </item>
diff --git a/src/calibre/gui2/wizard/send_email.py b/src/calibre/gui2/wizard/send_email.py
index 6dcc3d3cb7..e6331f6970 100644
--- a/src/calibre/gui2/wizard/send_email.py
+++ b/src/calibre/gui2/wizard/send_email.py
@@ -60,7 +60,7 @@ class TestEmail(QDialog):
             return error_dialog(self, _('No email address'), _(
                 'No email address to send mail to has been specified. You'
                 ' must specify a To: address before running the test.'), show=True)
-        self.log.setPlainText(_('Sending mail, please wait...'))
+        self.log.setPlainText(_('Sending email, please wait...'))
         self.test_button.setEnabled(False)
         t = Thread(target=self.run_test, name='TestEmailSending')
         t.daemon = True
@@ -68,7 +68,7 @@ class TestEmail(QDialog):
 
     def run_test(self):
         try:
-            tb = self.test_func(unicode(self.to.text())) or _('Mail successfully sent')
+            tb = self.test_func(unicode(self.to.text())) or _('Email successfully sent')
         except Exception:
             import traceback
             tb = traceback.format_exc()
diff --git a/src/calibre/gui2/wizard/send_email.ui b/src/calibre/gui2/wizard/send_email.ui
index 696fc226d0..0e89e94ac3 100644
--- a/src/calibre/gui2/wizard/send_email.ui
+++ b/src/calibre/gui2/wizard/send_email.ui
@@ -41,7 +41,7 @@
       <string>&lt;p&gt;A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
      </property>
      <property name="title">
-      <string>Mail server</string>
+      <string>Email server</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="0" colspan="4">