Rewritten some translation strings

lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php

@@ -116,7 +116,7 @@ class NewsletterBlank121Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p>It's time to design your newsletter! On the right sidebar, you'll find four menu items that will help you customize your newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p>It's time to design your newsletter! In the right sidebar, you'll find four menu items that will help you customize your newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",

lib/Config/PopulatorData/Templates/NewsletterBlank13Column.php

@@ -116,7 +116,7 @@ class NewsletterBlank13Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started! </strong></h1>\n<p></p>\n<p>It's time to design your newsletter! On the right sidebar, you'll find four menu items that will help you customize your newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started! </strong></h1>\n<p></p>\n<p>It's time to design your newsletter! In the right sidebar, you'll find four menu items that will help you customize your newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",

lib/Config/PopulatorData/Templates/PostNotificationsBlank1Column.php

@@ -116,7 +116,7 @@ class PostNotificationsBlank1Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Check Out Our New Blog Posts! </strong></h1>\n<p></p>\n<p>MailPoet can <span style=\"line-height: 1.6em; background-color: inherit;\"><em>automatically</em> </span><span style=\"line-height: 1.6em; background-color: inherit;\">send your new blog posts to your subscribers.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">Below, you'll find three recent posts, which are displayed automatically, thanks to the <em>Automatic Latest Content</em> widget, which can be found on the right sidebar, under <em>Content</em>.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">To edit the settings and styles of your post, simply click on a post below.</span></p>", 'mailpoet')
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Check Out Our New Blog Posts! </strong></h1>\n<p></p>\n<p>MailPoet can <span style=\"line-height: 1.6em; background-color: inherit;\"><em>automatically</em> </span><span style=\"line-height: 1.6em; background-color: inherit;\">send your new blog posts to your subscribers.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">Below, you'll find three recent posts, which are displayed automatically, thanks to the <em>Automatic Latest Content</em> widget, which can be found in the right sidebar, under <em>Content</em>.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">To edit the settings and styles of your post, simply click on a post below.</span></p>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",

lib/Config/PopulatorData/Templates/StoreDiscount.php

@@ -70,7 +70,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p></p>\n<p>Hi [subscriber:firstname | default:reader]</p>\n<p class=\"\"></p>\n<p>Fancy 15% off your next order? Use this coupon on all your favourite products from our store until Wednesday. Just enter the code on the payments page and your discount will applied.</p>", 'mailpoet')
+              "text" => __("<p></p>\n<p>Hi [subscriber:firstname | default:reader]</p>\n<p class=\"\"></p>\n<p>Fancy 15% off your next order? Use this coupon on any product in our store. Expires Wednesday! To apply the discount, enter the code on the payments page.</p>", 'mailpoet')
             ), array(
               "type" => "spacer",
               "styles" => array(
@@ -110,7 +110,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h1 style=\"text-align: center;\"><em><strong>Get 15% discount off your next order</strong></em></h1>", 'mailpoet')
+              "text" => __("<h1 style=\"text-align: center;\"><em><strong>Get a 15% off your next order</strong></em></h1>", 'mailpoet')
             ), array(
               "type" => "text",
               "text" => __("<h2 style=\"text-align: center;\"><strong>USE CODE: WELOVEMAILPOET</strong></h2>", 'mailpoet')
@@ -204,7 +204,7 @@ class StoreDiscount {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/red-icycle.jpg",
-              "alt" => __("red-icycle", 'mailpoet'),
+              "alt" => __("red-bicycle", 'mailpoet'),
               "fullWidth" => false,
               "width" => "558px",
               "height" => "399px",

lib/Config/PopulatorData/Templates/TravelEmail.php

@@ -70,7 +70,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h1 style=\"text-align: center;\">Hi [subscriber:firstname | default:reader]!</h1>\n<p></p>\n<p>Greetings from New Zealand, we're here enjoying the sights and sounds (and bad smells!) of Rotarua. Yesterday we took advantage of the local amenities and visited the hot springs! </p>\n<p>Don't forget to stay up-to-date via twitter!</p>", 'mailpoet')
+              "text" => __("<h1 style=\"text-align: center;\">Hi [subscriber:firstname | default:reader]!</h1>\n<p></p>\n<p>Greetings from New Zealand! We're here enjoying the sights, sounds, and smells of Rotarua! Yesterday, we visited the local hot springs, and today, we're going swimming.</p>\n<p>Don't forget to stay updated with Twitter!</p>", 'mailpoet')
             ), array(
               "type" => "social",
               "iconSet" => "circles",
@@ -324,7 +324,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/glow-worms.jpg",
-              "alt" => __("Glow worms, Waitomo Caves", 'mailpoet'),
+              "alt" => __("Glowworms, Waitomo Caves", 'mailpoet'),
               "fullWidth" => true,
               "width" => "640px",
               "height" => "428px",
@@ -335,7 +335,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p><em><a href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><strong>Waitomo Glow Worm Caves</strong></a></em></p>", 'mailpoet')
+              "text" => __("<p><em><a href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><strong>Waitomo GlowWorm Caves</strong></a></em></p>", 'mailpoet')
             ))
           ), array(
             "type" => "container",

lib/Config/RequirementsChecker.php

@@ -81,7 +81,7 @@ class RequirementsChecker {
   function checkPDOExtension() {
     if(extension_loaded('pdo') && extension_loaded('pdo_mysql')) return true;
     $error = Helpers::replaceLinkTags(
-      __('This plugin requires PDO_MYSQL PHP extension. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet'),
+      __('This plugin requires the PDO_MYSQL PHP extension. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet'),
       '//beta.docs.mailpoet.com/article/152-minimum-requirements-for-mailpoet-3#php_extension'
     );
     return $this->processError($error);
@@ -137,4 +137,4 @@ class RequirementsChecker {
     }
     return false;
   }
-}
+}

lib/Subscribers/ImportExport/Export/Export.php

@@ -47,7 +47,7 @@ class Export {
   function process() {
     try {
       if(is_writable($this->export_path) === false) {
-        throw new \Exception(__("Couldn't save export file on the server", 'mailpoet'));
+        throw new \Exception(__("The export file could not be saved on the server.", 'mailpoet'));
       }
       if(!extension_loaded('zip')) {
         throw new \Exception(__('Export requires a ZIP extension to be installed on the host.', 'mailpoet'));

views/index.html

@@ -2,7 +2,7 @@
 
 <% block content %>
   <h1><%= 'Welcome!' %></h1>
-  <p><%= __(' %sSetup%s MailPoet and start sending.')
+  <p><%= __(' %sSet up%s MailPoet and start sending.')
     | format('<a href="%s">', '</a>')
     | format(admin_url('admin.php?page=mailpoet-settings'))
     | raw

views/settings/mta.html

@@ -599,7 +599,7 @@
             <%= __('SPF Signature (Highly recommended!)') %>
           </label>
           <p class="description">
-            <%= __("Improves your delivery rate by verifying that you're allowed to send emails from your domain.") %>
+            <%= __("This improves your delivery rate by verifying that you're allowed to send emails from your domain.") %>
           </p>
         </th>
         <td>

views/subscribers/subscribers.html

@@ -79,7 +79,7 @@
     'multipleConfirmationEmailsSent': __('%$1d confirmation emails have been sent.'),
     'listsToWhichSubscriberWasSubscribed': __('Lists to which the subscriber was subscribed.'),
     'WPUsersSegment': __('WordPress Users'),
-    'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his profile[/link] to change his/her email.'),
+    'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his/her profile[/link] to change his/her email.'),
     'tip': __('Tip:'),
     'customFieldsTip': __('Need to add new fields, like a telephone number or street address? You can add custom fields by editing the subscription form on the Forms page.'),
     'year': __('Year'),