MailPoet Newsletters (New) - Version 3.0.0-beta.16

Version Description

2017-01-31 =
Improved: Updated language strings for better translation support;
Fixed: subscription forms now allow to subscribe only to specified lists. Thanks Paul!
Fixed: subscription forms now ignore any extra fields added not via the Form editor. Thx again Paul!
Fixed: previewing sent welcome emails now display latest email version. Thanks Tim!
Fixed: plugin no longer triggers a PHP error during initialization on hosts using PHP 5.3;
Fixed: plugin warns about missing required PDO_MYSQL extension.

Release Info

Developer	wysija
Plugin	MailPoet Newsletters (New)
Version	3.0.0-beta.16
Comparing to
See all releases

Code changes from version 3.0.0-beta.15 to 3.0.0-beta.16

Files changed (87) hide show

assets/js/admin.js +7 -7
lang/mailpoet.pot +445 -422
lib/API/API.php +4 -4
lib/API/Endpoint.php +2 -2
lib/API/Endpoints/AutomatedLatestContent.php +1 -2
lib/API/Endpoints/CustomFields.php +3 -3
lib/API/Endpoints/Forms.php +5 -5
lib/API/Endpoints/ImportExport.php +1 -3
lib/API/Endpoints/NewsletterTemplates.php +2 -2
lib/API/Endpoints/Segments.php +6 -8
lib/API/Endpoints/SendingQueue.php +0 -4
lib/API/Endpoints/Settings.php +3 -3
lib/API/Endpoints/Setup.php +2 -2
lib/API/Endpoints/Subscribers.php +21 -12
lib/Config/Analytics.php +2 -2
lib/Config/Changelog.php +2 -2
lib/Config/Hooks.php +1 -3
lib/Config/Populator.php +6 -6
lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php +2 -2
lib/Config/PopulatorData/Templates/NewsletterBlank12Column.php +1 -1
lib/Config/PopulatorData/Templates/NewsletterBlank13Column.php +2 -2
lib/Config/PopulatorData/Templates/NewsletterBlank1Column.php +1 -1
lib/Config/PopulatorData/Templates/PostNotificationsBlank1Column.php +2 -2
lib/Config/PopulatorData/Templates/StoreDiscount.php +3 -3
lib/Config/PopulatorData/Templates/TravelEmail.php +4 -4
lib/Config/PopulatorData/Templates/WelcomeBlank12Column.php +1 -1
lib/Config/PopulatorData/Templates/WelcomeBlank1Column.php +1 -1
lib/Config/Renderer.php +4 -4
lib/Config/RequirementsChecker.php +28 -30
lib/Config/Shortcodes.php +3 -3
lib/Config/Widget.php +1 -2
lib/Form/Block/Base.php +2 -2
lib/Form/Renderer.php +0 -2
lib/Form/Widget.php +4 -8
lib/Mailer/Mailer.php +6 -6
lib/Mailer/Methods/AmazonSES.php +50 -15
lib/Mailer/Methods/MailPoet.php +1 -1
lib/Mailer/Methods/PHPMail.php +7 -3
lib/Mailer/Methods/SMTP.php +7 -3
lib/Mailer/Methods/SendGrid.php +12 -5
lib/Models/CustomField.php +3 -3
lib/Models/Form.php +44 -1
lib/Models/Newsletter.php +2 -2
lib/Models/NewsletterOptionField.php +2 -2
lib/Models/NewsletterTemplate.php +2 -2
lib/Models/Segment.php +2 -2
lib/Models/Setting.php +1 -1
lib/Models/SubscriberSegment.php +0 -1
lib/Newsletter/AutomatedLatestContent.php +0 -1
lib/Newsletter/Editor/PostListTransformer.php +1 -1
lib/Newsletter/Editor/PostTransformer.php +3 -3
lib/Newsletter/Editor/StructureTransformer.php +1 -1
lib/Newsletter/Editor/Transformer.php +2 -2
lib/Router/Endpoints/ViewInBrowser.php +10 -5
lib/Router/Router.php +3 -3
lib/Settings/Pages.php +1 -1
lib/Subscribers/ImportExport/Export/Export.php +2 -2
lib/Subscription/Comment.php +4 -4
lib/Subscription/Form.php +3 -6
lib/Subscription/Manage.php +2 -2
lib/Subscription/Pages.php +11 -12
lib/Subscription/Registration.php +2 -2
lib/Twig/I18n.php +8 -1
lib/Util/ConflictResolver.php +6 -4
mailpoet.php +4 -4
readme.txt +12 -4
vendor/autoload.php +1 -1
vendor/composer/autoload_real.php +7 -7
vendor/composer/autoload_static.php +5 -5
views/form/templates/preview.hbs +3 -3
views/form/templates/settings/field_form.hbs +2 -2
views/form/widget.html +0 -5
views/forms.html +12 -11
views/index.html +1 -1
views/newsletter/editor.html +3 -3
views/newsletters.html +26 -25
views/segments.html +7 -6
views/settings.html +2 -2
views/settings/advanced.html +2 -2
views/settings/basics.html +6 -6
views/settings/mta.html +7 -7
views/settings/signup.html +8 -8
views/subscribers/importExport/export.html +2 -2
views/subscribers/importExport/import.html +10 -10
views/subscribers/importExport/import/step1.html +1 -1
views/subscribers/importExport/import/step2.html +3 -3
views/subscribers/subscribers.html +16 -15

assets/js/admin.js CHANGED Viewed

	@@ -29398,7 +29398,7 @@ webpackJsonp([0],[
29398	}
29399	}, {
29400	name: 'trash',
29401	- label: _mailpoet2['default'].I18n.t('~~trash~~'),
29402	onSuccess: messages.onTrash
29403	}];
29404
	@@ -29805,7 +29805,7 @@ webpackJsonp([0],[
29805	{
29806	href: 'javascript:;',
29807	onClick: this.handleTrashItem.bind(null, this.props.item.id) },
29808	- _mailpoet2['default'].I18n.t('~~trash~~')
29809	)
29810	);
29811	} else if (action.refresh) {
	@@ -57738,7 +57738,7 @@ webpackJsonp([0],[
57738
57739	var bulk_actions = [{
57740	name: 'trash',
57741	- label: _mailpoet2['default'].I18n.t('~~trash~~'),
57742	onSuccess: messages.onTrash
57743	}];
57744
	@@ -58342,7 +58342,7 @@ webpackJsonp([0],[
58342
58343	var bulk_actions = [{
58344	name: 'trash',
58345	- label: _mailpoet2['default'].I18n.t('~~trash~~'),
58346	onSuccess: messages.onTrash
58347	}];
58348
	@@ -58736,7 +58736,7 @@ webpackJsonp([0],[
58736
58737	var bulk_actions = [{
58738	name: 'trash',
58739	- label: _mailpoet2['default'].I18n.t('~~trash~~'),
58740	onSuccess: messages.onTrash
58741	}];
58742
	@@ -59307,7 +59307,7 @@ webpackJsonp([0],[
59307
59308	var bulk_actions = [{
59309	name: 'trash',
59310	- label: _mailpoet2['default'].I18n.t('~~trash~~'),
59311	onSuccess: messages.onTrash
59312	}];
59313
	@@ -59723,7 +59723,7 @@ webpackJsonp([0],[
59723
59724	var bulk_actions = [{
59725	name: 'trash',
59726	- label: _mailpoet2['default'].I18n.t('~~trash~~'),
59727	onSuccess: messages.onTrash
59728	}];
59729


29398	}
29399	}, {
29400	name: 'trash',
29401	+ label: _mailpoet2['default'].I18n.t('moveToTrash'),
29402	onSuccess: messages.onTrash
29403	}];
29404

29805	{
29806	href: 'javascript:;',
29807	onClick: this.handleTrashItem.bind(null, this.props.item.id) },
29808	+ _mailpoet2['default'].I18n.t('moveToTrash')
29809	)
29810	);
29811	} else if (action.refresh) {

57738
57739	var bulk_actions = [{
57740	name: 'trash',
57741	+ label: _mailpoet2['default'].I18n.t('moveToTrash'),
57742	onSuccess: messages.onTrash
57743	}];
57744

58342
58343	var bulk_actions = [{
58344	name: 'trash',
58345	+ label: _mailpoet2['default'].I18n.t('moveToTrash'),
58346	onSuccess: messages.onTrash
58347	}];
58348

58736
58737	var bulk_actions = [{
58738	name: 'trash',
58739	+ label: _mailpoet2['default'].I18n.t('moveToTrash'),
58740	onSuccess: messages.onTrash
58741	}];
58742

59307
59308	var bulk_actions = [{
59309	name: 'trash',
59310	+ label: _mailpoet2['default'].I18n.t('moveToTrash'),
59311	onSuccess: messages.onTrash
59312	}];
59313

59723
59724	var bulk_actions = [{
59725	name: 'trash',
59726	+ label: _mailpoet2['default'].I18n.t('moveToTrash'),
59727	onSuccess: messages.onTrash
59728	}];
59729

lang/mailpoet.pot CHANGED Viewed

	@@ -4,7 +4,7 @@ msgid ""
4	msgstr ""
5	"Project-Id-Version: \n"
6	"Report-Msgid-Bugs-To: http://support.mailpoet.com/\n"
7	- "POT-Creation-Date: 2017-01-24 16:41:22+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=utf-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
	@@ -27,7 +27,7 @@ msgstr ""
27	"X-Textdomain-Support: yes\n"
28
29	#: lib/API/API.php:41 lib/API/API.php:67
30	- msgid "Invalid request."
31	msgstr ""
32
33	#: lib/API/API.php:114
	@@ -39,7 +39,7 @@ msgid "An unknown error occurred."
39	msgstr ""
40
41	#: lib/API/Endpoint.php:30
42	- msgid "Invalid request parameters."
43	msgstr ""
44
45	#: lib/API/Endpoints/CustomFields.php:24 lib/API/Endpoints/CustomFields.php:51
	@@ -75,7 +75,7 @@ msgid "Check your inbox or spam folder to confirm your subscription."
75	msgstr ""
76
77	#: lib/API/Endpoints/Forms.php:259 lib/API/Endpoints/Newsletters.php:188
78	- #: lib/API/Endpoints/Segments.php:~~121~~
79	msgid "Copy of %s"
80	msgstr ""
81
	@@ -92,8 +92,8 @@ msgstr ""
92	#: lib/API/Endpoints/Newsletters.php:138 lib/API/Endpoints/Newsletters.php:154
93	#: lib/API/Endpoints/Newsletters.php:170 lib/API/Endpoints/Newsletters.php:184
94	#: lib/API/Endpoints/Newsletters.php:216 lib/API/Endpoints/Newsletters.php:247
95	- #: lib/API/Endpoints/SendingQueue.php:32 lib/API/Endpoints/SendingQueue.php:~~122~~
96	- #: lib/API/Endpoints/SendingQueue.php:~~148~~
97	msgid "This newsletter does not exist."
98	msgstr ""
99
	@@ -109,22 +109,22 @@ msgstr ""
109	msgid "Please specify receiver information."
110	msgstr ""
111
112	- #: lib/API/Endpoints/Segments.php:20 lib/API/Endpoints/Segments.php:71
113	- #: lib/API/Endpoints/Segments.php:87 lib/API/Endpoints/Segments.php:~~103~~
114	- #: lib/API/Endpoints/Segments.php:~~117~~
115	msgid "This list does not exist."
116	msgstr ""
117
118	- #: lib/API/Endpoints/SendingQueue.php:52
119	msgid "This newsletter is already being sent."
120	msgstr ""
121
122	- #: lib/API/Endpoints/SendingQueue.php:86
123	msgid "There are no subscribers in that list!"
124	msgstr ""
125
126	- #: lib/API/Endpoints/SendingQueue.php:~~129~~
127	- #: lib/API/Endpoints/SendingQueue.php:~~155~~
128	msgid "This newsletter has not been sent yet."
129	msgstr ""
130
	@@ -132,16 +132,20 @@ msgstr ""
132	msgid "You have not specified any settings to be saved."
133	msgstr ""
134
135	- #: lib/API/Endpoints/Subscribers.php:29 lib/API/Endpoints/Subscribers.php:~~130~~
136	- #: lib/API/Endpoints/Subscribers.php:~~146~~ lib/API/Endpoints/Subscribers.php:~~162~~
137	msgid "This subscriber does not exist."
138	msgstr ""
139
140	- #: lib/API/Endpoints/Subscribers.php:~~76 views/form/editor.html:57~~




141	msgid "Please select a list."
142	msgstr ""
143
144	- #: lib/Config/Hooks.php:~~151~~
145	msgid "MailPoet Newsletter"
146	msgstr ""
147
	@@ -159,8 +163,8 @@ msgid "Subscribers"
159	msgstr ""
160
161	#: lib/Config/Menu.php:129 lib/Config/Menu.php:130 views/forms.html:43
162	- #: views/newsletters.html:63 views/newsletters.html:~~149~~ views/segments.html:13
163	- #: views/subscribers/subscribers.html:61
164	msgid "Lists"
165	msgstr ""
166
	@@ -171,14 +175,14 @@ msgstr ""
171
172	#: lib/Config/Menu.php:163 lib/Config/Menu.php:164
173	#: views/subscribers/importExport/import.html:7
174	- #: views/subscribers/subscribers.html:89
175	msgid "Import"
176	msgstr ""
177
178	#: lib/Config/Menu.php:175 lib/Config/Menu.php:176
179	#: views/subscribers/importExport/export.html:6
180	#: views/subscribers/importExport/export.html:96
181	- #: views/subscribers/subscribers.html:90
182	msgid "Export"
183	msgstr ""
184
	@@ -197,7 +201,7 @@ msgstr ""
197
198	#: lib/Config/Menu.php:223 lib/Newsletter/Shortcodes/ShortcodesHelper.php:32
199	#: views/newsletter/templates/components/sidebar/styles.hbs:74
200	- #: views/newsletters.html:~~105~~
201	msgid "Newsletter"
202	msgstr ""
203
	@@ -218,7 +222,7 @@ msgid "My First List"
218	msgstr ""
219
220	#: lib/Config/Populator.php:141
221	- msgid "This list is automatically created when you install MailPoet"
222	msgstr ""
223
224	#: lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php:16
	@@ -348,7 +352,7 @@ msgstr ""
348	#: lib/Config/PopulatorData/Templates/WelcomeBlank1Column.php:55
349	msgid ""
350	"Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open "
351	- "this email in your web browser</a>"
352	msgstr ""
353
354	#: lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php:107
	@@ -363,7 +367,7 @@ msgstr ""
363	#: lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php:119
364	msgid ""
365	"<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n"
366	- "<p>It's time to design your newsletter! On the right sidebar, you'll find "
367	"four menu items that will help you customize your newsletter:</p>\n"
368	"<ol>\n"
369	"<li>Content</li>\n"
	@@ -484,7 +488,7 @@ msgstr ""
484	msgid ""
485	"<h1 style=\"text-align: center;\"><strong>Let's Get Started! </strong></h1>\n"
486	"<p></p>\n"
487	- "<p>It's time to design your newsletter! On the right sidebar, you'll find "
488	"four menu items that will help you customize your newsletter:</p>\n"
489	"<ol>\n"
490	"<li>Content</li>\n"
	@@ -567,7 +571,7 @@ msgid ""
567	"inherit;\"></span></p>\n"
568	"<p><span style=\"line-height: 1.6em; background-color: inherit;\">Below, "
569	"you'll find three recent posts, which are displayed automatically, thanks "
570	- "to the <em>Automatic Latest Content</em> widget, which can be found on the "
571	"right sidebar, under <em>Content</em>.</span></p>\n"
572	"<p><span style=\"line-height: 1.6em; background-color: "
573	"inherit;\"></span></p>\n"
	@@ -651,15 +655,15 @@ msgid ""
651	"<p></p>\n"
652	"<p>Hi [subscriber:firstname \| default:reader]</p>\n"
653	"<p class=\"\"></p>\n"
654	- "<p>Fancy 15% off your next order? Use this coupon on ~~all~~ ~~your~~ ~~favourite~~ "
655	- "~~products~~ ~~from~~ ~~our~~ ~~store~~ ~~until~~ ~~Wednesday.~~ ~~Just~~ enter the code on the "
656	- "payments page ~~and your discount will applied~~.</p>"
657	msgstr ""
658
659	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:113
660	msgid ""
661	- "<h1 style=\"text-align: center;\"><em><strong>Get 15% ~~discount~~ off your "
662	- "~~next~~ order</strong></em></h1>"
663	msgstr ""
664
665	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:116
	@@ -679,7 +683,7 @@ msgid ""
679	msgstr ""
680
681	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:207
682	- msgid "red-~~icycle~~"
683	msgstr ""
684
685	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:218
	@@ -757,10 +761,10 @@ msgid ""
757	"<h1 style=\"text-align: center;\">Hi [subscriber:firstname \| "
758	"default:reader]!</h1>\n"
759	"<p></p>\n"
760	- "<p>Greetings from New Zealand, we're here enjoying the sights and ~~sounds~~ "
761	- "~~(and bad~~ smells!) of Rotarua. Yesterday we ~~took~~ ~~advantage of~~ the local "
762	- "~~amenities~~ ~~and~~ ~~visited the hot springs! </~~p>\n"
763	- "<p>Don't forget to stay ~~up-to-date~~ ~~via~~ ~~twitter~~!</p>"
764	msgstr ""
765
766	#: lib/Config/PopulatorData/Templates/TravelEmail.php:88
	@@ -792,14 +796,14 @@ msgid "<h2><em>Here's our top recommendations in Rotarua</em></h2>"
792	msgstr ""
793
794	#: lib/Config/PopulatorData/Templates/TravelEmail.php:327
795	- msgid "~~Glow worms~~, Waitomo Caves"
796	msgstr ""
797
798	#: lib/Config/PopulatorData/Templates/TravelEmail.php:338
799	msgid ""
800	"<p><em><a "
801	"href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><"
802	- "strong>Waitomo ~~Glow~~ ~~Worm~~ Caves</strong></a></em></p>"
803	msgstr ""
804
805	#: lib/Config/PopulatorData/Templates/TravelEmail.php:352
	@@ -936,17 +940,17 @@ msgstr ""
936
937	#: lib/Config/RequirementsChecker.php:84
938	msgid ""
939	- "This plugin requires PDO_MYSQL PHP extension. Please read our "
940	"[link]instructions[/link] on how to resolve this issue."
941	msgstr ""
942
943	- #: lib/Config/RequirementsChecker.php:~~104~~
944	msgid ""
945	"A MailPoet dependency (%s) does not appear to be loaded correctly, thus "
946	"MailPoet will not work correctly. Please reinstall the plugin."
947	msgstr ""
948
949	- #: lib/Config/RequirementsChecker.php:~~115~~
950	msgid ""
951	"MailPoet has detected a dependency conflict (%s) with another plugin (%s), "
952	"which may cause unexpected behavior. Please disable the offending plugin to "
	@@ -978,11 +982,11 @@ msgid "Daemon does not exist."
978	msgstr ""
979
980	#: lib/Form/Block/Base.php:10
981	- msgid "Please specify a valid email address"
982	msgstr ""
983
984	#: lib/Form/Block/Base.php:18 views/form/editor.html:55
985	- #: views/newsletters.html:~~152~~
986	msgid "Please select a list"
987	msgstr ""
988
	@@ -1000,7 +1004,7 @@ msgstr ""
1000
1001	#: lib/Form/Block/Date.php:77 lib/Form/Block/Date.php:199
1002	#: views/form/templates/blocks/date_days.hbs:3 views/settings/bounce.html:252
1003	- #: views/subscribers/subscribers.html:87
1004	msgid "Day"
1005	msgstr ""
1006
	@@ -1010,7 +1014,7 @@ msgstr ""
1010
1011	#: lib/Form/Block/Date.php:86 lib/Form/Block/Date.php:143
1012	#: views/form/templates/blocks/date_months.hbs:3
1013	- #: views/subscribers/subscribers.html:86
1014	msgid "Month"
1015	msgstr ""
1016
	@@ -1022,7 +1026,7 @@ msgstr ""
1022	#: lib/Form/Block/Date.php:173
1023	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:74
1024	#: views/form/templates/blocks/date_years.hbs:5
1025	- #: views/subscribers/subscribers.html:85
1026	msgid "Year"
1027	msgstr ""
1028
	@@ -1038,62 +1042,62 @@ msgstr ""
1038	msgid "Month (January, February,...)"
1039	msgstr ""
1040
1041	- #: lib/Form/Block/Date.php:124 views/newsletters.html:~~174~~
1042	#: views/subscribers/importExport/import.html:56
1043	msgid "January"
1044	msgstr ""
1045
1046	- #: lib/Form/Block/Date.php:124 views/newsletters.html:~~175~~
1047	#: views/subscribers/importExport/import.html:57
1048	msgid "February"
1049	msgstr ""
1050
1051	- #: lib/Form/Block/Date.php:124 views/newsletters.html:~~176~~
1052	#: views/subscribers/importExport/import.html:58
1053	msgid "March"
1054	msgstr ""
1055
1056	- #: lib/Form/Block/Date.php:124 views/newsletters.html:~~177~~
1057	#: views/subscribers/importExport/import.html:59
1058	msgid "April"
1059	msgstr ""
1060
1061	- #: lib/Form/Block/Date.php:125 views/newsletters.html:~~178~~
1062	- #: views/newsletters.html:~~190~~ views/subscribers/importExport/import.html:60
1063	msgid "May"
1064	msgstr ""
1065
1066	- #: lib/Form/Block/Date.php:125 views/newsletters.html:~~179~~
1067	#: views/subscribers/importExport/import.html:61
1068	msgid "June"
1069	msgstr ""
1070
1071	- #: lib/Form/Block/Date.php:125 views/newsletters.html:~~180~~
1072	#: views/subscribers/importExport/import.html:62
1073	msgid "July"
1074	msgstr ""
1075
1076	- #: lib/Form/Block/Date.php:125 views/newsletters.html:~~181~~
1077	#: views/subscribers/importExport/import.html:63
1078	msgid "August"
1079	msgstr ""
1080
1081	- #: lib/Form/Block/Date.php:125 views/newsletters.html:~~182~~
1082	#: views/subscribers/importExport/import.html:64
1083	msgid "September"
1084	msgstr ""
1085
1086	- #: lib/Form/Block/Date.php:126 views/newsletters.html:~~183~~
1087	#: views/subscribers/importExport/import.html:65
1088	msgid "October"
1089	msgstr ""
1090
1091	- #: lib/Form/Block/Date.php:126 views/newsletters.html:~~184~~
1092	#: views/subscribers/importExport/import.html:66
1093	msgid "November"
1094	msgstr ""
1095
1096	- #: lib/Form/Block/Date.php:126 views/newsletters.html:~~185~~
1097	#: views/subscribers/importExport/import.html:67
1098	msgid "December"
1099	msgstr ""
	@@ -1106,36 +1110,36 @@ msgstr ""
1106	msgid "END Scripts"
1107	msgstr ""
1108
1109	- #: lib/Form/Widget.php:18
1110	msgid "MailPoet Form"
1111	msgstr ""
1112
1113	- #: lib/Form/Widget.php:20
1114	msgid "Add a newsletter subscription form"
1115	msgstr ""
1116
1117	- #: lib/Form/Widget.php:43
1118	msgid "Subscribe to Our Newsletter"
1119	msgstr ""
1120
1121	- #: lib/Form/Widget.php:58
1122	msgid "Title:"
1123	msgstr ""
1124
1125	- #: lib/Form/Widget.php:78
1126	msgid "Create a new form"
1127	msgstr ""
1128
1129	#: lib/Mailer/Mailer.php:83
1130	- msgid "Mailing method does not exist"
1131	msgstr ""
1132
1133	#: lib/Mailer/Mailer.php:91
1134	- msgid "Mailer is not configured"
1135	msgstr ""
1136
1137	#: lib/Mailer/Mailer.php:108
1138	- msgid "Sender name and email are not configured"
1139	msgstr ""
1140
1141	#: lib/Mailer/MailerLog.php:51
	@@ -1150,11 +1154,11 @@ msgstr ""
1150	msgid "Sending frequency limit has been reached."
1151	msgstr ""
1152
1153	- #: lib/Mailer/Methods/AmazonSES.php:34
1154	- msgid "Unsupported Amazon SES region."
1155	msgstr ""
1156
1157	- #: lib/Mailer/Methods/AmazonSES.php:63 lib/Mailer/Methods/PHPMail.php:33
1158	#: lib/Mailer/Methods/SMTP.php:47 lib/Mailer/Methods/SendGrid.php:32
1159	msgid "%s has returned an unknown error."
1160	msgstr ""
	@@ -1162,22 +1166,19 @@ msgstr ""
1162	#: lib/Models/CustomField.php:14 lib/Models/Form.php:13
1163	#: lib/Models/NewsletterOptionField.php:12 lib/Models/NewsletterTemplate.php:13
1164	#: lib/Models/Segment.php:13 lib/Models/Setting.php:22
1165	- #: ~~views/form/templates/settings/field_form~~.~~hbs:53~~
1166	- #: views/subscribers/importExport/import/step2.html:137
1167	- msgid "Please specify a name"
1168	msgstr ""
1169
1170	#: lib/Models/CustomField.php:17 lib/Models/Newsletter.php:27
1171	- #: ~~views/form/templates/settings/field_form~~.~~hbs:16~~
1172	- msgid "Please specify a type"
1173	msgstr ""
1174
1175	- #: lib/Models/Form.php:50 lib/Models/Newsletter.php:464
1176	#: lib/Models/Segment.php:126 lib/Models/Subscriber.php:343
1177	msgid "All"
1178	msgstr ""
1179
1180	- #: lib/Models/Form.php:55 lib/Models/Newsletter.php:534
1181	#: lib/Models/Segment.php:131 lib/Models/Subscriber.php:368 views/forms.html:56
1182	#: views/newsletters.html:75 views/segments.html:50
1183	#: views/subscribers/subscribers.html:34
	@@ -1215,7 +1216,7 @@ msgstr ""
1215	msgid "Sent"
1216	msgstr ""
1217
1218	- #: lib/Models/Newsletter.php:514 views/newsletters.html:82
1219	msgid "Active"
1220	msgstr ""
1221
	@@ -1224,19 +1225,19 @@ msgid "Not active"
1224	msgstr ""
1225
1226	#: lib/Models/NewsletterOptionField.php:15
1227	- msgid "Please specify a newsletter type"
1228	msgstr ""
1229
1230	#: lib/Models/NewsletterTemplate.php:16
1231	- msgid "The template body cannot be empty"
1232	msgstr ""
1233
1234	- #: lib/Models/Segment.php:107 views/subscribers/subscribers.html:81
1235	msgid "WordPress Users"
1236	msgstr ""
1237
1238	#: lib/Models/Segment.php:109
1239	- msgid "This ~~lists~~ ~~containts~~ all of your WordPress users"
1240	msgstr ""
1241
1242	#: lib/Models/Segment.php:193
	@@ -1279,23 +1280,23 @@ msgstr ""
1279	msgid "Subscribers without a list (%s)"
1280	msgstr ""
1281
1282	- #: lib/Models/Subscriber.php:348 lib/Subscription/Pages.php:~~290~~
1283	- #: views/segments.html:30 views/subscribers/subscribers.html:51
1284	msgid "Subscribed"
1285	msgstr ""
1286
1287	#: lib/Models/Subscriber.php:353 views/segments.html:31
1288	- #: views/subscribers/subscribers.html:50
1289	msgid "Unconfirmed"
1290	msgstr ""
1291
1292	- #: lib/Models/Subscriber.php:358 lib/Subscription/Pages.php:~~298~~
1293	- #: views/segments.html:32 views/subscribers/subscribers.html:52
1294	msgid "Unsubscribed"
1295	msgstr ""
1296
1297	- #: lib/Models/Subscriber.php:363 lib/Subscription/Pages.php:~~306~~
1298	- #: views/segments.html:33 views/subscribers/subscribers.html:53
1299	msgid "Bounced"
1300	msgstr ""
1301
	@@ -1320,7 +1321,7 @@ msgstr ""
1320	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:10
1321	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:95
1322	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:96
1323	- #: views/subscribers/subscribers.html:59
1324	msgid "Subscriber"
1325	msgstr ""
1326
	@@ -1409,24 +1410,24 @@ msgid "View in browser link"
1409	msgstr ""
1410
1411	#: lib/Router/Router.php:34
1412	- msgid "Invalid router endpoint."
1413	msgstr ""
1414
1415	#: lib/Router/Router.php:38
1416	- msgid "Invalid router endpoint action."
1417	msgstr ""
1418
1419	#: lib/Settings/Pages.php:12 lib/Settings/Pages.php:13
1420	- #: lib/Settings/Pages.php:37 lib/Subscription/Pages.php:95
1421	msgid "MailPoet Page"
1422	msgstr ""
1423
1424	#: lib/Subscribers/ImportExport/Export/Export.php:50
1425	- msgid "~~Couldn't~~ ~~save~~ export file on the server"
1426	msgstr ""
1427
1428	#: lib/Subscribers/ImportExport/Export/Export.php:53
1429	- msgid "Export requires a ZIP extension to be installed on the host"
1430	msgstr ""
1431
1432	#: lib/Subscribers/ImportExport/Export/Export.php:82 views/segments.html:29
	@@ -1476,20 +1477,20 @@ msgid "Not In List"
1476	msgstr ""
1477
1478	#: lib/Subscribers/ImportExport/ImportExportFactory.php:33
1479	- #: lib/Subscription/Pages.php:~~267~~ views/form/editor.html:227
1480	- #: views/form/editor.html:230
1481	msgid "First name"
1482	msgstr ""
1483
1484	#: lib/Subscribers/ImportExport/ImportExportFactory.php:34
1485	- #: lib/Subscription/Pages.php:~~276~~ views/form/editor.html:236
1486	- #: views/form/editor.html:239
1487	msgid "Last name"
1488	msgstr ""
1489
1490	#: lib/Subscribers/ImportExport/ImportExportFactory.php:35
1491	- #: lib/Subscription/Pages.php:~~286~~ views/newsletters.html:61
1492	- #: views/subscribers/subscribers.html:49 views/subscribers/subscribers.html:60
1493	msgid "Status"
1494	msgstr ""
1495
	@@ -1522,72 +1523,68 @@ msgstr ""
1522	msgid "User fields"
1523	msgstr ""
1524
1525	- #: lib/Subscription/Comment.php:23
1526	- msgid "Yes, please add me to your mailing list"
1527	msgstr ""
1528
1529	- #: lib/Subscription/Pages.php:91
1530	- msgid "Hmmm... we don't have a record of you"
1531	msgstr ""
1532
1533	- #: lib/Subscription/Pages.php:~~121~~
1534	msgid ""
1535	"Your email address doesn't appear in our lists anymore. Sign up again or "
1536	"contact us if this appears to be a mistake."
1537	msgstr ""
1538
1539	- #: lib/Subscription/Pages.php:~~165~~ lib/Subscription/Pages.php:~~177~~
1540	msgid "You have subscribed to: %s"
1541	msgstr ""
1542
1543	- #: lib/Subscription/Pages.php:~~174~~
1544	msgid "You are now subscribed!"
1545	msgstr ""
1546
1547	- #: lib/Subscription/Pages.php:~~187~~ lib/Subscription/Pages.php:~~405~~
1548	msgid "Manage your subscription"
1549	msgstr ""
1550
1551	- #: lib/Subscription/Pages.php:~~193~~
1552	- msgid "You are now unsubscribed"
1553	msgstr ""
1554
1555	- #: lib/Subscription/Pages.php:~~200~~
1556	msgid "Yup, we've added you to our email list. You'll hear from us shortly."
1557	msgstr ""
1558
1559	- #: lib/Subscription/Pages.php:~~329~~
1560	msgid "Your lists"
1561	msgstr ""
1562
1563	- #: lib/Subscription/Pages.php:~~337~~ views/form/editor.html:29
1564	#: views/form/editor.html:383 views/newsletter/templates/components/save.hbs:3
1565	- #: views/segments.html:55 views/subscribers/subscribers.html:91
1566	msgid "Save"
1567	msgstr ""
1568
1569	- #: lib/Subscription/Pages.php:~~369~~
1570	msgid "[link]Edit your profile[/link] to update your email."
1571	msgstr ""
1572
1573	- #: lib/Subscription/Pages.php:~~375~~
1574	msgid "[link]Log in to your account[/link] to update your email."
1575	msgstr ""
1576
1577	- #: lib/Subscription/Pages.php:~~379~~
1578	msgid ""
1579	"Need to change your email address? Unsubscribe here, then simply sign up "
1580	"again."
1581	msgstr ""
1582
1583	- #: lib/Subscription/Pages.php:~~393~~
1584	msgid "Accidentally unsubscribed?"
1585	msgstr ""
1586
1587	- #: lib/Subscription/Registration.php:11
1588	- msgid "Yes, please add me to your mailing list."
1589	- msgstr ""
1590	-
1591	#: lib/Twig/Functions.php:78 views/settings/mta.html:983
1592	msgid "every minute"
1593	msgstr ""
	@@ -1624,8 +1621,8 @@ msgstr ""
1624	msgid "Form"
1625	msgstr ""
1626
1627	- #: views/form/editor.html:6 views/segments.html:66
1628	- #: views/subscribers/subscribers.html:92
1629	msgid "Back"
1630	msgstr ""
1631
	@@ -1685,7 +1682,7 @@ msgstr ""
1685
1686	#: views/form/editor.html:195
1687	#: views/newsletter/templates/components/sidebar/preview.hbs:2
1688	- #: views/newsletters.html:~~100~~ views/settings/basics.html:242
1689	#: views/settings/basics.html:299 views/settings/signup.html:177
1690	msgid "Preview"
1691	msgstr ""
	@@ -1763,11 +1760,11 @@ msgid "Please select at least one list"
1763	msgstr ""
1764
1765	#: views/form/templates/preview.hbs:4
1766	- msgid "This is a success message"
1767	msgstr ""
1768
1769	#: views/form/templates/preview.hbs:5
1770	- msgid "This is an error message"
1771	msgstr ""
1772
1773	#: views/form/templates/settings/date_default.hbs:2
	@@ -1833,6 +1830,10 @@ msgstr[1] ""
1833	msgid "Select a field type:"
1834	msgstr ""
1835




1836	#: views/form/templates/settings/field_form.hbs:21
1837	msgid "Text Input"
1838	msgstr ""
	@@ -1849,19 +1850,15 @@ msgstr ""
1849	msgid "Checkbox"
1850	msgstr ""
1851
1852	- #: views/form/templates/settings/field_form.hbs:37 views/newsletters.html:99
1853	- #: views/subscribers/importExport/export.html:52
1854	- #: views/subscribers/importExport/export.html:63
1855	- #: views/subscribers/importExport/import/step1.html:95
1856	- #: views/subscribers/importExport/import/step2.html:41
1857	- #: views/subscribers/importExport/import.html:37
1858	- msgid "Select"
1859	- msgstr ""
1860	-
1861	#: views/form/templates/settings/field_form.hbs:46
1862	msgid "Field name:"
1863	msgstr ""
1864





1865	#: views/form/templates/settings/field_form.hbs:61
1866	#: views/form/templates/settings/submit.hbs:2
1867	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:299
	@@ -1942,7 +1939,7 @@ msgstr ""
1942	msgid "Delete field"
1943	msgstr ""
1944
1945	- #: views/form/widget.html:39
1946	msgid "An error occurred, make sure you have filled all the required fields."
1947	msgstr ""
1948
	@@ -1956,15 +1953,15 @@ msgid "Loading forms..."
1956	msgstr ""
1957
1958	#: views/forms.html:19
1959	- msgid "No forms found"
1960	msgstr ""
1961
1962	#: views/forms.html:20
1963	- msgid "All forms on this page are selected"
1964	msgstr ""
1965
1966	#: views/forms.html:21
1967	- msgid "All %d forms are selected"
1968	msgstr ""
1969
1970	#: views/forms.html:22
	@@ -2000,57 +1997,57 @@ msgstr ""
2000	msgid "Filter"
2001	msgstr ""
2002
2003	- #: views/forms.html:29 views/newsletters.html:41 views/segments.html:51
2004	#: views/subscribers/subscribers.html:30
2005	msgid "Empty Trash"
2006	msgstr ""
2007
2008	- #: views/forms.html:30 views/newsletters.html:42 views/segments.html:52
2009	#: views/subscribers/subscribers.html:31
2010	msgid "Select All"
2011	msgstr ""
2012
2013	- #: views/forms.html:31 views/newsletters.html:43 views/segments.html:53
2014	#: views/subscribers/subscribers.html:33
2015	msgid "Restore"
2016	msgstr ""
2017
2018	#: views/forms.html:32 views/newsletters.html:44
2019	- #: views/subscribers/subscribers.html:35
2020	msgid "Delete Permanently"
2021	msgstr ""
2022
2023	- #: views/forms.html:34 views/newsletters.html:47 views/segments.html:57
2024	- #: views/subscribers/subscribers.html:38
2025	msgid "Previous page"
2026	msgstr ""
2027
2028	- #: views/forms.html:35 views/newsletters.html:48 views/segments.html:58
2029	- #: views/subscribers/subscribers.html:39
2030	msgid "First page"
2031	msgstr ""
2032
2033	- #: views/forms.html:36 views/newsletters.html:49 views/segments.html:59
2034	- #: views/subscribers/subscribers.html:40
2035	msgid "Next page"
2036	msgstr ""
2037
2038	- #: views/forms.html:37 views/newsletters.html:50 views/segments.html:60
2039	- #: views/subscribers/subscribers.html:41
2040	msgid "Last page"
2041	msgstr ""
2042
2043	- #: views/forms.html:38 views/subscribers/subscribers.html:42
2044	msgid "Current Page"
2045	msgstr ""
2046
2047	- #: views/forms.html:39 views/newsletters.html:52 views/segments.html:62
2048	- #: views/subscribers/subscribers.html:43
2049	msgid "of"
2050	msgstr ""
2051
2052	- #: views/forms.html:40 views/newsletters.html:53 views/segments.html:63
2053	- #: views/subscribers/subscribers.html:44
2054	msgid "%$1d item(s)"
2055	msgstr ""
2056
	@@ -2064,7 +2061,7 @@ msgid "User choice:"
2064	msgstr ""
2065
2066	#: views/forms.html:45
2067	- msgid "~~Signups~~"
2068	msgstr ""
2069
2070	#: views/forms.html:46
	@@ -2072,49 +2069,54 @@ msgid "Created On"
2072	msgstr ""
2073
2074	#: views/forms.html:47
2075	- msgid "1 form was moved to the trash"
2076	msgstr ""
2077
2078	#: views/forms.html:48
2079	- msgid "%$1d forms were moved to the trash"
2080	msgstr ""
2081
2082	#: views/forms.html:49
2083	- msgid "1 form was permanently deleted"
2084	msgstr ""
2085
2086	#: views/forms.html:50
2087	- msgid "%$1d forms were permanently deleted"
2088	msgstr ""
2089
2090	#: views/forms.html:51
2091	- msgid "1 form has been restored from the trash"
2092	msgstr ""
2093
2094	#: views/forms.html:52
2095	- msgid "%$1d forms have been restored from the trash"
2096	msgstr ""
2097
2098	- #: views/forms.html:53 views/newsletters.html:76 views/segments.html:49
2099	#: views/subscribers/subscribers.html:32
2100	msgid "Edit"
2101	msgstr ""
2102
2103	- #: views/forms.html:54 views/newsletters.html:77 views/segments.html:41
2104	msgid "Duplicate"
2105	msgstr ""
2106
2107	#: views/forms.html:55
2108	- msgid "Form \"%$1s\" has been duplicated"
2109	msgstr ""
2110
2111	- #: views/forms.html:57 views/newsletters.html:89 views/segments.html:48
2112	- #: views/subscribers/subscribers.html:88





2113	msgid "Add New"
2114	msgstr ""
2115
2116	#: views/index.html:5
2117	- msgid " %~~sSetup~~%s MailPoet and start sending."
2118	msgstr ""
2119
2120	#: views/layout.html:64
	@@ -2272,7 +2274,7 @@ msgid "Categories & tags"
2272	msgstr ""
2273
2274	#: views/newsletter/editor.html:333
2275	- msgid "There is no content to display"
2276	msgstr ""
2277
2278	#: views/newsletter/editor.html:334
	@@ -2314,7 +2316,7 @@ msgid "An image of..."
2314	msgstr ""
2315
2316	#: views/newsletter/editor.html:1156
2317	- msgid "Edit this to insert text"
2318	msgstr ""
2319
2320	#: views/newsletter/editor.html:1159
	@@ -2322,7 +2324,7 @@ msgid "Display problems?"
2322	msgstr ""
2323
2324	#: views/newsletter/editor.html:1160
2325	- msgid "Open this email in your web browser"
2326	msgstr ""
2327
2328	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:1
	@@ -2511,7 +2513,7 @@ msgstr ""
2511
2512	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:233
2513	#: views/newsletter/templates/blocks/posts/settingsDisplayOptions.hbs:189
2514	- msgid "Read more\" text"
2515	msgstr ""
2516
2517	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:252
	@@ -2554,7 +2556,7 @@ msgid "Edit settings"
2554	msgstr ""
2555
2556	#: views/newsletter/templates/blocks/base/toolsGeneric.hbs:6
2557	- #: views/newsletters.html:98
2558	msgid "Delete"
2559	msgstr ""
2560
	@@ -2763,8 +2765,8 @@ msgstr ""
2763	msgid "Preview text (usually displayed underneath the subject line in the inbox)"
2764	msgstr ""
2765
2766	- #: views/newsletter/templates/components/save.hbs:5 views/newsletters.html:~~135~~
2767	- #: views/newsletters.html:~~212~~
2768	msgid "Next"
2769	msgstr ""
2770
	@@ -2842,11 +2844,11 @@ msgid ""
2842	msgstr ""
2843
2844	#: views/newsletters.html:32
2845	- msgid "All newsletters on this page are selected"
2846	msgstr ""
2847
2848	#: views/newsletters.html:33
2849	- msgid "All %d newsletters are selected"
2850	msgstr ""
2851
2852	#: views/newsletters.html:34
	@@ -2854,19 +2856,20 @@ msgid "Select all newsletters on all pages"
2854	msgstr ""
2855
2856	#: views/newsletters.html:36
2857	- msgid "%d newsletters were permanently deleted"
2858	msgstr ""
2859
2860	- #: views/newsletters.html:45 views/subscribers/importExport/import.html:47
2861	- #: views/subscribers/~~subscribers~~.html:36

2862	msgid "Show more details"
2863	msgstr ""
2864
2865	- #: views/newsletters.html:51 views/segments.html:61
2866	msgid "Current page"
2867	msgstr ""
2868
2869	- #: views/newsletters.html:60 views/newsletters.html:~~103~~
2870	msgid "Subject"
2871	msgstr ""
2872
	@@ -2886,565 +2889,545 @@ msgstr ""
2886	msgid "Created on"
2887	msgstr ""
2888
2889	- #: views/newsletters.html:68 views/subscribers/subscribers.html:63
2890	msgid "Last modified on"
2891	msgstr ""
2892
2893	#: views/newsletters.html:69
2894	- msgid "1 newsletter was moved to the trash"
2895	msgstr ""
2896
2897	#: views/newsletters.html:70
2898	- msgid "%$1d newsletters were moved to the trash"
2899	msgstr ""
2900
2901	#: views/newsletters.html:71
2902	- msgid "1 newsletter was permanently deleted"
2903	msgstr ""
2904
2905	#: views/newsletters.html:72
2906	- msgid "%$1d newsletters were permanently deleted"
2907	msgstr ""
2908
2909	#: views/newsletters.html:73
2910	- msgid "1 newsletter has been recovered from the trash"
2911	msgstr ""
2912
2913	#: views/newsletters.html:74
2914	- msgid "%$1d newsletters have been recovered from the trash"
2915	msgstr ""
2916
2917	- #: views/newsletters.html:78
2918	msgid "Email \"%$1s\" has been duplicated."
2919	msgstr ""
2920
2921	- #: views/newsletters.html:79
2922	msgid "Not sent yet"
2923	msgstr ""
2924
2925	- #: views/newsletters.html:80
2926	msgid "Scheduled for"
2927	msgstr ""
2928
2929	- #: views/newsletters.html:81
2930	msgid "Schedule it"
2931	msgstr ""
2932
2933	- #: views/newsletters.html:83
2934	msgid "Not Active"
2935	msgstr ""
2936
2937	- #: views/newsletters.html:84
2938	msgid "Sent to %$1d of %$2d"
2939	msgstr ""
2940
2941	- #: views/newsletters.html:85
2942	msgid "Sent to %$1d subscribers"
2943	msgstr ""
2944
2945	- #: views/newsletters.html:86
2946	msgid "Resume"
2947	msgstr ""
2948
2949	- #: views/newsletters.html:87
2950	msgid "Pause"
2951	msgstr ""
2952
2953	- #: views/newsletters.html:88
2954	msgid "Paused"
2955	msgstr ""
2956
2957	- #: views/newsletters.html:91
2958	msgid "This template file appears to be damaged. Please try another one."
2959	msgstr ""
2960
2961	- #: views/newsletters.html:92
2962	msgid "Import a template"
2963	msgstr ""
2964
2965	- #: views/newsletters.html:93
2966	msgid "Select a .json file to upload"
2967	msgstr ""
2968
2969	- #: views/newsletters.html:94
2970	msgid "Upload"
2971	msgstr ""
2972
2973	- #: views/newsletters.html:95
2974	msgid "MailPoet's Guide"
2975	msgstr ""
2976
2977	- #: views/newsletters.html:96
2978	- msgid "This is the standard template that comes with MailPoet"
2979	msgstr ""
2980
2981	- #: views/newsletters.html:97
2982	- msgid "You are about to delete the template named \"%$1s"
2983	msgstr ""
2984
2985	- #: views/newsletters.html:~~101~~
2986	msgid "Select a responsive template"
2987	msgstr ""
2988
2989	- #: views/newsletters.html:~~104~~
2990	msgid "Select type of email"
2991	msgstr ""
2992
2993	- #: views/newsletters.html:~~106~~
2994	msgid ""
2995	"Send a newsletter with images, buttons, dividers, and social bookmarks. Or, "
2996	"just send a basic text email."
2997	msgstr ""
2998
2999	- #: views/newsletters.html:~~107~~
3000	msgid "Create"
3001	msgstr ""
3002
3003	- #: views/newsletters.html:~~108~~
3004	msgid "Welcome Email"
3005	msgstr ""
3006
3007	- #: views/newsletters.html:~~109~~
3008	msgid ""
3009	"Automatically send an email (or series of emails) to new subscribers or "
3010	"WordPress users. Send a day, a week, or a month after they sign up."
3011	msgstr ""
3012
3013	- #: views/newsletters.html:~~110~~
3014	msgid "Set up"
3015	msgstr ""
3016
3017	- #: views/newsletters.html:~~111~~
3018	msgid "Latest Post Notifications"
3019	msgstr ""
3020
3021	- #: views/newsletters.html:~~112~~
3022	msgid ""
3023	"Let MailPoet email your subscribers with your latest content. You can send "
3024	"daily, weekly, monthly, or even immediately after publication."
3025	msgstr ""
3026
3027	- #: views/newsletters.html:~~113~~
3028	msgid "Select a frequency"
3029	msgstr ""
3030
3031	- #: views/newsletters.html:~~114~~
3032	msgid ""
3033	"Insert [newsletter:total] to show number of posts, [newsletter:post_title] "
3034	"to show the latest post's title & [newsletter:number] to display the issue "
3035	"number."
3036	msgstr ""
3037
3038	- #: views/newsletters.html:~~115~~ views/settings/mta.html:640
3039	msgid "Activate"
3040	msgstr ""
3041
3042	- #: views/newsletters.html:~~116~~
3043	msgid "Send this Welcome Email when..."
3044	msgstr ""
3045
3046	- #: views/newsletters.html:~~118~~
3047	msgid "Once a day at..."
3048	msgstr ""
3049
3050	- #: views/newsletters.html:~~119~~
3051	msgid "Weekly on..."
3052	msgstr ""
3053
3054	- #: views/newsletters.html:~~120~~
3055	msgid "Monthly on the..."
3056	msgstr ""
3057
3058	- #: views/newsletters.html:~~121~~
3059	msgid "Monthly every..."
3060	msgstr ""
3061
3062	- #: views/newsletters.html:~~122~~
3063	msgid "Immediately."
3064	msgstr ""
3065
3066	- #: views/newsletters.html:~~123~~
3067	msgid "Sunday"
3068	msgstr ""
3069
3070	- #: views/newsletters.html:~~124~~
3071	msgid "Monday"
3072	msgstr ""
3073
3074	- #: views/newsletters.html:~~125~~
3075	msgid "Tuesday"
3076	msgstr ""
3077
3078	- #: views/newsletters.html:~~126~~
3079	msgid "Wednesday"
3080	msgstr ""
3081
3082	- #: views/newsletters.html:~~127~~
3083	msgid "Thursday"
3084	msgstr ""
3085
3086	- #: views/newsletters.html:~~128~~
3087	msgid "Friday"
3088	msgstr ""
3089
3090	- #: views/newsletters.html:~~129~~
3091	msgid "Saturday"
3092	msgstr ""
3093
3094	- #: views/newsletters.html:~~130~~
3095	msgid "1st"
3096	msgstr ""
3097
3098	- #: views/newsletters.html:~~131~~
3099	msgid "2nd"
3100	msgstr ""
3101
3102	- #: views/newsletters.html:~~132~~
3103	msgid "3rd"
3104	msgstr ""
3105
3106	- #: views/newsletters.html:~~133~~
3107	msgid "%$1dth"
3108	msgstr ""
3109
3110	- #: views/newsletters.html:~~134~~
3111	msgid "last"
3112	msgstr ""
3113
3114	- #: views/newsletters.html:~~137~~
3115	msgid "When is this Welcome Email sent?"
3116	msgstr ""
3117
3118	- #: views/newsletters.html:~~139~~
3119	msgid "When someone subscribes to the list..."
3120	msgstr ""
3121
3122	- #: views/newsletters.html:~~140~~
3123	msgid "When a new WordPress user is added to your site..."
3124	msgstr ""
3125
3126	- #: views/newsletters.html:~~141~~
3127	msgid "immediately"
3128	msgstr ""
3129
3130	- #: views/newsletters.html:~~142~~
3131	msgid "hour(s) later"
3132	msgstr ""
3133
3134	- #: views/newsletters.html:~~143~~
3135	msgid "day(s) later"
3136	msgstr ""
3137
3138	- #: views/newsletters.html:~~144~~
3139	msgid "week(s) later"
3140	msgstr ""
3141
3142	- #: views/newsletters.html:~~146~~
3143	msgid "Subject line"
3144	msgstr ""
3145
3146	- #: views/newsletters.html:~~147~~
3147	msgid ""
3148	"Be creative! It's the first thing that your subscribers see. Tempt them to "
3149	"open your email."
3150	msgstr ""
3151
3152	- #: views/newsletters.html:~~148~~
3153	msgid "Please specify a subject"
3154	msgstr ""
3155
3156	- #: views/newsletters.html:~~150~~
3157	msgid "This subscriber segment will be used for this email."
3158	msgstr ""
3159
3160	- #: views/newsletters.html:~~151~~ views/subscribers/subscribers.html:54
3161	msgid "Select a list"
3162	msgstr ""
3163
3164	- #: views/newsletters.html:~~153~~
3165	msgid "Sender"
3166	msgstr ""
3167
3168	- #: views/newsletters.html:~~154~~
3169	- msgid "Your name and email."
3170	msgstr ""
3171
3172	- #: views/newsletters.html:~~155~~ views/newsletters.html:~~159~~
3173	msgid "John Doe"
3174	msgstr ""
3175
3176	- #: views/newsletters.html:~~156~~ views/newsletters.html:~~160~~
3177	msgid "john.doe@email.com"
3178	msgstr ""
3179
3180	- #: views/newsletters.html:~~157~~ views/settings/basics.html:29
3181	#: views/settings/signup.html:85
3182	msgid "Reply-to"
3183	msgstr ""
3184
3185	- #: views/newsletters.html:~~158~~
3186	msgid ""
3187	"When your subscribers reply to your newsletter, their emails will go to "
3188	- "this address"
3189	msgstr ""
3190
3191	- #: views/newsletters.html:~~161~~
3192	msgid "Newsletter was updated successfully!"
3193	msgstr ""
3194
3195	- #: views/newsletters.html:~~162~~
3196	msgid "Newsletter was added successfully!"
3197	msgstr ""
3198
3199	- #: views/newsletters.html:~~163~~
3200	msgid ""
3201	"An error occurred while trying to send. <a href=\"%$1s\">Please check your "
3202	- "settings</a>"
3203	msgstr ""
3204
3205	- #: views/newsletters.html:~~164~~
3206	msgid "Final Step: Last Details"
3207	msgstr ""
3208
3209	- #: views/newsletters.html:~~165~~
3210	msgid "Save as draft and close"
3211	msgstr ""
3212
3213	- #: views/newsletters.html:~~166~~
3214	msgid "or simply"
3215	msgstr ""
3216
3217	- #: views/newsletters.html:~~167~~
3218	msgid "go back to the Design page"
3219	msgstr ""
3220
3221	- #: views/newsletters.html:~~168~~
3222	msgid "Your website’s time is"
3223	msgstr ""
3224
3225	- #: views/newsletters.html:~~169~~
3226	- msgid "Please enter the scheduled date"
3227	msgstr ""
3228
3229	- #: views/newsletters.html:~~170~~
3230	msgid "Schedule"
3231	msgstr ""
3232
3233	- #: views/newsletters.html:~~172~~
3234	msgid "Close"
3235	msgstr ""
3236
3237	- #: views/newsletters.html:~~173~~
3238	msgid "Today"
3239	msgstr ""
3240
3241	- #: views/newsletters.html:~~186~~
3242	msgid "Jan"
3243	msgstr ""
3244
3245	- #: views/newsletters.html:~~187~~
3246	msgid "Feb"
3247	msgstr ""
3248
3249	- #: views/newsletters.html:~~188~~
3250	msgid "Mar"
3251	msgstr ""
3252
3253	- #: views/newsletters.html:~~189~~
3254	msgid "Apr"
3255	msgstr ""
3256
3257	- #: views/newsletters.html:~~191~~
3258	msgid "Jun"
3259	msgstr ""
3260
3261	- #: views/newsletters.html:~~192~~
3262	msgid "Jul"
3263	msgstr ""
3264
3265	- #: views/newsletters.html:~~193~~
3266	msgid "Aug"
3267	msgstr ""
3268
3269	- #: views/newsletters.html:~~194~~
3270	msgid "Sep"
3271	msgstr ""
3272
3273	- #: views/newsletters.html:~~195~~
3274	msgid "Oct"
3275	msgstr ""
3276
3277	- #: views/newsletters.html:~~196~~
3278	msgid "Nov"
3279	msgstr ""
3280
3281	- #: views/newsletters.html:~~197~~
3282	msgid "Dec"
3283	msgstr ""
3284
3285	- #: views/newsletters.html:~~198~~
3286	msgid "Sun"
3287	msgstr ""
3288
3289	- #: views/newsletters.html:~~199~~
3290	msgid "Mon"
3291	msgstr ""
3292
3293	- #: views/newsletters.html:~~200~~
3294	msgid "Tue"
3295	msgstr ""
3296
3297	- #: views/newsletters.html:~~201~~
3298	msgid "Wed"
3299	msgstr ""
3300
3301	- #: views/newsletters.html:~~202~~
3302	msgid "Thu"
3303	msgstr ""
3304
3305	- #: views/newsletters.html:~~203~~
3306	msgid "Fri"
3307	msgstr ""
3308
3309	- #: views/newsletters.html:~~204~~
3310	msgid "Sat"
3311	msgstr ""
3312
3313	- #: views/newsletters.html:205 views/newsletters.html:211
3314	- msgid "S"
3315	- msgstr ""
3316	-
3317	- #: views/newsletters.html:206
3318	- msgid "M"
3319	- msgstr ""
3320	-
3321	- #: views/newsletters.html:207 views/newsletters.html:209
3322	- msgid "T"
3323	- msgstr ""
3324	-
3325	- #: views/newsletters.html:208
3326	- msgid "W"
3327	- msgstr ""
3328	-
3329	- #: views/newsletters.html:210
3330	- msgid "F"
3331	- msgstr ""
3332	-
3333	- #: views/newsletters.html:213
3334	- msgid "Previous"
3335	- msgstr ""
3336	-
3337	#: views/newsletters.html:214
3338	- msgid "~~The newsletter is being sent...~~"
3339	msgstr ""
3340
3341	#: views/newsletters.html:215
3342	- msgid "The newsletter ~~has~~ ~~been~~ ~~scheduled.~~"
3343	msgstr ""
3344
3345	#: views/newsletters.html:216
3346	- msgid "~~Your~~ ~~Welcome~~ ~~Email~~ is ~~now activated!~~"
3347	msgstr ""
3348
3349	#: views/newsletters.html:217
3350	- msgid "Your Welcome Email ~~could~~ ~~not~~ be activated~~, please check the settings~~"
3351	msgstr ""
3352
3353	#: views/newsletters.html:218
3354	- msgid "Your ~~post~~ ~~notification~~ is ~~now~~ ~~active!~~"
3355	msgstr ""
3356
3357	#: views/newsletters.html:219
3358	- msgid "Your post notification ~~could~~ ~~not~~ ~~be activated, check the settings~~"
3359	msgstr ""
3360
3361	#: views/newsletters.html:220
3362	- msgid "~~This~~ ~~newsletter~~ is ~~sent~~ ~~when~~ ~~someone~~ ~~subscribes~~ to the ~~list: \~~"~~%$1s"~~
3363	msgstr ""
3364
3365	#: views/newsletters.html:221
3366	- msgid "This newsletter is sent when a ~~new~~ ~~WordPress~~ ~~user~~ is ~~added to your site~~"
3367	msgstr ""
3368
3369	#: views/newsletters.html:222




3370	msgid ""
3371	"This newsletter is sent when a new WordPress user with the role \"%$1s\" is "
3372	"added to your site"
3373	msgstr ""
3374
3375	- #: views/newsletters.html:~~223~~
3376	msgid "%$1d hour(s) later"
3377	msgstr ""
3378
3379	- #: views/newsletters.html:~~224~~
3380	msgid "%$1d day(s) later"
3381	msgstr ""
3382
3383	- #: views/newsletters.html:~~225~~
3384	msgid "%$1d week(s) later"
3385	msgstr ""
3386
3387	- #: views/newsletters.html:~~226~~
3388	msgid "Send daily at %$1s"
3389	msgstr ""
3390
3391	- #: views/newsletters.html:~~227~~
3392	msgid "Send weekly on %$1s at %$2s"
3393	msgstr ""
3394
3395	- #: views/newsletters.html:~~228~~
3396	msgid "Send monthly on the %$1s at %$2s"
3397	msgstr ""
3398
3399	- #: views/newsletters.html:~~229~~
3400	msgid "Send every %$1s %$2s of the month at %$3s"
3401	msgstr ""
3402
3403	- #: views/newsletters.html:~~230~~
3404	msgid "Send immediately"
3405	msgstr ""
3406
3407	- #: views/newsletters.html:~~231~~
3408	msgid "if there's new content to %$1s."
3409	msgstr ""
3410
3411	- #: views/newsletters.html:~~232~~
3412	msgid "You need to select a list to send to."
3413	msgstr ""
3414
3415	- #: views/newsletters.html:~~234~~
3416	msgid "Back to Post notifications"
3417	msgstr ""
3418
3419	- #: views/newsletters.html:~~235~~
3420	msgid "Sent on"
3421	msgstr ""
3422
3423	- #: views/newsletters.html:~~236~~
3424	msgid "No subscribers!"
3425	msgstr ""
3426
3427	- #: views/newsletters.html:~~238~~
3428	msgid ""
3429	"Sending is paused because %$1s prevents MailPoet from delivering emails "
3430	"with the following error: %$2s"
3431	msgstr ""
3432
3433	- #: views/newsletters.html:~~239~~
3434	msgid ""
3435	"Sending is paused because the following connection issue prevents MailPoet "
3436	"from delivering emails: %$1s"
3437	msgstr ""
3438
3439	- #: views/newsletters.html:~~240~~
3440	msgid "Check your [link]sending method settings[/link]."
3441	msgstr ""
3442
3443	- #: views/newsletters.html:~~241~~
3444	msgid "Resume sending"
3445	msgstr ""
3446
3447	- #: views/newsletters.html:~~242~~
3448	msgid "Sending has been resumed."
3449	msgstr ""
3450
	@@ -3457,11 +3440,11 @@ msgid "No lists found"
3457	msgstr ""
3458
3459	#: views/segments.html:17
3460	- msgid "All lists on this page are selected"
3461	msgstr ""
3462
3463	#: views/segments.html:18
3464	- msgid "All %d lists are selected"
3465	msgstr ""
3466
3467	#: views/segments.html:19
	@@ -3469,7 +3452,7 @@ msgid "Select all lists on all pages"
3469	msgstr ""
3470
3471	#: views/segments.html:21
3472	- msgid "%d lists were permanently deleted"
3473	msgstr ""
3474
3475	#: views/segments.html:26 views/subscribers/importExport/import/step2.html:143
	@@ -3497,7 +3480,7 @@ msgid "1 list was permanently deleted"
3497	msgstr ""
3498
3499	#: views/segments.html:38
3500	- msgid "%$1d ~~list~~ were permanently deleted"
3501	msgstr ""
3502
3503	#: views/segments.html:39
	@@ -3521,19 +3504,19 @@ msgid "Read More"
3521	msgstr ""
3522
3523	#: views/segments.html:46
3524	- msgid "List \"%$1s\" has been synchronized"
3525	msgstr ""
3526
3527	#: views/segments.html:47
3528	msgid "View Subscribers"
3529	msgstr ""
3530
3531	- #: views/segments.html:54
3532	msgid "Delete permanently"
3533	msgstr ""
3534
3535	- #: views/segments.html:65
3536	- msgid "This text box is for your own use and is never shown to your subscribers"
3537	msgstr ""
3538
3539	#: views/settings/advanced.html:7
	@@ -3541,7 +3524,7 @@ msgid "Bounce email address"
3541	msgstr ""
3542
3543	#: views/settings/advanced.html:10
3544	- msgid "Your bounced emails will be sent to this address"
3545	msgstr ""
3546
3547	#: views/settings/advanced.html:28
	@@ -3608,7 +3591,7 @@ msgid "Default sender"
3608	msgstr ""
3609
3610	#: views/settings/basics.html:9
3611	- msgid "These email addresses will be selected by default for each new email"
3612	msgstr ""
3613
3614	#: views/settings/basics.html:15 views/settings/signup.html:59
	@@ -3643,7 +3626,7 @@ msgid "Subscribe in comments"
3643	msgstr ""
3644
3645	#: views/settings/basics.html:91
3646	- msgid "Visitors that comment on a post can subscribe to your list via a checkbox"
3647	msgstr ""
3648
3649	#: views/settings/basics.html:115 views/settings/basics.html:179
	@@ -3665,7 +3648,7 @@ msgstr ""
3665	#: views/settings/basics.html:151
3666	msgid ""
3667	"Allow users who register as a WordPress user on your website to subscribe "
3668	- "to a MailPoet list (in addition to the \"WordPress Users\" list)"
3669	msgstr ""
3670
3671	#: views/settings/basics.html:206
	@@ -3679,7 +3662,7 @@ msgstr ""
3679	#: views/settings/basics.html:218
3680	msgid ""
3681	"When your subscribers click the \"Manage your subscription\" link, they "
3682	- "will be directed to this page"
3683	msgstr ""
3684
3685	#: views/settings/basics.html:241 views/settings/basics.html:298
	@@ -3717,7 +3700,7 @@ msgid "Archive page shortcode"
3717	msgstr ""
3718
3719	#: views/settings/basics.html:310
3720	- msgid "Paste this shortcode on a page to display a list of past newsletters"
3721	msgstr ""
3722
3723	#: views/settings/basics.html:343
	@@ -3727,7 +3710,7 @@ msgstr ""
3727	#: views/settings/basics.html:346
3728	msgid ""
3729	"Paste this shortcode on a post or page to display the total number of "
3730	- "confirmed subscribers"
3731	msgstr ""
3732
3733	#: views/settings/bounce.html:1
	@@ -3897,7 +3880,7 @@ msgstr ""
3897	#: views/settings/mta.html:254
3898	msgid ""
3899	"Please ask your host for the maximum number of emails you are allowed to "
3900	- "send per day"
3901	msgstr ""
3902
3903	#: views/settings/mta.html:270
	@@ -3917,7 +3900,7 @@ msgid "SMTP Hostname"
3917	msgstr ""
3918
3919	#: views/settings/mta.html:352 views/settings/mta.html:463
3920	- msgid "e.g.:smtp.mydomain.com"
3921	msgstr ""
3922
3923	#: views/settings/mta.html:368
	@@ -3955,7 +3938,7 @@ msgstr ""
3955	#: views/settings/mta.html:560
3956	msgid ""
3957	"Leave this option set to Yes. Only a tiny portion of SMTP services prefer "
3958	- "Authentication to be turned off"
3959	msgstr ""
3960
3961	#: views/settings/mta.html:599
	@@ -3964,14 +3947,14 @@ msgstr ""
3964
3965	#: views/settings/mta.html:602
3966	msgid ""
3967	- "~~Improves~~ your delivery rate by verifying that you're allowed to send ~~emails~~ "
3968	- "from your domain"
3969	msgstr ""
3970
3971	#: views/settings/mta.html:607
3972	msgid ""
3973	"SPF is set up in your DNS. Read your host's support documentation for more "
3974	- "information"
3975	msgstr ""
3976
3977	#: views/settings/mta.html:615
	@@ -4003,11 +3986,11 @@ msgid "You have selected an invalid sending method."
4003	msgstr ""
4004
4005	#: views/settings/mta.html:767
4006	- msgid "You need to specify a MailPoet account key"
4007	msgstr ""
4008
4009	#: views/settings/signup.html:7
4010	- msgid "Enable ~~signup~~ confirmation"
4011	msgstr ""
4012
4013	#: views/settings/signup.html:10
	@@ -4023,7 +4006,7 @@ msgid "Read more about Double Opt-in confirmation."
4023	msgstr ""
4024
4025	#: views/settings/signup.html:19
4026	- msgid "~~Signup~~ confirmation is mandatory when using the MailPoet Sending Service."
4027	msgstr ""
4028
4029	#: views/settings/signup.html:111
	@@ -4047,7 +4030,7 @@ msgstr ""
4047	#: views/settings/signup.html:154
4048	msgid ""
4049	"When subscribers click on the activation link, they will be redirected to "
4050	- "this page"
4051	msgstr ""
4052
4053	#: views/settings/signup.html:195
	@@ -4084,7 +4067,7 @@ msgid "Basics"
4084	msgstr ""
4085
4086	#: views/settings.html:19
4087	- msgid "~~Signup~~ Confirmation"
4088	msgstr ""
4089
4090	#: views/settings.html:20
	@@ -4182,10 +4165,6 @@ msgstr ""
4182	msgid "[link]Read more at our Knowledge Base[/link]"
4183	msgstr ""
4184
4185	- #: views/subscribers/importExport/import/step2.html:8
4186	- msgid "Show more details."
4187	- msgstr ""
4188	-
4189	#: views/subscribers/importExport/import/step2.html:36
4190	msgid "Pick one or more list(s)"
4191	msgstr ""
	@@ -4244,8 +4223,12 @@ msgstr ""
4244	msgid "No active lists found"
4245	msgstr ""
4246




4247	#: views/subscribers/importExport/import.html:39
4248	- msgid "Only comma-separated (CSV) file formats are supported"
4249	msgstr ""
4250
4251	#: views/subscribers/importExport/import.html:40
	@@ -4263,19 +4246,19 @@ msgstr ""
4263	#: views/subscribers/importExport/import.html:42
4264	msgid ""
4265	"No valid records were found. This file needs to be formatted in a CSV style "
4266	- "(comma-separated.) Look at some [link]examples on our support site[/link]"
4267	msgstr ""
4268
4269	#: views/subscribers/importExport/import.html:43
4270	- msgid "%1$s records had issues and were skipped"
4271	msgstr ""
4272
4273	#: views/subscribers/importExport/import.html:44
4274	- msgid "%1$s emails are not valid : %2$s"
4275	msgstr ""
4276
4277	#: views/subscribers/importExport/import.html:45
4278	- msgid "%1$s emails appear more than once in your file : %2$s"
4279	msgstr ""
4280
4281	#: views/subscribers/importExport/import.html:46
	@@ -4288,11 +4271,11 @@ msgid "Add new list"
4288	msgstr ""
4289
4290	#: views/subscribers/importExport/import.html:53
4291	- msgid "The selected value is already matched to another field"
4292	msgstr ""
4293
4294	#: views/subscribers/importExport/import.html:54
4295	- msgid "Confirm that this field corresponds to the selected field"
4296	msgstr ""
4297
4298	#: views/subscribers/importExport/import.html:55
	@@ -4312,7 +4295,7 @@ msgid "First row date cannot be empty."
4312	msgstr ""
4313
4314	#: views/subscribers/importExport/import.html:70
4315	- msgid "Verify that the date in blue matches the original date"
4316	msgstr ""
4317
4318	#: views/subscribers/importExport/import.html:71
	@@ -4348,7 +4331,7 @@ msgid "%1$s subscribers added to %2$s."
4348	msgstr ""
4349
4350	#: views/subscribers/importExport/import.html:79
4351	- msgid "%1$s existing subscribers were updated and added to %2$s"
4352	msgstr ""
4353
4354	#: views/subscribers/subscribers.html:19
	@@ -4364,7 +4347,7 @@ msgid "All subscribers on this page are selected."
4364	msgstr ""
4365
4366	#: views/subscribers/subscribers.html:22
4367	- msgid "All %d subscribers are selected"
4368	msgstr ""
4369
4370	#: views/subscribers/subscribers.html:23
	@@ -4372,116 +4355,108 @@ msgid "Select all subscribers on all pages."
4372	msgstr ""
4373
4374	#: views/subscribers/subscribers.html:25
4375	- msgid "%d subscribers were permanently deleted"
4376	- msgstr ""
4377	-
4378	- #: views/subscribers/subscribers.html:46
4379	- msgid "E-mail"
4380	msgstr ""
4381
4382	#: views/subscribers/subscribers.html:47
4383	- msgid "~~Firstname~~"
4384	- msgstr ""
4385	-
4386	- #: views/subscribers/subscribers.html:48
4387	- msgid "Lastname"
4388	msgstr ""
4389
4390	- #: views/subscribers/subscribers.html:55
4391	msgid "Unsubscribed on %$1s"
4392	msgstr ""
4393
4394	- #: views/subscribers/subscribers.html:56
4395	msgid "Subscriber was updated successfully!"
4396	msgstr ""
4397
4398	- #: views/subscribers/subscribers.html:57
4399	msgid "Subscriber was added successfully!"
4400	msgstr ""
4401
4402	- #: views/subscribers/subscribers.html:62
4403	msgid "Subscribed on"
4404	msgstr ""
4405
4406	- #: views/subscribers/subscribers.html:64
4407	- msgid "1 subscriber was moved to the trash"
4408	- msgstr ""
4409	-
4410	#: views/subscribers/subscribers.html:65
4411	- msgid "~~%$1d~~ ~~subscribers~~ ~~were~~ moved to the trash"
4412	msgstr ""
4413
4414	#: views/subscribers/subscribers.html:66
4415	- msgid "1 ~~subscriber~~ ~~was~~ ~~permanently~~ ~~deleted~~"
4416	msgstr ""
4417
4418	#: views/subscribers/subscribers.html:67
4419	- msgid "~~%$1d~~ ~~subscribers~~ ~~were~~ permanently deleted"
4420	msgstr ""
4421
4422	#: views/subscribers/subscribers.html:68
4423	- msgid "1 ~~subscriber~~ ~~has~~ ~~been~~ ~~restored from the trash~~"
4424	msgstr ""
4425
4426	#: views/subscribers/subscribers.html:69
4427	- msgid "~~%$1d~~ ~~subscribers~~ ~~have~~ been restored from the trash"
4428	msgstr ""
4429
4430	#: views/subscribers/subscribers.html:70
4431	- msgid "~~Move~~ to ~~list...~~"
4432	msgstr ""
4433
4434	#: views/subscribers/subscribers.html:71
4435	- msgid "~~%$1d~~ ~~subscribers were moved~~ to list ~~<strong>%$2s</strong>~~"
4436	msgstr ""
4437
4438	#: views/subscribers/subscribers.html:72
4439	- msgid "~~Add~~ to list~~...~~"
4440	msgstr ""
4441
4442	#: views/subscribers/subscribers.html:73
4443	- msgid "~~%$1d~~ ~~subscribers were added~~ to list ~~<strong>%$2s</strong>~~"
4444	msgstr ""
4445
4446	#: views/subscribers/subscribers.html:74
4447	- msgid "~~Remove~~ ~~from~~ list~~...~~"
4448	msgstr ""
4449
4450	#: views/subscribers/subscribers.html:75
4451	- msgid "~~%$1d~~ ~~subscribers were removed~~ from list ~~<strong>%$2s</strong>~~"
4452	msgstr ""
4453
4454	#: views/subscribers/subscribers.html:76
4455	- msgid "~~Remove~~ from ~~all~~ ~~lists~~"
4456	msgstr ""
4457
4458	#: views/subscribers/subscribers.html:77
4459	- msgid "~~%$1d~~ ~~subscribers were removed~~ from all lists"
4460	msgstr ""
4461
4462	#: views/subscribers/subscribers.html:78
4463	- msgid "~~Resend~~ ~~confirmation~~ ~~email~~"
4464	msgstr ""
4465
4466	#: views/subscribers/subscribers.html:79
4467	- msgid "~~%$1d~~ confirmation ~~emails have been sent~~"
4468	msgstr ""
4469
4470	#: views/subscribers/subscribers.html:80
4471	- msgid "~~Lists~~ to ~~which~~ ~~the~~ ~~subscriber~~ ~~was subscribed~~"




4472	msgstr ""
4473
4474	- #: views/subscribers/subscribers.html:82
4475	msgid ""
4476	- "This subscriber is a registered WordPress user. [link]Edit his "
4477	"profile[/link] to change his/her email."
4478	msgstr ""
4479
4480	- #: views/subscribers/subscribers.html:83
4481	msgid "Tip:"
4482	msgstr ""
4483
4484	- #: views/subscribers/subscribers.html:84
4485	msgid ""
4486	"Need to add new fields, like a telephone number or street address? You can "
4487	"add custom fields by editing the subscription form on the Forms page."
	@@ -4601,4 +4576,52 @@ msgstr ""
4601	#: lib/Config/Menu.php:142
4602	msgctxt "segments per page (screen options)"
4603	msgid "Number of segments per page"
















































4604	msgstr ""


4	msgstr ""
5	"Project-Id-Version: \n"
6	"Report-Msgid-Bugs-To: http://support.mailpoet.com/\n"
7	+ "POT-Creation-Date: 2017-01-31 12:37:25+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=utf-8\n"
10	"Content-Transfer-Encoding: 8bit\n"

27	"X-Textdomain-Support: yes\n"
28
29	#: lib/API/API.php:41 lib/API/API.php:67
30	+ msgid "Invalid request"
31	msgstr ""
32
33	#: lib/API/API.php:114

39	msgstr ""
40
41	#: lib/API/Endpoint.php:30
42	+ msgid "Invalid request parameters"
43	msgstr ""
44
45	#: lib/API/Endpoints/CustomFields.php:24 lib/API/Endpoints/CustomFields.php:51

75	msgstr ""
76
77	#: lib/API/Endpoints/Forms.php:259 lib/API/Endpoints/Newsletters.php:188
78	+ #: lib/API/Endpoints/Segments.php:119
79	msgid "Copy of %s"
80	msgstr ""
81

92	#: lib/API/Endpoints/Newsletters.php:138 lib/API/Endpoints/Newsletters.php:154
93	#: lib/API/Endpoints/Newsletters.php:170 lib/API/Endpoints/Newsletters.php:184
94	#: lib/API/Endpoints/Newsletters.php:216 lib/API/Endpoints/Newsletters.php:247
95	+ #: lib/API/Endpoints/SendingQueue.php:28 lib/API/Endpoints/SendingQueue.php:118
96	+ #: lib/API/Endpoints/SendingQueue.php:144
97	msgid "This newsletter does not exist."
98	msgstr ""
99

109	msgid "Please specify receiver information."
110	msgstr ""
111
112	+ #: lib/API/Endpoints/Segments.php:18 lib/API/Endpoints/Segments.php:69
113	+ #: lib/API/Endpoints/Segments.php:85 lib/API/Endpoints/Segments.php:101
114	+ #: lib/API/Endpoints/Segments.php:115
115	msgid "This list does not exist."
116	msgstr ""
117
118	+ #: lib/API/Endpoints/SendingQueue.php:48
119	msgid "This newsletter is already being sent."
120	msgstr ""
121
122	+ #: lib/API/Endpoints/SendingQueue.php:82
123	msgid "There are no subscribers in that list!"
124	msgstr ""
125
126	+ #: lib/API/Endpoints/SendingQueue.php:125
127	+ #: lib/API/Endpoints/SendingQueue.php:151
128	msgid "This newsletter has not been sent yet."
129	msgstr ""
130

132	msgid "You have not specified any settings to be saved."
133	msgstr ""
134
135	+ #: lib/API/Endpoints/Subscribers.php:25 lib/API/Endpoints/Subscribers.php:139
136	+ #: lib/API/Endpoints/Subscribers.php:155 lib/API/Endpoints/Subscribers.php:171
137	msgid "This subscriber does not exist."
138	msgstr ""
139
140	+ #: lib/API/Endpoints/Subscribers.php:66
141	+ msgid "Please specify a valid form ID."
142	+ msgstr ""
143	+
144	+ #: lib/API/Endpoints/Subscribers.php:79 views/form/editor.html:57
145	msgid "Please select a list."
146	msgstr ""
147
148	+ #: lib/Config/Hooks.php:149
149	msgid "MailPoet Newsletter"
150	msgstr ""
151

163	msgstr ""
164
165	#: lib/Config/Menu.php:129 lib/Config/Menu.php:130 views/forms.html:43
166	+ #: views/newsletters.html:63 views/newsletters.html:150 views/segments.html:13
167	+ #: views/subscribers/subscribers.html:62
168	msgid "Lists"
169	msgstr ""
170

175
176	#: lib/Config/Menu.php:163 lib/Config/Menu.php:164
177	#: views/subscribers/importExport/import.html:7
178	+ #: views/subscribers/subscribers.html:90
179	msgid "Import"
180	msgstr ""
181
182	#: lib/Config/Menu.php:175 lib/Config/Menu.php:176
183	#: views/subscribers/importExport/export.html:6
184	#: views/subscribers/importExport/export.html:96
185	+ #: views/subscribers/subscribers.html:91
186	msgid "Export"
187	msgstr ""
188

201
202	#: lib/Config/Menu.php:223 lib/Newsletter/Shortcodes/ShortcodesHelper.php:32
203	#: views/newsletter/templates/components/sidebar/styles.hbs:74
204	+ #: views/newsletters.html:106
205	msgid "Newsletter"
206	msgstr ""
207

222	msgstr ""
223
224	#: lib/Config/Populator.php:141
225	+ msgid "This list is automatically created when you install MailPoet."
226	msgstr ""
227
228	#: lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php:16

352	#: lib/Config/PopulatorData/Templates/WelcomeBlank1Column.php:55
353	msgid ""
354	"Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open "
355	+ "this email in your web browser.</a>"
356	msgstr ""
357
358	#: lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php:107

367	#: lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php:119
368	msgid ""
369	"<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n"
370	+ "<p>It's time to design your newsletter! In the right sidebar, you'll find "
371	"four menu items that will help you customize your newsletter:</p>\n"
372	"<ol>\n"
373	"<li>Content</li>\n"

488	msgid ""
489	"<h1 style=\"text-align: center;\"><strong>Let's Get Started! </strong></h1>\n"
490	"<p></p>\n"
491	+ "<p>It's time to design your newsletter! In the right sidebar, you'll find "
492	"four menu items that will help you customize your newsletter:</p>\n"
493	"<ol>\n"
494	"<li>Content</li>\n"

571	"inherit;\"></span></p>\n"
572	"<p><span style=\"line-height: 1.6em; background-color: inherit;\">Below, "
573	"you'll find three recent posts, which are displayed automatically, thanks "
574	+ "to the <em>Automatic Latest Content</em> widget, which can be found in the "
575	"right sidebar, under <em>Content</em>.</span></p>\n"
576	"<p><span style=\"line-height: 1.6em; background-color: "
577	"inherit;\"></span></p>\n"

655	"<p></p>\n"
656	"<p>Hi [subscriber:firstname \| default:reader]</p>\n"
657	"<p class=\"\"></p>\n"
658	+ "<p>Fancy 15% off your next order? Use this coupon on any product in our "
659	+ "store. Expires Wednesday! To apply the discount, enter the code on the "
660	+ "payments page.</p>"
661	msgstr ""
662
663	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:113
664	msgid ""
665	+ "<h1 style=\"text-align: center;\"><em><strong>Get a 15% off your next "
666	+ "order</strong></em></h1>"
667	msgstr ""
668
669	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:116

683	msgstr ""
684
685	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:207
686	+ msgid "red-bicycle"
687	msgstr ""
688
689	#: lib/Config/PopulatorData/Templates/StoreDiscount.php:218

761	"<h1 style=\"text-align: center;\">Hi [subscriber:firstname \| "
762	"default:reader]!</h1>\n"
763	"<p></p>\n"
764	+ "<p>Greetings from New Zealand! We're here enjoying the sights, sounds, and "
765	+ "smells of Rotarua! Yesterday, we visited the local hot springs, and today, "
766	+ "we're going swimming.</p>\n"
767	+ "<p>Don't forget to stay updated with Twitter!</p>"
768	msgstr ""
769
770	#: lib/Config/PopulatorData/Templates/TravelEmail.php:88

796	msgstr ""
797
798	#: lib/Config/PopulatorData/Templates/TravelEmail.php:327
799	+ msgid "Glowworms, Waitomo Caves"
800	msgstr ""
801
802	#: lib/Config/PopulatorData/Templates/TravelEmail.php:338
803	msgid ""
804	"<p><em><a "
805	"href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><"
806	+ "strong>Waitomo GlowWorm Caves</strong></a></em></p>"
807	msgstr ""
808
809	#: lib/Config/PopulatorData/Templates/TravelEmail.php:352

940
941	#: lib/Config/RequirementsChecker.php:84
942	msgid ""
943	+ "This plugin requires the PDO_MYSQL PHP extension. Please read our "
944	"[link]instructions[/link] on how to resolve this issue."
945	msgstr ""
946
947	+ #: lib/Config/RequirementsChecker.php:102
948	msgid ""
949	"A MailPoet dependency (%s) does not appear to be loaded correctly, thus "
950	"MailPoet will not work correctly. Please reinstall the plugin."
951	msgstr ""
952
953	+ #: lib/Config/RequirementsChecker.php:113
954	msgid ""
955	"MailPoet has detected a dependency conflict (%s) with another plugin (%s), "
956	"which may cause unexpected behavior. Please disable the offending plugin to "

982	msgstr ""
983
984	#: lib/Form/Block/Base.php:10
985	+ msgid "Please specify a valid email address."
986	msgstr ""
987
988	#: lib/Form/Block/Base.php:18 views/form/editor.html:55
989	+ #: views/newsletters.html:153
990	msgid "Please select a list"
991	msgstr ""
992

1004
1005	#: lib/Form/Block/Date.php:77 lib/Form/Block/Date.php:199
1006	#: views/form/templates/blocks/date_days.hbs:3 views/settings/bounce.html:252
1007	+ #: views/subscribers/subscribers.html:88
1008	msgid "Day"
1009	msgstr ""
1010

1014
1015	#: lib/Form/Block/Date.php:86 lib/Form/Block/Date.php:143
1016	#: views/form/templates/blocks/date_months.hbs:3
1017	+ #: views/subscribers/subscribers.html:87
1018	msgid "Month"
1019	msgstr ""
1020

1026	#: lib/Form/Block/Date.php:173
1027	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:74
1028	#: views/form/templates/blocks/date_years.hbs:5
1029	+ #: views/subscribers/subscribers.html:86
1030	msgid "Year"
1031	msgstr ""
1032

1042	msgid "Month (January, February,...)"
1043	msgstr ""
1044
1045	+ #: lib/Form/Block/Date.php:124 views/newsletters.html:175
1046	#: views/subscribers/importExport/import.html:56
1047	msgid "January"
1048	msgstr ""
1049
1050	+ #: lib/Form/Block/Date.php:124 views/newsletters.html:176
1051	#: views/subscribers/importExport/import.html:57
1052	msgid "February"
1053	msgstr ""
1054
1055	+ #: lib/Form/Block/Date.php:124 views/newsletters.html:177
1056	#: views/subscribers/importExport/import.html:58
1057	msgid "March"
1058	msgstr ""
1059
1060	+ #: lib/Form/Block/Date.php:124 views/newsletters.html:178
1061	#: views/subscribers/importExport/import.html:59
1062	msgid "April"
1063	msgstr ""
1064
1065	+ #: lib/Form/Block/Date.php:125 views/newsletters.html:179
1066	+ #: views/newsletters.html:191 views/subscribers/importExport/import.html:60
1067	msgid "May"
1068	msgstr ""
1069
1070	+ #: lib/Form/Block/Date.php:125 views/newsletters.html:180
1071	#: views/subscribers/importExport/import.html:61
1072	msgid "June"
1073	msgstr ""
1074
1075	+ #: lib/Form/Block/Date.php:125 views/newsletters.html:181
1076	#: views/subscribers/importExport/import.html:62
1077	msgid "July"
1078	msgstr ""
1079
1080	+ #: lib/Form/Block/Date.php:125 views/newsletters.html:182
1081	#: views/subscribers/importExport/import.html:63
1082	msgid "August"
1083	msgstr ""
1084
1085	+ #: lib/Form/Block/Date.php:125 views/newsletters.html:183
1086	#: views/subscribers/importExport/import.html:64
1087	msgid "September"
1088	msgstr ""
1089
1090	+ #: lib/Form/Block/Date.php:126 views/newsletters.html:184
1091	#: views/subscribers/importExport/import.html:65
1092	msgid "October"
1093	msgstr ""
1094
1095	+ #: lib/Form/Block/Date.php:126 views/newsletters.html:185
1096	#: views/subscribers/importExport/import.html:66
1097	msgid "November"
1098	msgstr ""
1099
1100	+ #: lib/Form/Block/Date.php:126 views/newsletters.html:186
1101	#: views/subscribers/importExport/import.html:67
1102	msgid "December"
1103	msgstr ""

1110	msgid "END Scripts"
1111	msgstr ""
1112
1113	+ #: lib/Form/Widget.php:14
1114	msgid "MailPoet Form"
1115	msgstr ""
1116
1117	+ #: lib/Form/Widget.php:16
1118	msgid "Add a newsletter subscription form"
1119	msgstr ""
1120
1121	+ #: lib/Form/Widget.php:39
1122	msgid "Subscribe to Our Newsletter"
1123	msgstr ""
1124
1125	+ #: lib/Form/Widget.php:54
1126	msgid "Title:"
1127	msgstr ""
1128
1129	+ #: lib/Form/Widget.php:74
1130	msgid "Create a new form"
1131	msgstr ""
1132
1133	#: lib/Mailer/Mailer.php:83
1134	+ msgid "Mailing method does not exist."
1135	msgstr ""
1136
1137	#: lib/Mailer/Mailer.php:91
1138	+ msgid "Mailer is not configured."
1139	msgstr ""
1140
1141	#: lib/Mailer/Mailer.php:108
1142	+ msgid "Sender name and email are not configured."
1143	msgstr ""
1144
1145	#: lib/Mailer/MailerLog.php:51

1154	msgid "Sending frequency limit has been reached."
1155	msgstr ""
1156
1157	+ #: lib/Mailer/Methods/AmazonSES.php:35
1158	+ msgid "Unsupported Amazon SES region"
1159	msgstr ""
1160
1161	+ #: lib/Mailer/Methods/AmazonSES.php:64 lib/Mailer/Methods/PHPMail.php:33
1162	#: lib/Mailer/Methods/SMTP.php:47 lib/Mailer/Methods/SendGrid.php:32
1163	msgid "%s has returned an unknown error."
1164	msgstr ""

1166	#: lib/Models/CustomField.php:14 lib/Models/Form.php:13
1167	#: lib/Models/NewsletterOptionField.php:12 lib/Models/NewsletterTemplate.php:13
1168	#: lib/Models/Segment.php:13 lib/Models/Setting.php:22
1169	+ msgid "Please specify a name."


1170	msgstr ""
1171
1172	#: lib/Models/CustomField.php:17 lib/Models/Newsletter.php:27
1173	+ msgid "Please specify a type."

1174	msgstr ""
1175
1176	+ #: lib/Models/Form.php:93 lib/Models/Newsletter.php:464
1177	#: lib/Models/Segment.php:126 lib/Models/Subscriber.php:343
1178	msgid "All"
1179	msgstr ""
1180
1181	+ #: lib/Models/Form.php:98 lib/Models/Newsletter.php:534
1182	#: lib/Models/Segment.php:131 lib/Models/Subscriber.php:368 views/forms.html:56
1183	#: views/newsletters.html:75 views/segments.html:50
1184	#: views/subscribers/subscribers.html:34

1216	msgid "Sent"
1217	msgstr ""
1218
1219	+ #: lib/Models/Newsletter.php:514 views/newsletters.html:83
1220	msgid "Active"
1221	msgstr ""
1222

1225	msgstr ""
1226
1227	#: lib/Models/NewsletterOptionField.php:15
1228	+ msgid "Please specify a newsletter type."
1229	msgstr ""
1230
1231	#: lib/Models/NewsletterTemplate.php:16
1232	+ msgid "The template body cannot be empty."
1233	msgstr ""
1234
1235	+ #: lib/Models/Segment.php:107 views/subscribers/subscribers.html:82
1236	msgid "WordPress Users"
1237	msgstr ""
1238
1239	#: lib/Models/Segment.php:109
1240	+ msgid "This list contains all of your WordPress users."
1241	msgstr ""
1242
1243	#: lib/Models/Segment.php:193

1280	msgid "Subscribers without a list (%s)"
1281	msgstr ""
1282
1283	+ #: lib/Models/Subscriber.php:348 lib/Subscription/Pages.php:289
1284	+ #: views/segments.html:30 views/subscribers/subscribers.html:52
1285	msgid "Subscribed"
1286	msgstr ""
1287
1288	#: lib/Models/Subscriber.php:353 views/segments.html:31
1289	+ #: views/subscribers/subscribers.html:51
1290	msgid "Unconfirmed"
1291	msgstr ""
1292
1293	+ #: lib/Models/Subscriber.php:358 lib/Subscription/Pages.php:297
1294	+ #: views/segments.html:32 views/subscribers/subscribers.html:53
1295	msgid "Unsubscribed"
1296	msgstr ""
1297
1298	+ #: lib/Models/Subscriber.php:363 lib/Subscription/Pages.php:305
1299	+ #: views/segments.html:33 views/subscribers/subscribers.html:54
1300	msgid "Bounced"
1301	msgstr ""
1302

1321	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:10
1322	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:95
1323	#: lib/Newsletter/Shortcodes/ShortcodesHelper.php:96
1324	+ #: views/subscribers/subscribers.html:60
1325	msgid "Subscriber"
1326	msgstr ""
1327

1410	msgstr ""
1411
1412	#: lib/Router/Router.php:34
1413	+ msgid "Invalid router endpoint"
1414	msgstr ""
1415
1416	#: lib/Router/Router.php:38
1417	+ msgid "Invalid router endpoint action"
1418	msgstr ""
1419
1420	#: lib/Settings/Pages.php:12 lib/Settings/Pages.php:13
1421	+ #: lib/Settings/Pages.php:37 lib/Subscription/Pages.php:94
1422	msgid "MailPoet Page"
1423	msgstr ""
1424
1425	#: lib/Subscribers/ImportExport/Export/Export.php:50
1426	+ msgid "The export file could not be saved on the server."
1427	msgstr ""
1428
1429	#: lib/Subscribers/ImportExport/Export/Export.php:53
1430	+ msgid "Export requires a ZIP extension to be installed on the host."
1431	msgstr ""
1432
1433	#: lib/Subscribers/ImportExport/Export/Export.php:82 views/segments.html:29

1477	msgstr ""
1478
1479	#: lib/Subscribers/ImportExport/ImportExportFactory.php:33
1480	+ #: lib/Subscription/Pages.php:266 views/form/editor.html:227
1481	+ #: views/form/editor.html:230 views/subscribers/subscribers.html:48
1482	msgid "First name"
1483	msgstr ""
1484
1485	#: lib/Subscribers/ImportExport/ImportExportFactory.php:34
1486	+ #: lib/Subscription/Pages.php:275 views/form/editor.html:236
1487	+ #: views/form/editor.html:239 views/subscribers/subscribers.html:49
1488	msgid "Last name"
1489	msgstr ""
1490
1491	#: lib/Subscribers/ImportExport/ImportExportFactory.php:35
1492	+ #: lib/Subscription/Pages.php:285 views/newsletters.html:61
1493	+ #: views/subscribers/subscribers.html:50 views/subscribers/subscribers.html:61
1494	msgid "Status"
1495	msgstr ""
1496

1523	msgid "User fields"
1524	msgstr ""
1525
1526	+ #: lib/Subscription/Comment.php:23 lib/Subscription/Registration.php:11
1527	+ msgid "Yes, please add me to your mailing list."
1528	msgstr ""
1529
1530	+ #: lib/Subscription/Pages.php:90
1531	+ msgid "Hmmm... we don't have a record of you."
1532	msgstr ""
1533
1534	+ #: lib/Subscription/Pages.php:120
1535	msgid ""
1536	"Your email address doesn't appear in our lists anymore. Sign up again or "
1537	"contact us if this appears to be a mistake."
1538	msgstr ""
1539
1540	+ #: lib/Subscription/Pages.php:164 lib/Subscription/Pages.php:176
1541	msgid "You have subscribed to: %s"
1542	msgstr ""
1543
1544	+ #: lib/Subscription/Pages.php:173
1545	msgid "You are now subscribed!"
1546	msgstr ""
1547
1548	+ #: lib/Subscription/Pages.php:186 lib/Subscription/Pages.php:404
1549	msgid "Manage your subscription"
1550	msgstr ""
1551
1552	+ #: lib/Subscription/Pages.php:192
1553	+ msgid "You are now unsubscribed."
1554	msgstr ""
1555
1556	+ #: lib/Subscription/Pages.php:199
1557	msgid "Yup, we've added you to our email list. You'll hear from us shortly."
1558	msgstr ""
1559
1560	+ #: lib/Subscription/Pages.php:328
1561	msgid "Your lists"
1562	msgstr ""
1563
1564	+ #: lib/Subscription/Pages.php:336 views/form/editor.html:29
1565	#: views/form/editor.html:383 views/newsletter/templates/components/save.hbs:3
1566	+ #: views/segments.html:56 views/subscribers/subscribers.html:92
1567	msgid "Save"
1568	msgstr ""
1569
1570	+ #: lib/Subscription/Pages.php:368
1571	msgid "[link]Edit your profile[/link] to update your email."
1572	msgstr ""
1573
1574	+ #: lib/Subscription/Pages.php:374
1575	msgid "[link]Log in to your account[/link] to update your email."
1576	msgstr ""
1577
1578	+ #: lib/Subscription/Pages.php:378
1579	msgid ""
1580	"Need to change your email address? Unsubscribe here, then simply sign up "
1581	"again."
1582	msgstr ""
1583
1584	+ #: lib/Subscription/Pages.php:392
1585	msgid "Accidentally unsubscribed?"
1586	msgstr ""
1587




1588	#: lib/Twig/Functions.php:78 views/settings/mta.html:983
1589	msgid "every minute"
1590	msgstr ""

1621	msgid "Form"
1622	msgstr ""
1623
1624	+ #: views/form/editor.html:6 views/segments.html:67
1625	+ #: views/subscribers/subscribers.html:93
1626	msgid "Back"
1627	msgstr ""
1628

1682
1683	#: views/form/editor.html:195
1684	#: views/newsletter/templates/components/sidebar/preview.hbs:2
1685	+ #: views/newsletters.html:101 views/settings/basics.html:242
1686	#: views/settings/basics.html:299 views/settings/signup.html:177
1687	msgid "Preview"
1688	msgstr ""

1760	msgstr ""
1761
1762	#: views/form/templates/preview.hbs:4
1763	+ msgid "This is a success message."
1764	msgstr ""
1765
1766	#: views/form/templates/preview.hbs:5
1767	+ msgid "This is an error message."
1768	msgstr ""
1769
1770	#: views/form/templates/settings/date_default.hbs:2

1830	msgid "Select a field type:"
1831	msgstr ""
1832
1833	+ #: views/form/templates/settings/field_form.hbs:16
1834	+ msgid "Please specify a type"
1835	+ msgstr ""
1836	+
1837	#: views/form/templates/settings/field_form.hbs:21
1838	msgid "Text Input"
1839	msgstr ""

1850	msgid "Checkbox"
1851	msgstr ""
1852









1853	#: views/form/templates/settings/field_form.hbs:46
1854	msgid "Field name:"
1855	msgstr ""
1856
1857	+ #: views/form/templates/settings/field_form.hbs:53
1858	+ #: views/subscribers/importExport/import/step2.html:137
1859	+ msgid "Please specify a name"
1860	+ msgstr ""
1861	+
1862	#: views/form/templates/settings/field_form.hbs:61
1863	#: views/form/templates/settings/submit.hbs:2
1864	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:299

1939	msgid "Delete field"
1940	msgstr ""
1941
1942	+ #: views/form/widget.html:34
1943	msgid "An error occurred, make sure you have filled all the required fields."
1944	msgstr ""
1945

1953	msgstr ""
1954
1955	#: views/forms.html:19
1956	+ msgid "No forms were found. Why not create a new one?"
1957	msgstr ""
1958
1959	#: views/forms.html:20
1960	+ msgid "All forms on this page are selected."
1961	msgstr ""
1962
1963	#: views/forms.html:21
1964	+ msgid "All %d forms are selected."
1965	msgstr ""
1966
1967	#: views/forms.html:22

1997	msgid "Filter"
1998	msgstr ""
1999
2000	+ #: views/forms.html:29 views/newsletters.html:41 views/segments.html:52
2001	#: views/subscribers/subscribers.html:30
2002	msgid "Empty Trash"
2003	msgstr ""
2004
2005	+ #: views/forms.html:30 views/newsletters.html:42 views/segments.html:53
2006	#: views/subscribers/subscribers.html:31
2007	msgid "Select All"
2008	msgstr ""
2009
2010	+ #: views/forms.html:31 views/newsletters.html:43 views/segments.html:54
2011	#: views/subscribers/subscribers.html:33
2012	msgid "Restore"
2013	msgstr ""
2014
2015	#: views/forms.html:32 views/newsletters.html:44
2016	+ #: views/subscribers/subscribers.html:36
2017	msgid "Delete Permanently"
2018	msgstr ""
2019
2020	+ #: views/forms.html:34 views/newsletters.html:47 views/segments.html:58
2021	+ #: views/subscribers/subscribers.html:39
2022	msgid "Previous page"
2023	msgstr ""
2024
2025	+ #: views/forms.html:35 views/newsletters.html:48 views/segments.html:59
2026	+ #: views/subscribers/subscribers.html:40
2027	msgid "First page"
2028	msgstr ""
2029
2030	+ #: views/forms.html:36 views/newsletters.html:49 views/segments.html:60
2031	+ #: views/subscribers/subscribers.html:41
2032	msgid "Next page"
2033	msgstr ""
2034
2035	+ #: views/forms.html:37 views/newsletters.html:50 views/segments.html:61
2036	+ #: views/subscribers/subscribers.html:42
2037	msgid "Last page"
2038	msgstr ""
2039
2040	+ #: views/forms.html:38 views/subscribers/subscribers.html:43
2041	msgid "Current Page"
2042	msgstr ""
2043
2044	+ #: views/forms.html:39 views/newsletters.html:52 views/segments.html:63
2045	+ #: views/subscribers/subscribers.html:44
2046	msgid "of"
2047	msgstr ""
2048
2049	+ #: views/forms.html:40 views/newsletters.html:53 views/segments.html:64
2050	+ #: views/subscribers/subscribers.html:45
2051	msgid "%$1d item(s)"
2052	msgstr ""
2053

2061	msgstr ""
2062
2063	#: views/forms.html:45
2064	+ msgid "Sign-ups"
2065	msgstr ""
2066
2067	#: views/forms.html:46

2069	msgstr ""
2070
2071	#: views/forms.html:47
2072	+ msgid "1 form was moved to the trash."
2073	msgstr ""
2074
2075	#: views/forms.html:48
2076	+ msgid "%$1d forms were moved to the trash."
2077	msgstr ""
2078
2079	#: views/forms.html:49
2080	+ msgid "1 form was permanently deleted."
2081	msgstr ""
2082
2083	#: views/forms.html:50
2084	+ msgid "%$1d forms were permanently deleted."
2085	msgstr ""
2086
2087	#: views/forms.html:51
2088	+ msgid "1 form has been restored from the trash."
2089	msgstr ""
2090
2091	#: views/forms.html:52
2092	+ msgid "%$1d forms have been restored from the trash."
2093	msgstr ""
2094
2095	+ #: views/forms.html:53 views/newsletters.html:77 views/segments.html:49
2096	#: views/subscribers/subscribers.html:32
2097	msgid "Edit"
2098	msgstr ""
2099
2100	+ #: views/forms.html:54 views/newsletters.html:78 views/segments.html:41
2101	msgid "Duplicate"
2102	msgstr ""
2103
2104	#: views/forms.html:55
2105	+ msgid "Form \"%$1s\" has been duplicated."
2106	msgstr ""
2107
2108	+ #: views/forms.html:57 views/newsletters.html:76 views/segments.html:51
2109	+ #: views/subscribers/subscribers.html:35
2110	+ msgid "Move to trash"
2111	+ msgstr ""
2112	+
2113	+ #: views/forms.html:58 views/newsletters.html:90 views/segments.html:48
2114	+ #: views/subscribers/subscribers.html:89
2115	msgid "Add New"
2116	msgstr ""
2117
2118	#: views/index.html:5
2119	+ msgid " %sSet up%s MailPoet and start sending."
2120	msgstr ""
2121
2122	#: views/layout.html:64

2274	msgstr ""
2275
2276	#: views/newsletter/editor.html:333
2277	+ msgid "There is no content to display."
2278	msgstr ""
2279
2280	#: views/newsletter/editor.html:334

2316	msgstr ""
2317
2318	#: views/newsletter/editor.html:1156
2319	+ msgid "Edit this to insert text."
2320	msgstr ""
2321
2322	#: views/newsletter/editor.html:1159

2324	msgstr ""
2325
2326	#: views/newsletter/editor.html:1160
2327	+ msgid "Open this email in your web browser."
2328	msgstr ""
2329
2330	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:1

2513
2514	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:233
2515	#: views/newsletter/templates/blocks/posts/settingsDisplayOptions.hbs:189
2516	+ msgid "\"Read more\" text"
2517	msgstr ""
2518
2519	#: views/newsletter/templates/blocks/automatedLatestContent/settings.hbs:252

2556	msgstr ""
2557
2558	#: views/newsletter/templates/blocks/base/toolsGeneric.hbs:6
2559	+ #: views/newsletters.html:99
2560	msgid "Delete"
2561	msgstr ""
2562

2765	msgid "Preview text (usually displayed underneath the subject line in the inbox)"
2766	msgstr ""
2767
2768	+ #: views/newsletter/templates/components/save.hbs:5 views/newsletters.html:136
2769	+ #: views/newsletters.html:213
2770	msgid "Next"
2771	msgstr ""
2772

2844	msgstr ""
2845
2846	#: views/newsletters.html:32
2847	+ msgid "All newsletters on this page are selected."
2848	msgstr ""
2849
2850	#: views/newsletters.html:33
2851	+ msgid "All %d newsletters are selected."
2852	msgstr ""
2853
2854	#: views/newsletters.html:34

2856	msgstr ""
2857
2858	#: views/newsletters.html:36
2859	+ msgid "%d newsletters were permanently deleted."
2860	msgstr ""
2861
2862	+ #: views/newsletters.html:45 views/subscribers/importExport/import/step2.html:8
2863	+ #: views/subscribers/importExport/import.html:47
2864	+ #: views/subscribers/subscribers.html:37
2865	msgid "Show more details"
2866	msgstr ""
2867
2868	+ #: views/newsletters.html:51 views/segments.html:62
2869	msgid "Current page"
2870	msgstr ""
2871
2872	+ #: views/newsletters.html:60 views/newsletters.html:104
2873	msgid "Subject"
2874	msgstr ""
2875

2889	msgid "Created on"
2890	msgstr ""
2891
2892	+ #: views/newsletters.html:68 views/subscribers/subscribers.html:64
2893	msgid "Last modified on"
2894	msgstr ""
2895
2896	#: views/newsletters.html:69
2897	+ msgid "1 newsletter was moved to the trash."
2898	msgstr ""
2899
2900	#: views/newsletters.html:70
2901	+ msgid "%$1d newsletters were moved to the trash."
2902	msgstr ""
2903
2904	#: views/newsletters.html:71
2905	+ msgid "1 newsletter was permanently deleted."
2906	msgstr ""
2907
2908	#: views/newsletters.html:72
2909	+ msgid "%$1d newsletters were permanently deleted."
2910	msgstr ""
2911
2912	#: views/newsletters.html:73
2913	+ msgid "1 newsletter has been recovered from the trash."
2914	msgstr ""
2915
2916	#: views/newsletters.html:74
2917	+ msgid "%$1d newsletters have been recovered from the trash."
2918	msgstr ""
2919
2920	+ #: views/newsletters.html:79
2921	msgid "Email \"%$1s\" has been duplicated."
2922	msgstr ""
2923
2924	+ #: views/newsletters.html:80
2925	msgid "Not sent yet"
2926	msgstr ""
2927
2928	+ #: views/newsletters.html:81
2929	msgid "Scheduled for"
2930	msgstr ""
2931
2932	+ #: views/newsletters.html:82
2933	msgid "Schedule it"
2934	msgstr ""
2935
2936	+ #: views/newsletters.html:84
2937	msgid "Not Active"
2938	msgstr ""
2939
2940	+ #: views/newsletters.html:85
2941	msgid "Sent to %$1d of %$2d"
2942	msgstr ""
2943
2944	+ #: views/newsletters.html:86
2945	msgid "Sent to %$1d subscribers"
2946	msgstr ""
2947
2948	+ #: views/newsletters.html:87
2949	msgid "Resume"
2950	msgstr ""
2951
2952	+ #: views/newsletters.html:88
2953	msgid "Pause"
2954	msgstr ""
2955
2956	+ #: views/newsletters.html:89
2957	msgid "Paused"
2958	msgstr ""
2959
2960	+ #: views/newsletters.html:92
2961	msgid "This template file appears to be damaged. Please try another one."
2962	msgstr ""
2963
2964	+ #: views/newsletters.html:93
2965	msgid "Import a template"
2966	msgstr ""
2967
2968	+ #: views/newsletters.html:94
2969	msgid "Select a .json file to upload"
2970	msgstr ""
2971
2972	+ #: views/newsletters.html:95
2973	msgid "Upload"
2974	msgstr ""
2975
2976	+ #: views/newsletters.html:96
2977	msgid "MailPoet's Guide"
2978	msgstr ""
2979
2980	+ #: views/newsletters.html:97
2981	+ msgid "This is the standard template that comes with MailPoet."
2982	msgstr ""
2983
2984	+ #: views/newsletters.html:98
2985	+ msgid "You are about to delete the template named \"%$1s\"."
2986	msgstr ""
2987
2988	+ #: views/newsletters.html:102
2989	msgid "Select a responsive template"
2990	msgstr ""
2991
2992	+ #: views/newsletters.html:105
2993	msgid "Select type of email"
2994	msgstr ""
2995
2996	+ #: views/newsletters.html:107
2997	msgid ""
2998	"Send a newsletter with images, buttons, dividers, and social bookmarks. Or, "
2999	"just send a basic text email."
3000	msgstr ""
3001
3002	+ #: views/newsletters.html:108
3003	msgid "Create"
3004	msgstr ""
3005
3006	+ #: views/newsletters.html:109
3007	msgid "Welcome Email"
3008	msgstr ""
3009
3010	+ #: views/newsletters.html:110
3011	msgid ""
3012	"Automatically send an email (or series of emails) to new subscribers or "
3013	"WordPress users. Send a day, a week, or a month after they sign up."
3014	msgstr ""
3015
3016	+ #: views/newsletters.html:111
3017	msgid "Set up"
3018	msgstr ""
3019
3020	+ #: views/newsletters.html:112
3021	msgid "Latest Post Notifications"
3022	msgstr ""
3023
3024	+ #: views/newsletters.html:113
3025	msgid ""
3026	"Let MailPoet email your subscribers with your latest content. You can send "
3027	"daily, weekly, monthly, or even immediately after publication."
3028	msgstr ""
3029
3030	+ #: views/newsletters.html:114
3031	msgid "Select a frequency"
3032	msgstr ""
3033
3034	+ #: views/newsletters.html:115
3035	msgid ""
3036	"Insert [newsletter:total] to show number of posts, [newsletter:post_title] "
3037	"to show the latest post's title & [newsletter:number] to display the issue "
3038	"number."
3039	msgstr ""
3040
3041	+ #: views/newsletters.html:116 views/settings/mta.html:640
3042	msgid "Activate"
3043	msgstr ""
3044
3045	+ #: views/newsletters.html:117
3046	msgid "Send this Welcome Email when..."
3047	msgstr ""
3048
3049	+ #: views/newsletters.html:119
3050	msgid "Once a day at..."
3051	msgstr ""
3052
3053	+ #: views/newsletters.html:120
3054	msgid "Weekly on..."
3055	msgstr ""
3056
3057	+ #: views/newsletters.html:121
3058	msgid "Monthly on the..."
3059	msgstr ""
3060
3061	+ #: views/newsletters.html:122
3062	msgid "Monthly every..."
3063	msgstr ""
3064
3065	+ #: views/newsletters.html:123
3066	msgid "Immediately."
3067	msgstr ""
3068
3069	+ #: views/newsletters.html:124
3070	msgid "Sunday"
3071	msgstr ""
3072
3073	+ #: views/newsletters.html:125
3074	msgid "Monday"
3075	msgstr ""
3076
3077	+ #: views/newsletters.html:126
3078	msgid "Tuesday"
3079	msgstr ""
3080
3081	+ #: views/newsletters.html:127
3082	msgid "Wednesday"
3083	msgstr ""
3084
3085	+ #: views/newsletters.html:128
3086	msgid "Thursday"
3087	msgstr ""
3088
3089	+ #: views/newsletters.html:129
3090	msgid "Friday"
3091	msgstr ""
3092
3093	+ #: views/newsletters.html:130
3094	msgid "Saturday"
3095	msgstr ""
3096
3097	+ #: views/newsletters.html:131
3098	msgid "1st"
3099	msgstr ""
3100
3101	+ #: views/newsletters.html:132
3102	msgid "2nd"
3103	msgstr ""
3104
3105	+ #: views/newsletters.html:133
3106	msgid "3rd"
3107	msgstr ""
3108
3109	+ #: views/newsletters.html:134
3110	msgid "%$1dth"
3111	msgstr ""
3112
3113	+ #: views/newsletters.html:135
3114	msgid "last"
3115	msgstr ""
3116
3117	+ #: views/newsletters.html:138
3118	msgid "When is this Welcome Email sent?"
3119	msgstr ""
3120
3121	+ #: views/newsletters.html:140
3122	msgid "When someone subscribes to the list..."
3123	msgstr ""
3124
3125	+ #: views/newsletters.html:141
3126	msgid "When a new WordPress user is added to your site..."
3127	msgstr ""
3128
3129	+ #: views/newsletters.html:142
3130	msgid "immediately"
3131	msgstr ""
3132
3133	+ #: views/newsletters.html:143
3134	msgid "hour(s) later"
3135	msgstr ""
3136
3137	+ #: views/newsletters.html:144
3138	msgid "day(s) later"
3139	msgstr ""
3140
3141	+ #: views/newsletters.html:145
3142	msgid "week(s) later"
3143	msgstr ""
3144
3145	+ #: views/newsletters.html:147
3146	msgid "Subject line"
3147	msgstr ""
3148
3149	+ #: views/newsletters.html:148
3150	msgid ""
3151	"Be creative! It's the first thing that your subscribers see. Tempt them to "
3152	"open your email."
3153	msgstr ""
3154
3155	+ #: views/newsletters.html:149
3156	msgid "Please specify a subject"
3157	msgstr ""
3158
3159	+ #: views/newsletters.html:151
3160	msgid "This subscriber segment will be used for this email."
3161	msgstr ""
3162
3163	+ #: views/newsletters.html:152 views/subscribers/subscribers.html:55
3164	msgid "Select a list"
3165	msgstr ""
3166
3167	+ #: views/newsletters.html:154
3168	msgid "Sender"
3169	msgstr ""
3170
3171	+ #: views/newsletters.html:155
3172	+ msgid "Your name and email"
3173	msgstr ""
3174
3175	+ #: views/newsletters.html:156 views/newsletters.html:160
3176	msgid "John Doe"
3177	msgstr ""
3178
3179	+ #: views/newsletters.html:157 views/newsletters.html:161
3180	msgid "john.doe@email.com"
3181	msgstr ""
3182
3183	+ #: views/newsletters.html:158 views/settings/basics.html:29
3184	#: views/settings/signup.html:85
3185	msgid "Reply-to"
3186	msgstr ""
3187
3188	+ #: views/newsletters.html:159
3189	msgid ""
3190	"When your subscribers reply to your newsletter, their emails will go to "
3191	+ "this address."
3192	msgstr ""
3193
3194	+ #: views/newsletters.html:162
3195	msgid "Newsletter was updated successfully!"
3196	msgstr ""
3197
3198	+ #: views/newsletters.html:163
3199	msgid "Newsletter was added successfully!"
3200	msgstr ""
3201
3202	+ #: views/newsletters.html:164
3203	msgid ""
3204	"An error occurred while trying to send. <a href=\"%$1s\">Please check your "
3205	+ "settings</a>."
3206	msgstr ""
3207
3208	+ #: views/newsletters.html:165
3209	msgid "Final Step: Last Details"
3210	msgstr ""
3211
3212	+ #: views/newsletters.html:166
3213	msgid "Save as draft and close"
3214	msgstr ""
3215
3216	+ #: views/newsletters.html:167
3217	msgid "or simply"
3218	msgstr ""
3219
3220	+ #: views/newsletters.html:168
3221	msgid "go back to the Design page"
3222	msgstr ""
3223
3224	+ #: views/newsletters.html:169
3225	msgid "Your website’s time is"
3226	msgstr ""
3227
3228	+ #: views/newsletters.html:170
3229	+ msgid "Please enter the scheduled date."
3230	msgstr ""
3231
3232	+ #: views/newsletters.html:171
3233	msgid "Schedule"
3234	msgstr ""
3235
3236	+ #: views/newsletters.html:173
3237	msgid "Close"
3238	msgstr ""
3239
3240	+ #: views/newsletters.html:174
3241	msgid "Today"
3242	msgstr ""
3243
3244	+ #: views/newsletters.html:187
3245	msgid "Jan"
3246	msgstr ""
3247
3248	+ #: views/newsletters.html:188
3249	msgid "Feb"
3250	msgstr ""
3251
3252	+ #: views/newsletters.html:189
3253	msgid "Mar"
3254	msgstr ""
3255
3256	+ #: views/newsletters.html:190
3257	msgid "Apr"
3258	msgstr ""
3259
3260	+ #: views/newsletters.html:192
3261	msgid "Jun"
3262	msgstr ""
3263
3264	+ #: views/newsletters.html:193
3265	msgid "Jul"
3266	msgstr ""
3267
3268	+ #: views/newsletters.html:194
3269	msgid "Aug"
3270	msgstr ""
3271
3272	+ #: views/newsletters.html:195
3273	msgid "Sep"
3274	msgstr ""
3275
3276	+ #: views/newsletters.html:196
3277	msgid "Oct"
3278	msgstr ""
3279
3280	+ #: views/newsletters.html:197
3281	msgid "Nov"
3282	msgstr ""
3283
3284	+ #: views/newsletters.html:198
3285	msgid "Dec"
3286	msgstr ""
3287
3288	+ #: views/newsletters.html:199
3289	msgid "Sun"
3290	msgstr ""
3291
3292	+ #: views/newsletters.html:200
3293	msgid "Mon"
3294	msgstr ""
3295
3296	+ #: views/newsletters.html:201
3297	msgid "Tue"
3298	msgstr ""
3299
3300	+ #: views/newsletters.html:202
3301	msgid "Wed"
3302	msgstr ""
3303
3304	+ #: views/newsletters.html:203
3305	msgid "Thu"
3306	msgstr ""
3307
3308	+ #: views/newsletters.html:204
3309	msgid "Fri"
3310	msgstr ""
3311
3312	+ #: views/newsletters.html:205
3313	msgid "Sat"
3314	msgstr ""
3315
























3316	#: views/newsletters.html:214
3317	+ msgid "Previous"
3318	msgstr ""
3319
3320	#: views/newsletters.html:215
3321	+ msgid "The newsletter is being sent..."
3322	msgstr ""
3323
3324	#: views/newsletters.html:216
3325	+ msgid "The newsletter has been scheduled."
3326	msgstr ""
3327
3328	#: views/newsletters.html:217
3329	+ msgid "Your Welcome Email is now activated!"
3330	msgstr ""
3331
3332	#: views/newsletters.html:218
3333	+ msgid "Your Welcome Email could not be activated, please check the settings."
3334	msgstr ""
3335
3336	#: views/newsletters.html:219
3337	+ msgid "Your post notification is now active!"
3338	msgstr ""
3339
3340	#: views/newsletters.html:220
3341	+ msgid "Your Post Notification could not be activated, check the settings."
3342	msgstr ""
3343
3344	#: views/newsletters.html:221
3345	+ msgid "This newsletter is sent when someone subscribes to the list: \"%$1s\""
3346	msgstr ""
3347
3348	#: views/newsletters.html:222
3349	+ msgid "This newsletter is sent when a new WordPress user is added to your site"
3350	+ msgstr ""
3351	+
3352	+ #: views/newsletters.html:223
3353	msgid ""
3354	"This newsletter is sent when a new WordPress user with the role \"%$1s\" is "
3355	"added to your site"
3356	msgstr ""
3357
3358	+ #: views/newsletters.html:224
3359	msgid "%$1d hour(s) later"
3360	msgstr ""
3361
3362	+ #: views/newsletters.html:225
3363	msgid "%$1d day(s) later"
3364	msgstr ""
3365
3366	+ #: views/newsletters.html:226
3367	msgid "%$1d week(s) later"
3368	msgstr ""
3369
3370	+ #: views/newsletters.html:227
3371	msgid "Send daily at %$1s"
3372	msgstr ""
3373
3374	+ #: views/newsletters.html:228
3375	msgid "Send weekly on %$1s at %$2s"
3376	msgstr ""
3377
3378	+ #: views/newsletters.html:229
3379	msgid "Send monthly on the %$1s at %$2s"
3380	msgstr ""
3381
3382	+ #: views/newsletters.html:230
3383	msgid "Send every %$1s %$2s of the month at %$3s"
3384	msgstr ""
3385
3386	+ #: views/newsletters.html:231
3387	msgid "Send immediately"
3388	msgstr ""
3389
3390	+ #: views/newsletters.html:232
3391	msgid "if there's new content to %$1s."
3392	msgstr ""
3393
3394	+ #: views/newsletters.html:233
3395	msgid "You need to select a list to send to."
3396	msgstr ""
3397
3398	+ #: views/newsletters.html:235
3399	msgid "Back to Post notifications"
3400	msgstr ""
3401
3402	+ #: views/newsletters.html:236
3403	msgid "Sent on"
3404	msgstr ""
3405
3406	+ #: views/newsletters.html:237
3407	msgid "No subscribers!"
3408	msgstr ""
3409
3410	+ #: views/newsletters.html:239
3411	msgid ""
3412	"Sending is paused because %$1s prevents MailPoet from delivering emails "
3413	"with the following error: %$2s"
3414	msgstr ""
3415
3416	+ #: views/newsletters.html:240
3417	msgid ""
3418	"Sending is paused because the following connection issue prevents MailPoet "
3419	"from delivering emails: %$1s"
3420	msgstr ""
3421
3422	+ #: views/newsletters.html:241
3423	msgid "Check your [link]sending method settings[/link]."
3424	msgstr ""
3425
3426	+ #: views/newsletters.html:242
3427	msgid "Resume sending"
3428	msgstr ""
3429
3430	+ #: views/newsletters.html:243
3431	msgid "Sending has been resumed."
3432	msgstr ""
3433

3440	msgstr ""
3441
3442	#: views/segments.html:17
3443	+ msgid "All lists on this page are selected."
3444	msgstr ""
3445
3446	#: views/segments.html:18
3447	+ msgid "All %d lists are selected."
3448	msgstr ""
3449
3450	#: views/segments.html:19

3452	msgstr ""
3453
3454	#: views/segments.html:21
3455	+ msgid "%d lists were permanently deleted."
3456	msgstr ""
3457
3458	#: views/segments.html:26 views/subscribers/importExport/import/step2.html:143

3480	msgstr ""
3481
3482	#: views/segments.html:38
3483	+ msgid "%$1d lists were permanently deleted."
3484	msgstr ""
3485
3486	#: views/segments.html:39

3504	msgstr ""
3505
3506	#: views/segments.html:46
3507	+ msgid "List \"%$1s\" has been synchronized."
3508	msgstr ""
3509
3510	#: views/segments.html:47
3511	msgid "View Subscribers"
3512	msgstr ""
3513
3514	+ #: views/segments.html:55
3515	msgid "Delete permanently"
3516	msgstr ""
3517
3518	+ #: views/segments.html:66
3519	+ msgid "This text box is for your own use and is never shown to your subscribers."
3520	msgstr ""
3521
3522	#: views/settings/advanced.html:7

3524	msgstr ""
3525
3526	#: views/settings/advanced.html:10
3527	+ msgid "Your bounced emails will be sent to this address."
3528	msgstr ""
3529
3530	#: views/settings/advanced.html:28

3591	msgstr ""
3592
3593	#: views/settings/basics.html:9
3594	+ msgid "These email addresses will be selected by default for each new email."
3595	msgstr ""
3596
3597	#: views/settings/basics.html:15 views/settings/signup.html:59

3626	msgstr ""
3627
3628	#: views/settings/basics.html:91
3629	+ msgid "Visitors that comment on a post can subscribe to your list via a checkbox."
3630	msgstr ""
3631
3632	#: views/settings/basics.html:115 views/settings/basics.html:179

3648	#: views/settings/basics.html:151
3649	msgid ""
3650	"Allow users who register as a WordPress user on your website to subscribe "
3651	+ "to a MailPoet list (in addition to the \"WordPress Users\" list.)"
3652	msgstr ""
3653
3654	#: views/settings/basics.html:206

3662	#: views/settings/basics.html:218
3663	msgid ""
3664	"When your subscribers click the \"Manage your subscription\" link, they "
3665	+ "will be directed to this page."
3666	msgstr ""
3667
3668	#: views/settings/basics.html:241 views/settings/basics.html:298

3700	msgstr ""
3701
3702	#: views/settings/basics.html:310
3703	+ msgid "Paste this shortcode on a page to display a list of past newsletters."
3704	msgstr ""
3705
3706	#: views/settings/basics.html:343

3710	#: views/settings/basics.html:346
3711	msgid ""
3712	"Paste this shortcode on a post or page to display the total number of "
3713	+ "confirmed subscribers."
3714	msgstr ""
3715
3716	#: views/settings/bounce.html:1

3880	#: views/settings/mta.html:254
3881	msgid ""
3882	"Please ask your host for the maximum number of emails you are allowed to "
3883	+ "send per day."
3884	msgstr ""
3885
3886	#: views/settings/mta.html:270

3900	msgstr ""
3901
3902	#: views/settings/mta.html:352 views/settings/mta.html:463
3903	+ msgid "e.g.: smtp.mydomain.com"
3904	msgstr ""
3905
3906	#: views/settings/mta.html:368

3938	#: views/settings/mta.html:560
3939	msgid ""
3940	"Leave this option set to Yes. Only a tiny portion of SMTP services prefer "
3941	+ "Authentication to be turned off."
3942	msgstr ""
3943
3944	#: views/settings/mta.html:599

3947
3948	#: views/settings/mta.html:602
3949	msgid ""
3950	+ "This improves your delivery rate by verifying that you're allowed to send "
3951	+ "emails from your domain."
3952	msgstr ""
3953
3954	#: views/settings/mta.html:607
3955	msgid ""
3956	"SPF is set up in your DNS. Read your host's support documentation for more "
3957	+ "information."
3958	msgstr ""
3959
3960	#: views/settings/mta.html:615

3986	msgstr ""
3987
3988	#: views/settings/mta.html:767
3989	+ msgid "You need to specify a MailPoet account key."
3990	msgstr ""
3991
3992	#: views/settings/signup.html:7
3993	+ msgid "Enable sign-up confirmation"
3994	msgstr ""
3995
3996	#: views/settings/signup.html:10

4006	msgstr ""
4007
4008	#: views/settings/signup.html:19
4009	+ msgid "Sign-up confirmation is mandatory when using the MailPoet Sending Service."
4010	msgstr ""
4011
4012	#: views/settings/signup.html:111

4030	#: views/settings/signup.html:154
4031	msgid ""
4032	"When subscribers click on the activation link, they will be redirected to "
4033	+ "this page."
4034	msgstr ""
4035
4036	#: views/settings/signup.html:195

4067	msgstr ""
4068
4069	#: views/settings.html:19
4070	+ msgid "Sign-up Confirmation"
4071	msgstr ""
4072
4073	#: views/settings.html:20

4165	msgid "[link]Read more at our Knowledge Base[/link]"
4166	msgstr ""
4167




4168	#: views/subscribers/importExport/import/step2.html:36
4169	msgid "Pick one or more list(s)"
4170	msgstr ""

4223	msgid "No active lists found"
4224	msgstr ""
4225
4226	+ #: views/subscribers/importExport/import.html:37
4227	+ msgid "Selecto"
4228	+ msgstr ""
4229	+
4230	#: views/subscribers/importExport/import.html:39
4231	+ msgid "Only comma-separated (CSV) file formats are supported."
4232	msgstr ""
4233
4234	#: views/subscribers/importExport/import.html:40

4246	#: views/subscribers/importExport/import.html:42
4247	msgid ""
4248	"No valid records were found. This file needs to be formatted in a CSV style "
4249	+ "(comma-separated.) Look at some [link]examples on our support site.[/link]"
4250	msgstr ""
4251
4252	#: views/subscribers/importExport/import.html:43
4253	+ msgid "%1$s records had issues and were skipped."
4254	msgstr ""
4255
4256	#: views/subscribers/importExport/import.html:44
4257	+ msgid "%1$s emails are not valid: %2$s"
4258	msgstr ""
4259
4260	#: views/subscribers/importExport/import.html:45
4261	+ msgid "%1$s emails appear more than once in your file: %2$s"
4262	msgstr ""
4263
4264	#: views/subscribers/importExport/import.html:46

4271	msgstr ""
4272
4273	#: views/subscribers/importExport/import.html:53
4274	+ msgid "The selected value is already matched to another field."
4275	msgstr ""
4276
4277	#: views/subscribers/importExport/import.html:54
4278	+ msgid "Confirm that this field corresponds to the selected field."
4279	msgstr ""
4280
4281	#: views/subscribers/importExport/import.html:55

4295	msgstr ""
4296
4297	#: views/subscribers/importExport/import.html:70
4298	+ msgid "Verify that the date in blue matches the original date."
4299	msgstr ""
4300
4301	#: views/subscribers/importExport/import.html:71

4331	msgstr ""
4332
4333	#: views/subscribers/importExport/import.html:79
4334	+ msgid "%1$s existing subscribers were updated and added to %2$s."
4335	msgstr ""
4336
4337	#: views/subscribers/subscribers.html:19

4347	msgstr ""
4348
4349	#: views/subscribers/subscribers.html:22
4350	+ msgid "All %d subscribers are selected."
4351	msgstr ""
4352
4353	#: views/subscribers/subscribers.html:23

4355	msgstr ""
4356
4357	#: views/subscribers/subscribers.html:25
4358	+ msgid "%d subscribers were permanently deleted."




4359	msgstr ""
4360
4361	#: views/subscribers/subscribers.html:47
4362	+ msgid "E-mail"




4363	msgstr ""
4364
4365	+ #: views/subscribers/subscribers.html:56
4366	msgid "Unsubscribed on %$1s"
4367	msgstr ""
4368
4369	+ #: views/subscribers/subscribers.html:57
4370	msgid "Subscriber was updated successfully!"
4371	msgstr ""
4372
4373	+ #: views/subscribers/subscribers.html:58
4374	msgid "Subscriber was added successfully!"
4375	msgstr ""
4376
4377	+ #: views/subscribers/subscribers.html:63
4378	msgid "Subscribed on"
4379	msgstr ""
4380




4381	#: views/subscribers/subscribers.html:65
4382	+ msgid "1 subscriber was moved to the trash."
4383	msgstr ""
4384
4385	#: views/subscribers/subscribers.html:66
4386	+ msgid "%$1d subscribers were moved to the trash."
4387	msgstr ""
4388
4389	#: views/subscribers/subscribers.html:67
4390	+ msgid "1 subscriber was permanently deleted."
4391	msgstr ""
4392
4393	#: views/subscribers/subscribers.html:68
4394	+ msgid "%$1d subscribers were permanently deleted."
4395	msgstr ""
4396
4397	#: views/subscribers/subscribers.html:69
4398	+ msgid "1 subscriber has been restored from the trash."
4399	msgstr ""
4400
4401	#: views/subscribers/subscribers.html:70
4402	+ msgid "%$1d subscribers have been restored from the trash."
4403	msgstr ""
4404
4405	#: views/subscribers/subscribers.html:71
4406	+ msgid "Move to list..."
4407	msgstr ""
4408
4409	#: views/subscribers/subscribers.html:72
4410	+ msgid "%$1d subscribers were moved to list <strong>%$2s</strong>"
4411	msgstr ""
4412
4413	#: views/subscribers/subscribers.html:73
4414	+ msgid "Add to list..."
4415	msgstr ""
4416
4417	#: views/subscribers/subscribers.html:74
4418	+ msgid "%$1d subscribers were added to list <strong>%$2s</strong>."
4419	msgstr ""
4420
4421	#: views/subscribers/subscribers.html:75
4422	+ msgid "Remove from list..."
4423	msgstr ""
4424
4425	#: views/subscribers/subscribers.html:76
4426	+ msgid "%$1d subscribers were removed from list <strong>%$2s</strong>"
4427	msgstr ""
4428
4429	#: views/subscribers/subscribers.html:77
4430	+ msgid "Remove from all lists"
4431	msgstr ""
4432
4433	#: views/subscribers/subscribers.html:78
4434	+ msgid "%$1d subscribers were removed from all lists."
4435	msgstr ""
4436
4437	#: views/subscribers/subscribers.html:79
4438	+ msgid "Resend confirmation email"
4439	msgstr ""
4440
4441	#: views/subscribers/subscribers.html:80
4442	+ msgid "%$1d confirmation emails have been sent."
4443	+ msgstr ""
4444	+
4445	+ #: views/subscribers/subscribers.html:81
4446	+ msgid "Lists to which the subscriber was subscribed."
4447	msgstr ""
4448
4449	+ #: views/subscribers/subscribers.html:83
4450	msgid ""
4451	+ "This subscriber is a registered WordPress user. [link]Edit his/her "
4452	"profile[/link] to change his/her email."
4453	msgstr ""
4454
4455	+ #: views/subscribers/subscribers.html:84
4456	msgid "Tip:"
4457	msgstr ""
4458
4459	+ #: views/subscribers/subscribers.html:85
4460	msgid ""
4461	"Need to add new fields, like a telephone number or street address? You can "
4462	"add custom fields by editing the subscription form on the Forms page."

4576	#: lib/Config/Menu.php:142
4577	msgctxt "segments per page (screen options)"
4578	msgid "Number of segments per page"
4579	+ msgstr ""
4580	+
4581	+ #: views/form/templates/settings/field_form.hbs:37
4582	+ msgctxt "Form input type"
4583	+ msgid "Select"
4584	+ msgstr ""
4585	+
4586	+ #: views/newsletters.html:100 views/subscribers/importExport/export.html:52
4587	+ #: views/subscribers/importExport/export.html:63
4588	+ #: views/subscribers/importExport/import/step1.html:95
4589	+ #: views/subscribers/importExport/import/step2.html:41
4590	+ msgctxt "Verb"
4591	+ msgid "Select"
4592	+ msgstr ""
4593	+
4594	+ #: views/newsletters.html:206
4595	+ msgctxt "Sunday - one letter abbreviation"
4596	+ msgid "S"
4597	+ msgstr ""
4598	+
4599	+ #: views/newsletters.html:207
4600	+ msgctxt "Monday - one letter abbreviation"
4601	+ msgid "M"
4602	+ msgstr ""
4603	+
4604	+ #: views/newsletters.html:208
4605	+ msgctxt "Tuesday - one letter abbreviation"
4606	+ msgid "T"
4607	+ msgstr ""
4608	+
4609	+ #: views/newsletters.html:209
4610	+ msgctxt "Wednesday - one letter abbreviation"
4611	+ msgid "W"
4612	+ msgstr ""
4613	+
4614	+ #: views/newsletters.html:210
4615	+ msgctxt "Thursday - one letter abbreviation"
4616	+ msgid "T"
4617	+ msgstr ""
4618	+
4619	+ #: views/newsletters.html:211
4620	+ msgctxt "Friday - one letter abbreviation"
4621	+ msgid "F"
4622	+ msgstr ""
4623	+
4624	+ #: views/newsletters.html:212
4625	+ msgctxt "Saturday - one letter abbreviation"
4626	+ msgid "S"
4627	msgstr ""

lib/API/API.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	namespace MailPoet\API;
3	- use \MailPoet\Util\Security;
4
5	if(!defined('ABSPATH')) exit;
6
	@@ -38,7 +38,7 @@ class API {
38	if($this->checkToken() === false) {
39	$error_response = new ErrorResponse(
40	array(
41	- Error::UNAUTHORIZED => __('Invalid request.', 'mailpoet')
42	),
43	array(),
44	Response::STATUS_UNAUTHORIZED
	@@ -64,7 +64,7 @@ class API {
64	// throw exception bad request
65	$error_response = new ErrorResponse(
66	array(
67	- Error::BAD_REQUEST => __('Invalid request.', 'mailpoet')
68	),
69	array(),
70	Response::STATUS_BAD_REQUEST
	@@ -149,4 +149,4 @@ class API {
149	$global .= '</script>';
150	echo $global;
151	}
152	- }


1	<?php
2	namespace MailPoet\API;
3	+ use MailPoet\Util\Security;
4
5	if(!defined('ABSPATH')) exit;
6

38	if($this->checkToken() === false) {
39	$error_response = new ErrorResponse(
40	array(
41	+ Error::UNAUTHORIZED => __('Invalid request', 'mailpoet')
42	),
43	array(),
44	Response::STATUS_UNAUTHORIZED

64	// throw exception bad request
65	$error_response = new ErrorResponse(
66	array(
67	+ Error::BAD_REQUEST => __('Invalid request', 'mailpoet')
68	),
69	array(),
70	Response::STATUS_BAD_REQUEST

149	$global .= '</script>';
150	echo $global;
151	}
152	+ }

lib/API/Endpoint.php CHANGED Viewed

	@@ -27,9 +27,9 @@ abstract class Endpoint {
27	function badRequest($errors = array(), $meta = array()) {
28	if(empty($errors)) {
29	$errors = array(
30	- Error::BAD_REQUEST => __('Invalid request parameters.', 'mailpoet')
31	);
32	}
33	return new ErrorResponse($errors, $meta, Response::STATUS_BAD_REQUEST);
34	}
35	- }


27	function badRequest($errors = array(), $meta = array()) {
28	if(empty($errors)) {
29	$errors = array(
30	+ Error::BAD_REQUEST => __('Invalid request parameters', 'mailpoet')
31	);
32	}
33	return new ErrorResponse($errors, $meta, Response::STATUS_BAD_REQUEST);
34	}
35	+ }

lib/API/Endpoints/AutomatedLatestContent.php CHANGED Viewed

	@@ -1,7 +1,6 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;

4
5	if(!defined('ABSPATH')) exit;
6

lib/API/Endpoints/CustomFields.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5	- use \MailPoet\Models\CustomField;
6
7	if(!defined('ABSPATH')) exit;
8


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;
4	+ use MailPoet\API\Error as APIError;
5	+ use MailPoet\Models\CustomField;
6
7	if(!defined('ABSPATH')) exit;
8

lib/API/Endpoints/Forms.php CHANGED Viewed

	@@ -3,11 +3,11 @@ namespace MailPoet\API\Endpoints;
3	use MailPoet\API\Endpoint as APIEndpoint;
4	use MailPoet\API\Error as APIError;
5
6	- use \MailPoet\Models\Form;
7	- use \MailPoet\Models\StatisticsForms;
8	- use \MailPoet\Form\Renderer as FormRenderer;
9	- use \MailPoet\Listing;
10	- use \MailPoet\Form\Util;
11
12	if(!defined('ABSPATH')) exit;
13


3	use MailPoet\API\Endpoint as APIEndpoint;
4	use MailPoet\API\Error as APIError;
5
6	+ use MailPoet\Models\Form;
7	+ use MailPoet\Models\StatisticsForms;
8	+ use MailPoet\Form\Renderer as FormRenderer;
9	+ use MailPoet\Listing;
10	+ use MailPoet\Form\Util;
11
12	if(!defined('ABSPATH')) exit;
13

lib/API/Endpoints/ImportExport.php CHANGED Viewed

	@@ -1,10 +1,8 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5
6	use MailPoet\Subscribers\ImportExport\Import\MailChimp;
7	- use MailPoet\Models\CustomField;
8	use MailPoet\Models\Segment;
9
10	if(!defined('ABSPATH')) exit;


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;

4
5	use MailPoet\Subscribers\ImportExport\Import\MailChimp;

6	use MailPoet\Models\Segment;
7
8	if(!defined('ABSPATH')) exit;

lib/API/Endpoints/NewsletterTemplates.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5
6	use MailPoet\Models\NewsletterTemplate;
7


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;
4	+ use MailPoet\API\Error as APIError;
5
6	use MailPoet\Models\NewsletterTemplate;
7

lib/API/Endpoints/Segments.php CHANGED Viewed

	@@ -1,13 +1,11 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5	-
6	- use \MailPoet\Models\Segment;
7	- use \MailPoet\~~Models\SubscriberSegment~~;
8	- use \MailPoet\~~Models~~\~~SegmentFilter~~;
9	- use \MailPoet\Listing;
10	- use \MailPoet\Segments\WP;
11
12	if(!defined('ABSPATH')) exit;
13


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;
4	+ use MailPoet\API\Error as APIError;
5	+
6	+ use MailPoet\Models\Segment;
7	+ use MailPoet\Listing;
8	+ use MailPoet\Segments\WP;


9
10	if(!defined('ABSPATH')) exit;
11

lib/API/Endpoints/SendingQueue.php CHANGED Viewed

	@@ -5,11 +5,7 @@ use MailPoet\API\Error as APIError;
5
6	use MailPoet\Mailer\Mailer;
7	use MailPoet\Models\Newsletter;
8	- use MailPoet\Models\NewsletterOption;
9	- use MailPoet\Models\NewsletterOptionField;
10	- use MailPoet\Models\Setting;
11	use MailPoet\Models\Subscriber;
12	- use MailPoet\Models\SubscriberSegment;
13	use MailPoet\Newsletter\Scheduler\Scheduler;
14	use MailPoet\Models\SendingQueue as SendingQueueModel;
15	use MailPoet\Util\Helpers;


5
6	use MailPoet\Mailer\Mailer;
7	use MailPoet\Models\Newsletter;



8	use MailPoet\Models\Subscriber;

9	use MailPoet\Newsletter\Scheduler\Scheduler;
10	use MailPoet\Models\SendingQueue as SendingQueueModel;
11	use MailPoet\Util\Helpers;

lib/API/Endpoints/Settings.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5	- use \MailPoet\Models\Setting;
6
7	if(!defined('ABSPATH')) exit;
8


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;
4	+ use MailPoet\API\Error as APIError;
5	+ use MailPoet\Models\Setting;
6
7	if(!defined('ABSPATH')) exit;
8

lib/API/Endpoints/Setup.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\Config\Activator;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;
4	+ use MailPoet\Config\Activator;
5
6	if(!defined('ABSPATH')) exit;
7

lib/API/Endpoints/Subscribers.php CHANGED Viewed

	@@ -1,15 +1,11 @@
1	<?php
2	namespace MailPoet\API\Endpoints;
3	- use \MailPoet\API\Endpoint as APIEndpoint;
4	- use \MailPoet\API\Error as APIError;
5	- use \MailPoet\API\Access as APIAccess;
6
7	use MailPoet\Listing;
8	use MailPoet\Models\Subscriber;
9	- use MailPoet\Models\SubscriberSegment;
10	- use MailPoet\Models\SubscriberCustomField;
11	- use MailPoet\Models\Segment;
12	- use MailPoet\Models\Setting;
13	use MailPoet\Models\Form;
14	use MailPoet\Models\StatisticsForms;
15
	@@ -65,10 +61,17 @@ class Subscribers extends APIEndpoint {
65	$form = Form::findOne($form_id);
66	unset($data['form_id']);
67






68	$segment_ids = (!empty($data['segments'])
69	? (array)$data['segments']
70	: array()
71	);

72	unset($data['segments']);
73
74	if(empty($segment_ids)) {
	@@ -77,6 +80,10 @@ class Subscribers extends APIEndpoint {
77	));
78	}
79




80	$subscriber = Subscriber::subscribe($data, $segment_ids);
81	$errors = $subscriber->getErrors();
82
	@@ -91,11 +98,13 @@ class Subscribers extends APIEndpoint {
91
92	$form = $form->asArray();
93
94	- if($form['settings']['on_success'] ~~=== 'page'~~) {
95	- // ~~redirect~~ ~~to a~~ page ~~on a success, pass the page url in the meta~~
96	- ~~$meta['redirect_url']~~ = ~~get_permalink($form['settings']['success_page']);~~
97	- } ~~else~~ if($form['settings']['~~on_success~~'] ~~=== 'url'~~) {
98	- ~~$meta['redirect_url']~~ = $form['settings']['~~success_url~~'];


99	}
100	}
101


1	<?php
2	namespace MailPoet\API\Endpoints;
3	+ use MailPoet\API\Endpoint as APIEndpoint;
4	+ use MailPoet\API\Error as APIError;
5	+ use MailPoet\API\Access as APIAccess;
6
7	use MailPoet\Listing;
8	use MailPoet\Models\Subscriber;




9	use MailPoet\Models\Form;
10	use MailPoet\Models\StatisticsForms;
11

61	$form = Form::findOne($form_id);
62	unset($data['form_id']);
63
64	+ if(!$form) {
65	+ return $this->badRequest(array(
66	+ APIError::BAD_REQUEST => __('Please specify a valid form ID.', 'mailpoet')
67	+ ));
68	+ }
69	+
70	$segment_ids = (!empty($data['segments'])
71	? (array)$data['segments']
72	: array()
73	);
74	+ $segment_ids = $form->filterSegments($segment_ids);
75	unset($data['segments']);
76
77	if(empty($segment_ids)) {

80	));
81	}
82
83	+ // only accept fields defined in the form
84	+ $form_fields = $form->getFieldList();
85	+ $data = array_intersect_key($data, array_flip($form_fields));
86	+
87	$subscriber = Subscriber::subscribe($data, $segment_ids);
88	$errors = $subscriber->getErrors();
89

98
99	$form = $form->asArray();
100
101	+ if(!empty($form['settings']['on_success'])) {
102	+ if($form['settings']['on_success'] === 'page') {
103	+ // redirect to a page on a success, pass the page url in the meta
104	+ $meta['redirect_url'] = get_permalink($form['settings']['success_page']);
105	+ } else if($form['settings']['on_success'] === 'url') {
106	+ $meta['redirect_url'] = $form['settings']['success_url'];
107	+ }
108	}
109	}
110

lib/Config/Analytics.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Config;
3	- use \MailPoet\Analytics\Reporter;
4	- use \MailPoet\Models\Setting;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\Config;
3	+ use MailPoet\Analytics\Reporter;
4	+ use MailPoet\Models\Setting;
5
6	if(!defined('ABSPATH')) exit;
7

lib/Config/Changelog.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Config;
3	- use \MailPoet\Models\Setting;
4	- use \MailPoet\Util\Url;
5
6	class Changelog {
7	function __construct() {


1	<?php
2	namespace MailPoet\Config;
3	+ use MailPoet\Models\Setting;
4	+ use MailPoet\Util\Url;
5
6	class Changelog {
7	function __construct() {

lib/Config/Hooks.php CHANGED Viewed

	@@ -1,8 +1,6 @@
1	<?php
2	namespace MailPoet\Config;
3	- use MailPoet\~~Cron~~\~~Workers\Scheduler~~;
4	- use MailPoet\Cron\Workers\SendingQueue;
5	- use \MailPoet\Models\Setting;
6
7	class Hooks {
8	function __construct() {


1	<?php
2	namespace MailPoet\Config;
3	+ use MailPoet\Models\Setting;


4
5	class Hooks {
6	function __construct() {

lib/Config/Populator.php CHANGED Viewed

	@@ -3,11 +3,11 @@ namespace MailPoet\Config;
3
4	use MailPoet\Cron\CronTrigger;
5	use MailPoet\Mailer\MailerLog;
6	- use \MailPoet\Models\Segment;
7	- use \MailPoet\Segments\WP;
8	- use \MailPoet\Models\Setting;
9	- use \MailPoet\Settings\Pages;
10	- use \MailPoet\Util\Helpers;
11
12	if(!defined('ABSPATH')) exit;
13
	@@ -138,7 +138,7 @@ class Populator {
138	$default_segment->hydrate(array(
139	'name' => __('My First List', 'mailpoet'),
140	'description' =>
141	- __('This list is automatically created when you install MailPoet', 'mailpoet')
142	));
143	$default_segment->save();
144	}


3
4	use MailPoet\Cron\CronTrigger;
5	use MailPoet\Mailer\MailerLog;
6	+ use MailPoet\Models\Segment;
7	+ use MailPoet\Segments\WP;
8	+ use MailPoet\Models\Setting;
9	+ use MailPoet\Settings\Pages;
10	+ use MailPoet\Util\Helpers;
11
12	if(!defined('ABSPATH')) exit;
13

138	$default_segment->hydrate(array(
139	'name' => __('My First List', 'mailpoet'),
140	'description' =>
141	+ __('This list is automatically created when you install MailPoet.', 'mailpoet')
142	));
143	$default_segment->save();
144	}

lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class NewsletterBlank121Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"
	@@ -116,7 +116,7 @@ class NewsletterBlank121Column {
116	),
117	array(
118	"type" => "text",
119	- "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')
120	),
121	array(
122	"type" => "divider",


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

116	),
117	array(
118	"type" => "text",
119	+ "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')
120	),
121	array(
122	"type" => "divider",

lib/Config/PopulatorData/Templates/NewsletterBlank12Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class NewsletterBlank12Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/NewsletterBlank13Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class NewsletterBlank13Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"
	@@ -116,7 +116,7 @@ class NewsletterBlank13Column {
116	),
117	array(
118	"type" => "text",
119	- "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')
120	),
121	array(
122	"type" => "divider",


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

116	),
117	array(
118	"type" => "text",
119	+ "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')
120	),
121	array(
122	"type" => "divider",

lib/Config/PopulatorData/Templates/NewsletterBlank1Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class NewsletterBlank1Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/PostNotificationsBlank1Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class PostNotificationsBlank1Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"
	@@ -116,7 +116,7 @@ class PostNotificationsBlank1Column {
116	),
117	array(
118	"type" => "text",
119	- "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')
120	),
121	array(
122	"type" => "divider",


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

116	),
117	array(
118	"type" => "text",
119	+ "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')
120	),
121	array(
122	"type" => "divider",

lib/Config/PopulatorData/Templates/StoreDiscount.php CHANGED Viewed

	@@ -70,7 +70,7 @@ class StoreDiscount {
70	)
71	), array(
72	"type" => "text",
73	- "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')
74	), array(
75	"type" => "spacer",
76	"styles" => array(
	@@ -110,7 +110,7 @@ class StoreDiscount {
110	)
111	), array(
112	"type" => "text",
113	- "text" => __("<h1 style=\"text-align: center;\"><em><strong>Get 15% ~~discount~~ off your next order</strong></em></h1>", 'mailpoet')
114	), array(
115	"type" => "text",
116	"text" => __("<h2 style=\"text-align: center;\"><strong>USE CODE: WELOVEMAILPOET</strong></h2>", 'mailpoet')
	@@ -204,7 +204,7 @@ class StoreDiscount {
204	"type" => "image",
205	"link" => "",
206	"src" => $this->template_image_url . "/red-icycle.jpg",
207	- "alt" => __("red-~~icycle~~", 'mailpoet'),
208	"fullWidth" => false,
209	"width" => "558px",
210	"height" => "399px",


70	)
71	), array(
72	"type" => "text",
73	+ "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')
74	), array(
75	"type" => "spacer",
76	"styles" => array(

110	)
111	), array(
112	"type" => "text",
113	+ "text" => __("<h1 style=\"text-align: center;\"><em><strong>Get a 15% off your next order</strong></em></h1>", 'mailpoet')
114	), array(
115	"type" => "text",
116	"text" => __("<h2 style=\"text-align: center;\"><strong>USE CODE: WELOVEMAILPOET</strong></h2>", 'mailpoet')

204	"type" => "image",
205	"link" => "",
206	"src" => $this->template_image_url . "/red-icycle.jpg",
207	+ "alt" => __("red-bicycle", 'mailpoet'),
208	"fullWidth" => false,
209	"width" => "558px",
210	"height" => "399px",

lib/Config/PopulatorData/Templates/TravelEmail.php CHANGED Viewed

	@@ -70,7 +70,7 @@ class TravelEmail {
70	)
71	), array(
72	"type" => "text",
73	- "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')
74	), array(
75	"type" => "social",
76	"iconSet" => "circles",
	@@ -324,7 +324,7 @@ class TravelEmail {
324	"type" => "image",
325	"link" => "",
326	"src" => $this->template_image_url . "/glow-worms.jpg",
327	- "alt" => __("~~Glow worms~~, Waitomo Caves", 'mailpoet'),
328	"fullWidth" => true,
329	"width" => "640px",
330	"height" => "428px",
	@@ -335,7 +335,7 @@ class TravelEmail {
335	)
336	), array(
337	"type" => "text",
338	- "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')
339	))
340	), array(
341	"type" => "container",
	@@ -446,7 +446,7 @@ class TravelEmail {
446	)
447	), array(
448	"type" => "header",
449	- "text" => ("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
450	"styles" => array(
451	"block" => array(
452	"backgroundColor" => "transparent"


70	)
71	), array(
72	"type" => "text",
73	+ "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')
74	), array(
75	"type" => "social",
76	"iconSet" => "circles",

324	"type" => "image",
325	"link" => "",
326	"src" => $this->template_image_url . "/glow-worms.jpg",
327	+ "alt" => __("Glowworms, Waitomo Caves", 'mailpoet'),
328	"fullWidth" => true,
329	"width" => "640px",
330	"height" => "428px",

335	)
336	), array(
337	"type" => "text",
338	+ "text" => __("<p><em><a href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><strong>Waitomo GlowWorm Caves</strong></a></em></p>", 'mailpoet')
339	))
340	), array(
341	"type" => "container",

446	)
447	), array(
448	"type" => "header",
449	+ "text" => ("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>"),
450	"styles" => array(
451	"block" => array(
452	"backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/WelcomeBlank12Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class WelcomeBlank12Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/WelcomeBlank1Column.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class WelcomeBlank1Column {
52	"blocks" => array(
53	array(
54	"type" => "header",
55	- "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"


52	"blocks" => array(
53	array(
54	"type" => "header",
55	+ "text" => __("Display problems? <a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
56	"styles" => array(
57	"block" => array(
58	"backgroundColor" => "transparent"

lib/Config/Renderer.php CHANGED Viewed

	@@ -1,9 +1,9 @@
1	<?php
2	namespace MailPoet\Config;
3	- use \Twig_Loader_Filesystem as TwigFileSystem;
4	- use \Twig_Environment as TwigEnv;
5	- use \Twig_Lexer as TwigLexer;
6	- use \MailPoet\Twig;
7
8	if(!defined('ABSPATH')) exit;
9


1	<?php
2	namespace MailPoet\Config;
3	+ use Twig_Loader_Filesystem as TwigFileSystem;
4	+ use Twig_Environment as TwigEnv;
5	+ use Twig_Lexer as TwigLexer;
6	+ use MailPoet\Twig;
7
8	if(!defined('ABSPATH')) exit;
9

lib/Config/RequirementsChecker.php CHANGED Viewed

	@@ -1,7 +1,6 @@
1	<?php
2	namespace MailPoet\Config;
3
4	- use MailPoet\Config\Env;
5	use MailPoet\Util\Helpers;
6	use MailPoet\WP\Notice as WPNotice;
7
	@@ -15,25 +14,26 @@ class RequirementsChecker {
15
16	public $display_error_notice;
17	public $vendor_classes = array(
18	- '\ORM',
19	- '\Model',
20	- '\Twig_Environment',
21	- '\Twig_Loader_Filesystem',
22	- '\Twig_Lexer',
23	- '\Twig_Extension',
24	- '\Twig_Extension_GlobalsInterface',
25	- '\Twig_SimpleFunction',
26	- '\Swift_Mailer',
27	- '\Swift_SmtpTransport',
28	- '\Swift_Message',
29	- '\Carbon\Carbon',
30	- '\Sudzy\ValidModel',
31	- '\Sudzy\ValidationException',
32	- '\Sudzy\Engine',
33	- '\pQuery',
34	- '\Cron\CronExpression',
35	- '\Html2Text\Html2Text',
36	- '\csstidy'

37	);
38
39	function __construct($display_error_notice = true) {
	@@ -62,7 +62,7 @@ class RequirementsChecker {
62	if(!is_dir($paths['cache_path']) && !wp_mkdir_p($paths['cache_path'])) {
63	$error = Helpers::replaceLinkTags(
64	__('This plugin requires write permissions inside the /wp-content/uploads folder. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet'),
65	- '//docs.mailpoet.com/article/152-minimum-requirements-for-mailpoet-3#folder_permissions'
66	);
67	return $this->processError($error);
68	}
	@@ -79,14 +79,12 @@ class RequirementsChecker {
79	}
80
81	function checkPDOExtension() {
82	- if(!extension_loaded('pdo') && !extension_loaded('pdo_mysql')) {
83	- $error = Helpers::replaceLinkTags(
84	- __('This plugin requires PDO_MYSQL PHP extension. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet'),
85	- '//docs.mailpoet.com/article/152-minimum-requirements-for-mailpoet-3#php_extension'
86	- );
87	- return $this->processError($error);
88	- }
89	- return true;
90	}
91
92	function checkMbstringExtension() {
	@@ -139,4 +137,4 @@ class RequirementsChecker {
139	}
140	return false;
141	}
142	- }


1	<?php
2	namespace MailPoet\Config;
3

4	use MailPoet\Util\Helpers;
5	use MailPoet\WP\Notice as WPNotice;
6

14
15	public $display_error_notice;
16	public $vendor_classes = array(
17	+ '\ORM',
18	+ '\Model',
19	+ '\Twig_Environment',
20	+ '\Twig_Loader_Filesystem',
21	+ '\Twig_Lexer',
22	+ '\Twig_Extension',
23	+ '\Twig_Extension_GlobalsInterface',
24	+ '\Twig_SimpleFunction',
25	+ '\Swift_Mailer',
26	+ '\Swift_SmtpTransport',
27	+ '\Swift_Message',
28	+ '\Carbon\Carbon',
29	+ '\Sudzy\ValidModel',
30	+ '\Sudzy\ValidationException',
31	+ '\Sudzy\Engine',
32	+ '\pQuery',
33	+ '\Cron\CronExpression',
34	+ '\Html2Text\Html2Text',
35	+ '\csstidy',
36	+ '\Sabberworm\CSS\Parser'
37	);
38
39	function __construct($display_error_notice = true) {

62	if(!is_dir($paths['cache_path']) && !wp_mkdir_p($paths['cache_path'])) {
63	$error = Helpers::replaceLinkTags(
64	__('This plugin requires write permissions inside the /wp-content/uploads folder. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet'),
65	+ '//beta.docs.mailpoet.com/article/152-minimum-requirements-for-mailpoet-3#folder_permissions'
66	);
67	return $this->processError($error);
68	}

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


88	}
89
90	function checkMbstringExtension() {

137	}
138	return false;
139	}
140	+ }

lib/Config/Shortcodes.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<?php
2	namespace MailPoet\Config;
3	- use \MailPoet\Models\Newsletter;
4	- use \MailPoet\Models\Subscriber;
5	- use \MailPoet\Models\SubscriberSegment;
6	use MailPoet\Newsletter\Url as NewsletterUrl;
7
8	class Shortcodes {


1	<?php
2	namespace MailPoet\Config;
3	+ use MailPoet\Models\Newsletter;
4	+ use MailPoet\Models\Subscriber;
5	+ use MailPoet\Models\SubscriberSegment;
6	use MailPoet\Newsletter\Url as NewsletterUrl;
7
8	class Shortcodes {

lib/Config/Widget.php CHANGED Viewed

	@@ -1,7 +1,6 @@
1	<?php
2	namespace MailPoet\Config;
3	- use \MailPoet\~~Util~~\~~Security~~;
4	- use \MailPoet\Models\Form;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\Config;
3	+ use MailPoet\Models\Form;

4
5	if(!defined('ABSPATH')) exit;
6

lib/Form/Block/Base.php CHANGED Viewed

	@@ -7,7 +7,7 @@ abstract class Base {
7
8	if($block['id'] === 'email') {
9	$rules['required'] = true;
10	- $rules['error-message'] = __('Please specify a valid email address', 'mailpoet');
11	}
12
13	if($block['id'] === 'segments') {
	@@ -132,4 +132,4 @@ abstract class Base {
132	}
133	return join(' ', $modifiers);
134	}
135	- }


7
8	if($block['id'] === 'email') {
9	$rules['required'] = true;
10	+ $rules['error-message'] = __('Please specify a valid email address.', 'mailpoet');
11	}
12
13	if($block['id'] === 'segments') {

132	}
133	return join(' ', $modifiers);
134	}
135	+ }

lib/Form/Renderer.php CHANGED Viewed

	@@ -1,7 +1,5 @@
1	<?php
2	namespace MailPoet\Form;
3	- use MailPoet\Form\Block;
4	- use MailPoet\Form\Util;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\Form;


3
4	if(!defined('ABSPATH')) exit;
5

lib/Form/Widget.php CHANGED Viewed

	@@ -1,13 +1,9 @@
1	<?php
2	namespace MailPoet\Form;
3	- use \MailPoet\Config\Renderer;
4	- use \MailPoet\Models\Form;
5	- use \MailPoet\~~Models~~\~~Segment~~;
6	- use \MailPoet\~~Models~~\~~Setting~~;
7	- use \MailPoet\Models\Subscriber;
8	- use \MailPoet\Form\Renderer as FormRenderer;
9	- use \MailPoet\Form\Util;
10	- use \MailPoet\Util\Security;
11
12	if(!defined('ABSPATH')) exit;
13


1	<?php
2	namespace MailPoet\Form;
3	+ use MailPoet\Config\Renderer;
4	+ use MailPoet\Models\Form;
5	+ use MailPoet\Form\Renderer as FormRenderer;
6	+ use MailPoet\Util\Security;




7
8	if(!defined('ABSPATH')) exit;
9

lib/Mailer/Mailer.php CHANGED Viewed

	@@ -28,9 +28,9 @@ class Mailer {
28	$this->mailer_instance = $this->buildMailer();
29	}
30
31	- function send($newsletter, $subscriber) {
32	$subscriber = $this->formatSubscriberNameAndEmailAddress($subscriber);
33	- return $this->mailer_instance->send($newsletter, $subscriber);
34	}
35
36	function buildMailer() {
	@@ -80,7 +80,7 @@ class Mailer {
80	);
81	break;
82	default:
83	- throw new \Exception(__('Mailing method does not exist', 'mailpoet'));
84	}
85	return $mailer_instance;
86	}
	@@ -88,7 +88,7 @@ class Mailer {
88	static function getMailerConfig($mailer = false) {
89	if(!$mailer) {
90	$mailer = Setting::getValue(self::MAILER_CONFIG_SETTING_NAME);
91	- if(!$mailer \|\| !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured', 'mailpoet'));
92	}
93	if(empty($mailer['frequency'])) {
94	$default_settings = Setting::getDefaults();
	@@ -105,7 +105,7 @@ class Mailer {
105	function getSenderNameAndAddress($sender = false) {
106	if(empty($sender)) {
107	$sender = Setting::getValue('sender', array());
108	- if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured', 'mailpoet'));
109	}
110	$from_name = $this->encodeAddressNamePart($sender['name']);
111	return array(
	@@ -187,4 +187,4 @@ class Mailer {
187	'response' => true
188	);
189	}
190	- }


28	$this->mailer_instance = $this->buildMailer();
29	}
30
31	+ function send($newsletter, $subscriber, $extra_params = array()) {
32	$subscriber = $this->formatSubscriberNameAndEmailAddress($subscriber);
33	+ return $this->mailer_instance->send($newsletter, $subscriber, $extra_params);
34	}
35
36	function buildMailer() {

80	);
81	break;
82	default:
83	+ throw new \Exception(__('Mailing method does not exist.', 'mailpoet'));
84	}
85	return $mailer_instance;
86	}

88	static function getMailerConfig($mailer = false) {
89	if(!$mailer) {
90	$mailer = Setting::getValue(self::MAILER_CONFIG_SETTING_NAME);
91	+ if(!$mailer \|\| !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured.', 'mailpoet'));
92	}
93	if(empty($mailer['frequency'])) {
94	$default_settings = Setting::getDefaults();

105	function getSenderNameAndAddress($sender = false) {
106	if(empty($sender)) {
107	$sender = Setting::getValue('sender', array());
108	+ if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured.', 'mailpoet'));
109	}
110	$from_name = $this->encodeAddressNamePart($sender['name']);
111	return array(

187	'response' => true
188	);
189	}
190	+ }

lib/Mailer/Methods/AmazonSES.php CHANGED Viewed

	@@ -18,6 +18,7 @@ class AmazonSES {
18	public $sender;
19	public $reply_to;
20	public $return_path;

21	public $date;
22	public $date_without_time;
23	private $available_regions = array(
	@@ -31,7 +32,7 @@ class AmazonSES {
31	$this->aws_secret_key = $secret_key;
32	$this->aws_region = (in_array($region, $this->available_regions)) ? $region : false;
33	if(!$this->aws_region) {
34	- throw new \Exception(__('Unsupported Amazon SES region.', 'mailpoet'));
35	}
36	$this->aws_endpoint = sprintf('email.%s.amazonaws.com', $this->aws_region);
37	$this->aws_signing_algorithm = 'AWS4-HMAC-SHA256';
	@@ -48,10 +49,10 @@ class AmazonSES {
48	$this->date_without_time = gmdate('Ymd');
49	}
50
51	- function send($newsletter, $subscriber) {
52	$result = wp_remote_post(
53	$this->url,
54	- $this->request($newsletter, $subscriber)
55	);
56	if(is_wp_error($result)) {
57	return Mailer::formatMailerConnectionErrorResult($result->get_error_message());
	@@ -66,27 +67,61 @@ class AmazonSES {
66	return Mailer::formatMailerSendSuccessResult();
67	}
68
69	- function getBody($newsletter, $subscriber) {

70	$body = array(
71	- 'Action' => '~~SendEmail~~',
72	'Version' => '2010-12-01',
73	- 'Destination.ToAddresses.member.1' => $subscriber,
74	'Source' => $this->sender['from_name_email'],
75	- '~~ReplyToAddresses~~.~~member.1~~' => $this->~~reply_to['reply_to_name_email'],~~
76	- 'Message.Subject.Data' => $newsletter['subject'],
77	- 'ReturnPath' => $this->return_path
78	);



















79	if(!empty($newsletter['body']['html'])) {
80	- $~~body['Message.Body.Html.Data']~~ = $newsletter['body']['html'];
81	}
82	if(!empty($newsletter['body']['text'])) {
83	- $~~body['Message.Body.Text.Data']~~ = $newsletter['body']['text'];
84	}
85	- return $~~body~~;

















86	}
87
88	- function request($newsletter, $subscriber) {
89	- $body = array_map('urlencode', $this->getBody($newsletter, $subscriber));
90	return array(
91	'timeout' => 10,
92	'httpversion' => '1.1',
	@@ -176,4 +211,4 @@ class AmazonSES {
176	true
177	);
178	}
179	- }


18	public $sender;
19	public $reply_to;
20	public $return_path;
21	+ public $message;
22	public $date;
23	public $date_without_time;
24	private $available_regions = array(

32	$this->aws_secret_key = $secret_key;
33	$this->aws_region = (in_array($region, $this->available_regions)) ? $region : false;
34	if(!$this->aws_region) {
35	+ throw new \Exception(__('Unsupported Amazon SES region', 'mailpoet'));
36	}
37	$this->aws_endpoint = sprintf('email.%s.amazonaws.com', $this->aws_region);
38	$this->aws_signing_algorithm = 'AWS4-HMAC-SHA256';

49	$this->date_without_time = gmdate('Ymd');
50	}
51
52	+ function send($newsletter, $subscriber, $extra_params = array()) {
53	$result = wp_remote_post(
54	$this->url,
55	+ $this->request($newsletter, $subscriber, $extra_params)
56	);
57	if(is_wp_error($result)) {
58	return Mailer::formatMailerConnectionErrorResult($result->get_error_message());

67	return Mailer::formatMailerSendSuccessResult();
68	}
69
70	+ function getBody($newsletter, $subscriber, $extra_params = array()) {
71	+ $this->message = $this->createMessage($newsletter, $subscriber, $extra_params);
72	$body = array(
73	+ 'Action' => 'SendRawEmail',
74	'Version' => '2010-12-01',

75	'Source' => $this->sender['from_name_email'],
76	+ 'RawMessage.Data' => $this->encodeMessage($this->message)


77	);
78	+ return $body;
79	+ }
80	+
81	+ function createMessage($newsletter, $subscriber, $extra_params = array()) {
82	+ $message = \Swift_Message::newInstance()
83	+ ->setTo($this->processSubscriber($subscriber))
84	+ ->setFrom(array(
85	+ $this->sender['from_email'] => $this->sender['from_name']
86	+ ))
87	+ ->setSender($this->sender['from_email'])
88	+ ->setReplyTo(array(
89	+ $this->reply_to['reply_to_email'] => $this->reply_to['reply_to_name']
90	+ ))
91	+ ->setReturnPath($this->return_path)
92	+ ->setSubject($newsletter['subject']);
93	+ if(!empty($extra_params['unsubscribe_url'])) {
94	+ $headers = $message->getHeaders();
95	+ $headers->addTextHeader('List-Unsubscribe', '<' . $extra_params['unsubscribe_url'] . '>');
96	+ }
97	if(!empty($newsletter['body']['html'])) {
98	+ $message = $message->setBody($newsletter['body']['html'], 'text/html');
99	}
100	if(!empty($newsletter['body']['text'])) {
101	+ $message = $message->addPart($newsletter['body']['text'], 'text/plain');
102	}
103	+ return $message;
104	+ }
105	+
106	+ function encodeMessage(\Swift_Message $message) {
107	+ return base64_encode($message->toString());
108	+ }
109	+
110	+ function processSubscriber($subscriber) {
111	+ preg_match('!(?P<name>.?)\s<(?P<email>.?)>!', $subscriber, $subscriber_data);
112	+ if(!isset($subscriber_data['email'])) {
113	+ $subscriber_data = array(
114	+ 'email' => $subscriber,
115	+ );
116	+ }
117	+ return array(
118	+ $subscriber_data['email'] =>
119	+ (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
120	+ );
121	}
122
123	+ function request($newsletter, $subscriber, $extra_params = array()) {
124	+ $body = array_map('urlencode', $this->getBody($newsletter, $subscriber, $extra_params));
125	return array(
126	'timeout' => 10,
127	'httpversion' => '1.1',

211	true
212	);
213	}
214	+ }

lib/Mailer/Methods/MailPoet.php CHANGED Viewed

	@@ -17,7 +17,7 @@ class MailPoet {
17	$this->reply_to = $reply_to;
18	}
19
20	- function send($newsletter, $subscriber) {
21	$message_body = $this->getBody($newsletter, $subscriber);
22	$result = wp_remote_post(
23	$this->url,


17	$this->reply_to = $reply_to;
18	}
19
20	+ function send($newsletter, $subscriber, $extra_params = array()) {
21	$message_body = $this->getBody($newsletter, $subscriber);
22	$result = wp_remote_post(
23	$this->url,

lib/Mailer/Methods/PHPMail.php CHANGED Viewed

	@@ -20,9 +20,9 @@ class PHPMail {
20	$this->mailer = $this->buildMailer();
21	}
22
23	- function send($newsletter, $subscriber) {
24	try {
25	- $message = $this->createMessage($newsletter, $subscriber);
26	$result = $this->mailer->send($message);
27	} catch(\Exception $e) {
28	return Mailer::formatMailerSendErrorResult($e->getMessage());
	@@ -39,7 +39,7 @@ class PHPMail {
39	return \Swift_Mailer::newInstance($transport);
40	}
41
42	- function createMessage($newsletter, $subscriber) {
43	$message = \Swift_Message::newInstance()
44	->setTo($this->processSubscriber($subscriber))
45	->setFrom(array(
	@@ -51,6 +51,10 @@ class PHPMail {
51	))
52	->setReturnPath($this->return_path)
53	->setSubject($newsletter['subject']);




54	if(!empty($newsletter['body']['html'])) {
55	$message = $message->setBody($newsletter['body']['html'], 'text/html');
56	}


20	$this->mailer = $this->buildMailer();
21	}
22
23	+ function send($newsletter, $subscriber, $extra_params = array()) {
24	try {
25	+ $message = $this->createMessage($newsletter, $subscriber, $extra_params);
26	$result = $this->mailer->send($message);
27	} catch(\Exception $e) {
28	return Mailer::formatMailerSendErrorResult($e->getMessage());

39	return \Swift_Mailer::newInstance($transport);
40	}
41
42	+ function createMessage($newsletter, $subscriber, $extra_params = array()) {
43	$message = \Swift_Message::newInstance()
44	->setTo($this->processSubscriber($subscriber))
45	->setFrom(array(

51	))
52	->setReturnPath($this->return_path)
53	->setSubject($newsletter['subject']);
54	+ if(!empty($extra_params['unsubscribe_url'])) {
55	+ $headers = $message->getHeaders();
56	+ $headers->addTextHeader('List-Unsubscribe', '<' . $extra_params['unsubscribe_url'] . '>');
57	+ }
58	if(!empty($newsletter['body']['html'])) {
59	$message = $message->setBody($newsletter['body']['html'], 'text/html');
60	}

lib/Mailer/Methods/SMTP.php CHANGED Viewed

	@@ -34,9 +34,9 @@ class SMTP {
34	$this->mailer = $this->buildMailer();
35	}
36
37	- function send($newsletter, $subscriber) {
38	try {
39	- $message = $this->createMessage($newsletter, $subscriber);
40	$result = $this->mailer->send($message);
41	} catch(\Exception $e) {
42	return Mailer::formatMailerSendErrorResult($e->getMessage());
	@@ -60,7 +60,7 @@ class SMTP {
60	return \Swift_Mailer::newInstance($transport);
61	}
62
63	- function createMessage($newsletter, $subscriber) {
64	$message = \Swift_Message::newInstance()
65	->setTo($this->processSubscriber($subscriber))
66	->setFrom(array(
	@@ -72,6 +72,10 @@ class SMTP {
72	))
73	->setReturnPath($this->return_path)
74	->setSubject($newsletter['subject']);




75	if(!empty($newsletter['body']['html'])) {
76	$message = $message->setBody($newsletter['body']['html'], 'text/html');
77	}


34	$this->mailer = $this->buildMailer();
35	}
36
37	+ function send($newsletter, $subscriber, $extra_params = array()) {
38	try {
39	+ $message = $this->createMessage($newsletter, $subscriber, $extra_params);
40	$result = $this->mailer->send($message);
41	} catch(\Exception $e) {
42	return Mailer::formatMailerSendErrorResult($e->getMessage());

60	return \Swift_Mailer::newInstance($transport);
61	}
62
63	+ function createMessage($newsletter, $subscriber, $extra_params = array()) {
64	$message = \Swift_Message::newInstance()
65	->setTo($this->processSubscriber($subscriber))
66	->setFrom(array(

72	))
73	->setReturnPath($this->return_path)
74	->setSubject($newsletter['subject']);
75	+ if(!empty($extra_params['unsubscribe_url'])) {
76	+ $headers = $message->getHeaders();
77	+ $headers->addTextHeader('List-Unsubscribe', '<' . $extra_params['unsubscribe_url'] . '>');
78	+ }
79	if(!empty($newsletter['body']['html'])) {
80	$message = $message->setBody($newsletter['body']['html'], 'text/html');
81	}

lib/Mailer/Methods/SendGrid.php CHANGED Viewed

	@@ -17,10 +17,10 @@ class SendGrid {
17	$this->reply_to = $reply_to;
18	}
19
20	- function send($newsletter, $subscriber) {
21	$result = wp_remote_post(
22	$this->url,
23	- $this->request($newsletter, $subscriber)
24	);
25	if(is_wp_error($result)) {
26	return Mailer::formatMailerConnectionErrorResult($result->get_error_message());
	@@ -35,7 +35,7 @@ class SendGrid {
35	return Mailer::formatMailerSendSuccessResult();
36	}
37
38	- function getBody($newsletter, $subscriber) {
39	$body = array(
40	'to' => $subscriber,
41	'from' => $this->sender['from_email'],
	@@ -43,6 +43,13 @@ class SendGrid {
43	'replyto' => $this->reply_to['reply_to_email'],
44	'subject' => $newsletter['subject']
45	);







46	if(!empty($newsletter['body']['html'])) {
47	$body['html'] = $newsletter['body']['html'];
48	}
	@@ -56,8 +63,8 @@ class SendGrid {
56	return 'Bearer ' . $this->api_key;
57	}
58
59	- function request($newsletter, $subscriber) {
60	- $body = $this->getBody($newsletter, $subscriber);
61	return array(
62	'timeout' => 10,
63	'httpversion' => '1.1',


17	$this->reply_to = $reply_to;
18	}
19
20	+ function send($newsletter, $subscriber, $extra_params = array()) {
21	$result = wp_remote_post(
22	$this->url,
23	+ $this->request($newsletter, $subscriber, $extra_params)
24	);
25	if(is_wp_error($result)) {
26	return Mailer::formatMailerConnectionErrorResult($result->get_error_message());

35	return Mailer::formatMailerSendSuccessResult();
36	}
37
38	+ function getBody($newsletter, $subscriber, $extra_params = array()) {
39	$body = array(
40	'to' => $subscriber,
41	'from' => $this->sender['from_email'],

43	'replyto' => $this->reply_to['reply_to_email'],
44	'subject' => $newsletter['subject']
45	);
46	+ $headers = array();
47	+ if(!empty($extra_params['unsubscribe_url'])) {
48	+ $headers['List-Unsubscribe'] = '<' . $extra_params['unsubscribe_url'] . '>';
49	+ }
50	+ if($headers) {
51	+ $body['headers'] = json_encode($headers);
52	+ }
53	if(!empty($newsletter['body']['html'])) {
54	$body['html'] = $newsletter['body']['html'];
55	}

63	return 'Bearer ' . $this->api_key;
64	}
65
66	+ function request($newsletter, $subscriber, $extra_params = array()) {
67	+ $body = $this->getBody($newsletter, $subscriber, $extra_params);
68	return array(
69	'timeout' => 10,
70	'httpversion' => '1.1',

lib/Models/CustomField.php CHANGED Viewed

	@@ -11,10 +11,10 @@ class CustomField extends Model {
11	function __construct() {
12	parent::__construct();
13	$this->addValidations('name', array(
14	- 'required' => __('Please specify a name', 'mailpoet')
15	));
16	$this->addValidations('type', array(
17	- 'required' => __('Please specify a type', 'mailpoet')
18	));
19	}
20
	@@ -142,4 +142,4 @@ class CustomField extends Model {
142
143	return $custom_field->save();
144	}
145	- }


11	function __construct() {
12	parent::__construct();
13	$this->addValidations('name', array(
14	+ 'required' => __('Please specify a name.', 'mailpoet')
15	));
16	$this->addValidations('type', array(
17	+ 'required' => __('Please specify a type.', 'mailpoet')
18	));
19	}
20

142
143	return $custom_field->save();
144	}
145	+ }

lib/Models/Form.php CHANGED Viewed

@@ -10,7 +10,7 @@ class Form extends Model {
                 parent::__construct();
                 $this->addValidations('name', array(
-            -
                  'required' => __('Please specify a name', 'mailpoet')
                 ));
+              }
@@ -39,6 +39,49 @@ class Form extends Model {
                 return parent::save();
+              }
               static function search($orm, $search = '') {
                 return $orm->whereLike('name', '%'.$search.'%');
+              }


10	parent::__construct();
11
12	$this->addValidations('name', array(
13	+ 'required' => __('Please specify a name.', 'mailpoet')
14	));
15	}
16

39	return parent::save();
40	}
41
42	+ function getFieldList() {
43	+ $form = $this->asArray();
44	+ if(empty($form['body'])) {
45	+ return false;
46	+ }
47	+
48	+ $skipped_types = array('html', 'divider', 'submit');
49	+ $fields = array();
50	+
51	+ foreach((array)$form['body'] as $field) {
52	+ if(empty($field['id'])
53	+ \|\| empty($field['type'])
54	+ \|\| in_array($field['type'], $skipped_types)
55	+ ) {
56	+ continue;
57	+ }
58	+ if($field['id'] > 0) {
59	+ $fields[] = 'cf_' . $field['id'];
60	+ } else {
61	+ $fields[] = $field['id'];
62	+ }
63	+ }
64	+
65	+ return $fields ?: false;
66	+ }
67	+
68	+ function filterSegments(array $segment_ids = array()) {
69	+ $form = $this->asArray();
70	+ if(empty($form['settings']['segments'])) {
71	+ return array();
72	+ }
73	+
74	+ if(!empty($form['settings']['segments_selected_by'])
75	+ && $form['settings']['segments_selected_by'] == 'user'
76	+ ) {
77	+ $segment_ids = array_intersect($segment_ids, $form['settings']['segments']);
78	+ } else {
79	+ $segment_ids = $form['settings']['segments'];
80	+ }
81	+
82	+ return $segment_ids;
83	+ }
84	+
85	static function search($orm, $search = '') {
86	return $orm->whereLike('name', '%'.$search.'%');
87	}

lib/Models/Newsletter.php CHANGED Viewed

	@@ -24,7 +24,7 @@ class Newsletter extends Model {
24	function __construct() {
25	parent::__construct();
26	$this->addValidations('type', array(
27	- 'required' => __('Please specify a type', 'mailpoet')
28	));
29	}
30
	@@ -715,4 +715,4 @@ class Newsletter extends Model {
715	self::NEWSLETTER_HASH_LENGTH
716	);
717	}
718	- }


24	function __construct() {
25	parent::__construct();
26	$this->addValidations('type', array(
27	+ 'required' => __('Please specify a type.', 'mailpoet')
28	));
29	}
30

715	self::NEWSLETTER_HASH_LENGTH
716	);
717	}
718	+ }

lib/Models/NewsletterOptionField.php CHANGED Viewed

	@@ -9,10 +9,10 @@ class NewsletterOptionField extends Model {
9	function __construct() {
10	parent::__construct();
11	$this->addValidations('name', array(
12	- 'required' => __('Please specify a name', 'mailpoet')
13	));
14	$this->addValidations('newsletter_type', array(
15	- 'required' => __('Please specify a newsletter type', 'mailpoet')
16	));
17	}
18


9	function __construct() {
10	parent::__construct();
11	$this->addValidations('name', array(
12	+ 'required' => __('Please specify a name.', 'mailpoet')
13	));
14	$this->addValidations('newsletter_type', array(
15	+ 'required' => __('Please specify a newsletter type.', 'mailpoet')
16	));
17	}
18

lib/Models/NewsletterTemplate.php CHANGED Viewed

	@@ -10,10 +10,10 @@ class NewsletterTemplate extends Model {
10	parent::__construct();
11
12	$this->addValidations('name', array(
13	- 'required' => __('Please specify a name', 'mailpoet')
14	));
15	$this->addValidations('body', array(
16	- 'required' => __('The template body cannot be empty', 'mailpoet')
17	));
18	}
19


10	parent::__construct();
11
12	$this->addValidations('name', array(
13	+ 'required' => __('Please specify a name.', 'mailpoet')
14	));
15	$this->addValidations('body', array(
16	+ 'required' => __('The template body cannot be empty.', 'mailpoet')
17	));
18	}
19

lib/Models/Segment.php CHANGED Viewed

	@@ -10,7 +10,7 @@ class Segment extends Model {
10	parent::__construct();
11
12	$this->addValidations('name', array(
13	- 'required' => __('Please specify a name', 'mailpoet')
14	));
15	}
16
	@@ -106,7 +106,7 @@ class Segment extends Model {
106	$wp_segment->hydrate(array(
107	'name' => __('WordPress Users', 'mailpoet'),
108	'description' =>
109	- __('This ~~lists~~ ~~containts~~ all of your WordPress users', 'mailpoet'),
110	'type' => 'wp_users'
111	));
112	$wp_segment->save();


10	parent::__construct();
11
12	$this->addValidations('name', array(
13	+ 'required' => __('Please specify a name.', 'mailpoet')
14	));
15	}
16

106	$wp_segment->hydrate(array(
107	'name' => __('WordPress Users', 'mailpoet'),
108	'description' =>
109	+ __('This list contains all of your WordPress users.', 'mailpoet'),
110	'type' => 'wp_users'
111	));
112	$wp_segment->save();

lib/Models/Setting.php CHANGED Viewed

	@@ -19,7 +19,7 @@ class Setting extends Model {
19	parent::__construct();
20
21	$this->addValidations('name', array(
22	- 'required' => __('Please specify a name', 'mailpoet')
23	));
24	}
25


19	parent::__construct();
20
21	$this->addValidations('name', array(
22	+ 'required' => __('Please specify a name.', 'mailpoet')
23	));
24	}
25

lib/Models/SubscriberSegment.php CHANGED Viewed

	@@ -1,7 +1,6 @@
1	<?php
2	namespace MailPoet\Models;
3
4	- use MailPoet\Util\Helpers;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\Models;
3

4
5	if(!defined('ABSPATH')) exit;
6

lib/Newsletter/AutomatedLatestContent.php CHANGED Viewed

	@@ -2,7 +2,6 @@
2	namespace MailPoet\Newsletter;
3
4	use MailPoet\Newsletter\Editor\Transformer;
5	- use MailPoet\Util\Helpers;
6
7	if(!defined('ABSPATH')) exit;
8


2	namespace MailPoet\Newsletter;
3
4	use MailPoet\Newsletter\Editor\Transformer;

5
6	if(!defined('ABSPATH')) exit;
7

lib/Newsletter/Editor/PostListTransformer.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	- use \MailPoet\Newsletter\Editor\PostTransformer;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	+ use MailPoet\Newsletter\Editor\PostTransformer;
5
6	if(!defined('ABSPATH')) exit;
7

lib/Newsletter/Editor/PostTransformer.php CHANGED Viewed

	@@ -1,9 +1,9 @@
1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	- use \MailPoet\Newsletter\Editor\PostContentManager;
5	- use \MailPoet\Newsletter\Editor\MetaInformationManager;
6	- use \MailPoet\Newsletter\Editor\StructureTransformer;
7
8	if(!defined('ABSPATH')) exit;
9


1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	+ use MailPoet\Newsletter\Editor\PostContentManager;
5	+ use MailPoet\Newsletter\Editor\MetaInformationManager;
6	+ use MailPoet\Newsletter\Editor\StructureTransformer;
7
8	if(!defined('ABSPATH')) exit;
9

lib/Newsletter/Editor/StructureTransformer.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	- use \pQuery;
5
6	if(!defined('ABSPATH')) exit;
7


1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	+ use pQuery;
5
6	if(!defined('ABSPATH')) exit;
7

lib/Newsletter/Editor/Transformer.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	- use \MailPoet\Newsletter\Editor\TitleListTransformer;
5	- use \MailPoet\Newsletter\Editor\PostListTransformer;
6
7	if(!defined('ABSPATH')) exit;
8


1	<?php
2	namespace MailPoet\Newsletter\Editor;
3
4	+ use MailPoet\Newsletter\Editor\TitleListTransformer;
5	+ use MailPoet\Newsletter\Editor\PostListTransformer;
6
7	if(!defined('ABSPATH')) exit;
8

lib/Router/Endpoints/ViewInBrowser.php CHANGED Viewed

	@@ -52,17 +52,22 @@ class ViewInBrowser {
52	) return false;
53	} else if(!$data->subscriber && !empty($data->preview)) {
54	// if this is a preview and subscriber does not exist,
55	- // ~~attemp~~ to set subscriber to the current logged-in WP user
56	$data->subscriber = Subscriber::getCurrentWPUser();
57	}
58
59	// if newsletter hash is not provided but newsletter ID is defined then subscriber must exist
60	if(empty($data->newsletter_hash) && $data->newsletter_id && !$data->subscriber) return false;
61
62	- // queue is optional; if defined, ~~get~~ it
63	- $data->~~queue~~ = ~~(!empty($data->queue_id~~)) ?
64	- ~~SendingQueue::findOne~~($data->queue_id) :
65	- SendingQueue::~~where~~(~~'newsletter_id',~~ $data->~~newsletter->id~~)~~->findOne();~~





66
67	// allow users with 'manage_options' permission to preview any newsletter
68	if(!empty($data->preview) && current_user_can(Env::$required_permission)


52	) return false;
53	} else if(!$data->subscriber && !empty($data->preview)) {
54	// if this is a preview and subscriber does not exist,
55	+ // attempt to set subscriber to the current logged-in WP user
56	$data->subscriber = Subscriber::getCurrentWPUser();
57	}
58
59	// if newsletter hash is not provided but newsletter ID is defined then subscriber must exist
60	if(empty($data->newsletter_hash) && $data->newsletter_id && !$data->subscriber) return false;
61
62	+ // queue is optional; try to find it if it's not defined and this is not a welcome email
63	+ if($data->newsletter->type !== Newsletter::TYPE_WELCOME) {
64	+ $data->queue = (!empty($data->queue_id)) ?
65	+ SendingQueue::findOne($data->queue_id) :
66	+ SendingQueue::where('newsletter_id', $data->newsletter->id)
67	+ ->findOne();
68	+ } else {
69	+ $data->queue = false;
70	+ }
71
72	// allow users with 'manage_options' permission to preview any newsletter
73	if(!empty($data->preview) && current_user_can(Env::$required_permission)

lib/Router/Router.php CHANGED Viewed

	@@ -31,11 +31,11 @@ class Router {
31	$endpoint_class = __NAMESPACE__ . "\\Endpoints\\" . ucfirst($this->endpoint);
32	if(!$this->api_request) return;
33	if(!$this->endpoint \|\| !class_exists($endpoint_class)) {
34	- return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint.', 'mailpoet'));
35	}
36	$endpoint = new $endpoint_class($this->data);
37	if(!method_exists($endpoint, $this->action) \|\| !in_array($this->action, $endpoint->allowed_actions)) {
38	- return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint action.', 'mailpoet'));
39	}
40	do_action('mailpoet_conflict_resolver_router_url_query_parameters');
41	return call_user_func(
	@@ -74,4 +74,4 @@ class Router {
74	status_header($code, $message);
75	exit;
76	}
77	- }


31	$endpoint_class = __NAMESPACE__ . "\\Endpoints\\" . ucfirst($this->endpoint);
32	if(!$this->api_request) return;
33	if(!$this->endpoint \|\| !class_exists($endpoint_class)) {
34	+ return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint', 'mailpoet'));
35	}
36	$endpoint = new $endpoint_class($this->data);
37	if(!method_exists($endpoint, $this->action) \|\| !in_array($this->action, $endpoint->allowed_actions)) {
38	+ return $this->terminateRequest(self::RESPONSE_ERROR, __('Invalid router endpoint action', 'mailpoet'));
39	}
40	do_action('mailpoet_conflict_resolver_router_url_query_parameters');
41	return call_user_func(

74	status_header($code, $message);
75	exit;
76	}
77	+ }

lib/Settings/Pages.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	namespace MailPoet\Settings;
3	- use \MailPoet\Subscription;
4
5	class Pages {
6	function __construct() {


1	<?php
2	namespace MailPoet\Settings;
3	+ use MailPoet\Subscription;
4
5	class Pages {
6	function __construct() {

lib/Subscribers/ImportExport/Export/Export.php CHANGED Viewed

	@@ -47,10 +47,10 @@ class Export {
47	function process() {
48	try {
49	if(is_writable($this->export_path) === false) {
50	- throw new \Exception(__("~~Couldn't~~ ~~save~~ export file on the server", 'mailpoet'));
51	}
52	if(!extension_loaded('zip')) {
53	- throw new \Exception(__('Export requires a ZIP extension to be installed on the host', 'mailpoet'));
54	}
55	$processed_subscribers = call_user_func(
56	array(


47	function process() {
48	try {
49	if(is_writable($this->export_path) === false) {
50	+ throw new \Exception(__("The export file could not be saved on the server.", 'mailpoet'));
51	}
52	if(!extension_loaded('zip')) {
53	+ throw new \Exception(__('Export requires a ZIP extension to be installed on the host.', 'mailpoet'));
54	}
55	$processed_subscribers = call_user_func(
56	array(

lib/Subscription/Comment.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Subscription;
3	- use \MailPoet\Models\Setting;
4	- use \MailPoet\Models\Subscriber;
5
6	class Comment {
7	const SPAM = 'spam';
	@@ -20,7 +20,7 @@ class Comment {
20	static function getSubscriptionField() {
21	$label = Setting::getValue(
22	'subscribe.on_comment.label',
23	- __('Yes, please add me to your mailing list', 'mailpoet')
24	);
25
26	return '<p class="comment-form-mailpoet">
	@@ -91,4 +91,4 @@ class Comment {
91	);
92	}
93	}
94	- }


1	<?php
2	namespace MailPoet\Subscription;
3	+ use MailPoet\Models\Setting;
4	+ use MailPoet\Models\Subscriber;
5
6	class Comment {
7	const SPAM = 'spam';

20	static function getSubscriptionField() {
21	$label = Setting::getValue(
22	'subscribe.on_comment.label',
23	+ __('Yes, please add me to your mailing list.', 'mailpoet')
24	);
25
26	return '<p class="comment-form-mailpoet">

91	);
92	}
93	}
94	+ }

lib/Subscription/Form.php CHANGED Viewed

	@@ -1,11 +1,8 @@
1	<?php
2	namespace MailPoet\Subscription;
3	- use \MailPoet\API\Endpoints\Subscribers;
4	- use \MailPoet\API\Response as APIResponse;
5	- use \MailPoet\~~Models~~\~~Subscriber~~;
6	- use \MailPoet\Models\StatisticsForms;
7	- use \MailPoet\Models\Form as FormModel;
8	- use \MailPoet\Util\Url;
9
10	class Form {
11	static function onSubmit() {


1	<?php
2	namespace MailPoet\Subscription;
3	+ use MailPoet\API\Endpoints\Subscribers;
4	+ use MailPoet\API\Response as APIResponse;
5	+ use MailPoet\Util\Url;



6
7	class Form {
8	static function onSubmit() {

lib/Subscription/Manage.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Subscription;
3	- use \MailPoet\Models\Subscriber;
4	- use \MailPoet\Util\Url;
5
6	class Manage {
7


1	<?php
2	namespace MailPoet\Subscription;
3	+ use MailPoet\Models\Subscriber;
4	+ use MailPoet\Util\Url;
5
6	class Manage {
7

lib/Subscription/Pages.php CHANGED Viewed

	@@ -1,16 +1,15 @@
1	<?php
2	namespace MailPoet\Subscription;
3
4	- use \MailPoet\Models\Subscriber;
5	- use \MailPoet\Models\SubscriberSegment;
6	- use \MailPoet\Models\CustomField;
7	- use \MailPoet\Models\Setting;
8	- use \MailPoet\Models\Segment;
9	- use \MailPoet\Util\~~Helpers~~;
10	- use \MailPoet\~~Util\Url~~;
11	- use \MailPoet\~~Subscription~~;
12	- use \MailPoet\Form\~~Renderer~~ as ~~FormRenderer~~;
13	- use \MailPoet\Form\Block\Date as FormBlockDate;
14
15	class Pages {
16	const DEMO_EMAIL = 'demo@mailpoet.com';
	@@ -88,7 +87,7 @@ class Pages {
88	global $post;
89
90	if($this->isPreview() === false && $this->subscriber === false) {
91	- return __("Hmmm... we don't have a record of you", 'mailpoet');
92	}
93
94	if(
	@@ -190,7 +189,7 @@ class Pages {
190
191	private function getUnsubscribeTitle() {
192	if($this->isPreview() \|\| $this->subscriber !== false) {
193	- return __("You are now unsubscribed", 'mailpoet');
194	}
195	}
196


1	<?php
2	namespace MailPoet\Subscription;
3
4	+ use MailPoet\Models\Subscriber;
5	+ use MailPoet\Models\SubscriberSegment;
6	+ use MailPoet\Models\CustomField;
7	+ use MailPoet\Models\Setting;
8	+ use MailPoet\Models\Segment;
9	+ use MailPoet\Util\Url;
10	+ use MailPoet\Subscription;
11	+ use MailPoet\Form\Renderer as FormRenderer;
12	+ use MailPoet\Form\Block\Date as FormBlockDate;

13
14	class Pages {
15	const DEMO_EMAIL = 'demo@mailpoet.com';

87	global $post;
88
89	if($this->isPreview() === false && $this->subscriber === false) {
90	+ return __("Hmmm... we don't have a record of you.", 'mailpoet');
91	}
92
93	if(

189
190	private function getUnsubscribeTitle() {
191	if($this->isPreview() \|\| $this->subscriber !== false) {
192	+ return __("You are now unsubscribed.", 'mailpoet');
193	}
194	}
195

lib/Subscription/Registration.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	namespace MailPoet\Subscription;
3	- use \MailPoet\Models\Setting;
4	- use \MailPoet\Models\Subscriber;
5
6	class Registration {
7


1	<?php
2	namespace MailPoet\Subscription;
3	+ use MailPoet\Models\Setting;
4	+ use MailPoet\Models\Subscriber;
5
6	class Registration {
7

lib/Twig/I18n.php CHANGED Viewed

	@@ -24,6 +24,7 @@ class I18n extends \Twig_Extension {
24	'localize' => 'localize',
25	'__' => 'translate',
26	'_n' => 'pluralize',

27	'date' => 'date'
28	);
29
	@@ -63,6 +64,12 @@ class I18n extends \Twig_Extension {
63	return call_user_func_array('_n', $this->setTextDomain($args));
64	}
65






66	function date() {
67	$args = func_get_args();
68	$date = (isset($args[0])) ? $args[0] : null;
	@@ -88,4 +95,4 @@ class I18n extends \Twig_Extension {
88	}
89	return $args;
90	}
91	- }


24	'localize' => 'localize',
25	'__' => 'translate',
26	'_n' => 'pluralize',
27	+ '_x' => 'translateWithContext',
28	'date' => 'date'
29	);
30

64	return call_user_func_array('_n', $this->setTextDomain($args));
65	}
66
67	+ function translateWithContext() {
68	+ $args = func_get_args();
69	+
70	+ return call_user_func_array('_x', $this->setTextDomain($args));
71	+ }
72	+
73	function date() {
74	$args = func_get_args();
75	$date = (isset($args[0])) ? $args[0] : null;

95	}
96	return $args;
97	}
98	+ }

lib/Util/ConflictResolver.php CHANGED Viewed

	@@ -50,14 +50,15 @@ class ConflictResolver {
50	}
51
52	function resolveStylesConflict() {

53	// unload all styles except from the list of allowed
54	- $dequeue_styles = function() {
55	global $wp_styles;
56	if(empty($wp_styles->queue)) return;
57	foreach($wp_styles->queue as $wp_style) {
58	if(empty($wp_styles->registered[$wp_style])) continue;
59	$registered_style = $wp_styles->registered[$wp_style];
60	- if(!preg_match('!' . implode('\|', $~~this~~->permitted_assets_locations['styles']) . '!i', $registered_style->src)) {
61	wp_dequeue_style($wp_style);
62	}
63	}
	@@ -69,13 +70,14 @@ class ConflictResolver {
69	}
70
71	function resolveScriptsConflict() {

72	// unload all scripts except from the list of allowed
73	- $dequeue_scripts = function() {
74	global $wp_scripts;
75	foreach($wp_scripts->queue as $wp_script) {
76	if(empty($wp_scripts->registered[$wp_script])) continue;
77	$registered_script = $wp_scripts->registered[$wp_script];
78	- if(!preg_match('!' . implode('\|', $~~this~~->permitted_assets_locations['scripts']) . '!i', $registered_script->src)) {
79	wp_dequeue_script($wp_script);
80	}
81	}


50	}
51
52	function resolveStylesConflict() {
53	+ $_this = $this;
54	// unload all styles except from the list of allowed
55	+ $dequeue_styles = function() use($_this) {
56	global $wp_styles;
57	if(empty($wp_styles->queue)) return;
58	foreach($wp_styles->queue as $wp_style) {
59	if(empty($wp_styles->registered[$wp_style])) continue;
60	$registered_style = $wp_styles->registered[$wp_style];
61	+ if(!preg_match('!' . implode('\|', $_this->permitted_assets_locations['styles']) . '!i', $registered_style->src)) {
62	wp_dequeue_style($wp_style);
63	}
64	}

70	}
71
72	function resolveScriptsConflict() {
73	+ $_this = $this;
74	// unload all scripts except from the list of allowed
75	+ $dequeue_scripts = function() use($_this) {
76	global $wp_scripts;
77	foreach($wp_scripts->queue as $wp_script) {
78	if(empty($wp_scripts->registered[$wp_script])) continue;
79	$registered_script = $wp_scripts->registered[$wp_script];
80	+ if(!preg_match('!' . implode('\|', $_this->permitted_assets_locations['scripts']) . '!i', $registered_script->src)) {
81	wp_dequeue_script($wp_script);
82	}
83	}

mailpoet.php CHANGED Viewed

	@@ -4,13 +4,13 @@ if(!defined('ABSPATH')) exit;
4
5	/*
6	* Plugin Name: MailPoet
7	- * Version: 3.0.0-beta.15
8	* Plugin URI: http://www.mailpoet.com
9	* Description: Create and send beautiful email newsletters, autoresponders, and post notifications without leaving WordPress. This is a beta version of our brand new plugin!
10	* Author: MailPoet
11	* Author URI: http://www.mailpoet.com
12	* Requires at least: 4.6
13	- * Tested up to: 4.7.1
14	*
15	* Text Domain: mailpoet
16	* Domain Path: /lang/
	@@ -21,7 +21,7 @@ if(!defined('ABSPATH')) exit;
21	*/
22
23	$mailpoet_plugin = array(
24	- 'version' => '3.0.0-beta.15',
25	'filename' => __FILE__,
26	'path' => dirname(__FILE__),
27	'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',
	@@ -47,7 +47,7 @@ if(version_compare(phpversion(), '5.3.0', '<')) {
47	function mailpoet_php_version_notice() {
48	$notice = str_replace(
49	'[link]',
50	- '<a href="//docs.mailpoet.com/article/152-minimum-requirements-for-mailpoet-3#php_version" target="_blank">',
51	__('MailPoet plugin requires PHP version 5.3 or newer. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet')
52	);
53	$notice = str_replace('[/link]', '</a>', $notice);


4
5	/*
6	* Plugin Name: MailPoet
7	+ * Version: 3.0.0-beta.16
8	* Plugin URI: http://www.mailpoet.com
9	* Description: Create and send beautiful email newsletters, autoresponders, and post notifications without leaving WordPress. This is a beta version of our brand new plugin!
10	* Author: MailPoet
11	* Author URI: http://www.mailpoet.com
12	* Requires at least: 4.6
13	+ * Tested up to: 4.7.2
14	*
15	* Text Domain: mailpoet
16	* Domain Path: /lang/

21	*/
22
23	$mailpoet_plugin = array(
24	+ 'version' => '3.0.0-beta.16',
25	'filename' => __FILE__,
26	'path' => dirname(__FILE__),
27	'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',

47	function mailpoet_php_version_notice() {
48	$notice = str_replace(
49	'[link]',
50	+ '<a href="//beta.docs.mailpoet.com/article/152-minimum-requirements-for-mailpoet-3#php_version" target="_blank">',
51	__('MailPoet plugin requires PHP version 5.3 or newer. Please read our [link]instructions[/link] on how to resolve this issue.', 'mailpoet')
52	);
53	$notice = str_replace('[/link]', '</a>', $notice);

readme.txt CHANGED Viewed

	@@ -2,8 +2,8 @@
2	Contributors: mailpoet, wysija
3	Tags: newsletter, email, welcome email, post notification, autoresponder, mailchimp, signup, smtp
4	Requires at least: 4.6
5	- Tested up to: 4.7.1
6	- Stable tag: 3.0.0-beta.15
7	Create and send beautiful emails and newsletters from WordPress.
8
9	== Description ==
	@@ -83,10 +83,18 @@ Our [support site](https://docs.mailpoet.com/) has plenty of articles. You can w
83
84	== Changelog ==
85








86	= 3.0.0-beta.15 - 2017-01-24 =
87	- * Fixed: plugin no longer throws a fatal exception error on (prehistoric :)) hosts running PHP <5.3. Thanks Otto & jtm12!;
88	* Fixed: users who are not subscribed to any list can be filtered in the admin panel;
89	- * Fixed: ~~newsletters'~~ preview links can now be ~~publicly~~ ~~shared~~.
90
91	= 3.0.0-beta.14 - 2017-01-19 =
92	* Fixed: images can't be added to newsletters. Thanks Leon!;


2	Contributors: mailpoet, wysija
3	Tags: newsletter, email, welcome email, post notification, autoresponder, mailchimp, signup, smtp
4	Requires at least: 4.6
5	+ Tested up to: 4.7.2
6	+ Stable tag: 3.0.0-beta.16
7	Create and send beautiful emails and newsletters from WordPress.
8
9	== Description ==

83
84	== Changelog ==
85
86	+ = 3.0.0-beta.16 - 2017-01-31 =
87	+ - Improved: Updated language strings for better translation support;
88	+ - Fixed: subscription forms now allow to subscribe only to specified lists. Thanks Paul!
89	+ - Fixed: subscription forms now ignore any extra fields added not via the Form editor. Thx again Paul!
90	+ - Fixed: previewing sent welcome emails now display latest email version. Thanks Tim!
91	+ - Fixed: plugin no longer triggers a PHP error during initialization on hosts using PHP 5.3;
92	+ - Fixed: plugin warns about missing required PDO_MYSQL extension.
93	+
94	= 3.0.0-beta.15 - 2017-01-24 =
95	+ * Fixed: plugin no longer throws a fatal exception error on (prehistoric :)) hosts running older versions than PHP 5.3. Thanks Otto & jtm12!;
96	* Fixed: users who are not subscribed to any list can be filtered in the admin panel;
97	+ * Fixed: newsletter preview links can now be shared with non WP users.
98
99	= 3.0.0-beta.14 - 2017-01-19 =
100	* Fixed: images can't be added to newsletters. Thanks Leon!;

vendor/autoload.php CHANGED Viewed

	@@ -4,4 +4,4 @@
4
5	require_once __DIR__ . '/composer/autoload_real.php';
6
7	- return ~~ComposerAutoloaderInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::getLoader();


4
5	require_once __DIR__ . '/composer/autoload_real.php';
6
7	+ return ComposerAutoloaderInitbc6a71515c63313e189bde6b793cf9a7::getLoader();

vendor/composer/autoload_real.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2
3	// autoload_real.php @generated by Composer
4
5	- class ~~ComposerAutoloaderInit3a231df0fc1b3b4acf9c054c7ccc6b08~~
6	{
7	private static $loader;
8
	@@ -19,15 +19,15 @@ class ComposerAutoloaderInit3a231df0fc1b3b4acf9c054c7ccc6b08
19	return self::$loader;
20	}
21
22	- spl_autoload_register(array('~~ComposerAutoloaderInit3a231df0fc1b3b4acf9c054c7ccc6b08~~', 'loadClassLoader'), true, true);
23	self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24	- spl_autoload_unregister(array('~~ComposerAutoloaderInit3a231df0fc1b3b4acf9c054c7ccc6b08~~', 'loadClassLoader'));
25
26	$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') \|\| !zend_loader_file_encoded());
27	if ($useStaticLoader) {
28	require_once __DIR__ . '/autoload_static.php';
29
30	- call_user_func(\Composer\Autoload\~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::getInitializer($loader));
31	} else {
32	$map = require __DIR__ . '/autoload_namespaces.php';
33	foreach ($map as $namespace => $path) {
	@@ -48,19 +48,19 @@ class ComposerAutoloaderInit3a231df0fc1b3b4acf9c054c7ccc6b08
48	$loader->register(true);
49
50	if ($useStaticLoader) {
51	- $includeFiles = Composer\Autoload\~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::$files;
52	} else {
53	$includeFiles = require __DIR__ . '/autoload_files.php';
54	}
55	foreach ($includeFiles as $fileIdentifier => $file) {
56	- ~~composerRequire3a231df0fc1b3b4acf9c054c7ccc6b08~~($fileIdentifier, $file);
57	}
58
59	return $loader;
60	}
61	}
62
63	- function ~~composerRequire3a231df0fc1b3b4acf9c054c7ccc6b08~~($fileIdentifier, $file)
64	{
65	if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66	require $file;


2
3	// autoload_real.php @generated by Composer
4
5	+ class ComposerAutoloaderInitbc6a71515c63313e189bde6b793cf9a7
6	{
7	private static $loader;
8

19	return self::$loader;
20	}
21
22	+ spl_autoload_register(array('ComposerAutoloaderInitbc6a71515c63313e189bde6b793cf9a7', 'loadClassLoader'), true, true);
23	self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24	+ spl_autoload_unregister(array('ComposerAutoloaderInitbc6a71515c63313e189bde6b793cf9a7', 'loadClassLoader'));
25
26	$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') \|\| !zend_loader_file_encoded());
27	if ($useStaticLoader) {
28	require_once __DIR__ . '/autoload_static.php';
29
30	+ call_user_func(\Composer\Autoload\ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7::getInitializer($loader));
31	} else {
32	$map = require __DIR__ . '/autoload_namespaces.php';
33	foreach ($map as $namespace => $path) {

48	$loader->register(true);
49
50	if ($useStaticLoader) {
51	+ $includeFiles = Composer\Autoload\ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7::$files;
52	} else {
53	$includeFiles = require __DIR__ . '/autoload_files.php';
54	}
55	foreach ($includeFiles as $fileIdentifier => $file) {
56	+ composerRequirebc6a71515c63313e189bde6b793cf9a7($fileIdentifier, $file);
57	}
58
59	return $loader;
60	}
61	}
62
63	+ function composerRequirebc6a71515c63313e189bde6b793cf9a7($fileIdentifier, $file)
64	{
65	if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66	require $file;

vendor/composer/autoload_static.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4
5	namespace Composer\Autoload;
6
7	- class ~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~
8	{
9	public static $files = array (
10	'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
	@@ -602,10 +602,10 @@ class ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08
602	public static function getInitializer(ClassLoader $loader)
603	{
604	return \Closure::bind(function () use ($loader) {
605	- $loader->prefixLengthsPsr4 = ~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::$prefixLengthsPsr4;
606	- $loader->prefixDirsPsr4 = ~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::$prefixDirsPsr4;
607	- $loader->prefixesPsr0 = ~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::$prefixesPsr0;
608	- $loader->classMap = ~~ComposerStaticInit3a231df0fc1b3b4acf9c054c7ccc6b08~~::$classMap;
609
610	}, null, ClassLoader::class);
611	}


4
5	namespace Composer\Autoload;
6
7	+ class ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7
8	{
9	public static $files = array (
10	'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',

602	public static function getInitializer(ClassLoader $loader)
603	{
604	return \Closure::bind(function () use ($loader) {
605	+ $loader->prefixLengthsPsr4 = ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7::$prefixLengthsPsr4;
606	+ $loader->prefixDirsPsr4 = ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7::$prefixDirsPsr4;
607	+ $loader->prefixesPsr0 = ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7::$prefixesPsr0;
608	+ $loader->classMap = ComposerStaticInitbc6a71515c63313e189bde6b793cf9a7::$classMap;
609
610	}, null, ClassLoader::class);
611	}

views/form/templates/preview.hbs CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<style type="text/css" id="mailpoet_form_preview_styles">{{{ css }}}</style>
2	<div class="mailpoet_form">
3	<div class="mailpoet_message">
4	- <p class="mailpoet_validate_success"><%= __('This is a success message') %></p>
5	- <p class="mailpoet_validate_error"><%= __('This is an error message') %></p>
6	</div>
7	{{{ html }}}
8	- </div>


1	<style type="text/css" id="mailpoet_form_preview_styles">{{{ css }}}</style>
2	<div class="mailpoet_form">
3	<div class="mailpoet_message">
4	+ <p class="mailpoet_validate_success"><%= __('This is a success message.') %></p>
5	+ <p class="mailpoet_validate_error"><%= __('This is an error message.') %></p>
6	</div>
7	{{{ html }}}
8	+ </div>

views/form/templates/settings/field_form.hbs CHANGED Viewed

	@@ -34,7 +34,7 @@
34	</option>
35	<option
36	{{#ifCond type '==' 'select'}}selected="selected"{{/ifCond}}
37	- value="select"><%= __('Select') %>
38	</option>
39	<option
40	{{#ifCond type '==' 'date'}}selected="selected"{{/ifCond}}
	@@ -133,4 +133,4 @@
133	}
134	}
135	});
136	- </script>


34	</option>
35	<option
36	{{#ifCond type '==' 'select'}}selected="selected"{{/ifCond}}
37	+ value="select"><%= _x('Select', 'Form input type') %>
38	</option>
39	<option
40	{{#ifCond type '==' 'date'}}selected="selected"{{/ifCond}}

133	}
134	}
135	});
136	+ </script>

views/form/widget.html CHANGED Viewed

	@@ -18,11 +18,6 @@
18	<input type="hidden" name="endpoint" value="subscribers" />
19	<input type="hidden" name="method" value="subscribe" />
20
21	- <% if not(form.settings.segments_selected_by == 'user') %>
22	- <% for segment in form.settings.segments %>
23	- <input type="hidden" name="segments[]" value="<%= segment %>" />
24	- <% endfor %>
25	- <% endif %>
26	<%= html \| raw %>
27	<div class="mailpoet_message">
28	<p


18	<input type="hidden" name="endpoint" value="subscribers" />
19	<input type="hidden" name="method" value="subscribe" />
20





21	<%= html \| raw %>
22	<div class="mailpoet_message">
23	<p

views/forms.html CHANGED Viewed

	@@ -16,9 +16,9 @@
16	'pageTitle': __('Forms'),
17	'searchLabel': __('Search'),
18	'loadingItems': __('Loading forms...'),
19	- 'noItemsFound': __('No forms found'),
20	- 'selectAllLabel': __('All forms on this page are selected'),
21	- 'selectedAllLabel': __('All %d forms are selected'),
22	'selectAllLink': __('Select all forms on all pages'),
23	'clearSelection': __('Clear selection'),
24	'permanentlyDeleted': __('%d forms permanently deleted'),
	@@ -42,18 +42,19 @@
42	'formName': __('Name'),
43	'segments': __('Lists'),
44	'userChoice': __('User choice:'),
45	- 'signups': __('~~Signups~~'),
46	'createdOn': __('Created On'),
47	- 'oneFormTrashed': __('1 form was moved to the trash'),
48	- 'multipleFormsTrashed': __('%$1d forms were moved to the trash'),
49	- 'oneFormDeleted': __('1 form was permanently deleted'),
50	- 'multipleFormsDeleted': __('%$1d forms were permanently deleted'),
51	- 'oneFormRestored': __('1 form has been restored from the trash'),
52	- 'multipleFormsRestored': __('%$1d forms have been restored from the trash'),
53	'edit': __('Edit'),
54	'duplicate': __('Duplicate'),
55	- 'formDuplicated': __('Form "%$1s" has been duplicated'),
56	'trash': __('Trash'),

57	'new': __('Add New'),
58	}) %>
59	<% endblock %>


16	'pageTitle': __('Forms'),
17	'searchLabel': __('Search'),
18	'loadingItems': __('Loading forms...'),
19	+ 'noItemsFound': __('No forms were found. Why not create a new one?'),
20	+ 'selectAllLabel': __('All forms on this page are selected.'),
21	+ 'selectedAllLabel': __('All %d forms are selected.'),
22	'selectAllLink': __('Select all forms on all pages'),
23	'clearSelection': __('Clear selection'),
24	'permanentlyDeleted': __('%d forms permanently deleted'),

42	'formName': __('Name'),
43	'segments': __('Lists'),
44	'userChoice': __('User choice:'),
45	+ 'signups': __('Sign-ups'),
46	'createdOn': __('Created On'),
47	+ 'oneFormTrashed': __('1 form was moved to the trash.'),
48	+ 'multipleFormsTrashed': __('%$1d forms were moved to the trash.'),
49	+ 'oneFormDeleted': __('1 form was permanently deleted.'),
50	+ 'multipleFormsDeleted': __('%$1d forms were permanently deleted.'),
51	+ 'oneFormRestored': __('1 form has been restored from the trash.'),
52	+ 'multipleFormsRestored': __('%$1d forms have been restored from the trash.'),
53	'edit': __('Edit'),
54	'duplicate': __('Duplicate'),
55	+ 'formDuplicated': __('Form "%$1s" has been duplicated.'),
56	'trash': __('Trash'),
57	+ 'moveToTrash': __('Move to trash'),
58	'new': __('Add New'),
59	}) %>
60	<% endblock %>

views/index.html CHANGED Viewed

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


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

views/newsletter/editor.html CHANGED Viewed

	@@ -330,7 +330,7 @@
330	'templateSaved': __('Template has been saved.'),
331	'templateSaveFailed': __('Template has not been saved, please try again'),
332	'categoriesAndTags': __('Categories & tags'),
333	- 'noPostsToDisplay': __('There is no content to display'),
334	'previewShouldOpenInNewTab': __('Your preview should open in a new tab. Please ensure your browser is not blocking popups from this page.'),
335	'newsletterPreview': __('Newsletter Preview'),
336	}) %>
	@@ -1153,11 +1153,11 @@
1153	},
1154	},
1155	text: {
1156	- text: '<%= __('Edit this to insert text') %>',
1157	},
1158	header: {
1159	text: '<%= __('Display problems?') %> ' +
1160	- '<a href="[link:newsletter_view_in_browser_url]"><%= __('Open this email in your web browser') %></a>',
1161	styles: {
1162	block: {
1163	backgroundColor: 'transparent',


330	'templateSaved': __('Template has been saved.'),
331	'templateSaveFailed': __('Template has not been saved, please try again'),
332	'categoriesAndTags': __('Categories & tags'),
333	+ 'noPostsToDisplay': __('There is no content to display.'),
334	'previewShouldOpenInNewTab': __('Your preview should open in a new tab. Please ensure your browser is not blocking popups from this page.'),
335	'newsletterPreview': __('Newsletter Preview'),
336	}) %>

1153	},
1154	},
1155	text: {
1156	+ text: '<%= __('Edit this to insert text.') %>',
1157	},
1158	header: {
1159	text: '<%= __('Display problems?') %> ' +
1160	+ '<a href="[link:newsletter_view_in_browser_url]"><%= __('Open this email in your web browser.') %></a>',
1161	styles: {
1162	block: {
1163	backgroundColor: 'transparent',

views/newsletters.html CHANGED Viewed

	@@ -29,11 +29,11 @@
29	'searchLabel': __('Search'),
30	'loadingItems': __('Loading newsletters...'),
31	'noItemsFound': __("Nothing here yet! But, don't fret - there's no reason to get upset. Pretty soon, you’ll be sending emails faster than a turbo-jet."),
32	- 'selectAllLabel': __('All newsletters on this page are selected'),
33	- 'selectedAllLabel': __('All %d newsletters are selected'),
34	'selectAllLink': __('Select all newsletters on all pages'),
35	'clearSelection': __('Clear selection'),
36	- 'permanentlyDeleted': __('%d newsletters were permanently deleted'),
37	'selectBulkAction': __('Select bulk action'),
38	'bulkActions': __('Bulk Actions'),
39	'apply': __('Apply'),
	@@ -66,13 +66,14 @@
66	'viewHistory': __('View history'),
67	'createdOn': __('Created on'),
68	'lastModifiedOn': __('Last modified on'),
69	- 'oneNewsletterTrashed': __('1 newsletter was moved to the trash'),
70	- 'multipleNewslettersTrashed': __('%$1d newsletters were moved to the trash'),
71	- 'oneNewsletterDeleted': __('1 newsletter was permanently deleted'),
72	- 'multipleNewslettersDeleted': __('%$1d newsletters were permanently deleted'),
73	- 'oneNewsletterRestored': __('1 newsletter has been recovered from the trash'),
74	- 'multipleNewslettersRestored': __('%$1d newsletters have been recovered from the trash'),
75	'trash': __('Trash'),

76	'edit': __('Edit'),
77	'duplicate': __('Duplicate'),
78	'newsletterDuplicated': __('Email "%$1s" has been duplicated.'),
	@@ -93,10 +94,10 @@
93	'selectJsonFileToUpload': __('Select a .json file to upload'),
94	'upload': __('Upload'),
95	'mailpoetGuideTemplateTitle': __("MailPoet's Guide"),
96	- 'mailpoetGuideTemplateDescription': __("This is the standard template that comes with MailPoet"),
97	- 'confirmTemplateDeletion': __('You are about to delete the template named "%$1s"'),
98	'delete': __('Delete'),
99	- 'select': __('Select'),
100	'preview': __('Preview'),
101	'selectTemplateTitle': __('Select a responsive template'),
102
	@@ -151,22 +152,22 @@
151	'selectSegmentPlaceholder': __('Select a list'),
152	'noSegmentsSelectedError': __('Please select a list'),
153	'sender': __('Sender'),
154	- 'senderTip': __('Your name and email.'),
155	'senderNamePlaceholder': __('John Doe'),
156	'senderAddressPlaceholder': __('john.doe@email.com'),
157	'replyTo': __('Reply-to'),
158	- 'replyToTip': __('When your subscribers reply to your newsletter, their emails will go to this address'),
159	'replyToNamePlaceholder': __('John Doe'),
160	'replyToAddressPlaceholder': __('john.doe@email.com'),
161	'newsletterUpdated': __('Newsletter was updated successfully!'),
162	'newsletterAdded': __('Newsletter was added successfully!'),
163	- 'newsletterSendingError': __('An error occurred while trying to send. <a href="%$1s">Please check your settings</a>'),
164	'finalNewsletterStep': __('Final Step: Last Details'),
165	'saveDraftAndClose': __('Save as draft and close'),
166	'orSimply': __('or simply'),
167	'goBackToDesign': __('go back to the Design page'),
168	'websiteTimeIs': __("Your website’s time is"),
169	- 'noScheduledDateError': __('Please enter the scheduled date'),
170	'schedule': __('Schedule'),
171
172	'close': __('Close'),
	@@ -202,21 +203,21 @@
202	'thursdayShort': __('Thu'),
203	'fridayShort': __('Fri'),
204	'saturdayShort': __('Sat'),
205	- 'sundayMin': __('S'),
206	- 'mondayMin': __('M'),
207	- 'tuesdayMin': __('T'),
208	- 'wednesdayMin': __('W'),
209	- 'thursdayMin': __('T'),
210	- 'fridayMin': __('F'),
211	- 'saturdayMin': __('S'),
212	'next': __('Next'),
213	'previous': __('Previous'),
214	'newsletterBeingSent': __('The newsletter is being sent...'),
215	'newsletterHasBeenScheduled': __('The newsletter has been scheduled.'),
216	'welcomeEmailActivated': __('Your Welcome Email is now activated!'),
217	- 'welcomeEmailActivationFailed': __('Your Welcome Email could not be activated, please check the settings'),
218	'postNotificationActivated': __('Your post notification is now active!'),
219	- 'postNotificationActivationFailed': __('Your ~~post~~ ~~notification~~ could not be activated, check the settings'),
220	'welcomeEventSegment': __('This newsletter is sent when someone subscribes to the list: "%$1s"'),
221	'welcomeEventWPUserAnyRole': __('This newsletter is sent when a new WordPress user is added to your site'),
222	'welcomeEventWPUserWithRole': __('This newsletter is sent when a new WordPress user with the role "%$1s" is added to your site'),


29	'searchLabel': __('Search'),
30	'loadingItems': __('Loading newsletters...'),
31	'noItemsFound': __("Nothing here yet! But, don't fret - there's no reason to get upset. Pretty soon, you’ll be sending emails faster than a turbo-jet."),
32	+ 'selectAllLabel': __('All newsletters on this page are selected.'),
33	+ 'selectedAllLabel': __('All %d newsletters are selected.'),
34	'selectAllLink': __('Select all newsletters on all pages'),
35	'clearSelection': __('Clear selection'),
36	+ 'permanentlyDeleted': __('%d newsletters were permanently deleted.'),
37	'selectBulkAction': __('Select bulk action'),
38	'bulkActions': __('Bulk Actions'),
39	'apply': __('Apply'),

66	'viewHistory': __('View history'),
67	'createdOn': __('Created on'),
68	'lastModifiedOn': __('Last modified on'),
69	+ 'oneNewsletterTrashed': __('1 newsletter was moved to the trash.'),
70	+ 'multipleNewslettersTrashed': __('%$1d newsletters were moved to the trash.'),
71	+ 'oneNewsletterDeleted': __('1 newsletter was permanently deleted.'),
72	+ 'multipleNewslettersDeleted': __('%$1d newsletters were permanently deleted.'),
73	+ 'oneNewsletterRestored': __('1 newsletter has been recovered from the trash.'),
74	+ 'multipleNewslettersRestored': __('%$1d newsletters have been recovered from the trash.'),
75	'trash': __('Trash'),
76	+ 'moveToTrash': __('Move to trash'),
77	'edit': __('Edit'),
78	'duplicate': __('Duplicate'),
79	'newsletterDuplicated': __('Email "%$1s" has been duplicated.'),

94	'selectJsonFileToUpload': __('Select a .json file to upload'),
95	'upload': __('Upload'),
96	'mailpoetGuideTemplateTitle': __("MailPoet's Guide"),
97	+ 'mailpoetGuideTemplateDescription': __("This is the standard template that comes with MailPoet."),
98	+ 'confirmTemplateDeletion': __('You are about to delete the template named "%$1s".'),
99	'delete': __('Delete'),
100	+ 'select': _x('Select', 'Verb'),
101	'preview': __('Preview'),
102	'selectTemplateTitle': __('Select a responsive template'),
103

152	'selectSegmentPlaceholder': __('Select a list'),
153	'noSegmentsSelectedError': __('Please select a list'),
154	'sender': __('Sender'),
155	+ 'senderTip': __('Your name and email'),
156	'senderNamePlaceholder': __('John Doe'),
157	'senderAddressPlaceholder': __('john.doe@email.com'),
158	'replyTo': __('Reply-to'),
159	+ 'replyToTip': __('When your subscribers reply to your newsletter, their emails will go to this address.'),
160	'replyToNamePlaceholder': __('John Doe'),
161	'replyToAddressPlaceholder': __('john.doe@email.com'),
162	'newsletterUpdated': __('Newsletter was updated successfully!'),
163	'newsletterAdded': __('Newsletter was added successfully!'),
164	+ 'newsletterSendingError': __('An error occurred while trying to send. <a href="%$1s">Please check your settings</a>.'),
165	'finalNewsletterStep': __('Final Step: Last Details'),
166	'saveDraftAndClose': __('Save as draft and close'),
167	'orSimply': __('or simply'),
168	'goBackToDesign': __('go back to the Design page'),
169	'websiteTimeIs': __("Your website’s time is"),
170	+ 'noScheduledDateError': __('Please enter the scheduled date.'),
171	'schedule': __('Schedule'),
172
173	'close': __('Close'),

203	'thursdayShort': __('Thu'),
204	'fridayShort': __('Fri'),
205	'saturdayShort': __('Sat'),
206	+ 'sundayMin': _x('S', 'Sunday - one letter abbreviation'),
207	+ 'mondayMin': _x('M', 'Monday - one letter abbreviation'),
208	+ 'tuesdayMin': _x('T', 'Tuesday - one letter abbreviation'),
209	+ 'wednesdayMin': _x('W', 'Wednesday - one letter abbreviation'),
210	+ 'thursdayMin': _x('T', 'Thursday - one letter abbreviation'),
211	+ 'fridayMin': _x('F', 'Friday - one letter abbreviation'),
212	+ 'saturdayMin': _x('S', 'Saturday - one letter abbreviation'),
213	'next': __('Next'),
214	'previous': __('Previous'),
215	'newsletterBeingSent': __('The newsletter is being sent...'),
216	'newsletterHasBeenScheduled': __('The newsletter has been scheduled.'),
217	'welcomeEmailActivated': __('Your Welcome Email is now activated!'),
218	+ 'welcomeEmailActivationFailed': __('Your Welcome Email could not be activated, please check the settings.'),
219	'postNotificationActivated': __('Your post notification is now active!'),
220	+ 'postNotificationActivationFailed': __('Your Post Notification could not be activated, check the settings.'),
221	'welcomeEventSegment': __('This newsletter is sent when someone subscribes to the list: "%$1s"'),
222	'welcomeEventWPUserAnyRole': __('This newsletter is sent when a new WordPress user is added to your site'),
223	'welcomeEventWPUserWithRole': __('This newsletter is sent when a new WordPress user with the role "%$1s" is added to your site'),

views/segments.html CHANGED Viewed

	@@ -14,11 +14,11 @@
14	'searchLabel': __('Search'),
15	'loadingItems': __('Loading lists...'),
16	'noItemsFound': __('No lists found'),
17	- 'selectAllLabel': __('All lists on this page are selected'),
18	- 'selectedAllLabel': __('All %d lists are selected'),
19	'selectAllLink': __('Select all lists on all pages'),
20	'clearSelection': __('Clear selection'),
21	- 'permanentlyDeleted': __('%d lists were permanently deleted'),
22	'selectBulkAction': __('Select bulk action'),
23	'bulkActions': __('Bulk Actions'),
24	'apply': __('Apply'),
	@@ -35,7 +35,7 @@
35	'oneSegmentTrashed': __('1 list was moved to the trash'),
36	'multipleSegmentsTrashed': __('%$1d lists were moved to the trash'),
37	'oneSegmentDeleted': __('1 list was permanently deleted'),
38	- 'multipleSegmentsDeleted': __('%$1d ~~list~~ were permanently deleted'),
39	'oneSegmentRestored': __('1 list has been restored from the trash'),
40	'multipleSegmentsRestored': __('%$1d lists have been restored from the trash'),
41	'duplicate': __('Duplicate'),
	@@ -43,11 +43,12 @@
43	'update': __('Update'),
44	'forceSync': __('Force Sync'),
45	'readMore': __('Read More'),
46	- 'listSynchronized': __('List "%$1s" has been synchronized'),
47	'viewSubscribers': __('View Subscribers'),
48	'new': __('Add New'),
49	'edit': __('Edit'),
50	'trash': __('Trash'),

51	'emptyTrash': __('Empty Trash'),
52	'selectAll': __('Select All'),
53	'restore': __('Restore'),
	@@ -62,7 +63,7 @@
62	'pageOutOf': __('of'),
63	'numberOfItems': __('%$1d item(s)'),
64
65	- 'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers'),
66	'backToList': __('Back')
67	}) %>
68	<% endblock %>


14	'searchLabel': __('Search'),
15	'loadingItems': __('Loading lists...'),
16	'noItemsFound': __('No lists found'),
17	+ 'selectAllLabel': __('All lists on this page are selected.'),
18	+ 'selectedAllLabel': __('All %d lists are selected.'),
19	'selectAllLink': __('Select all lists on all pages'),
20	'clearSelection': __('Clear selection'),
21	+ 'permanentlyDeleted': __('%d lists were permanently deleted.'),
22	'selectBulkAction': __('Select bulk action'),
23	'bulkActions': __('Bulk Actions'),
24	'apply': __('Apply'),

35	'oneSegmentTrashed': __('1 list was moved to the trash'),
36	'multipleSegmentsTrashed': __('%$1d lists were moved to the trash'),
37	'oneSegmentDeleted': __('1 list was permanently deleted'),
38	+ 'multipleSegmentsDeleted': __('%$1d lists were permanently deleted.'),
39	'oneSegmentRestored': __('1 list has been restored from the trash'),
40	'multipleSegmentsRestored': __('%$1d lists have been restored from the trash'),
41	'duplicate': __('Duplicate'),

43	'update': __('Update'),
44	'forceSync': __('Force Sync'),
45	'readMore': __('Read More'),
46	+ 'listSynchronized': __('List "%$1s" has been synchronized.'),
47	'viewSubscribers': __('View Subscribers'),
48	'new': __('Add New'),
49	'edit': __('Edit'),
50	'trash': __('Trash'),
51	+ 'moveToTrash': __('Move to trash'),
52	'emptyTrash': __('Empty Trash'),
53	'selectAll': __('Select All'),
54	'restore': __('Restore'),

63	'pageOutOf': __('of'),
64	'numberOfItems': __('%$1d item(s)'),
65
66	+ 'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers.'),
67	'backToList': __('Back')
68	}) %>
69	<% endblock %>

views/settings.html CHANGED Viewed

	@@ -16,7 +16,7 @@
16	<!-- tabs -->
17	<h2 class="nav-tab-wrapper" id="mailpoet_settings_tabs">
18	<a class="nav-tab" href="#basics"><%= __('Basics') %></a>
19	- <a class="nav-tab" href="#signup"><%= __('~~Signup~~ Confirmation') %></a>
20	<a class="nav-tab" href="#mta"><%= __('Send With...') %></a>
21	<a class="nav-tab" href="#advanced"><%= __('Advanced') %></a>
22	</h2>
	@@ -26,7 +26,7 @@
26	<% include 'settings/basics.html' %>
27	</div>
28
29	- <!-- ~~signup~~ confirmation -->
30	<div data-tab="signup" class="mailpoet_panel">
31	<% include 'settings/signup.html' %>
32	</div>


16	<!-- tabs -->
17	<h2 class="nav-tab-wrapper" id="mailpoet_settings_tabs">
18	<a class="nav-tab" href="#basics"><%= __('Basics') %></a>
19	+ <a class="nav-tab" href="#signup"><%= __('Sign-up Confirmation') %></a>
20	<a class="nav-tab" href="#mta"><%= __('Send With...') %></a>
21	<a class="nav-tab" href="#advanced"><%= __('Advanced') %></a>
22	</h2>

26	<% include 'settings/basics.html' %>
27	</div>
28
29	+ <!-- sign-up confirmation -->
30	<div data-tab="signup" class="mailpoet_panel">
31	<% include 'settings/signup.html' %>
32	</div>

views/settings/advanced.html CHANGED Viewed

	@@ -7,7 +7,7 @@
7	<%= __('Bounce email address') %>
8	</label>
9	<p class="description">
10	- <%= __('Your bounced emails will be sent to this address') %>
11	</p>
12	</th>
13	<td>
	@@ -191,4 +191,4 @@
191	});
192	});
193	});
194	- </script>


7	<%= __('Bounce email address') %>
8	</label>
9	<p class="description">
10	+ <%= __('Your bounced emails will be sent to this address.') %>
11	</p>
12	</th>
13	<td>

191	});
192	});
193	});
194	+ </script>

views/settings/basics.html CHANGED Viewed

	@@ -6,7 +6,7 @@
6	<%= __("Default sender") %>
7	</label>
8	<p class="description">
9	- <%= __('These email addresses will be selected by default for each new email') %>
10	</p>
11	</th>
12	<td>
	@@ -88,7 +88,7 @@
88	<%= __('Subscribe in comments') %>
89	</label>
90	<p class="description">
91	- <%= __('Visitors that comment on a post can subscribe to your list via a checkbox') %>
92	</p>
93	</th>
94	<td>
	@@ -148,7 +148,7 @@
148	<%= __('Subscribe in registration form') %>
149	</label>
150	<p class="description">
151	- <%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list)') %>
152	</p>
153	</th>
154	<td>
	@@ -215,7 +215,7 @@
215	<%= __('Manage Subscription page') %>
216	</label>
217	<p class="description">
218	- <%= __('When your subscribers click the "Manage your subscription" link, they will be directed to this page') %>
219	</p>
220	</th>
221	<td>
	@@ -307,7 +307,7 @@
307	<%= __('Archive page shortcode') %>
308	</label>
309	<p class="description">
310	- <%= __('Paste this shortcode on a page to display a list of past newsletters') %>
311	</p>
312	</th>
313	<td>
	@@ -343,7 +343,7 @@
343	<%= __('Shortcode to display total number of subscribers') %>
344	</label>
345	<p class="description">
346	- <%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers') %>
347	</p>
348	</th>
349	<td>


6	<%= __("Default sender") %>
7	</label>
8	<p class="description">
9	+ <%= __('These email addresses will be selected by default for each new email.') %>
10	</p>
11	</th>
12	<td>

88	<%= __('Subscribe in comments') %>
89	</label>
90	<p class="description">
91	+ <%= __('Visitors that comment on a post can subscribe to your list via a checkbox.') %>
92	</p>
93	</th>
94	<td>

148	<%= __('Subscribe in registration form') %>
149	</label>
150	<p class="description">
151	+ <%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list.)') %>
152	</p>
153	</th>
154	<td>

215	<%= __('Manage Subscription page') %>
216	</label>
217	<p class="description">
218	+ <%= __('When your subscribers click the "Manage your subscription" link, they will be directed to this page.') %>
219	</p>
220	</th>
221	<td>

307	<%= __('Archive page shortcode') %>
308	</label>
309	<p class="description">
310	+ <%= __('Paste this shortcode on a page to display a list of past newsletters.') %>
311	</p>
312	</th>
313	<td>

343	<%= __('Shortcode to display total number of subscribers') %>
344	</label>
345	<p class="description">
346	+ <%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers.') %>
347	</p>
348	</th>
349	<td>

views/settings/mta.html CHANGED Viewed

	@@ -251,7 +251,7 @@
251	<p>
252	<%= __('<strong>Warning!</strong> Sending more than the recommended amount of emails? You may break the terms of your web host or provider!') %>'
253	<br />
254	- <%= __('Please ask your host for the maximum number of emails you are allowed to send per day') %>
255	</p>
256	</div>
257	</td>
	@@ -349,7 +349,7 @@
349	<%= __('SMTP Hostname') %>
350	</label>
351	<p class="description">
352	- <%= __('e.g.:smtp.mydomain.com') %>
353	</p>
354	</th>
355	<td>
	@@ -460,7 +460,7 @@
460	<%= __('Domain') %>
461	</label>
462	<p class="description">
463	- <%= __('e.g.:smtp.mydomain.com') %>
464	</p>
465	</th>
466	<td>
	@@ -557,7 +557,7 @@
557	<%= __('Authentication') %>
558	</label>
559	<p class="description">
560	- <%= __('Leave this option set to Yes. Only a tiny portion of SMTP services prefer Authentication to be turned off') %>
561	</p>
562	</th>
563	<td>
	@@ -599,12 +599,12 @@
599	<%= __('SPF Signature (Highly recommended!)') %>
600	</label>
601	<p class="description">
602	- <%= __("~~Improves~~ your delivery rate by verifying that you're allowed to send emails from your domain") %>
603	</p>
604	</th>
605	<td>
606	<p>
607	- <%= __("SPF is set up in your DNS. Read your host's support documentation for more information") %>
608	</p>
609	</td>
610	</tr>
	@@ -764,7 +764,7 @@
764	&& $('#mailpoet_api_key').val().trim().length === 0
765	) {
766	MailPoet.Notice.error(
767	- "<%= __('You need to specify a MailPoet account key') %>"
768	);
769	return false;
770	}


251	<p>
252	<%= __('<strong>Warning!</strong> Sending more than the recommended amount of emails? You may break the terms of your web host or provider!') %>'
253	<br />
254	+ <%= __('Please ask your host for the maximum number of emails you are allowed to send per day.') %>
255	</p>
256	</div>
257	</td>

349	<%= __('SMTP Hostname') %>
350	</label>
351	<p class="description">
352	+ <%= __('e.g.: smtp.mydomain.com') %>
353	</p>
354	</th>
355	<td>

460	<%= __('Domain') %>
461	</label>
462	<p class="description">
463	+ <%= __('e.g.: smtp.mydomain.com') %>
464	</p>
465	</th>
466	<td>

557	<%= __('Authentication') %>
558	</label>
559	<p class="description">
560	+ <%= __('Leave this option set to Yes. Only a tiny portion of SMTP services prefer Authentication to be turned off.') %>
561	</p>
562	</th>
563	<td>

599	<%= __('SPF Signature (Highly recommended!)') %>
600	</label>
601	<p class="description">
602	+ <%= __("This improves your delivery rate by verifying that you're allowed to send emails from your domain.") %>
603	</p>
604	</th>
605	<td>
606	<p>
607	+ <%= __("SPF is set up in your DNS. Read your host's support documentation for more information.") %>
608	</p>
609	</td>
610	</tr>

764	&& $('#mailpoet_api_key').val().trim().length === 0
765	) {
766	MailPoet.Notice.error(
767	+ "<%= __('You need to specify a MailPoet account key.') %>"
768	);
769	return false;
770	}

views/settings/signup.html CHANGED Viewed

	@@ -1,10 +1,10 @@
1	<table class="form-table">
2	<tbody>
3	- <!-- enable ~~signup~~ confirmation -->
4	<tr>
5	<th scope="row">
6	<label>
7	- <%= __('Enable ~~signup~~ confirmation') %>
8	</label>
9	<p class="description">
10	<%= __("If you enable this option, your subscribers will first receive a confirmation email after they subscribe. Once they confirm their subscription (via this email), they will be marked as 'confirmed' and will begin to receive your email newsletters.") %>
	@@ -16,7 +16,7 @@
16	id="mailpoet_signup_confirmation_notice"
17	<% if (settings.mta_group != "mailpoet") %>style="display:none;"<% endif %>
18	>
19	- <%=- __('~~Signup~~ confirmation is mandatory when using the MailPoet Sending Service.') -%>
20	</p>
21	<p
22	id="mailpoet_signup_confirmation_input"
	@@ -52,7 +52,7 @@
52	</table>
53	<table id="mailpoet_signup_options" class="form-table">
54	<tbody>
55	- <!-- ~~signup~~ confirmation: from name & email -->
56	<tr>
57	<th scope="row">
58	<label for="settings[signup_confirmation_from_name]">
	@@ -78,7 +78,7 @@
78	</p>
79	</td>
80	</tr>
81	- <!-- ~~signup~~ confirmation: reply_to name & email -->
82	<tr>
83	<th scope="row">
84	<label for="settings[signup_confirmation_reply_name]">
	@@ -144,14 +144,14 @@
144	<% endif %></textarea>
145	</td>
146	</tr>
147	- <!-- ~~signup~~ confirmation: confirmation page -->
148	<tr>
149	<th scope="row">
150	<label>
151	<%= __('Confirmation page') %>
152	</label>
153	<p class="description">
154	- <%= __('When subscribers click on the activation link, they will be redirected to this page') %>
155	</p>
156	</th>
157	<td>
	@@ -196,7 +196,7 @@
196	} else {
197	result = confirm("<%= __('New subscribers will be automatically confirmed, without having to confirm their subscription. This is not recommended!') %>");
198	}
199	- // if the user confirmed changing the ~~signup~~ confirmation (yes/no)
200	if(result === true) {
201	// toggle signup options depending on the currently selected value
202	toggleSignupOptions();


1	<table class="form-table">
2	<tbody>
3	+ <!-- enable sign-up confirmation -->
4	<tr>
5	<th scope="row">
6	<label>
7	+ <%= __('Enable sign-up confirmation') %>
8	</label>
9	<p class="description">
10	<%= __("If you enable this option, your subscribers will first receive a confirmation email after they subscribe. Once they confirm their subscription (via this email), they will be marked as 'confirmed' and will begin to receive your email newsletters.") %>

16	id="mailpoet_signup_confirmation_notice"
17	<% if (settings.mta_group != "mailpoet") %>style="display:none;"<% endif %>
18	>
19	+ <%=- __('Sign-up confirmation is mandatory when using the MailPoet Sending Service.') -%>
20	</p>
21	<p
22	id="mailpoet_signup_confirmation_input"

52	</table>
53	<table id="mailpoet_signup_options" class="form-table">
54	<tbody>
55	+ <!-- sign-up confirmation: from name & email -->
56	<tr>
57	<th scope="row">
58	<label for="settings[signup_confirmation_from_name]">

78	</p>
79	</td>
80	</tr>
81	+ <!-- sign-up confirmation: reply_to name & email -->
82	<tr>
83	<th scope="row">
84	<label for="settings[signup_confirmation_reply_name]">

144	<% endif %></textarea>
145	</td>
146	</tr>
147	+ <!-- sign-up confirmation: confirmation page -->
148	<tr>
149	<th scope="row">
150	<label>
151	<%= __('Confirmation page') %>
152	</label>
153	<p class="description">
154	+ <%= __('When subscribers click on the activation link, they will be redirected to this page.') %>
155	</p>
156	</th>
157	<td>

196	} else {
197	result = confirm("<%= __('New subscribers will be automatically confirmed, without having to confirm their subscription. This is not recommended!') %>");
198	}
199	+ // if the user confirmed changing the sign-up confirmation (yes/no)
200	if(result === true) {
201	// toggle signup options depending on the currently selected value
202	toggleSignupOptions();

views/subscribers/importExport/export.html CHANGED Viewed

	@@ -49,7 +49,7 @@
49	</label>
50	</th>
51	<td>
52	- <select id="export_lists" data-placeholder="<%= __('Select') %>" multiple="multiple"></select>
53	</td>
54	</tr>
55	{{/if}}
	@@ -60,7 +60,7 @@
60	</label>
61	</th>
62	<td>
63	- <select id="export_columns" data-placeholder="<%= __('Select') %>" multiple="multiple"></select>
64	</td>
65	</tr>
66	{{#if groupBySegmentOption}}


49	</label>
50	</th>
51	<td>
52	+ <select id="export_lists" data-placeholder="<%= _x('Select', 'Verb') %>" multiple="multiple"></select>
53	</td>
54	</tr>
55	{{/if}}

60	</label>
61	</th>
62	<td>
63	+ <select id="export_columns" data-placeholder="<%= _x('Select', 'Verb') %>" multiple="multiple"></select>
64	</td>
65	</tr>
66	{{#if groupBySegmentOption}}

views/subscribers/importExport/import.html CHANGED Viewed

	@@ -34,15 +34,15 @@
34	<%= localize({
35	'noMailChimpLists': __('No active lists found'),
36	'serverError': __('Server error:'),
37	- 'select': __('~~Select~~'),
38	'csvKBLink': csvKBLink,
39	- 'wrongFileFormat': __('Only comma-separated (CSV) file formats are supported'),
40	'maxPostSizeNotice': __('Your CSV is over %s and is too big to process. Please split the file into two or more sections.')\|replace({'%s': maxPostSize}),
41	'dataProcessingError': __("Your data could not be processed. Please make sure it is in the correct format."),
42	- '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]'),
43	- 'importNoticeSkipped': __('%1$s records had issues and were skipped'),
44	- 'importNoticeInvalid': __('%1$s emails are not valid : %2$s'),
45	- 'importNoticeDuplicate': __('%1$s emails appear more than once in your file : %2$s'),
46	'hideDetails': __('Hide details'),
47	'showDetails': __('Show more details'),
48	'segmentSelectionRequired': __('Please select at least one list'),
	@@ -50,8 +50,8 @@
50	'addNewField': __('Add new field'),
51	'addNewColumuserColumnsn': __('Add new list'),
52	'userColumns': __('User fields'),
53	- 'selectedValueAlreadyMatched': __('The selected value is already matched to another field'),
54	- 'confirmCorrespondingColumn': __('Confirm that this field corresponds to the selected field'),
55	'columnContainInvalidElement': __('One of the fields contains an invalid email. Please fix it before continuing.'),
56	'january': __('January'),
57	'february': __('February'),
	@@ -67,7 +67,7 @@
67	'december': __('December'),
68	'noDateFieldMatch': __("Do not match as a 'date field' if most of the rows for that field return the same error."),
69	'emptyFirstRowDate': __('First row date cannot be empty.'),
70	- 'verifyDateMatch': __('Verify that the date in blue matches the original date'),
71	'pm': __('PM'),
72	'am': __('AM'),
73	'dateMatchError': __('Error matching date'),
	@@ -76,6 +76,6 @@
76	'columnContainsInvalidElement': __('One of the fields contains an invalid email. Please fix before continuing.'),
77	'customFieldCreateError': __('Custom field could not be created'),
78	'subscribersCreated': __('%1$s subscribers added to %2$s.'),
79	- 'subscribersUpdated': __('%1$s existing subscribers were updated and added to %2$s')
80	}) %>
81	<% endblock %>


34	<%= localize({
35	'noMailChimpLists': __('No active lists found'),
36	'serverError': __('Server error:'),
37	+ 'select': __('Selecto', 'Form input type'),
38	'csvKBLink': csvKBLink,
39	+ 'wrongFileFormat': __('Only comma-separated (CSV) file formats are supported.'),
40	'maxPostSizeNotice': __('Your CSV is over %s and is too big to process. Please split the file into two or more sections.')\|replace({'%s': maxPostSize}),
41	'dataProcessingError': __("Your data could not be processed. Please make sure it is in the correct format."),
42	+ '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]'),
43	+ 'importNoticeSkipped': __('%1$s records had issues and were skipped.'),
44	+ 'importNoticeInvalid': __('%1$s emails are not valid: %2$s'),
45	+ 'importNoticeDuplicate': __('%1$s emails appear more than once in your file: %2$s'),
46	'hideDetails': __('Hide details'),
47	'showDetails': __('Show more details'),
48	'segmentSelectionRequired': __('Please select at least one list'),

50	'addNewField': __('Add new field'),
51	'addNewColumuserColumnsn': __('Add new list'),
52	'userColumns': __('User fields'),
53	+ 'selectedValueAlreadyMatched': __('The selected value is already matched to another field.'),
54	+ 'confirmCorrespondingColumn': __('Confirm that this field corresponds to the selected field.'),
55	'columnContainInvalidElement': __('One of the fields contains an invalid email. Please fix it before continuing.'),
56	'january': __('January'),
57	'february': __('February'),

67	'december': __('December'),
68	'noDateFieldMatch': __("Do not match as a 'date field' if most of the rows for that field return the same error."),
69	'emptyFirstRowDate': __('First row date cannot be empty.'),
70	+ 'verifyDateMatch': __('Verify that the date in blue matches the original date.'),
71	'pm': __('PM'),
72	'am': __('AM'),
73	'dateMatchError': __('Error matching date'),

76	'columnContainsInvalidElement': __('One of the fields contains an invalid email. Please fix before continuing.'),
77	'customFieldCreateError': __('Custom field could not be created'),
78	'subscribersCreated': __('%1$s subscribers added to %2$s.'),
79	+ 'subscribersUpdated': __('%1$s existing subscribers were updated and added to %2$s.')
80	}) %>
81	<% endblock %>

views/subscribers/importExport/import/step1.html CHANGED Viewed

	@@ -92,7 +92,7 @@
92	</label>
93	</th>
94	<td>
95	- <select class="mailchimp_lists_select" data-placeholder="<%= __('Select') %>" multiple="multiple"></select>
96	</td>
97	</tr>
98	</tbody>


92	</label>
93	</th>
94	<td>
95	+ <select class="mailchimp_lists_select" data-placeholder="<%= _x('Select', 'Verb') %>" multiple="multiple"></select>
96	</td>
97	</tr>
98	</tbody>

views/subscribers/importExport/import/step2.html CHANGED Viewed

	@@ -5,7 +5,7 @@
5
6	<script id="subscribers_data_parse_results_template" type="text/x-handlebars-template">
7	<div class="error">
8	- <p>{{{notice}}} <a class="mailpoet_subscribers_data_parse_results_details_show" href="javascript:;"><%= __('Show more details.') %></a><p>
9	<div class="mailpoet_subscribers_data_parse_results_details mailpoet_hidden">
10	<hr>
11	{{#if duplicate}}
	@@ -38,7 +38,7 @@
38	</label>
39	</th>
40	<td>
41	- <select id="mailpoet_segments_select" data-placeholder="<%= __('Select') %>" multiple="multiple"></select>
42	<a href="javascript:;" class="mailpoet_create_segment"><%= __('Create a new list') %></a>
43	</td>
44	</tr>
	@@ -160,4 +160,4 @@
160	<!-- New custom field logic -->
161	<% include 'form/custom_fields.html' %>
162	</div>
163	- </div>


5
6	<script id="subscribers_data_parse_results_template" type="text/x-handlebars-template">
7	<div class="error">
8	+ <p>{{{notice}}} <a class="mailpoet_subscribers_data_parse_results_details_show" href="javascript:;"><%= __('Show more details') %></a><p>
9	<div class="mailpoet_subscribers_data_parse_results_details mailpoet_hidden">
10	<hr>
11	{{#if duplicate}}

38	</label>
39	</th>
40	<td>
41	+ <select id="mailpoet_segments_select" data-placeholder="<%= _x('Select', 'Verb') %>" multiple="multiple"></select>
42	<a href="javascript:;" class="mailpoet_create_segment"><%= __('Create a new list') %></a>
43	</td>
44	</tr>

160	<!-- New custom field logic -->
161	<% include 'form/custom_fields.html' %>
162	</div>
163	+ </div>

views/subscribers/subscribers.html CHANGED Viewed

	@@ -19,10 +19,10 @@
19	'loadingItems': __('Loading subscribers...'),
20	'noItemsFound': __('No subscribers were found.'),
21	'selectAllLabel': __('All subscribers on this page are selected.'),
22	- 'selectedAllLabel': __('All %d subscribers are selected'),
23	'selectAllLink': __('Select all subscribers on all pages.'),
24	'clearSelection': __('Clear selection'),
25	- 'permanentlyDeleted': __('%d subscribers were permanently deleted'),
26	'selectBulkAction': __('Select bulk action'),
27	'bulkActions': __('Bulk Actions'),
28	'apply': __('Apply'),
	@@ -32,6 +32,7 @@
32	'edit': __('Edit'),
33	'restore': __('Restore'),
34	'trash': __('Trash'),

35	'deletePermanently': __('Delete Permanently'),
36	'showMoreDetails': __('Show more details'),
37
	@@ -44,8 +45,8 @@
44	'numberOfItems': __('%$1d item(s)'),
45
46	'email': __('E-mail'),
47	- 'firstname': __('~~Firstname~~'),
48	- 'lastname': __('~~Lastname~~'),
49	'status': __('Status'),
50	'unconfirmed': __('Unconfirmed'),
51	'subscribed': __('Subscribed'),
	@@ -61,25 +62,25 @@
61	'lists': __('Lists'),
62	'subscribedOn': __('Subscribed on'),
63	'lastModifiedOn': __('Last modified on'),
64	- 'oneSubscriberTrashed': __('1 subscriber was moved to the trash'),
65	- 'multipleSubscribersTrashed': __('%$1d subscribers were moved to the trash'),
66	- 'oneSubscriberDeleted': __('1 subscriber was permanently deleted'),
67	- 'multipleSubscribersDeleted': __('%$1d subscribers were permanently deleted'),
68	- 'oneSubscriberRestored': __('1 subscriber has been restored from the trash'),
69	- 'multipleSubscribersRestored': __('%$1d subscribers have been restored from the trash'),
70	'moveToList': __('Move to list...'),
71	'multipleSubscribersMovedToList': __('%$1d subscribers were moved to list <strong>%$2s</strong>'),
72	'addToList': __('Add to list...'),
73	- 'multipleSubscribersAddedToList': __('%$1d subscribers were added to list <strong>%$2s</strong>'),
74	'removeFromList': __('Remove from list...'),
75	'multipleSubscribersRemovedFromList': __('%$1d subscribers were removed from list <strong>%$2s</strong>'),
76	'removeFromAllLists': __('Remove from all lists'),
77	- 'multipleSubscribersRemovedFromAllLists': __('%$1d subscribers were removed from all lists'),
78	'resendConfirmationEmail': __('Resend confirmation email'),
79	- 'multipleConfirmationEmailsSent': __('%$1d confirmation emails have been sent'),
80	- 'listsToWhichSubscriberWasSubscribed': __('Lists to which the subscriber was subscribed'),
81	'WPUsersSegment': __('WordPress Users'),
82	- 'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his profile[/link] to change his/her email.'),
83	'tip': __('Tip:'),
84	'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.'),
85	'year': __('Year'),


19	'loadingItems': __('Loading subscribers...'),
20	'noItemsFound': __('No subscribers were found.'),
21	'selectAllLabel': __('All subscribers on this page are selected.'),
22	+ 'selectedAllLabel': __('All %d subscribers are selected.'),
23	'selectAllLink': __('Select all subscribers on all pages.'),
24	'clearSelection': __('Clear selection'),
25	+ 'permanentlyDeleted': __('%d subscribers were permanently deleted.'),
26	'selectBulkAction': __('Select bulk action'),
27	'bulkActions': __('Bulk Actions'),
28	'apply': __('Apply'),

32	'edit': __('Edit'),
33	'restore': __('Restore'),
34	'trash': __('Trash'),
35	+ 'moveToTrash': __('Move to trash'),
36	'deletePermanently': __('Delete Permanently'),
37	'showMoreDetails': __('Show more details'),
38

45	'numberOfItems': __('%$1d item(s)'),
46
47	'email': __('E-mail'),
48	+ 'firstname': __('First name'),
49	+ 'lastname': __('Last name'),
50	'status': __('Status'),
51	'unconfirmed': __('Unconfirmed'),
52	'subscribed': __('Subscribed'),

62	'lists': __('Lists'),
63	'subscribedOn': __('Subscribed on'),
64	'lastModifiedOn': __('Last modified on'),
65	+ 'oneSubscriberTrashed': __('1 subscriber was moved to the trash.'),
66	+ 'multipleSubscribersTrashed': __('%$1d subscribers were moved to the trash.'),
67	+ 'oneSubscriberDeleted': __('1 subscriber was permanently deleted.'),
68	+ 'multipleSubscribersDeleted': __('%$1d subscribers were permanently deleted.'),
69	+ 'oneSubscriberRestored': __('1 subscriber has been restored from the trash.'),
70	+ 'multipleSubscribersRestored': __('%$1d subscribers have been restored from the trash.'),
71	'moveToList': __('Move to list...'),
72	'multipleSubscribersMovedToList': __('%$1d subscribers were moved to list <strong>%$2s</strong>'),
73	'addToList': __('Add to list...'),
74	+ 'multipleSubscribersAddedToList': __('%$1d subscribers were added to list <strong>%$2s</strong>.'),
75	'removeFromList': __('Remove from list...'),
76	'multipleSubscribersRemovedFromList': __('%$1d subscribers were removed from list <strong>%$2s</strong>'),
77	'removeFromAllLists': __('Remove from all lists'),
78	+ 'multipleSubscribersRemovedFromAllLists': __('%$1d subscribers were removed from all lists.'),
79	'resendConfirmationEmail': __('Resend confirmation email'),
80	+ 'multipleConfirmationEmailsSent': __('%$1d confirmation emails have been sent.'),
81	+ 'listsToWhichSubscriberWasSubscribed': __('Lists to which the subscriber was subscribed.'),
82	'WPUsersSegment': __('WordPress Users'),
83	+ 'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his/her profile[/link] to change his/her email.'),
84	'tip': __('Tip:'),
85	'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.'),
86	'year': __('Year'),