From 49b65729db8bf0e968343c88a499dc55d5aa0f26 Mon Sep 17 00:00:00 2001 From: Kiefer Conrad Date: Thu, 14 Jul 2016 20:58:12 +0200 Subject: [PATCH] update 14 July 2016 --- .../Templates/FranksRoastHouseTemplate.php | 2 +- .../PostNotificationsBlankTemplate.php | 6 +- .../Templates/WelcomeTemplate.php | 4 +- .../Workers/SendingQueue/Tasks/Mailer.php | 4 +- lib/Form/Block/Base.php | 2 +- lib/Form/Widget.php | 2 +- lib/Mailer/Mailer.php | 6 +- lib/Models/CustomField.php | 4 +- lib/Models/Form.php | 2 +- lib/Models/Newsletter.php | 2 +- lib/Models/NewsletterOptionField.php | 4 +- lib/Models/NewsletterTemplate.php | 4 +- lib/Models/Segment.php | 4 +- lib/Models/Setting.php | 2 +- lib/Models/Subscriber.php | 4 +- lib/Router/Newsletters.php | 4 +- lib/Router/SendingQueue.php | 12 ++-- lib/Router/Subscribers.php | 2 +- .../ImportExport/Export/Export.php | 4 +- .../ImportExport/Import/MailChimp.php | 6 +- lib/Subscription/Comment.php | 2 +- lib/Subscription/Pages.php | 8 +-- views/form/editor.html | 6 +- views/form/templates/blocks/segment.hbs | 2 +- .../templates/settings/segment_selection.hbs | 2 +- views/forms.html | 26 ++++----- views/newsletter/editor.html | 12 ++-- .../templates/components/heading.hbs | 2 +- views/newsletters.html | 56 +++++++++---------- views/segments.html | 30 +++++----- views/settings.html | 6 +- views/settings/advanced.html | 10 ++-- views/settings/basics.html | 24 ++++---- views/settings/bounce.html | 2 +- views/settings/mta.html | 28 +++++----- views/settings/signup.html | 6 +- .../settings/templates/sending_frequency.hbs | 4 +- views/subscribers/importExport/export.html | 2 +- views/subscribers/importExport/import.html | 34 +++++------ .../importExport/import/step1.html | 2 +- .../importExport/import/step2.html | 10 ++-- .../importExport/import/step3.html | 4 +- views/subscribers/subscribers.html | 36 ++++++------ views/welcome.html | 4 +- 44 files changed, 199 insertions(+), 199 deletions(-) diff --git a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php index ae3b001afa..7e994e3359 100644 --- a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php +++ b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php @@ -254,7 +254,7 @@ class FranksRoastHouseTemplate { ), array( "type" => "text", - "text" => __("

New and Improved Hours!

\n

\n

Frank's is now open even later, so you can get your caffeine fix all day long! Here's our new opening hours:

\n

\n") + "text" => __("

New and Improved Hours!

\n

\n

Frank's is now open even later, so you can get your caffeine fix all day (and night) long! Here's our new opening hours:

\n

\n") ) ) ) diff --git a/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php b/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php index 6392519c9e..bb36d9793b 100644 --- a/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php +++ b/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php @@ -13,8 +13,8 @@ class PostNotificationsBlankTemplate { function get() { return array( - 'name' => __("Post Notifications Blank Template"), - 'description' => __("A simple and plain post notifications template for you to create your own email from."), + 'name' => __("Blank Post Notifications Template"), + 'description' => __("A simple post notifications template. Customize it and make it your own!"), 'readonly' => 0, 'thumbnail' => $this->getThumbnail(), 'body' => json_encode($this->getBody()), @@ -72,7 +72,7 @@ class PostNotificationsBlankTemplate { "blocks" => array( array( "type" => "text", - "text" => __("

Your posts below are generated using our Automated Latest Content widget in the right sidebar.

") + "text" => __("

Your posts below are generated using our Automated Latest Content widget on the right sidebar.

") ) ) ), diff --git a/lib/Config/PopulatorData/Templates/WelcomeTemplate.php b/lib/Config/PopulatorData/Templates/WelcomeTemplate.php index e42f704511..ce048c434b 100644 --- a/lib/Config/PopulatorData/Templates/WelcomeTemplate.php +++ b/lib/Config/PopulatorData/Templates/WelcomeTemplate.php @@ -14,7 +14,7 @@ class WelcomeTemplate { function get() { return array( 'name' => __("Welcome Email Example"), - 'description' => __("A really simple welcome email idea to help you say hello your new subscribers."), + 'description' => __("A simple welcome email idea to help welcome your new subscribers."), 'readonly' => 0, 'thumbnail' => $this->getThumbnail(), 'body' => json_encode($this->getBody()), @@ -101,7 +101,7 @@ class WelcomeTemplate { "blocks" => array( array( "type" => "text", - "text" => __("

What's in a Welcome Email? 

\n

How about thanking the person and telling them what they can expect from signing up as a subscriber, for example, how frequently they might receive newsletters from you and what type of content. If you also write a blog, why not share a few of your most recent posts using Automated Latest Content?

\n

Get help with your welcome email in our blog post: http://www.mailpoet.com/improve-your-signup-welcome-email/

\n

") + "text" => __("

What's should you put in a Welcome Email? 

\n

We recommend thanking the person (for subscribing!) and telling them what they can expect in the future.   For example, how the type of content you'll be sending (and how often you'll be sending it.) If you have a blog, why not share a few of your recent posts using the Automated Latest Content widget?

\n

Get some more tips on your Welcome Email in our blog post: http://www.mailpoet.com/improve-your-signup-welcome-email/

\n

") ) ) ) diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Mailer.php b/lib/Cron/Workers/SendingQueue/Tasks/Mailer.php index 6c81b1aff0..9563ff9361 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Mailer.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Mailer.php @@ -43,7 +43,7 @@ class Mailer { function getMailerConfig() { $mta_config = Setting::getValue('mta'); if(!$mta_config) { - throw new \Exception(__('Mailer is not configured.')); + throw new \Exception(__('Mailer is not configured')); } return $mta_config; } @@ -90,7 +90,7 @@ class Mailer { if($this->mta_log['sent'] === $frequency_limit && $elapsed_time <= $frequency_interval ) { - throw new \Exception(__('Sending frequency limit has been reached.')); + throw new \Exception(__('Sending frequency limit has been reached')); } if($elapsed_time > $frequency_interval) { $this->mta_log = array( diff --git a/lib/Form/Block/Base.php b/lib/Form/Block/Base.php index 7adf3e1a2e..6f2399fd49 100644 --- a/lib/Form/Block/Base.php +++ b/lib/Form/Block/Base.php @@ -34,7 +34,7 @@ abstract class Base { if(in_array($block['type'], array('radio', 'checkbox'))) { $rules['group'] = 'custom_field_'.$block['id']; $rules['errors-container'] = '.mailpoet_error_'.$block['id']; - $rules['required-message'] = __('Please select at least one option.'); + $rules['required-message'] = __('Please select at least one option'); } $validation = array(); diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php index 7ea2be7a4a..ca06a58cd3 100644 --- a/lib/Form/Widget.php +++ b/lib/Form/Widget.php @@ -17,7 +17,7 @@ class Widget extends \WP_Widget { 'mailpoet_form', __('MailPoet Form'), array( - 'description' => __('Add a newsletter subscription form.') + 'description' => __('Add a newsletter subscription form') ) ); } diff --git a/lib/Mailer/Mailer.php b/lib/Mailer/Mailer.php index 627ec3ba97..cf1a9797c7 100644 --- a/lib/Mailer/Mailer.php +++ b/lib/Mailer/Mailer.php @@ -84,7 +84,7 @@ class Mailer { ); break; default: - throw new \Exception(__('Mailing method does not exist.')); + throw new \Exception(__('Mailing method does not exist')); } return $mailer_instance; } @@ -92,7 +92,7 @@ class Mailer { function getMailer($mailer = false) { if(!$mailer) { $mailer = Setting::getValue('mta'); - if(!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured.')); + if(!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured')); } $mailer['class'] = 'MailPoet\\Mailer\\Methods\\' . $mailer['method']; return $mailer; @@ -101,7 +101,7 @@ class Mailer { function getSender($sender = false) { if(empty($sender)) { $sender = Setting::getValue('sender', array()); - if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured.')); + if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured')); } return array( 'from_name' => $sender['name'], diff --git a/lib/Models/CustomField.php b/lib/Models/CustomField.php index 3601a5066e..e8baf7292e 100644 --- a/lib/Models/CustomField.php +++ b/lib/Models/CustomField.php @@ -9,10 +9,10 @@ class CustomField extends Model { function __construct() { parent::__construct(); $this->addValidations('name', array( - 'required' => __('Please specify a name.') + 'required' => __('Please specify a name') )); $this->addValidations('type', array( - 'required' => __('Please specify a type.') + 'required' => __('Please specify a type') )); } diff --git a/lib/Models/Form.php b/lib/Models/Form.php index 2b14203d2b..64f0b5ad99 100644 --- a/lib/Models/Form.php +++ b/lib/Models/Form.php @@ -10,7 +10,7 @@ class Form extends Model { parent::__construct(); $this->addValidations('name', array( - 'required' => __('Please specify a name.') + 'required' => __('Please specify a name') )); } diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php index 8ffa745a43..84c058609b 100644 --- a/lib/Models/Newsletter.php +++ b/lib/Models/Newsletter.php @@ -24,7 +24,7 @@ class Newsletter extends Model { parent::__construct(); $this->addValidations('type', array( - 'required' => __('Please specify a type.') + 'required' => __('Please specify a type') )); } diff --git a/lib/Models/NewsletterOptionField.php b/lib/Models/NewsletterOptionField.php index 4540f7eb04..b73b7894cd 100644 --- a/lib/Models/NewsletterOptionField.php +++ b/lib/Models/NewsletterOptionField.php @@ -9,10 +9,10 @@ class NewsletterOptionField extends Model { function __construct() { parent::__construct(); $this->addValidations('name', array( - 'required' => __('Please specify a name.') + 'required' => __('Please specify a name') )); $this->addValidations('newsletter_type', array( - 'required' => __('Please specify a newsletter type.') + 'required' => __('Please specify a newsletter type') )); } diff --git a/lib/Models/NewsletterTemplate.php b/lib/Models/NewsletterTemplate.php index bb7730c6ef..ecaac6fda2 100644 --- a/lib/Models/NewsletterTemplate.php +++ b/lib/Models/NewsletterTemplate.php @@ -10,10 +10,10 @@ class NewsletterTemplate extends Model { parent::__construct(); $this->addValidations('name', array( - 'required' => __('Please specify a name.') + 'required' => __('Please specify a name') )); $this->addValidations('body', array( - 'required' => __('The template body cannot be empty.') + 'required' => __('The template body cannot be empty') )); } diff --git a/lib/Models/Segment.php b/lib/Models/Segment.php index b6cf5c820c..68253a7d0d 100644 --- a/lib/Models/Segment.php +++ b/lib/Models/Segment.php @@ -10,7 +10,7 @@ class Segment extends Model { parent::__construct(); $this->addValidations('name', array( - 'required' => __('Please specify a name.') + 'required' => __('Please specify a name') )); } @@ -102,7 +102,7 @@ class Segment extends Model { $wp_segment->hydrate(array( 'name' => __('WordPress Users'), 'description' => - __('This lists containts all of your WordPress users.'), + __('This lists containts all of your WordPress users'), 'type' => 'wp_users' )); $wp_segment->save(); diff --git a/lib/Models/Setting.php b/lib/Models/Setting.php index ba48ab6bff..9d0a94398d 100644 --- a/lib/Models/Setting.php +++ b/lib/Models/Setting.php @@ -17,7 +17,7 @@ class Setting extends Model { parent::__construct(); $this->addValidations('name', array( - 'required' => __('Please specify a name.') + 'required' => __('Please specify a name') )); } diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index b082c02414..a16512da9d 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -18,8 +18,8 @@ class Subscriber extends Model { parent::__construct(); $this->addValidations('email', array( - 'required' => __('Please enter your email address.'), - 'isEmail' => __('Your email address is invalid.') + 'required' => __('Please enter your email address'), + 'isEmail' => __('Your email address is invalid!') )); } diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php index 6bf6fd86df..77c4dabb78 100644 --- a/lib/Router/Newsletters.php +++ b/lib/Router/Newsletters.php @@ -165,7 +165,7 @@ class Newsletters { if(!isset($data['body'])) { return array( 'result' => false, - 'errors' => array(__('Newsletter data is missing.')) + 'errors' => array(__('Newsletter data is missing')) ); } $newsletter_id = (isset($data['id'])) ? (int)$data['id'] : null; @@ -173,7 +173,7 @@ class Newsletters { if(!$newsletter) { return array( 'result' => false, - 'errors' => array(__('Newsletter could not be read.')) + 'errors' => array(__('Newsletter could not be read')) ); } $newsletter->body = $data['body']; diff --git a/lib/Router/SendingQueue.php b/lib/Router/SendingQueue.php index 516ba329ce..508eab0177 100644 --- a/lib/Router/SendingQueue.php +++ b/lib/Router/SendingQueue.php @@ -33,7 +33,7 @@ class SendingQueue { if($newsletter === false) { return array( 'result' => false, - 'errors' => array(__('This newsletter does not exist.')) + 'errors' => array(__('This newsletter does not exist')) ); } @@ -51,7 +51,7 @@ class SendingQueue { return array( 'result' => true, 'data' => array( - 'message' => __('Your welcome email has been activated.') + 'message' => __('Your welcome email has been activated') ) ); } @@ -71,7 +71,7 @@ class SendingQueue { if(!empty($queue)) { return array( 'result' => false, - 'errors' => array(__('This newsletter is already being sent.')) + 'errors' => array(__('This newsletter is already being sent')) ); } @@ -90,7 +90,7 @@ class SendingQueue { return array( 'result' => true, 'data' => array( - 'message' => __('Your post notification has been activated.') + 'message' => __('Your post notification has been activated') ) ); } @@ -107,7 +107,7 @@ class SendingQueue { $queue->subscribers = null; $queue->count_total = $queue->count_to_process = 0; - $message = __('The newsletter has been scheduled.'); + $message = __('The newsletter has been scheduled'); } else { $segments = $newsletter->segments()->findArray(); $segment_ids = array_map(function($segment) { @@ -120,7 +120,7 @@ class SendingQueue { if(!count($subscribers)) { return array( 'result' => false, - 'errors' => array(__('There are no subscribers.')) + 'errors' => array(__('There are no subscribers')) ); } $queue->status = null; diff --git a/lib/Router/Subscribers.php b/lib/Router/Subscribers.php index 5c33dc0551..cf41cf8c96 100644 --- a/lib/Router/Subscribers.php +++ b/lib/Router/Subscribers.php @@ -69,7 +69,7 @@ class Subscribers { $form = Form::findOne($data['form_id']); unset($data['form_id']); if($form === false || !$form->id()) { - $errors[] = __('This form does not exist.'); + $errors[] = __('This form does not exist'); } $segment_ids = (!empty($data['segments']) diff --git a/lib/Subscribers/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php index 9979aff052..95c389d518 100644 --- a/lib/Subscribers/ImportExport/Export/Export.php +++ b/lib/Subscribers/ImportExport/Export/Export.php @@ -46,10 +46,10 @@ class Export { function process() { try { if(is_writable($this->export_path) === false) { - throw new \Exception(__("Couldn't save export file on the server.")); + throw new \Exception(__("Couldn't save export file on the server")); } if(!extension_loaded('zip')) { - throw new \Exception(__('Export requires a ZIP extension to be installed on the host.')); + throw new \Exception(__('Export requires a ZIP extension to be installed on the host')); } $processed_subscribers = call_user_func( array( diff --git a/lib/Subscribers/ImportExport/Import/MailChimp.php b/lib/Subscribers/ImportExport/Import/MailChimp.php index a1dc6a815c..bae4d9877c 100644 --- a/lib/Subscribers/ImportExport/Import/MailChimp.php +++ b/lib/Subscribers/ImportExport/Import/MailChimp.php @@ -135,13 +135,13 @@ class MailChimp { $errorMessage = __('Invalid API Key.'); break; case 'connection': - $errorMessage = __('Could not connect to your MailChimp account.'); + $errorMessage = __('Could not connect to your MailChimp account'); break; case 'headers': - $errorMessage = __('The selected lists do not have matching columns (headers).'); + $errorMessage = __('The selected lists do not have matching columns (headers)'); break; case 'size': - $errorMessage = __('The information received from MailChimp is too large for processing. Please limit the number of lists.'); + $errorMessage = __('The information received from MailChimp is too large for processing. Please limit the number of lists!'); break; case 'subscribers': $errorMessage = __('Did not find any active subscribers.'); diff --git a/lib/Subscription/Comment.php b/lib/Subscription/Comment.php index b554906e47..5214f572ff 100644 --- a/lib/Subscription/Comment.php +++ b/lib/Subscription/Comment.php @@ -20,7 +20,7 @@ class Comment { static function getSubscriptionField() { $label = Setting::getValue( 'subscribe.on_comment.label', - __('Yes, please add me to your mailing list.') + __('Yes, please add me to your mailing list') ); return '

diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php index 3496a3a412..34f449614c 100644 --- a/lib/Subscription/Pages.php +++ b/lib/Subscription/Pages.php @@ -161,21 +161,21 @@ class Pages { private function getConfirmTitle() { if($this->isPreview()) { $title = sprintf( - __("You've subscribed to: %s"), + __("You have subscribed to: %s"), 'demo 1, demo 2' ); } else if($this->subscriber === false) { - $title = __('Your confirmation link expired, please subscribe again.'); + $title = __('Your confirmation link expired, please subscribe again'); } else { $segment_names = array_map(function($segment) { return $segment->name; }, $this->subscriber->segments()->findMany()); if(empty($segment_names)) { - $title = __("You're now subscribed!"); + $title = __("You are now subscribed!"); } else { $title = sprintf( - __("You've subscribed to: %s"), + __("You have subscribed to: %s"), join(', ', $segment_names) ); } diff --git a/views/form/editor.html b/views/form/editor.html index 7fa645ccae..d024b074c9 100644 --- a/views/form/editor.html +++ b/views/form/editor.html @@ -8,7 +8,7 @@

@@ -52,7 +52,7 @@ {{ name }} diff --git a/views/form/templates/settings/segment_selection.hbs b/views/form/templates/settings/segment_selection.hbs index 8e33053e57..4d56469275 100644 --- a/views/form/templates/settings/segment_selection.hbs +++ b/views/form/templates/settings/segment_selection.hbs @@ -1,7 +1,7 @@
-

<%= __('Select the segment you want to add:') %>

+

<%= __('Select the segment that you want to add:') %>

diff --git a/views/forms.html b/views/forms.html index cf2f8d450f..331fd1fc24 100644 --- a/views/forms.html +++ b/views/forms.html @@ -16,12 +16,12 @@ 'pageTitle': __('Forms'), 'searchLabel': __('Search'), 'loadingItems': __('Loading forms...'), - 'noItemsFound': __('No forms found.'), - 'selectAllLabel': __('All forms on this page are selected.'), - 'selectedAllLabel': __('All %d forms are selected.'), - 'selectAllLink': __('Select all forms on all pages.'), - 'clearSelection': __('Clear selection.'), - 'permanentlyDeleted': __('%d forms permanently deleted.'), + 'noItemsFound': __('No forms found'), + 'selectAllLabel': __('All forms on this page are selected'), + 'selectedAllLabel': __('All %d forms are selected'), + 'selectAllLink': __('Select all forms on all pages'), + 'clearSelection': __('Clear selection'), + 'permanentlyDeleted': __('%d forms permanently deleted'), 'selectBulkAction': __('Select bulk action'), 'bulkActions': __('Bulk Actions'), 'apply': __('Apply'), @@ -42,15 +42,15 @@ 'formName': __('Name'), 'segments': __('Lists'), 'createdOn': __('Created on'), - 'oneFormTrashed': __('1 form was moved to the trash.'), - 'multipleFormsTrashed': __('%$1d forms were moved to the trash.'), - 'oneFormDeleted': __('1 form was permanently deleted.'), - 'multipleFormsDeleted': __('%$1d forms were permanently deleted.'), - 'oneFormRestored': __('1 form has been restored from the trash.'), - 'multipleFormsRestored': __('%$1d forms have been restored from the trash.'), + 'oneFormTrashed': __('1 form was moved to the trash'), + 'multipleFormsTrashed': __('%$1d forms were moved to the trash'), + 'oneFormDeleted': __('1 form was permanently deleted'), + 'multipleFormsDeleted': __('%$1d forms were permanently deleted'), + 'oneFormRestored': __('1 form has been restored from the trash'), + 'multipleFormsRestored': __('%$1d forms have been restored from the trash'), 'edit': __('Edit'), 'duplicate': __('Duplicate'), - 'formDuplicated': __('Form "%$1s" has been duplicated.'), + 'formDuplicated': __('Form "%$1s" has been duplicated'), 'trash': __('Trash'), 'new': __('New'), }) %> diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index 49de2869b7..797da48aaf 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -318,15 +318,15 @@ '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.'), - 'newsletterPreviewFailed': __('Preview failed. Pleae check console log.'), + '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'), + 'newsletterPreviewFailed': __('Preview failed. Pleae check console log'), 'newsletterPreviewSent': __('Newsletter preview email has been successfully sent!'), - 'newsletterPreviewFailedToSend': __('Attempt to send a newsletter preview email failed. Please verify that your sending method is configured correctly and try again.'), + 'newsletterPreviewFailedToSend': __('Attempt to send a newsletter preview email failed. Please verify that your sending method is configured correctly and try again'), 'templateNameMissing': __('Please add a template name'), 'templateDescriptionMissing': __('Please add a template description'), 'templateSaved': __('Template has been saved.'), - 'templateSaveFailed': __('Template has not been saved, please try again.'), + 'templateSaveFailed': __('Template has not been saved, please try again'), 'categoriesAndTags': __('Categories & tags'), 'noPostsToDisplay': __('There is no content to display'), }) %> @@ -1152,7 +1152,7 @@ }, header: { text: '<%= __('Display problems?') %> ' + - '<%= __('Open this email in your web browser.') %>', + '<%= __('Open this email in your web browser') %>', styles: { block: { backgroundColor: 'transparent', diff --git a/views/newsletter/templates/components/heading.hbs b/views/newsletter/templates/components/heading.hbs index 495d892076..40aeb80212 100644 --- a/views/newsletter/templates/components/heading.hbs +++ b/views/newsletter/templates/components/heading.hbs @@ -10,6 +10,6 @@
diff --git a/views/newsletters.html b/views/newsletters.html index a83e0d368a..0a8bdd8312 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -28,12 +28,12 @@ 'searchLabel': __('Search'), 'loadingItems': __('Loading newsletters...'), - 'noItemsFound': __('No newsletters found.'), - 'selectAllLabel': __('All newsletters on this page are selected.'), - 'selectedAllLabel': __('All %d newsletters are selected.'), - 'selectAllLink': __('Select all newsletters on all pages.'), - 'clearSelection': __('Clear selection.'), - 'permanentlyDeleted': __('%d newsletters were permanently deleted.'), + 'noItemsFound': __('No newsletters found'), + 'selectAllLabel': __('All newsletters on this page are selected'), + 'selectedAllLabel': __('All %d newsletters are selected'), + 'selectAllLink': __('Select all newsletters on all pages'), + 'clearSelection': __('Clear selection'), + 'permanentlyDeleted': __('%d newsletters were permanently deleted'), 'selectBulkAction': __('Select bulk action'), 'bulkActions': __('Bulk Actions'), 'apply': __('Apply'), @@ -66,23 +66,23 @@ 'viewHistory': __('View history'), 'createdOn': __('Created on'), 'lastModifiedOn': __('Last modified on'), - 'oneNewsletterTrashed': __('1 newsletter was moved to the trash.'), - 'multipleNewslettersTrashed': __('%$1d newsletters were moved to the trash.'), - 'oneNewsletterDeleted': __('1 newsletter was permanently deleted.'), - 'multipleNewslettersDeleted': __('%$1d newsletters were permanently deleted.'), - 'oneNewsletterRestored': __('1 newsletter has been recovered from the trash.'), - 'multipleNewslettersRestored': __('%$1d newsletters have been recovered from the trash.'), + 'oneNewsletterTrashed': __('1 newsletter was moved to the trash'), + 'multipleNewslettersTrashed': __('%$1d newsletters were moved to the trash'), + 'oneNewsletterDeleted': __('1 newsletter was permanently deleted'), + 'multipleNewslettersDeleted': __('%$1d newsletters were permanently deleted'), + 'oneNewsletterRestored': __('1 newsletter has been recovered from the trash'), + 'multipleNewslettersRestored': __('%$1d newsletters have been recovered from the trash'), 'trash': __('Trash'), 'edit': __('Edit'), 'duplicate': __('Duplicate'), - 'newsletterDuplicated': __('Newsletter "%$1s" has been duplicated.'), - 'notSentYet': __('Not sent yet.'), + 'newsletterDuplicated': __('Newsletter "%$1s" has been duplicated'), + 'notSentYet': __('Not sent yet'), 'scheduledFor': __('Scheduled for'), 'scheduleIt': __('Schedule it'), 'active': __('Active'), 'inactive': __('Not Active'), - 'newsletterQueueCompleted': __('Sent to %$1d of %$2d.'), - 'sentToXSubscribers': __('Sent to %$1d subscribers.'), + 'newsletterQueueCompleted': __('Sent to %$1d of %$2d'), + 'sentToXSubscribers': __('Sent to %$1d subscribers'), 'resume': __('Resume'), 'pause': __('Pause'), 'new': __('New'), @@ -92,7 +92,7 @@ 'selectJsonFileToUpload': __('Select a .json file to upload'), 'upload': __('Upload'), 'mailpoetGuideTemplateTitle': __("MailPoet's Guide"), - 'mailpoetGuideTemplateDescription': __("This is the standard template that comes with MailPoet."), + 'mailpoetGuideTemplateDescription': __("This is the standard template that comes with MailPoet"), 'confirmTemplateDeletion': __('You are about to delete the template named "%$1s"'), 'delete': __('Delete'), 'select': __('Select'), @@ -105,14 +105,14 @@ 'regularNewsletterTypeDescription': __('Send a newsletter with images, buttons, dividers, and social bookmarks. Or, just send a basic text email.'), 'create': __('Create'), 'welcomeNewsletterTypeTitle': __('Welcome email'), - 'welcomeNewsletterTypeDescription': __('Send an email for new users.'), + 'welcomeNewsletterTypeDescription': __('Send an email to new users'), 'setUp': __('Set up'), 'postNotificationNewsletterTypeTitle': __('Post notifications'), 'postNotificationsNewsletterTypeDescription': __('Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.'), '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'), - 'sendWelcomeEmailWhen': __('Send welcome email when...'), + 'sendWelcomeEmailWhen': __('Send this welcome email when...'), 'daily': __('Once a day at...'), 'weekly': __('Weekly on...'), @@ -144,22 +144,22 @@ 'subjectLine': __('Subject line'), 'subjectLineTip': __("Be creative! It's the first thing that your subscribers see. Tempt them to open your email."), - 'emptySubjectLineError': __('Please specify a subject.'), + 'emptySubjectLineError': __('Please specify a subject'), 'segments': __('Segments'), - 'segmentsTip': __('This subscriber segment will be used for this campaign.'), + 'segmentsTip': __('This subscriber segment will be used for this campaign'), 'selectSegmentPlaceholder': __('Select a segment'), - 'noSegmentsSelectedError': __('Please select a segment.'), + 'noSegmentsSelectedError': __('Please select a segment'), 'sender': __('Sender'), 'senderTip': __('Your name and email.'), 'senderNamePlaceholder': __('John Doe'), 'senderAddressPlaceholder': __('john.doe@email.com'), 'replyTo': __('Reply-to'), - 'replyToTip': __('When your subscribers reply to your newsletter, their emails will go to this address.'), + 'replyToTip': __('When your subscribers reply to your newsletter, their emails will go to this address'), 'replyToNamePlaceholder': __('John Doe'), 'replyToAddressPlaceholder': __('john.doe@email.com'), 'newsletterUpdated': __('Newsletter was updated successfully!'), 'newsletterAdded': __('Newsletter was added successfully!'), - 'newsletterSendingError': __('An error occurred while trying to send. Please check your settings.'), + 'newsletterSendingError': __('An error occurred while trying to send. Please check your settings'), 'finalNewsletterStep': __('Final step: last details'), 'saveDraftAndClose': __('Save as draft and close'), 'orSimply': __('or simply'), @@ -211,10 +211,10 @@ 'next': __('Next'), 'previous': __('Previous'), - 'welcomeEmailActivated': __('Your welcome email is now active.'), - 'welcomeEmailActivationFailed': __('Your welcome email could not be activated, check its settings.'), - 'postNotificationActivated': __('Your post notification is now active.'), - 'postNotificationActivationFailed': __('Your post notification could not be activated, check its settings.'), + 'welcomeEmailActivated': __('Your welcome email is now active!'), + 'welcomeEmailActivationFailed': __('Your welcome email could not be activated, please check the settings'), + 'postNotificationActivated': __('Your post notification is now active!'), + 'postNotificationActivationFailed': __('Your post notification could not be activated, check the settings'), 'welcomeEventSegment': __('This newsletter is sent when someone subscribes to the list "%$1s"'), 'welcomeEventWPUserAnyRole': __('This newsletter is sent when a new WordPress user is added to your site'), diff --git a/views/segments.html b/views/segments.html index b1bf6c00a6..e6b4554f9d 100644 --- a/views/segments.html +++ b/views/segments.html @@ -13,12 +13,12 @@ 'pageTitle': __('Segments'), 'searchLabel': __('Search'), 'loadingItems': __('Loading segments...'), - 'noItemsFound': __('No segments found.'), - 'selectAllLabel': __('All segments on this page are selected.'), - 'selectedAllLabel': __('All %d segments are selected.'), - 'selectAllLink': __('Select all segments on all pages.'), - 'clearSelection': __('Clear selection.'), - 'permanentlyDeleted': __('%d segments were permanently deleted.'), + 'noItemsFound': __('No segments found'), + 'selectAllLabel': __('All segments on this page are selected'), + 'selectedAllLabel': __('All %d segments are selected'), + 'selectAllLink': __('Select all segments on all pages'), + 'clearSelection': __('Clear selection'), + 'permanentlyDeleted': __('%d segments were permanently deleted'), 'selectBulkAction': __('Select bulk action'), 'bulkActions': __('Bulk Actions'), 'apply': __('Apply'), @@ -31,18 +31,18 @@ 'unconfirmed': __('Unconfirmed'), 'unsubscribed': __('Unsubscribed'), 'createdOn': __('Created on'), - 'oneSegmentTrashed': __('1 segment was moved to the trash.'), - 'multipleSegmentsTrashed': __('%$1d segments were moved to the trash.'), - 'oneSegmentDeleted': __('1 segment was permanently deleted.'), - 'multipleSegmentsDeleted': __('%$1d segments were permanently deleted.'), - 'oneSegmentRestored': __('1 segment has been restored from the trash.'), - 'multipleSegmentsRestored': __('%$1d segments have been restored from the trash.'), + 'oneSegmentTrashed': __('1 segment was moved to the trash'), + 'multipleSegmentsTrashed': __('%$1d segments were moved to the trash'), + 'oneSegmentDeleted': __('1 segment was permanently deleted'), + 'multipleSegmentsDeleted': __('%$1d segments were permanently deleted'), + 'oneSegmentRestored': __('1 segment has been restored from the trash'), + 'multipleSegmentsRestored': __('%$1d segments have been restored from the trash'), 'duplicate': __('Duplicate'), - 'listDuplicated': __('List "%$1s" has been duplicated.'), + 'listDuplicated': __('List "%$1s" has been duplicated'), 'update': __('Update'), 'forceSync': __('Force Sync'), 'readMore': __('Read More'), - 'listSynchronized': __('List "%$1s" has been synchronized.'), + 'listSynchronized': __('List "%$1s" has been synchronized'), 'viewSubscribers': __('View Subscribers'), 'new': __('New'), 'edit': __('Edit'), @@ -61,7 +61,7 @@ 'pageOutOf': __('of'), 'numberOfItems': __('%$1d items'), - 'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers.'), + 'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers'), 'backToList': __('Back to list') }) %> <% endblock %> diff --git a/views/settings.html b/views/settings.html index 2e36b2da39..d8a05bdaec 100644 --- a/views/settings.html +++ b/views/settings.html @@ -80,19 +80,19 @@ }).done(function(response) { if(response === true) { MailPoet.Notice.success( - "<%= __('Settings saved.') %>", + "<%= __('Settings saved') %>", { scroll: true } ); } else { MailPoet.Notice.error( - "<%= __('Settings could not be saved.') %>", + "<%= __('Settings could not be saved') %>", { scroll: true } ); } MailPoet.Modal.loading(false); }).error(function(errors) { MailPoet.Notice.error( - "<%= __('An error occurred. Please check your settings.') %>", + "<%= __('An error occurred. Please check the settings.') %>", { scroll: true } ); MailPoet.Modal.loading(false); diff --git a/views/settings/advanced.html b/views/settings/advanced.html index 2bffdd16dd..adc40dd2b5 100644 --- a/views/settings/advanced.html +++ b/views/settings/advanced.html @@ -7,7 +7,7 @@ <%= __('Bounce email') %>

- <%= __('Your bounced emails will be sent to this address.') %> + <%= __('Your bounced emails will be sent to this address') %>

@@ -28,7 +28,7 @@ <%= __('Open and click tracking') %>

- <%= __('Some users prefer to not track their subscribers.') %> + <%= __('Some users prefer to not track their subscribers') %>

@@ -64,7 +64,7 @@ <%= __('Share anonymous data') %>

- <%= __('Share anonymous data and help us improve the plugin! We appreciate your help.') %> + <%= __('Share anonymous data and help us improve the plugin. We appreciate your help!') %>

- <%= __('Want to start from the beginning? This will completely wipe out MailPoet and reinstall from scratch.') %> + <%= __('Want to start over? This will completely wipe out MailPoet and reinstall from scratch.') %>

@@ -122,7 +122,7 @@ $(function() { $('#mailpoet_reinstall').on('click', function() { if(confirm( - "<%= __('If you continue, all of your current MailPoet data will be permanently erased (newsletters, statistics, subscribers, etc...)') %>" + "<%= __('Are you sure? All of your MailPoet data will be permanently erased (newsletters, statistics, subscribers, etc.)') %>" )) { MailPoet.Modal.loading(true); MailPoet.Ajax.post({ diff --git a/views/settings/basics.html b/views/settings/basics.html index d89fbfaa81..eeee558920 100644 --- a/views/settings/basics.html +++ b/views/settings/basics.html @@ -6,7 +6,7 @@ <%= __("Default sender") %>

- <%= __('These email addresses will be the defaults for each new email created.') %> + <%= __('These email addresses will be selected by default for each new email') %>

@@ -47,7 +47,7 @@ <%= __("Email notifications") %>

- <%= __('These email addresses will receive notifications (separate each address with a comma).') %> + <%= __('These email addresses will receive notifications (separate each address with a comma)') %>

@@ -88,7 +88,7 @@ <%= __('Subscribe in comments') %>

- <%= __('Visitors that comment on a post can click on a checkbox to subscribe to your list.') %> + <%= __('Visitors that comment on a post can subscribe to your list via a checkbox') %>

@@ -112,7 +112,7 @@ <% if(settings.subscribe.on_comment.label) %> value="<%= settings.subscribe.on_comment.label %>" <% else %> - value="<%= __('Yes, add me to your mailing list.') %>" + value="<%= __('Yes, add me to your mailing list') %>" <% endif %> />

@@ -148,7 +148,7 @@ <%= __('Subscribe in registration form') %>

- <%= __('Allow users who register on your site to subscribe to a list.') %> + <%= __('Allow users who register on your site to subscribe to a list') %>

@@ -176,7 +176,7 @@ <% if(settings.subscribe.on_register.label) %> value="<%= settings.subscribe.on_register.label %>" <% else %> - value="<%= __('Yes, add me to your mailing list.') %>" + value="<%= __('Yes, add me to your mailing list') %>" <% endif %> />

@@ -203,7 +203,7 @@ <% else %>

- <%= __('Registration is disabled on this site.') %> + <%= __('Registration is disabled on this site') %>

<% endif %> @@ -215,7 +215,7 @@ <%= __('Manage Subscription page') %>

- <%= __('Your subscribers will be directed to this page when they click the "Manage your subscription" link in your email.') %> + <%= __('When your subscribers click the "Manage your subscription" link, they will be directed to this page') %>

@@ -270,9 +270,9 @@ <%= __('Unsubscribe page') %>

- <%= __('Your subscribers will be directed to this page when they click the "Unsubscribe" link in your email.') %> + <%= __('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"].') %> + <%= __('Use this shortcode on your website\'s WordPress pages: [mailpoet_manage text="Manage your subscription"]') %>

@@ -307,7 +307,7 @@ <%= __('Archive page shortcode') %>

- <%= __('Paste this shortcode on a page to display a list of past newsletters.') %> + <%= __('Paste this shortcode on a page to display a list of past newsletters') %>

@@ -343,7 +343,7 @@ <%= __('This shortcode displays the total number of subscribers') %>

- <%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers.') %> + <%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers') %>

diff --git a/views/settings/bounce.html b/views/settings/bounce.html index a40165de81..08579479d3 100644 --- a/views/settings/bounce.html +++ b/views/settings/bounce.html @@ -263,7 +263,7 @@ id="mailpoet_bounce_test" class="button-secondary" href="javascript:;" - ><%= __('Is it working? Try to connect.') %> + ><%= __('Is it working? Try to connect') %> diff --git a/views/settings/mta.html b/views/settings/mta.html index 8f946dc381..540dd40a61 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -55,7 +55,7 @@

- <%= __('Currently in closed beta.') %> + <%= __('Currently in Closed Beta') %>
<%= __('[link]Sign up to our newsletter[/link] to get our latest news on our sending service plus other useful tips and tricks.') | replace({ @@ -83,9 +83,9 @@

<%= __('Your web host / web server') %>

- <%= __('Free, but not recommended.') %> + <%= __('Free, but not recommended') %>
- <%= __('Web hosts generally have a bad reputation as a sender. Your newsletter will probably be considered spam.') %> + <%= __('Web hosts generally have a bad reputation as a sender. Your newsletter will probably be considered spam') %>

@@ -105,9 +105,9 @@

<%= __('Third-party') %>

- <%= __('Currently the best solution.') %> + <%= __('Currently the best solution') %>
- <%= __('Send with an external email provider. This is usually not free.') %> + <%= __('Send with an external email provider. This is usually not free') %>

@@ -245,9 +245,9 @@


- <%= __('Warning! Sending more than the recommended amount of emails? You may break the terms of your web host or provider.') %>' + <%= __('Warning! Sending more than the recommended amount of emails? You may break the terms of your web host or provider!') %>'
- <%= __('Please ask your host for the maximum number of emails you are allowed to send per day.') %> + <%= __('Please ask your host for the maximum number of emails you are allowed to send per day') %>

@@ -546,7 +546,7 @@ <%= __('Authentication') %>

- <%= __('Leave this option set to Yes. Only a tiny portion of SMTP services prefer Authentication to be turned off.') %> + <%= __('Leave this option set to Yes. Only a tiny portion of SMTP services prefer Authentication to be turned off') %>

@@ -588,12 +588,12 @@ <%= __('SPF Signature (Highly recommended!)') %>

- <%= __("Improves your delivery rate by verifying that you're allowed to send emails from your domain.") %> + <%= __("Improves your delivery rate by verifying that you're allowed to send emails from your domain") %>

- <%= __("SPF is set up in your DNS. Read your host's support documentation for more information.") %> + <%= __("SPF is set up in your DNS. Read your host's support documentation for more information") %>

@@ -631,7 +631,7 @@ <%= __('or cancel.') %> + ><%= __('or Cancel') %>

@@ -688,9 +688,9 @@ data: { mailer: mailer, newsletter: { - subject: "<%= __('This is a sending method test.') %>", + subject: "<%= __('This is a Sending Method Test') %>", body: { - text: "<%= __('Yup, it works. You can start blasting away emails to the moon.') %>" + text: "<%= __('Yup, it works! You can start blasting away emails to the moon.') %>" } }, subscriber: { @@ -709,7 +709,7 @@ } else { if (response.errors) { MailPoet.Notice.error( - "<%= __('The email could not be sent.') %> " + response.errors, + "<%= __('The email could not be sent: ') %> " + response.errors, { scroll: true } ); } diff --git a/views/settings/signup.html b/views/settings/signup.html index e023a7f1c8..4830e73ad8 100644 --- a/views/settings/signup.html +++ b/views/settings/signup.html @@ -151,7 +151,7 @@ <%= __('Confirmation page') %>

- <%= __('When subscribers click on the activation link, they are redirected to this page.') %> + <%= __('When subscribers click on the activation link, they are redirected to this page') %>

@@ -192,9 +192,9 @@ var result = false; 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.') %>"); + 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.') %>"); + result = confirm("<%= __('Unconfirmed subscribers will receive your newsletters from without needing to activate their subscriptions. This is not recommended!') %>"); } // if the user confirmed changing the signup confirmation (yes/no) if(result === true) { diff --git a/views/settings/templates/sending_frequency.hbs b/views/settings/templates/sending_frequency.hbs index 32f3f3c9db..f57a489763 100644 --- a/views/settings/templates/sending_frequency.hbs +++ b/views/settings/templates/sending_frequency.hbs @@ -8,7 +8,7 @@ <%= - __("That's %1$s emails per day.") + __("That's %1$s emails per day") | format('{{ daily_emails }}') | raw %> @@ -17,7 +17,7 @@

<%= - __("That's %1$s emails per second. We highly recommend to send 1 email per second at most. This is the time MailPoet needs to process and send a single email from most hosts. Alternatively, send with MailPoet which can be 50 times faster.") + __("That's %1$s emails per second. We highly recommend to send 1 email per second, at the absolute maximum. MailPoet needs at least one second to process and send a single email (on most hosts.) Alternatively, send with MailPoet, which can be up to 50 times faster.") | format('{{ emails_per_second }}') | raw %> diff --git a/views/subscribers/importExport/export.html b/views/subscribers/importExport/export.html index 2cd4c71664..1c7df07bac 100644 --- a/views/subscribers/importExport/export.html +++ b/views/subscribers/importExport/export.html @@ -8,7 +8,7 @@ <% if segments is empty %>
-

<%= __("Yikes! Couldn't find any subscribers.") %>

+

<%= __("Yikes! Couldn't find any subscribers") %>

<% endif %>
diff --git a/views/subscribers/importExport/import.html b/views/subscribers/importExport/import.html index 36b249bf7e..b7cc8de07e 100644 --- a/views/subscribers/importExport/import.html +++ b/views/subscribers/importExport/import.html @@ -32,26 +32,26 @@ <% block translations %> <%= localize({ -'noMailChimpLists': __('No active lists found.'), +'noMailChimpLists': __('No active lists found'), 'serverError': __('Server error:'), 'select': __('Select'), 'csvKBLink': csvKBLink, -'wrongFileFormat': __('Only comma-separated (CSV) file formats are supported.'), +'wrongFileFormat': __('Only comma-separated (CSV) file formats are supported'), 'maxPostSizeNotice': __('Your CSV is over %s and is too big to process. Please split the file into two or more sections.')|replace({'%s': maxPostSize}), 'dataProcessingError': __("Your data could not be processed. Please make sure it is in the correct format."), 'noValidRecords': __('No valid records were found. This file needs to be formatted in a CSV style (comma-separated.) Look at some [link]examples on our support site[/link]'), -'importNoticeSkipped': __('%1$s records had issues and were skipped.'), -'importNoticeInvalid': __('%1$s emails are not valid : %2$s.'), -'importNoticeDuplicate': __('%1$s emails appear more than once in your file : %2$s.'), -'hideDetails': __('Hide details.'), -'showDetails': __('Show more details.'), -'segmentSelectionRequired': __('Please select at least one list.'), +'importNoticeSkipped': __('%1$s records had issues and were skipped'), +'importNoticeInvalid': __('%1$s emails are not valid : %2$s'), +'importNoticeDuplicate': __('%1$s emails appear more than once in your file : %2$s'), +'hideDetails': __('Hide details'), +'showDetails': __('Show more details'), +'segmentSelectionRequired': __('Please select at least one list'), 'addNewList': __('Add new list'), 'addNewColumuserColumnsn': __('Add new list'), 'userColumns': __('User columns'), -'selectedValueAlreadyMatched': __('The selected value is already matched to another column.'), -'confirmCorrespondingColumn': __('Confirm that this column corresponds to the selected field.'), -'columnContainInvalidElement': __('One of the columns contains an invalid email. Please fix it before continuing.'), +'selectedValueAlreadyMatched': __('The selected value is already matched to another column'), +'confirmCorrespondingColumn': __('Confirm that this column corresponds to the selected field'), +'columnContainInvalidElement': __('One of the columns contains an invalid email. Please fix it before continuing'), 'january': __('January'), 'february': __('February'), 'march': __('March'), @@ -64,17 +64,17 @@ 'october': __('October'), 'november': __('November'), 'december': __('December'), -'noDateFieldMatch': __("Do not match as a 'date field' if most of the rows for that column return the same error."), +'noDateFieldMatch': __("Do not match as a 'date field' if most of the rows for that column return the same error"), 'emptyDate': __('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 columns contains an invalid date. Please fix it before continuing.'), +'dateMatchError': __('Error matching date'), +'columnContainsInvalidDate': __('One of the columns contains an invalid date. Please fix it before continuing'), 'listCreateError': __('Error adding a new segment:'), -'columnContainsInvalidElement': __('One of the columns contains an invalid email. Please fix before continuing.'), -'customFieldCreateError': __('Custom field could not be created.'), +'columnContainsInvalidElement': __('One of the columns 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.') +'subscribersUpdated': __('%1$s existing subscribers were updated and added to %2$s') }) %> <% endblock %> diff --git a/views/subscribers/importExport/import/step1.html b/views/subscribers/importExport/import/step1.html index 127e5b6ae1..a939d9e85e 100644 --- a/views/subscribers/importExport/import/step1.html +++ b/views/subscribers/importExport/import/step1.html @@ -113,7 +113,7 @@ <%= ('If the answer is "no", consider yourself a spammer.') %>
<%= - __('[link]Read more on support.mailpoet.com[/link].') + __('[link]Read more on support.mailpoet.com[/link]') |replace({ '[link]': '', '[/link]': '' diff --git a/views/subscribers/importExport/import/step2.html b/views/subscribers/importExport/import/step2.html index 478a286339..227e52408a 100644 --- a/views/subscribers/importExport/import/step2.html +++ b/views/subscribers/importExport/import/step2.html @@ -34,12 +34,12 @@
\ No newline at end of file diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html index 9addcff5d0..32c3413bbb 100644 --- a/views/subscribers/subscribers.html +++ b/views/subscribers/subscribers.html @@ -17,12 +17,12 @@ 'pageTitle': __('Subscribers'), 'searchLabel': __('Search'), 'loadingItems': __('Loading subscribers...'), - '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.'), - 'clearSelection': __('Clear selection.'), - 'permanentlyDeleted': __('%d subscribers were permanently deleted.'), + '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'), + 'clearSelection': __('Clear selection'), + 'permanentlyDeleted': __('%d subscribers were permanently deleted'), 'selectBulkAction': __('Select bulk action'), 'bulkActions': __('Bulk Actions'), 'apply': __('Apply'), @@ -60,23 +60,23 @@ 'lists': __('Lists'), 'subscribedOn': __('Subscribed on'), 'lastModifiedOn': __('Last modified on'), - 'oneSubscriberTrashed': __('1 subscriber was moved to the trash.'), - 'multipleSubscribersTrashed': __('%$1d subscribers were moved to the trash.'), - 'oneSubscriberDeleted': __('1 subscriber was permanently deleted.'), - 'multipleSubscribersDeleted': __('%$1d subscribers were permanently deleted.'), - 'oneSubscriberRestored': __('1 subscriber has been restored from the trash.'), - 'multipleSubscribersRestored': __('%$1d subscribers have been restored from the trash.'), + 'oneSubscriberTrashed': __('1 subscriber was moved to the trash'), + 'multipleSubscribersTrashed': __('%$1d subscribers were moved to the trash'), + 'oneSubscriberDeleted': __('1 subscriber was permanently deleted'), + 'multipleSubscribersDeleted': __('%$1d subscribers were permanently deleted'), + 'oneSubscriberRestored': __('1 subscriber has been restored from the trash'), + 'multipleSubscribersRestored': __('%$1d subscribers have been restored from the trash'), 'moveToList': __('Move to list...'), - 'multipleSubscribersMovedToList': __('%$1d subscribers were moved to list %$2s.'), + 'multipleSubscribersMovedToList': __('%$1d subscribers were moved to list %$2s'), 'addToList': __('Add to list...'), - 'multipleSubscribersAddedToList': __('%$1d subscribers were added to list %$2s.'), + 'multipleSubscribersAddedToList': __('%$1d subscribers were added to list %$2s'), 'removeFromList': __('Remove from list...'), - 'multipleSubscribersRemovedFromList': __('%$1d subscribers were removed from list %$2s.'), + 'multipleSubscribersRemovedFromList': __('%$1d subscribers were removed from list %$2s'), 'removeFromAllLists': __('Remove from all lists'), - 'multipleSubscribersRemovedFromAllLists': __('%$1d subscribers were removed from all lists.'), + 'multipleSubscribersRemovedFromAllLists': __('%$1d subscribers were removed from all lists'), 'resendConfirmationEmail': __('Resend confirmation email'), - 'multipleConfirmationEmailsSent': __('%$1d confirmation emails have been sent.'), - 'listsToWhichSubscriberWasSubscribed': __('Lists to which the subscriber was subscribed.'), + '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.'), 'tip': __('Tip:'), diff --git a/views/welcome.html b/views/welcome.html index 32c825a530..5df7c28861 100644 --- a/views/welcome.html +++ b/views/welcome.html @@ -79,8 +79,8 @@

<%= __('Welcome to MailPoet') %> <%= settings.version %> <%=__('BETA') %>

-

You’re one our extra special testers! We salute you.

-

Big changes...watch the video!

+

You’re one of our extra special testers! We salute you.

+

Big changes are coming. Check out the video for more details!