- Updates text strings

- Closes #655

assets/js/src/subscribers/importExport/import.js

@@ -871,7 +871,7 @@ define(
                     '<span class="mailpoet_data_match mailpoet_import_error" title="'
                     + MailPoet.I18n.t('noDateFieldMatch') + '">'
                     + MailPoet.I18n.t('emptyFirstRowDate')
-                    + '</span>';
+                    + '</span> ';
                   preventNextStep = true;
                 }
                 else {
@@ -901,7 +901,7 @@ define(
                       + '<span class="mailpoet_data_match" title="'
                       + MailPoet.I18n.t('verifyDateMatch') + '">'
                       + MailPoet.Date.format(date)
-                      + '</span>'
+                      + '</span> '
                     );
                   }
                   else {
@@ -910,7 +910,7 @@ define(
                       + '<span class="mailpoet_data_match mailpoet_import_error" title="'
                       + MailPoet.I18n.t('noDateFieldMatch') + '">'
                       + (new Handlebars.SafeString(MailPoet.I18n.t('dateMatchError')))
-                      + '</span>'
+                      + '</span> '
                     );
                     preventNextStep = true;
                   };

lib/Config/Menu.php

@@ -59,8 +59,8 @@ class Menu {
 
     $newsletters_page = add_submenu_page(
       $main_page_slug,
-      $this->setPageTitle(__('Newsletters', 'mailpoet')),
+      $this->setPageTitle(__('Emails', 'mailpoet')),
-      __('Newsletters', 'mailpoet'),
+      __('Emails', 'mailpoet'),
       'manage_options',
       $main_page_slug,
       array($this, 'newsletters')

views/newsletter/editor.html

@@ -322,8 +322,8 @@
     'failedToFetchAvailablePosts': __('Failed to fetch available posts'),
     'failedToFetchRenderedPosts': __('Failed to fetch rendered posts'),
     'shortcodesWindowTitle': __('Select a shortcode'),
-    'unsubscribeLinkMissing': __('All newsletters must include an "Unsubscribe" link. Add a footer widget to your newsletter to continue'),
+    'unsubscribeLinkMissing': __('All emails must include an "Unsubscribe" link. Add a footer widget to your email to continue.'),
-    'newsletterPreviewEmailMissing': __('Enter an email address to send the preview newsletter to'),
+    'newsletterPreviewEmailMissing': __('Enter an email address to send the preview newsletter to.'),
     'newsletterPreviewSent': __('Your test email has been sent!'),
     'templateNameMissing': __('Please add a template name'),
     'templateDescriptionMissing': __('Please add a template description'),

views/newsletter/templates/blocks/container/emptyBlock.hbs

@@ -1,2 +1,2 @@
-<div class="mailpoet_container_empty">{{#ifCond emptyContainerMessage '!==' ''}}{{emptyContainerMessage}}{{else}}{{#if isRoot}}<%= __('Drop layout here!') %>{{else}}<%= __('Drop content here!') %>{{/if}}{{/ifCond}}</div>
+<div class="mailpoet_container_empty">{{#ifCond emptyContainerMessage '!==' ''}}{{emptyContainerMessage}}{{else}}{{#if isRoot}}<%= __('Add a column block here.') %>{{else}}<%= __('Add a content block here.') %>{{/if}}{{/ifCond}}</div>
 {{debug}}

views/newsletter/templates/blocks/container/settings.hbs

@@ -1,4 +1,4 @@
-<h3><%= __('Layout') %></h3>
+<h3><%= __('Columns') %></h3>
 <div class="mailpoet_form_field">
     <label>
         <div class="mailpoet_form_field_input_option">

views/newsletter/templates/components/sidebar/layout.hbs

@@ -1,4 +1,4 @@
 <div class="handlediv" title="Click to toggle"><br></div>
-<h3><%= __('Layout') %></h3>
+<h3><%= __('Columns') %></h3>
 <div class="mailpoet_region_content clearfix">
 </div>

views/newsletters.html

@@ -20,9 +20,9 @@
 
 <% block translations %>
   <%= localize({
-    'pageTitle': __('Newsletters'),
+    'pageTitle': __('Emails'),
 
-    'tabStandardTitle': __('Newsletters'),
+    'tabStandardTitle': __('Emails'),
     'tabWelcomeTitle': __('Welcome Emails'),
     'tabNotificationTitle': __('Post Notifications'),
 
@@ -75,7 +75,7 @@
     'trash': __('Trash'),
     'edit': __('Edit'),
     'duplicate': __('Duplicate'),
-    'newsletterDuplicated': __('Newsletter "%$1s" has been duplicated'),
+    'newsletterDuplicated': __('Email "%$1s" has been duplicated.'),
     'notSentYet': __('Not sent yet'),
     'scheduledFor': __('Scheduled for'),
     'scheduleIt': __('Schedule it'),
@@ -97,18 +97,18 @@
     'delete': __('Delete'),
     'select': __('Select'),
     'preview': __('Preview'),
-    'selectTemplateTitle': __('Select a template'),
+    'selectTemplateTitle': __('Select a responsive template'),
 
     'draftNewsletterTitle': __('Subject'),
-    'pickCampaignType': __('Pick a type of campaign'),
+    'pickCampaignType': __('Select type of email'),
     'regularNewsletterTypeTitle': __('Newsletter'),
     'regularNewsletterTypeDescription': __('Send a newsletter with images, buttons, dividers, and social bookmarks. Or, just send a basic text email.'),
     'create': __('Create'),
     'welcomeNewsletterTypeTitle': __('Welcome Email'),
     'welcomeNewsletterTypeDescription': __('Automatically send an email (or series of emails) to new subscribers or WordPress users. Send a day, a week, or a month after they sign up.'),
     'setUp': __('Set up'),
-    'postNotificationNewsletterTypeTitle': __('Post Notifications'),
+    'postNotificationNewsletterTypeTitle': __('Latest Post Notifications'),
-    'postNotificationsNewsletterTypeDescription': __('Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.'),
+    'postNotificationsNewsletterTypeDescription': __('Let MailPoet email your subscribers with your latest content. You can send daily, weekly, monthly, or even immediately after publication.'),
     'selectFrequency': __('Select a frequency'),
     'postNotificationSubjectLineTip': __("Insert [newsletter:total] to show number of posts, [newsletter:post_title] to show the latest post's title & [newsletter:number] to display the issue number."),
     'activate': __('Activate'),
@@ -146,7 +146,7 @@
     'subjectLineTip': __("Be creative! It's the first thing that your subscribers see. Tempt them to open your email."),
     'emptySubjectLineError': __('Please specify a subject'),
     'segments': __('Lists'),
-    'segmentsTip': __('Your email newsletter(s) will be sent to this list.'),
+    'segmentsTip': __('This subscriber segment will be used for this email.'),
     'selectSegmentPlaceholder': __('Select a list'),
     'noSegmentsSelectedError': __('Please select a list'),
     'sender': __('Sender'),
@@ -160,7 +160,7 @@
     'newsletterUpdated': __('Newsletter was updated successfully!'),
     'newsletterAdded': __('Newsletter was added successfully!'),
     'newsletterSendingError': __('An error occurred while trying to send. <a href="%$1s">Please check your settings</a>'),
-    'finalNewsletterStep': __('Final step: last details'),
+    'finalNewsletterStep': __('Final Step: Last Details'),
     'saveDraftAndClose': __('Save as draft and close'),
     'orSimply': __('or simply'),
     'goBackToDesign': __('go back to the Design page'),

views/settings/advanced.html

@@ -25,7 +25,7 @@
     <tr>
       <th scope="row">
         <label>
-          <%= __('Newsletter task scheduler') %>
+          <%= __('Newsletter task scheduler (cron)') %>
         </label>
         <p class="description">
           <%= __('Select what will activate your newsletter queue.') %>

views/settings/basics.html

@@ -148,7 +148,7 @@
           <%= __('Subscribe in registration form') %>
         </label>
         <p class="description">
-          <%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list') %>
+          <%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list)') %>
         </p>
       </th>
       <td>
@@ -203,7 +203,7 @@
           </div>
         <% else %>
           <p>
-            <em><%= __('Registration is disabled on this site') %></em>
+            <em><%= __('Registration is disabled on this site.') %></em>
           </p>
         <% endif %>
       </td>
@@ -270,9 +270,9 @@
           <%= __('Unsubscribe page') %>
         </label>
         <p class="description">
-          <%= __('When your subscribers click the "Unsubscribe" link, they will be directed to this page') %>
+          <%= __('When your subscribers click the "Unsubscribe" link, they will be directed to this page.') %>
           <br />
-          <%= __('Use this shortcode on your website\'s WordPress pages: [mailpoet_manage text="Manage your subscription"]') %>
+          <%= __('If you want to use a custom Unsubscribe page, simply paste this shortcode on to a WordPress page: [mailpoet_manage_text="Manage your subscription"]') %>
         </p>
       </th>
       <td>
@@ -340,7 +340,7 @@
     <tr>
       <th scope="row">
         <label>
-          <%= __('Shortcode to Display Total Number of Subscribers') %>
+          <%= __('Shortcode to display total number of subscribers') %>
         </label>
         <p class="description">
           <%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers') %>

views/settings/signup.html

@@ -194,7 +194,7 @@
         if(~~($(this).val()) === 1) {
           result = confirm("<%= __('Subscribers will need to activate their subscription via email in order to receive your newsletters. This is highly recommended!') %>");
         } else {
-          result = confirm("<%= __('Unconfirmed subscribers will receive your newsletters from without needing to activate their subscriptions. This is not recommended!') %>");
+          result = confirm("<%= __('New subscribers will be automatically confirmed, without having to confirm their subscription. This is not recommended!') %>");
         }
         // if the user confirmed changing the signup confirmation (yes/no)
         if(result === true) {

views/subscribers/importExport/import.html

@@ -52,7 +52,7 @@
 'userColumns': __('User fields'),
 'selectedValueAlreadyMatched': __('The selected value is already matched to another field'),
 'confirmCorrespondingColumn': __('Confirm that this field corresponds to the selected field'),
-'columnContainInvalidElement': __('One of the fields contains an invalid email. Please fix it before continuing'),
+'columnContainInvalidElement': __('One of the fields contains an invalid email. Please fix it before continuing.'),
 'january': __('January'),
 'february': __('February'),
 'march': __('March'),
@@ -65,15 +65,15 @@
 'october': __('October'),
 'november': __('November'),
 'december': __('December'),
-'noDateFieldMatch': __("Do not match as a 'date field' if most of the rows for that field return the same error"),
+'noDateFieldMatch': __("Do not match as a 'date field' if most of the rows for that field return the same error."),
-'emptyFirstRowDate': __('First row date cannot be empty'),
+'emptyFirstRowDate': __('First row date cannot be empty.'),
 'verifyDateMatch': __('Verify that the date in blue matches the original date'),
 'pm': __('PM'),
 'am': __('AM'),
 'dateMatchError': __('Error matching date'),
-'columnContainsInvalidDate': __('One of the fields contains an invalid date. Please fix it before continuing'),
+'columnContainsInvalidDate': __('One of the fields contains an invalid date. Please fix before continuing.'),
 'listCreateError': __('Error adding a new list:'),
-'columnContainsInvalidElement': __('One of the fields contains an invalid email. Please fix before continuing'),
+'columnContainsInvalidElement': __('One of the fields contains an invalid email. Please fix before continuing.'),
 'customFieldCreateError': __('Custom field could not be created'),
 'subscribersCreated': __('%1$s subscribers added to %2$s.'),
 'subscribersUpdated': __('%1$s existing subscribers were updated and added to %2$s')

views/subscribers/subscribers.html

@@ -17,7 +17,7 @@
     'pageTitle': __('Subscribers'),
     'searchLabel': __('Search'),
     'loadingItems': __('Loading subscribers...'),
-    'noItemsFound': __('No subscribers were found'),
+    'noItemsFound': __('No subscribers were found.'),
     'selectAllLabel': __('All subscribers on this page are selected.'),
     'selectedAllLabel': __('All %d subscribers are selected'),
     'selectAllLink': __('Select all subscribers on all pages.'),

views/update.html

@@ -17,8 +17,8 @@
   <div style="position: absolute; top: .2em; right: 0;"><img src="<%= image_url('welcome_template/mailpoet-logo.png') %>" alt="MailPoet Logo" /></div>
 
   <h2 class="nav-tab-wrapper wp-clearfix">
-    <a href="admin.php?page=mailpoet-welcome" class="nav-tab"><%= __('What’s New') %></a>
+    <a href="admin.php?page=mailpoet-welcome" class="nav-tab"><%= __('Welcome') %></a>
-    <a href="admin.php?page=mailpoet-update" class="nav-tab nav-tab-active"><%= __('Changelog') %></a>
+    <a href="admin.php?page=mailpoet-update" class="nav-tab nav-tab-active"><%= __("What's New") %></a>
   </h2>
 
   <div id="mailpoet-changelog" clas="feature-section one-col">

views/welcome.html

@@ -26,8 +26,8 @@
   <div style="position: absolute; top: .2em; right: 0;"><img src="<%= image_url('welcome_template/mailpoet-logo.png') %>" alt="<%= __('MailPoet Logo') %>" /></div>
 
   <h2 class="nav-tab-wrapper wp-clearfix">
-    <a href="admin.php?page=mailpoet-welcome" class="nav-tab nav-tab-active"><%= __('What’s New') %></a>
+    <a href="admin.php?page=mailpoet-welcome" class="nav-tab nav-tab-active"><%= __('Welcome') %></a>
-    <a href="admin.php?page=mailpoet-update" class="nav-tab"><%= __('Changelog') %></a>
+    <a href="admin.php?page=mailpoet-update" class="nav-tab"><%= __("What's new") %></a>
   </h2>
 
   <div class="headline-feature feature-video">