diff --git a/assets/js/src/subscribers/importExport/import.js b/assets/js/src/subscribers/importExport/import.js index 279e64d17d..660d594678 100644 --- a/assets/js/src/subscribers/importExport/import.js +++ b/assets/js/src/subscribers/importExport/import.js @@ -871,7 +871,7 @@ define( '' + MailPoet.I18n.t('emptyFirstRowDate') - + ''; + + ' '; preventNextStep = true; } else { @@ -901,7 +901,7 @@ define( + '' + MailPoet.Date.format(date) - + '' + + ' ' ); } else { @@ -910,7 +910,7 @@ define( + '' + (new Handlebars.SafeString(MailPoet.I18n.t('dateMatchError'))) - + '' + + ' ' ); preventNextStep = true; }; diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 7ba53a9a7e..eabb84ca4a 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -59,8 +59,8 @@ class Menu { $newsletters_page = add_submenu_page( $main_page_slug, - $this->setPageTitle(__('Newsletters', 'mailpoet')), - __('Newsletters', 'mailpoet'), + $this->setPageTitle(__('Emails', 'mailpoet')), + __('Emails', 'mailpoet'), 'manage_options', $main_page_slug, array($this, 'newsletters') diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index 02cd34e80c..6e00486d94 100644 --- a/views/newsletter/editor.html +++ b/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'), - 'newsletterPreviewEmailMissing': __('Enter an email address to send the preview newsletter to'), + '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.'), 'newsletterPreviewSent': __('Your test email has been sent!'), 'templateNameMissing': __('Please add a template name'), 'templateDescriptionMissing': __('Please add a template description'), diff --git a/views/newsletter/templates/blocks/container/emptyBlock.hbs b/views/newsletter/templates/blocks/container/emptyBlock.hbs index a3fdaaa407..b4f91cf56a 100644 --- a/views/newsletter/templates/blocks/container/emptyBlock.hbs +++ b/views/newsletter/templates/blocks/container/emptyBlock.hbs @@ -1,2 +1,2 @@ -
{{#ifCond emptyContainerMessage '!==' ''}}{{emptyContainerMessage}}{{else}}{{#if isRoot}}<%= __('Drop layout here!') %>{{else}}<%= __('Drop content here!') %>{{/if}}{{/ifCond}}
+
{{#ifCond emptyContainerMessage '!==' ''}}{{emptyContainerMessage}}{{else}}{{#if isRoot}}<%= __('Add a column block here.') %>{{else}}<%= __('Add a content block here.') %>{{/if}}{{/ifCond}}
{{debug}} diff --git a/views/newsletter/templates/blocks/container/settings.hbs b/views/newsletter/templates/blocks/container/settings.hbs index 7f851afcbe..fd510b0b4d 100644 --- a/views/newsletter/templates/blocks/container/settings.hbs +++ b/views/newsletter/templates/blocks/container/settings.hbs @@ -1,4 +1,4 @@ -

<%= __('Layout') %>

+

<%= __('Columns') %>

- <%= __('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.') %>
- <%= __('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"]') %>

@@ -340,7 +340,7 @@

<%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers') %> diff --git a/views/settings/signup.html b/views/settings/signup.html index 506a9a3126..8c977b646a 100644 --- a/views/settings/signup.html +++ b/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) { diff --git a/views/subscribers/importExport/import.html b/views/subscribers/importExport/import.html index e06b6eb361..f828b90452 100644 --- a/views/subscribers/importExport/import.html +++ b/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"), -'emptyFirstRowDate': __('First row date cannot be empty'), +'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.'), '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') diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html index 80e037b7fb..9f570a5202 100644 --- a/views/subscribers/subscribers.html +++ b/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.'), diff --git a/views/update.html b/views/update.html index 224e08707c..4a4427e31b 100644 --- a/views/update.html +++ b/views/update.html @@ -17,8 +17,8 @@

MailPoet Logo
diff --git a/views/welcome.html b/views/welcome.html index 8b2cfcefb3..594c7d65e6 100644 --- a/views/welcome.html +++ b/views/welcome.html @@ -26,8 +26,8 @@
<%= __('MailPoet Logo') %>